Disallow flagging whispers #29994

youssef-lr · 2023-10-19T16:13:12Z

All whispers are systematic and come from "us" so we shouldn't allow flagging them. The only exception is the welcome message whisper which can be set by any room creator.

Details

Fixed Issues

$ #26696

Tests

Verify that no errors appear in the JS console

Set up a workspace, create a public room in the workspace and set a welcome message. Note down the reportID of the room.
Create a new account without a display name, and navigate to the public room using the reportID from step1.
You'll see two whispers in the room, make sure the welcome message whisper is flaggable.
Make sure the 2nd whisper below it is not flaggable.

Offline tests

N/A

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-10-19T16:13:17Z

@rushatgabhane Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

rushatgabhane

One edge case that i can think of is public room welcome messages.
A welcome message is also a whisper, and could be offensive 🤷

@youssef-lr what do you think?

youssef-lr · 2023-10-19T16:44:09Z

Good catch! I'll look into it.

youssef-lr · 2023-10-19T16:57:37Z

How about something like this? seems to work, just need to figure out html vs text thing if it applies

rushatgabhane · 2023-10-19T17:01:05Z

@youssef-lr looks good

cloudflare-workers-and-pages · 2023-10-19T17:17:48Z

Deploying with Cloudflare Pages

Latest commit:	`704af3e`
Status:	✅ Deploy successful!
Preview URL:	https://806724d6.helpdot.pages.dev
Branch Preview URL:	https://youssef-disallow-flagging-wh.helpdot.pages.dev

View logs

youssef-lr · 2023-10-19T17:21:41Z

updated test steps

youssef-lr · 2023-10-19T17:23:52Z

src/libs/ReportUtils.js

+
+    if (ReportActionsUtils.isWhisperAction(reportAction)) {
+        // Allow flagging welcome message whispers as they can be set by any room creator
+        if (lodashGet(reportAction, 'originalMessage.html') === report.welcomeMessage && !isCurrentUserAction) {


I tested this, the welcome message is always plain text so this comparison is safe

youssef-lr · 2023-10-19T18:31:55Z

@rushatgabhane I don't think we need mobile screenshots for this, just Web should be enough.

rushatgabhane · 2023-10-20T05:26:06Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

rushatgabhane

LGTM!

melvin-bot · 2023-10-20T09:26:44Z

@danieldoglas Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

OSBotify · 2023-10-24T02:00:53Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 1.3.90-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-10-25T16:37:47Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.90-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2023-10-25T17:02:47Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 1.3.91-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-10-26T22:44:48Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.91-8 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

getusha · 2024-03-20T15:24:23Z

src/libs/ReportUtils.js

 * - It's an ADDCOMMENT that is not an attachment
 *
 * @param {Object} reportAction
 * @param {number} reportID
 * @returns {Boolean}
 */
 function canFlagReportAction(reportAction, reportID) {
+    const report = getReport(reportID);


we missed a case here where flag as offensive is hidden but present on thread #36045

Disallow flagging whispers

5016de0

youssef-lr self-assigned this Oct 19, 2023

youssef-lr requested a review from a team as a code owner October 19, 2023 16:13

melvin-bot bot requested review from rushatgabhane and removed request for a team October 19, 2023 16:13

rushatgabhane reviewed Oct 19, 2023

View reviewed changes

Allow flagging welcome message whispers

7920d3a

Update comment

e9f86b6

youssef-lr commented Oct 19, 2023

View reviewed changes

Add another check to prevent a needless comparison

704af3e

rushatgabhane approved these changes Oct 20, 2023

View reviewed changes

melvin-bot bot requested a review from danieldoglas October 20, 2023 09:26

danieldoglas approved these changes Oct 23, 2023

View reviewed changes

danieldoglas merged commit e2d4845 into main Oct 23, 2023
14 checks passed

danieldoglas deleted the youssef_disallow_flagging_whispers branch October 23, 2023 10:03

OSBotify mentioned this pull request Oct 24, 2023

Deploy Checklist: New Expensify 2023-10-24 #30224

Closed

43 tasks

melvin-bot bot mentioned this pull request Oct 25, 2023

[HOLD for payment 2023-11-01] [$125] Save the world - Thank you for referring your friend whisper message can be flagged #26696

Closed

6 tasks

OSBotify mentioned this pull request Oct 25, 2023

Deploy Checklist: New Expensify 2023-10-25 #30365

Closed

99 tasks

getusha reviewed Mar 20, 2024

View reviewed changes

getusha mentioned this pull request Mar 20, 2024

[HOLD for payment 2024-03-18] [$250] Room - Flag as offensive function is absent in the conversation, but present in the thread #36045

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disallow flagging whispers #29994

Disallow flagging whispers #29994

youssef-lr commented Oct 19, 2023 •

edited

Loading

melvin-bot bot commented Oct 19, 2023

rushatgabhane left a comment •

edited

Loading

youssef-lr commented Oct 19, 2023

youssef-lr commented Oct 19, 2023 •

edited

Loading

rushatgabhane commented Oct 19, 2023

cloudflare-workers-and-pages bot commented Oct 19, 2023 •

edited

Loading

youssef-lr commented Oct 19, 2023

youssef-lr Oct 19, 2023

youssef-lr commented Oct 19, 2023

rushatgabhane commented Oct 20, 2023 •

edited

Loading

rushatgabhane left a comment

melvin-bot bot commented Oct 20, 2023

OSBotify commented Oct 24, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 26, 2023

getusha Mar 20, 2024

Disallow flagging whispers #29994

Disallow flagging whispers #29994

Conversation

youssef-lr commented Oct 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 19, 2023

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

youssef-lr commented Oct 19, 2023

youssef-lr commented Oct 19, 2023 • edited Loading

rushatgabhane commented Oct 19, 2023

cloudflare-workers-and-pages bot commented Oct 19, 2023 • edited Loading

Deploying with Cloudflare Pages

youssef-lr commented Oct 19, 2023

youssef-lr Oct 19, 2023

Choose a reason for hiding this comment

youssef-lr commented Oct 19, 2023

rushatgabhane commented Oct 20, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 20, 2023

OSBotify commented Oct 24, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 26, 2023

getusha Mar 20, 2024

Choose a reason for hiding this comment

youssef-lr commented Oct 19, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

youssef-lr commented Oct 19, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 19, 2023 •

edited

Loading

rushatgabhane commented Oct 20, 2023 •

edited

Loading