wuffle 0.73.2 → 0.73.3

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019-present Nico Rehwaldt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/apps/automatic-dev-flow.js

@@ -1,6 +1,3 @@
-import { filterIssueOrPull } from '../filters.js';
-import { issueIdent } from '../util/meta.js';
-
 const DONE = 'DONE';
 const EXTERNAL_CONTRIBUTION = 'EXTERNAL_CONTRIBUTION';
 const IN_PROGRESS = 'IN_PROGRESS';
@@ -27,26 +24,7 @@ export default function(webhookEvents, githubIssues, columns, issueFilter, logge
     name: 'wuffle:automatic-dev-flow'
   });
 
-  function ifEnabled(webhookHandlerFn) {
-
-    return (context) => {
-
-      const payload = context.payload;
-
-      const issueOrPull = filterIssueOrPull(
-        payload.issue || payload.pull_request,
-        payload.repository
-      );
-
-      if (issueFilter.isIgnored(issueOrPull)) {
-        log.debug({ issue: issueIdent(issueOrPull) }, 'issue matching ignore filter');
-
-        return;
-      }
-
-      return webhookHandlerFn(context);
-    };
-  }
+  const ifEnabled = issueFilter.createWebhookFilter(log);
 
   webhookEvents.on([
     'issues.closed',

package/lib/apps/background-sync/BackgroundSync.js

@@ -217,25 +217,11 @@ We automatically synchronize all repositories you granted us access to via the G
 
               const update = filterIssueOrPull(issueOrPull, repository);
 
-              const {
-                id
-              } = update;
+              foundIssues[update.id] = update;
 
-              const existingIssue = await store.getIssueById(id);
-
-              if (existingIssue && existingIssue.updated_at >= update.updated_at) {
-                foundIssues[id] = null;
-
-                log.debug({
-                  [type]: `${owner}/${repo}#${issueOrPull.number}`
-                }, 'skipping, as up-to-date');
-              } else {
-                foundIssues[id] = update;
-
-                log.debug({
-                  [type]: `${owner}/${repo}#${issueOrPull.number}`
-                }, 'scheduled for update');
-              }
+              log.debug({
+                [type]: `${owner}/${repo}#${issueOrPull.number}`
+              }, 'scheduled for update');
             } catch (err) {
               log.error({
                 err,
@@ -395,12 +381,21 @@ We automatically synchronize all repositories you granted us access to via the G
 
     // update changed issues
 
-    await Promise.all(pendingUpdates.map(update => store.updateIssue(update)));
+    const updateTasks = pendingUpdates.map(
+      update => store.updateIssue(update)
+    );
+
+    // returns the update for updated issues or undefined
+    // where issues were not stored (filtered out) - we only filter
+    // for actual updated issues
+    const updatedIssues = await Promise.all(updateTasks).then(updates => {
+      return updates.filter(update => update);
+    });
 
-    // emit background sync event for all found issues
+    // emit background sync event for all updated issues
 
     await syncDetails(
-      Object.keys(foundIssues),
+      updatedIssues,
       getSyncClosedDetailsSince(),
       getSyncOpenDetailsSince()
     );
@@ -437,10 +432,12 @@ We automatically synchronize all repositories you granted us access to via the G
     );
   }
 
-  function syncDetails(issueIds, syncClosedSince, syncOpenSince) {
+  function syncDetails(updatedIssues, syncClosedSince, syncOpenSince) {
+
+    const jobs = updatedIssues.map(async updatedIssue => {
 
-    const jobs = issueIds.map(async id => {
-      const issue = await store.getIssueById(id);
+      // ensure we fetch latest version of issue (to prevent de-sync)
+      const issue = await store.getIssueById(updatedIssue.id);
 
       if (!issue) {
         return;

package/lib/apps/github-comments/GithubComments.js

@@ -12,8 +12,16 @@ import gql from 'fake-tag';
  * @param {import('../../events.js').default} events
  * @param {import('../github-client/GithubClient.js').default} githubClient
  * @param {import('../../store.js').default} store
+ * @param {import('../issue-filter/IssueFilter.js').default} issueFilter
+ * @param {import('../../types.js').Logger } logger
  */
-export default function GithubComments(webhookEvents, events, githubClient, store) {
+export default function GithubComments(webhookEvents, events, githubClient, store, issueFilter, logger) {
+
+  const log = logger.child({
+    name: 'wuffle:github-comments'
+  });
+
+  const ifEnabled = issueFilter.createWebhookFilter(log);
 
   // issues /////////////////////
 
@@ -108,7 +116,7 @@ export default function GithubComments(webhookEvents, events, githubClient, stor
 
   webhookEvents.on([
     'issue_comment'
-  ], async ({ payload }) => {
+  ], ifEnabled(async ({ payload }) => {
     const {
       action,
       comment: _comment,
@@ -169,7 +177,7 @@ export default function GithubComments(webhookEvents, events, githubClient, stor
       ...commentedIssue,
       comments
     });
-  });
+  }));
 
 }
 

package/lib/apps/github-reviews/GithubReviews.js

@@ -11,8 +11,16 @@ import { filterUser, filterPull } from '../../filters.js';
  * @param {import('../../events.js').default} events
  * @param {import('../github-client/GithubClient.js').default} githubClient
  * @param {import('../../store.js').default} store
+ * @param {import('../issue-filter/IssueFilter.js').default} issueFilter
+ * @param {import('../../types.js').Logger } logger
  */
-export default function GithubReviews(webhookEvents, events, githubClient, store) {
+export default function GithubReviews(webhookEvents, events, githubClient, store, issueFilter, logger) {
+
+  const log = logger.child({
+    name: 'wuffle:github-reviews'
+  });
+
+  const ifEnabled = issueFilter.createWebhookFilter(log);
 
   // issues /////////////////////
 
@@ -54,7 +62,7 @@ export default function GithubReviews(webhookEvents, events, githubClient, store
 
   webhookEvents.on([
     'pull_request_review'
-  ], async ({ payload }) => {
+  ], ifEnabled(async ({ payload }) => {
     const {
       action,
       review: _review,
@@ -102,7 +110,7 @@ export default function GithubReviews(webhookEvents, events, githubClient, store
       ...pull_request,
       reviews
     });
-  });
+  }));
 
 }
 

package/lib/apps/github-statuses/GithubStatuses.js

@@ -11,8 +11,16 @@ import { filterPull } from '../../filters.js';
  * @param {import('../../events.js').default} events
  * @param {import('../github-client/GithubClient.js').default} githubClient
  * @param {import('../../store.js').default} store
+ * @param {import('../issue-filter/IssueFilter.js').default} issueFilter
+ * @param {import('../../types.js').Logger } logger
  */
-export default function GithubStates(webhookEvents, events, githubClient, store) {
+export default function GithubStatuses(webhookEvents, events, githubClient, store, issueFilter, logger) {
+
+  const log = logger.child({
+    name: 'wuffle:github-statuses'
+  });
+
+  const ifEnabled = issueFilter.createWebhookFilter(log);
 
   // issues /////////////////////
 
@@ -89,7 +97,7 @@ export default function GithubStates(webhookEvents, events, githubClient, store)
   webhookEvents.on([
     'pull_request.opened',
     'pull_request.synchronize'
-  ], async ({ payload }) => {
+  ], ifEnabled(async ({ payload }) => {
 
     const {
       pull_request: _pull_request,
@@ -108,7 +116,7 @@ export default function GithubStates(webhookEvents, events, githubClient, store)
       id,
       statuses
     });
-  });
+  }));
 
   webhookEvents.on([
     'status'

package/lib/apps/issue-filter/IssueFilter.js

@@ -2,12 +2,14 @@
  * @typedef { { ignoreFilter?: string } } StoreFilterConfig
  */
 
+import { filterIssueOrPull } from '../../filters.js';
+import { issueIdent } from '../../util/meta.js';
+
 /**
  * An component that configures the store to filter certain elements,
  * effectively making them invisible to the board and its users.
  *
  * @param { StoreFilterConfig } config
- *
  * @param { import('../../store.js').default } store
  * @param { import('../search/Search.js').default } search
  * @param { import('../../types.js').Logger } logger
@@ -21,21 +23,50 @@ export default function IssueFilter(config, store, search, logger) {
   /**
    * @type { import('../search/Search.js').FilterFn }
    */
-  let ignoreFilter = (issue) => false;
+  let isIgnored = (issue) => false;
 
 
   if ('ignoreFilter' in config) {
     const ignoreFilterFn = search.buildFilterFn(config.ignoreFilter);
 
     if (ignoreFilterFn) {
-      ignoreFilter = ignoreFilterFn;
+      isIgnored = ignoreFilterFn;
 
-      store.setIgnoreFilter(ignoreFilter);
+      store.setIgnoreFilter(isIgnored);
     } else {
       log.warn('unparseable <ignoreFilter> - please correct your board configuration');
     }
   }
 
+  /**
+   * @param {import('../../types.js').Logger } log
+   *
+   * @return { (filterFn) => (any) => any }
+   */
+  function createWebhookFilter(log) {
+
+    return function ifEnabled(webhookHandlerFn) {
+
+      return (context) => {
+
+        const payload = context.payload;
+
+        const issueOrPull = filterIssueOrPull(
+          payload.issue || payload.pull_request,
+          payload.repository
+        );
+
+        if (isIgnored(issueOrPull)) {
+          log.debug({ issue: issueIdent(issueOrPull) }, 'issue matching ignore filter');
+
+          return;
+        }
+
+        return webhookHandlerFn(context);
+      };
+    };
+  };
+
   /**
    * Figure whether the issue shall be ignored (by ignore filter rules)
    *
@@ -43,8 +74,12 @@ export default function IssueFilter(config, store, search, logger) {
    *
    * @return {boolean} true, if issue shall be ignored
    */
-  this.isIgnored = function(issue) {
-    return ignoreFilter(issue);
-  };
+  this.isIgnored = isIgnored;
 
+  /**
+   * @param {import('../../types.js').Logger } log
+   *
+   * @return { (filterFn) => (any) => any }
+   */
+  this.createWebhookFilter = createWebhookFilter;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wuffle",
-  "version": "0.73.2",
+  "version": "0.73.3",
   "description": "A multi-repository task board for GitHub issues",
   "author": {
     "name": "Nico Rehwaldt",
@@ -81,5 +81,6 @@
     "app.yml",
     "index.js",
     "wuffle.config.example.js"
-  ]
+  ],
+  "gitHead": "1d7cdf09524102d300d6230b840959cdd1479e3e"
 }