fix(tests): post merge cleanup

test/api/v3/integration/members/POST-members_memberId_clear-flags.js

@@ -25,10 +25,10 @@ describe('POST /members/:memberId/clear-flags', () => {
           message: t('invalidReqParams'),
         });
     });
-  
+
     it('returns error when member with UUID is not found', async () => {
       const randomId = generateUUID();
-  
+
       await expect(moderator.post(`/members/${randomId}/clear-flags`))
         .to.eventually.be.rejected.and.eql({
           code: 404,
@@ -39,14 +39,14 @@ describe('POST /members/:memberId/clear-flags', () => {
 
     it('returns error when requesting user is not a moderator', async () => {
       await expect(reporter.post(`/members/${admin._id}/clear-flags`))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: 'Only a moderator may clear reports from a profile.',
-      });
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: 'Only a moderator may clear reports from a profile.',
+        });
     });
   });
-  
+
   context('valid request', () => {
     it('removes a single flag from user', async () => {
       await expect(moderator.post(`/members/${admin._id}/clear-flags`)).to.eventually.be.ok;
@@ -61,4 +61,4 @@ describe('POST /members/:memberId/clear-flags', () => {
       expect(updatedTarget.profile.flags).to.eql({});
     });
   });
-});
+});

test/api/v3/integration/members/POST-members_memberId_flag.js

@@ -1,11 +1,11 @@
 import { v4 as generateUUID } from 'uuid';
 import moment from 'moment';
 import nconf from 'nconf';
+import { IncomingWebhook } from '@slack/webhook';
 import {
   generateUser,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { IncomingWebhook } from '@slack/webhook';
 
 describe('POST /members/:memberId/flag', () => {
   let reporter;
@@ -28,10 +28,10 @@ describe('POST /members/:memberId/flag', () => {
           message: t('invalidReqParams'),
         });
     });
-  
+
     it('returns error when member with UUID is not found', async () => {
       const randomId = generateUUID();
-  
+
       await expect(reporter.post(`/members/${randomId}/flag`))
         .to.eventually.be.rejected.and.eql({
           code: 404,
@@ -42,7 +42,7 @@ describe('POST /members/:memberId/flag', () => {
 
     it('returns error when non-admin flags same profile twice', async () => {
       await reporter.post(`/members/${target._id}/flag`);
-      await expect (reporter.post(`/members/${target._id}/flag`))
+      await expect(reporter.post(`/members/${target._id}/flag`))
         .to.eventually.be.rejected.and.eql({
           code: 400,
           error: 'BadRequest',
@@ -148,4 +148,4 @@ describe('POST /members/:memberId/flag', () => {
       /* eslint-enable camelcase */
     });
   });
-});
+});

test/common/ops/buy/purchase.js

@@ -197,14 +197,14 @@ describe('shared.ops.purchase', () => {
 
     it('purchases quest bundles', async () => {
       const startingBalance = user.balance;
-      // const clock = sandbox.useFakeTimers(moment('2019-05-20').valueOf());
+      const clock = sandbox.useFakeTimers(moment('2022-03-16').valueOf());
       const type = 'bundles';
-      const key = 'featheredFriends';
+      const key = 'cuddleBuddies';
       const price = 1.75;
       const questList = [
-        'falcon',
-        'harpy',
-        'owl',
+        'bunny',
+        'ferret',
+        'guineapig',
       ];
 
       await purchase(user, { params: { type, key } });
@@ -216,7 +216,7 @@ describe('shared.ops.purchase', () => {
       expect(user.balance).to.equal(startingBalance - price);
 
       expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
-      // clock.restore();
+      clock.restore();
     });
   });
 

website/server/controllers/api-v3/chat.js

@@ -148,21 +148,6 @@ api.postChat = {
       const authorEmail = getUserInfo(user, ['email']).email;
       const groupUrl = getGroupUrl(group);
 
-      const report = [
-        { name: 'MESSAGE_TIME', content: (new Date()).toString() },
-        { name: 'MESSAGE_TEXT', content: message },
-
-        { name: 'AUTHOR_USERNAME', content: user.profile.name },
-        { name: 'AUTHOR_UUID', content: user._id },
-        { name: 'AUTHOR_EMAIL', content: authorEmail },
-        { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` },
-
-        { name: 'GROUP_NAME', content: group.name },
-        { name: 'GROUP_TYPE', content: group.type },
-        { name: 'GROUP_ID', content: group._id },
-        { name: 'GROUP_URL', content: groupUrl },
-      ];
-
       // Slack the mods
       slack.sendSlurNotification({
         authorEmail,
@@ -223,21 +208,6 @@ api.postChat = {
       const authorEmail = getUserInfo(user, ['email']).email;
       const groupUrl = getGroupUrl(group);
 
-      const report = [
-        { name: 'MESSAGE_TIME', content: (new Date()).toString() },
-        { name: 'MESSAGE_TEXT', content: message },
-
-        { name: 'AUTHOR_USERNAME', content: user.profile.name },
-        { name: 'AUTHOR_UUID', content: user._id },
-        { name: 'AUTHOR_EMAIL', content: authorEmail },
-        { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` },
-
-        { name: 'GROUP_NAME', content: group.name },
-        { name: 'GROUP_TYPE', content: group.type },
-        { name: 'GROUP_ID', content: group._id },
-        { name: 'GROUP_URL', content: groupUrl },
-      ];
-
       // Slack the mods
       slack.sendShadowMutedPostNotification({
         authorEmail,
@@ -438,10 +408,6 @@ api.clearChatFlags = {
     message.flagCount = 0;
     await message.save();
 
-    const adminEmailContent = getUserInfo(user, ['email']).email;
-    const authorEmail = getAuthorEmailFromMessage(message);
-    const groupUrl = getGroupUrl(group);
-
     res.respond(200, {});
   },
 };

website/server/libs/chatReporting/groupChatReporter.js

@@ -47,7 +47,7 @@ export default class GroupChatReporter extends ChatReporter {
 
   async notify (group, message, userComment, automatedComment = '') {
     slack.sendFlagNotification({
-      authorEmail: this.authorEmail,
+      authorEmail: this.user.auth.local.email,
       flagger: this.user,
       group,
       message,

website/server/libs/chatReporting/inboxChatReporter.js

@@ -38,12 +38,6 @@ export default class InboxChatReporter extends ChatReporter {
   }
 
   async notify (message, userComment) {
-    const group = {
-      type: 'private messages',
-      name: 'N/A',
-      _id: 'N/A',
-    };
-
     slack.sendInboxFlagNotification({
       messageUserEmail: this.messageUserEmail,
       flagger: this.user,