Merge branch 'master' of https://github.com/jgillick/jira-changelog

jgillick · Mar 24, 2021 · fa42730 · fa42730
2 parents 4534d55 + 6ca2812
commit fa42730
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Jira.js b/src/Jira.js
@@ -239,6 +239,8 @@ export default class Jira {
 
     return this.jira.findIssue(ticketId).then((origTicket) => {
       const ticket = Object.assign({}, origTicket);
+      if (!this.config.slack.api || !ticket.fields.reporter)
+        return ticket;
       return this.slack.findUser(ticket.fields.reporter.emailAddress, ticket.fields.reporter.displayName)
       .then((slackUser) => {
         ticket.slackUser = slackUser;

diff --git a/src/template.js b/src/template.js
@@ -86,7 +86,7 @@ export function getTicketReporters(tickets) {
   const reporters = {};
 
   tickets.forEach((ticket) => {
-    const { email, displayName } = ticket.fields.reporter;
+    const { email, displayName } = ticket.fields.reporter || [];
     if (!reporters[email]) {
       reporters[email] = {
         email,