Merge pull request #3202 from withspectrum/2.4.2

2.4.2

Author: brianlovin

.circleci/config.yml

@@ -136,6 +136,16 @@ jobs:
           name: Deploy and alias Hyperion
           command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team spaceprogram
 
+  deploy_desktop:
+    <<: *js_defaults
+    docker:
+      - image: circleci/node:8
+    steps:
+      - attach_workspace:
+          at: ~/spectrum
+      - run:
+          name: Build and release desktop app
+          command: yarn run release:desktop
 
   # Run eslint, flow etc.
   test_static_js:
@@ -212,3 +222,10 @@ workflows:
           filters:
             branches:
               only: alpha
+      - deploy_desktop:
+          requires:
+            - test_static_js
+            - test_web
+          filters:
+            branches:
+              only: production

api/mutations/community/updateAdministratorEmail.js

@@ -20,7 +20,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
   const { id: communityId, email } = args.input;
   const { loaders, user } = ctx;
 
-  if (!isEmail(email)) {
+  if (!email || !isEmail(email)) {
     return new UserError('Please enter a working email address');
   }
 

api/mutations/message/addMessage.js

@@ -203,7 +203,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
   // at this point we are only dealing with thread messages
   const thread = await loaders.thread.load(message.threadId);
 
-  if (thread.isDeleted) {
+  if (!thread || thread.deletedAt) {
     trackQueue.add({
       userId: user.id,
       event: eventFailed,

athena/queues/private-channel-request-approved.js

@@ -45,7 +45,9 @@ export default async (job: Job<PrivateChannelRequestApprovedJobData>) => {
   const recipients = await getUsers([userId]);
 
   // only get owners with emails
-  const filteredRecipients = recipients.filter(user => isEmail(user.email));
+  const filteredRecipients = recipients.filter(
+    user => user && isEmail(user.email)
+  );
 
   // for each owner, create a notification for the app
   const usersNotificationPromises = filteredRecipients.map(recipient =>

athena/queues/private-channel-request-sent.js

@@ -75,7 +75,7 @@ export default async (job: Job<PrivateChannelRequestJobData>) => {
 
   // only get owners + moderators with emails
   const filteredRecipients = recipientsWithUserData.filter(
-    owner => owner.email && isEmail(owner.email)
+    owner => owner && owner.email && isEmail(owner.email)
   );
 
   // for each owner, create a notification for the app

athena/queues/private-community-request-approved.js

@@ -42,7 +42,9 @@ export default async (job: Job<PrivateCommunityRequestApprovedJobData>) => {
 
   const community = await getCommunityById(communityId);
   const recipients = await getUsers([userId]);
-  const filteredRecipients = recipients.filter(user => isEmail(user.email));
+  const filteredRecipients = recipients.filter(
+    user => user && isEmail(user.email)
+  );
   const usersNotificationPromises = filteredRecipients.map(recipient =>
     storeUsersNotifications(updatedNotification.id, recipient.id)
   );

athena/queues/private-community-request-sent.js

@@ -59,7 +59,7 @@ export default async (job: Job<PrivateCommunityRequestJobData>) => {
 
   // only get owners + moderators with emails
   const filteredRecipients = recipientsWithUserData.filter(
-    owner => owner.email && isEmail(owner.email)
+    owner => owner && owner.email && isEmail(owner.email)
   );
 
   // for each owner, create a notification for the app

athena/queues/send-slack-invitations.js

@@ -62,7 +62,13 @@ const processJob = async (job: Job<SendSlackInvitationsJobData>) => {
     // filter out deleted members
     .filter(member => !member.deleted)
     // only save members with valid email
-    .filter(member => member.profile.email && isEmail(member.profile.email))
+    .filter(
+      member =>
+        member &&
+        member.profile &&
+        member.profile.email &&
+        isEmail(member.profile.email)
+    )
     // format output data
     .map(member => ({
       firstName: member.profile.first_name,

config-overrides.js

@@ -106,37 +106,19 @@ module.exports = function override(config, env) {
   });
   config.plugins.push(
     new OfflinePlugin({
-      // Don't cache anything in dev
+      appShell: '/index.html',
       caches: process.env.NODE_ENV === 'development' ? {} : 'all',
-      updateStrategy: 'all', // Update all files on update, seems safer than trying to only update changed files since we didn't write the webpack config
-      externals, // These files should be cached, but they're not emitted by webpack, so we gotta tell OfflinePlugin about 'em.
-      excludes: ['**/*.map'], // Don't cache any source maps, they're huge and unnecessary for clients
-      autoUpdate: true, // Automatically check for updates every hour
-      rewrites: arg => arg,
-      cacheMaps: [
-        {
-          match: url => {
-            // Don't return the cached index.html for API requests or /auth pages
-            if (url.pathname.indexOf('/api') === 0) return;
-            if (url.pathname.indexOf('/auth') === 0) return;
-            try {
-              return new URL('/index.html', url);
-              // TODO: Fix this properly instead of ignoring errors
-            } catch (err) {
-              return;
-            }
-          },
-          requestType: ['navigate'],
-        },
-      ],
+      externals,
+      autoUpdate: true,
       ServiceWorker: {
-        entry: './public/push-sw.js', // Add the push notification ServiceWorker
-        events: true, // Emit events from the ServiceWorker
+        entry: './public/push-sw.js',
+        events: true,
         prefetchRequest: {
-          credentials: 'include', // Include credentials when fetching files, just to make sure we don't get into any issues
+          mode: 'cors',
+          credentials: 'include',
         },
       },
-      AppCache: false, // Don't cache using AppCache, too buggy that thing
+      AppCache: false,
     })
   );
   if (process.env.ANALYZE_BUNDLE === 'true') {

desktop/README.md

@@ -1,16 +1,12 @@
 # Desktop
 
-**This folder contains all sources used to build spectrum desktop application.**
-
-The project uses [Electron](https://electronjs.org/) to build cross platform desktop apps with JavaScript, HTML, and CSS.
+This folder contains the [Electron](https://electronjs.org/)-based desktop app for Spectrum. Electron renders a web view, which renders the main `Spectrum.chat` webpage.
 
 ## Directory Structure
 
-* `release/` - the release build for each platform (mac, win, linux).
-* `resources/` - the resources folder (icons, images ...).
-* `src/` the source code of electron application.
-* `package.json` - dependencies & devdependencies.
-* `yarn.lock` - Yarn lockfile to get consistent installs across machine.
+* `release/` - the release build for each platform (mac, win, linux)
+* `resources/` - the resources folder (icons, images ...)
+* `src/` the source code of electron application
 
 ## Scripts