Merge pull request #2767 from withspectrum/2.2.4

2.2.4

Author: brianlovin

LICENSE

@@ -0,0 +1,11 @@
+Copyright 2018 Space Program Inc.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -3,7 +3,7 @@
   [![Spectrum](./public/img/media.png)](https://spectrum.chat)
 
   ### Simple, powerful online communities.
-  
+
 </div>
 
 This is the main monorepo codebase of [Spectrum](https://spectrum.chat). Every single line of code that's not packaged into a reusable library is in this repository.
@@ -16,7 +16,7 @@ It is difficult to grow, manage and measure the impact of online communities. Co
 
 Spectrum aims to be the best platform to build any kind of community online by combining the best of web 2.0 forums and real-time chat apps. With best-in-class moderation tooling, a single platform for all your communities, threaded conversations by default, community health monitoring (and much more to come), we think that we will be able to help more people start and grow the best online communities.
 
-> "[Spectrum] will take the place that Reddit used to have a long time ago for communities (especially tech) to freely share ideas and iteract. Except realtime and trolling-free."
+> "[Spectrum] will take the place that Reddit used to have a long time ago for communities (especially tech) to freely share ideas and interact. Except realtime and trolling-free."
 >
 > \- [Guillermo Rauch (@rauchg)](https://twitter.com/rauchg/status/930946768841228288)
 
@@ -39,17 +39,17 @@ Spectrum has been under full-time development since March, 2017. See [the roadma
   - [First time setup](#first-time-setup)
   - [Running the app locally](#running-the-app-locally)
   - [Roadmap](https://github.com/withspectrum/spectrum/projects/19)
-- Technical
+- [Technical](docs/)
   - [Testing](docs/testing.md)
   - [Background Jobs](docs/backend/background-jobs.md)
   - [Deployment](docs/backend/deployment.md)
-  - [GraphQL](docs/backend/api/)
+  - [API](docs/backend/api/)
     - [Fragments](docs/backend/api/fragments.md)
     - [Pagination](docs/backend/api/pagination.md)
     - [Testing](docs/backend/api/testing.md)
     - [Tips and Tricks](docs/backend/api/tips-and-tricks.md)
 
-## Contributing 
+## Contributing
 
 **We heartily welcome any and all contributions that match [our product roadmap](https://github.com/withspectrum/spectrum/projects/19) and engineering standards!**
 
@@ -67,9 +67,9 @@ If you found a technical bug on Spectrum or have ideas for features we should im
 
 #### Fixing a bug or implementing a new feature
 
-If you find a bug on Spectrum and open a PR that fixes it we'll review it as soon as possible to ensure it matches our engineering standards. If you want implement a new feature, open an issue first to discuss what it'd look like and to ensure it fits in [our roadmap](https://github.com/withspectrum/spectrum/projects/19) and plans for the app.
+If you find a bug on Spectrum and open a PR that fixes it we'll review it as soon as possible to ensure it matches our engineering standards. If you want to implement a new feature, open an issue first to discuss what it'd look like and to ensure it fits in [our roadmap](https://github.com/withspectrum/spectrum/projects/19) and plans for the app.
 
-If you want to contribute but are unsure to start, we have [a "good first issue" label](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) which is applied to newcomer-friendly issues. Take a look at [the full list of good first issues](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and pick something you like!
+If you want to contribute but are unsure to start, we have [a "good first issue" label](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) which is applied to newcomer-friendly issues. Take a look at [the full list of good first issues](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and pick something you like! There is also [an "open" channel in the Spectrum community on Spectrum](https://spectrum.chat/spectrum/open) (how meta), if you run into troubles while trying to contribute that is the best place to talk to us.
 
 Want to fix a bug or implement an agreed-upon feature? Great, jump to the [local setup instructions](#first-time-setup)!
 
@@ -225,7 +225,7 @@ yarn run dev:api
 
 #### Develop the web UI
 
-To develop the frontend and web UI run 
+To develop the frontend and web UI run
 
 ```
 yarn run dev:web
@@ -239,12 +239,12 @@ To start the mobile apps run:
 yarn run dev:mobile
 ```
 
-And then open either the iOS simulator or the Android simulator with 
+And then open either the iOS simulator or the Android simulator with
 
 ```sh
-yarn run open:ios 
+yarn run open:ios
 # or
-yarn run open:android 
+yarn run open:android
 ```
 
 Refer to [the Expo documentation on how to install the simulators](https://docs.expo.io/versions/v25.0.0/guides/debugging.html#using-a-simulator--emulator).
@@ -256,3 +256,7 @@ Refer to [the Expo documentation on how to install the simulators](https://docs.
   <img height="200px" src="public/img/connect.svg" />
 </div>
 
+## License
+
+BSD 3-Clause, see the [LICENSE](./LICENSE) file.
+

api/models/message.js

@@ -104,6 +104,7 @@ export const getMediaMessagesForThread = (
     .table('messages')
     .getAll(threadId, { index: 'threadId' })
     .filter({ messageType: 'media' })
+    .filter(db.row.hasFields('deletedAt').not())
     .run();
 };
 

api/routes/auth/create-signin-routes.js

@@ -10,7 +10,7 @@
 import passport from 'passport';
 import { URL } from 'url';
 import isSpectrumUrl from '../../utils/is-spectrum-url';
-import { signCookie } from 'shared/cookie-utils';
+import { signCookie, getCookies } from 'shared/cookie-utils';
 
 const IS_PROD = process.env.NODE_ENV === 'production';
 const FALLBACK_URL = IS_PROD
@@ -63,11 +63,13 @@ export const createSigninRoutes = (
           req.cookies.session &&
           req.cookies['session.sig']
         ) {
+          const cookies = getCookies(req.session.passport);
+
           redirectUrl.searchParams.append(
             'accessToken',
             signCookie(
-              `session=${req.cookies.session}; session.sig=${
-                req.cookies['session.sig']
+              `session=${cookies.session}; session.sig=${
+                cookies['session.sig']
               }`
             )
           );

api/subscriptions/message.js

@@ -58,7 +58,7 @@ module.exports = {
         try {
           return addMessageListener({
             filter: message => {
-              if (message.threadId === thread) {
+              if (message.threadId === thread && user) {
                 trackUserThreadLastSeenQueue.add({
                   userId: user.id,
                   threadId: message.threadId,

athena/index.js

@@ -37,13 +37,14 @@ import {
   PRIVATE_CHANNEL_REQUEST_SENT,
   PRIVATE_CHANNEL_REQUEST_APPROVED,
   SEND_PUSH_NOTIFICATIONS,
+  TRACK_USER_LAST_SEEN,
 } from './queues/constants';
 
 const PORT = process.env.PORT || 3003;
 
-console.log('\n🛠 Athena, the processing worker, is starting...');
+debug('\n🛠 Athena, the processing worker, is starting...');
 debug('Logging with debug enabled!');
-console.log('');
+debug('');
 
 const server = createWorker({
   [MESSAGE_NOTIFICATION]: processMessageNotification,
@@ -57,7 +58,7 @@ const server = createWorker({
   [COMMUNITY_INVITE_NOTIFICATION]: processCommunityInvite,
   [COMMUNITY_INVOICE_PAID_NOTIFICATION]: processCommunityInvoicePaid,
   [PRO_INVOICE_PAID_NOTIFICATION]: processProInvoicePaid,
-  'track user thread last seen': trackUserThreadLastSeen,
+  [TRACK_USER_LAST_SEEN]: trackUserThreadLastSeen,
   [PROCESS_ADMIN_TOXIC_MESSAGE]: processAdminMessageModeration,
   [PROCESS_ADMIN_TOXIC_THREAD]: processAdminThreadModeration,
   [PRIVATE_CHANNEL_REQUEST_SENT]: processUserRequestedJoinPrivateChannel,
@@ -67,7 +68,7 @@ const server = createWorker({
 
 startNotificationsListener();
 
-console.log(
+debug(
   `🗄 Queues open for business ${(process.env.NODE_ENV === 'production' &&
     // $FlowIssue
     `at ${process.env.COMPOSE_REDIS_URL}:${process.env.COMPOSE_REDIS_PORT}`) ||
@@ -76,7 +77,7 @@ console.log(
 
 // $FlowIssue
 server.listen(PORT, 'localhost', () => {
-  console.log(
+  debug(
     `💉 Healthcheck server running at ${server.address().address}:${
       server.address().port
     }`

athena/queues/channel-notification.js

@@ -91,6 +91,5 @@ export default async (job: Job<ChannelNotificationJobData>) => {
     debug('❌ Error in job:\n');
     debug(err);
     Raven.captureException(err);
-    console.log(err);
   });
 };

athena/queues/community-invite.js

@@ -91,8 +91,8 @@ export default async (job: Job<CommunityInviteNotificationJobData>) => {
       sender,
       customMessage
     ).catch(err => {
+      debug(err);
       Raven.captureException(err);
-      console.log(err);
     });
   } else {
     // the user exists on spectrum
@@ -142,7 +142,6 @@ export default async (job: Job<CommunityInviteNotificationJobData>) => {
       debug('❌ Error in job:\n');
       debug(err);
       Raven.captureException(err);
-      console.log(err);
     });
   }
 };

athena/queues/community-invoice-paid.js

@@ -76,6 +76,5 @@ export default async (job: Job<InvoiceJobData>) => {
     debug('❌ Error in job:\n');
     debug(err);
     Raven.captureException(err);
-    console.log(err);
   });
 };

athena/queues/community-notification.js

@@ -79,6 +79,5 @@ export default async (job: Job<CommunityNotificationJobData>) => {
     debug('❌ Error in job:\n');
     debug(err);
     Raven.captureException(err);
-    console.log(err);
   }
 };