Merge branch 'alpha' of github.com:withspectrum/spectrum into 3.1.12

withspectrum · May 13, 2019 · 26e4bbe · 26e4bbe
2 parents ecd60ed + db9e9ba
commit 26e4bbe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 84 deletions.
diff --git a/api/migrations/20190501021006-remove-all-private-channel-members.js b/api/migrations/20190501021006-remove-all-private-channel-members.js
diff --git a/api/models/usersChannels.js b/api/models/usersChannels.js
@@ -452,7 +452,7 @@ const createMemberInDefaultChannels = (communityId: string, userId: string): Pro
 };
 
 // prettier-ignore
-const toggleUserChannelNotifications = async (userId: string, channelId: string, value: boolean): Promise<DBChannel> => {
+const toggleUserChannelNotifications = async (userId: string, channelId: string, value: boolean): Promise<?DBChannel> => {
   const event = value ? events.CHANNEL_NOTIFICATIONS_ENABLED : events.CHANNEL_NOTIFICATIONS_DISABLED
 
   trackQueue.add({
@@ -490,7 +490,7 @@ const toggleUserChannelNotifications = async (userId: string, channelId: string,
     return createMemberInChannel(channelId, userId, false)
   }
 
-  return
+  return null
 };
 
 const removeUsersChannelMemberships = async (userId: string) => {

diff --git a/now.json b/now.json
@@ -9,11 +9,11 @@
     "DEBUG": "shared:rethinkdb:db-query-cache",
     "S3_TOKEN": "@s3-token",
     "S3_SECRET": "@s3-secret",
-    "COMPOSE_RETHINKDB_PASSWORD": "@github-compose-rethinkdb-password",
-    "COMPOSE_RETHINKDB_URL": "@github-compose-rethinkdb-url",
-    "COMPOSE_RETHINKDB_PORT": "@github-compose-rethinkdb-port",
-    "BACKUP_RETHINKDB_URL": "@backup-compose-rethinkdb-url",
-    "BACKUP_RETHINKDB_PORT": "@backup-compose-rethinkdb-port",
+    "COMPOSE_RETHINKDB_PASSWORD": "@new-compose-rethinkdb-password",
+    "COMPOSE_RETHINKDB_URL": "@new-compose-rethinkdb-url",
+    "COMPOSE_RETHINKDB_PORT": "@new-compose-rethinkdb-port",
+    "BACKUP_RETHINKDB_URL": "@new-backup-compose-rethinkdb-url",
+    "BACKUP_RETHINKDB_PORT": "@new-backup-compose-rethinkdb-port",
     "AWS_RETHINKDB_PASSWORD": "@aws-rethinkdb-password",
     "AWS_RETHINKDB_URL": "@aws-rethinkdb-url",
     "AWS_RETHINKDB_PORT": "@aws-rethinkdb-port",

diff --git a/shared/imgix/sign.js b/shared/imgix/sign.js
@@ -36,15 +36,15 @@ const defaultOpts = {
 
 const signPrimary = (url: string, opts: Opts = defaultOpts): string => {
   const client = new ImgixClient({
-    domains: ['spectrum.imgix.net'],
+    domains: 'spectrum.imgix.net',
     secureURLToken: process.env.IMGIX_SECURITY_KEY,
   });
   return client.buildURL(url, opts);
 };
 
 const signProxy = (url: string, opts?: Opts = defaultOpts): string => {
   const client = new ImgixClient({
-    domains: ['spectrum-proxy.imgix.net'],
+    domains: 'spectrum-proxy.imgix.net',
     secureURLToken: process.env.IMGIX_PROXY_SECURITY_KEY,
   });
   return client.buildURL(url, opts);