From 729f022550b7976a1b2db712df1f67dc74659461 Mon Sep 17 00:00:00 2001
From: lowlighter <22963968+lowlighter@users.noreply.github.com>
Date: Mon, 13 Sep 2021 15:17:27 -0400
Subject: [PATCH] fix(plugins/code): handle no code snippet case

---
 source/plugins/code/index.mjs              | 19 +++----
 source/templates/classic/partials/code.ejs | 61 +++++++++++++---------
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/source/plugins/code/index.mjs b/source/plugins/code/index.mjs
index 8f8e8027..8bc93800 100644
--- a/source/plugins/code/index.mjs
+++ b/source/plugins/code/index.mjs
@@ -45,16 +45,17 @@ export default async function({login, q, imports, data, rest, account}, {enabled
     const files = events
       .flatMap(({sha, commit:{message, url}, files}) => files.map(({filename, status, additions, deletions, patch}) => ({sha, message, filename, status, additions, deletions, patch, repo:url.match(/repos[/](?<repo>[\s\S]+)[/]git[/]commits/)?.groups?.repo})))
       .filter(({patch}) => (patch ? (patch.match(/\n/mg)?.length ?? 1) : Infinity) < lines)
-    const snippet = files[Math.floor(Math.random()*files.length)]
+    const snippet = files[Math.floor(Math.random()*files.length)] ?? null
+    if (snippet) {
+      //Trim common indent from content and change line feed
+      if (!snippet.patch.split("\n").shift().endsWith("@@"))
+        snippet.patch = snippet.patch.replace(/^(?<coord>@@.*?@@)/, "$<coord>\n")
+      const indent = Math.min(...(snippet.patch.match(/^[+-]? +/mg)?.map(indent => (indent.length ?? Infinity) - indent.startsWith("+") - indent.startsWith("-")) ?? [])) || 0
+      const content = imports.htmlescape(snippet.patch.replace(/\r\n/mg, "\n").replace(new RegExp(`^([+-]?)${" ".repeat(indent)}`, "mg"), "$1"))
 
-    //Trim common indent from content and change line feed
-    if (!snippet.patch.split("\n").shift().endsWith("@@"))
-      snippet.patch = snippet.patch.replace(/^(?<coord>@@.*?@@)/, "$<coord>\n")
-    const indent = Math.min(...(snippet.patch.match(/^[+-]? +/mg)?.map(indent => (indent.length ?? Infinity) - indent.startsWith("+") - indent.startsWith("-")) ?? [])) || 0
-    const content = imports.htmlescape(snippet.patch.replace(/\r\n/mg, "\n").replace(new RegExp(`^([+-]?)${" ".repeat(indent)}`, "mg"), "$1"))
-
-    //Format patch
-    snippet.patch = imports.htmlunescape((await imports.highlight(content, "diff")).trim())
+      //Format patch
+      snippet.patch = imports.htmlunescape((await imports.highlight(content, "diff")).trim())
+    }
 
     //Results
     return {snippet}
diff --git a/source/templates/classic/partials/code.ejs b/source/templates/classic/partials/code.ejs
index dbee7bd5..a82b386e 100644
--- a/source/templates/classic/partials/code.ejs
+++ b/source/templates/classic/partials/code.ejs
@@ -14,31 +14,42 @@
         </section>
       </div>
     <% } else { %>
-      <div class="row">
-        <section class="largeable-column-fields">
-          <div class="field">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 2.5A2.5 2.5 0 014.5 0h8.75a.75.75 0 01.75.75v12.5a.75.75 0 01-.75.75h-2.5a.75.75 0 110-1.5h1.75v-2h-8a1 1 0 00-.714 1.7.75.75 0 01-1.072 1.05A2.495 2.495 0 012 11.5v-9zm10.5-1V9h-8c-.356 0-.694.074-1 .208V2.5a1 1 0 011-1h8zM5 12.25v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z"></path></svg>
-            From <span class="blue space"><%= plugins.code.snippet.repo %></span>
-          </div>
-          <div class="field">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z"></path></svg>
-            <%= plugins.code.snippet.message %>
-          </div>
-          <div class="field">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"></path></svg>
-            <span class="code"><%= plugins.code.snippet.sha.substring(0, 8) %></span>
-            <span class="code"><%= plugins.code.snippet.filename %></span>
-            <span class="code"><span class="snippet additions">++<%= plugins.code.snippet.additions %></span> <span class="snippet deletions">--<%= plugins.code.snippet.deletions %></span></span>
-          </div>
-        </section>
-      </div>
-      <div class="row">
-        <section class="snippet">
-          <div class="body markdown">
-            <code class="language-diff" xml:space="preserve"><%- plugins.code.snippet.patch %></code>
-          </div>
-        </section>
-      </div>
+      <% if (plugins.code.snippet) { %>
+        <div class="row">
+          <section class="largeable-column-fields">
+            <div class="field">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 2.5A2.5 2.5 0 014.5 0h8.75a.75.75 0 01.75.75v12.5a.75.75 0 01-.75.75h-2.5a.75.75 0 110-1.5h1.75v-2h-8a1 1 0 00-.714 1.7.75.75 0 01-1.072 1.05A2.495 2.495 0 012 11.5v-9zm10.5-1V9h-8c-.356 0-.694.074-1 .208V2.5a1 1 0 011-1h8zM5 12.25v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z"></path></svg>
+              From <span class="blue space"><%= plugins.code.snippet.repo %></span>
+            </div>
+            <div class="field">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z"></path></svg>
+              <%= plugins.code.snippet.message %>
+            </div>
+            <div class="field">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"></path></svg>
+              <span class="code"><%= plugins.code.snippet.sha.substring(0, 8) %></span>
+              <span class="code"><%= plugins.code.snippet.filename %></span>
+              <span class="code"><span class="snippet additions">++<%= plugins.code.snippet.additions %></span> <span class="snippet deletions">--<%= plugins.code.snippet.deletions %></span></span>
+            </div>
+          </section>
+        </div>
+        <div class="row">
+          <section class="snippet">
+            <div class="body markdown">
+              <code class="language-diff" xml:space="preserve"><%- plugins.code.snippet.patch %></code>
+            </div>
+          </section>
+        </div>
+      <% } else { %>
+        <div class="row">
+          <section class="largeable-column-fields">
+            <div class="field">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"></path></svg>
+              No recent code snippet found
+            </div>
+          </section>
+        </div>
+      <% } %>
     <% } %>
   </section>
 <% } %>