Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[No QA] Add Report.flagComment command #19405

Merged
merged 6 commits into from
May 26, 2023
Merged

[No QA] Add Report.flagComment command #19405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
504420e
initial command
dangrous May 22, 2023
c18b381
address comments
dangrous May 24, 2023
ab0b8bc
dont send reportID
dangrous May 24, 2023
1d11f20
prettier
dangrous May 24, 2023
2101499
update to add two statuses
dangrous May 25, 2023
a2b0689
actually add the constants I was using
dangrous May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2385,6 +2385,12 @@ const CONST = {
// This ID is used in SelectionScraper.js to query the DOM for UnreadActionIndicator's
// div and then remove it from copied contents in the getHTMLOfSelection() method.
UNREAD_ACTION_INDICATOR_ID: 'no-copy-area-unread-action-indicator',
MODERATION: {
MODERATOR_DECISION_PENDING: 'pending',
MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',
FLAG_SEVERITY_SPAM: 'spam',
FLAG_SEVERITY_INCONSIDERATE: 'inconsiderate',
},
};

export default CONST;
76 changes: 76 additions & 0 deletions src/libs/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,81 @@ function leaveRoom(reportID) {
navigateToConciergeChat();
}

/**
* Flag a comment as offensive
*
* @param {String} reportID
* @param {Object} reportAction
* @param {String} severity
*/
function flagComment(reportID, reportAction, severity) {
let newDecision;
if (severity === CONST.MODERATION.FLAG_SEVERITY_SPAM || severity === CONST.MODERATION.FLAG_SEVERITY_INCONSIDERATE) {
newDecision = {
decision: CONST.MODERATION.MODERATOR_DECISION_PENDING,
};
} else {
newDecision = {
decision: CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE,
};
}

const message = reportAction.message[0];
const reportActionID = reportAction.reportActionID;

const updatedDecisions = [...(message.moderationDecisions || []), newDecision];

const updatedMessage = {
...message,
moderationDecisions: updatedDecisions,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a particular reason for making the moderationDecisions a collection instead of an array of strings?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah so they're going to be objects:

[{
	decision: "pending/hidden/whatever",
	timestamp: [timestamp]
}]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that way we can sync them back up to what version of a comment was decided upon, as needed (for example if it's reported, then decided on, then the author edits it)

};

const optimisticData = [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {
[reportActionID]: {
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
message: [updatedMessage],
},
},
},
];

const failureData = [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {
[reportActionID]: {
...reportAction,
pendingAction: null,
},
},
},
];

const successData = [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {
[reportActionID]: {
pendingAction: null,
},
},
},
];

const parameters = {
severity,
reportActionID,
};

API.write('FlagComment', parameters, {optimisticData, successData, failureData});
}

export {
addComment,
addAttachment,
Expand Down Expand Up @@ -1677,4 +1752,5 @@ export {
hasAccountIDReacted,
shouldShowReportActionNotification,
leaveRoom,
flagComment,
};