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

Jump to bottom

Refactoring code in src/flags.js #478

Closed
wants to merge 4 commits into from
Closed

Refactoring code in src/flags.js #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b2b10d
created new processChatRoom function to reduce function nesting to le…
dominicteh1 Aug 31, 2024
d69b0a0
Merge pull request #1 from dominicteh1/refactor-src/upgrades/1.0.0/ch…
dominicteh1 Aug 31, 2024
6d3f295
refactored flags.validate function to reduce cognitive complexity fro…
dominicteh1 Sep 3, 2024
c2ba3d8
undo changes from chat_room_hashes (previous issue that was selected)
dominicteh1 Sep 4, 2024
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
Binary file added dump.rdb
View file
Open in desktop
Binary file not shown.
16 changes: 13 additions & 3 deletions src/flags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,17 @@ Flags.validate = async function (payload) {

if (!target) {
throw new Error('[[error:invalid-data]]');
} else if (target.deleted) {
}

if (target.deleted) {
throw new Error('[[error:post-deleted]]');
} else if (!reporter || !reporter.userslug) {
}

if (!reporter || !reporter.userslug) {
throw new Error('[[error:no-user]]');
} else if (reporter.banned) {
}

if (reporter.banned) {
throw new Error('[[error:user-banned]]');
}

Expand All @@ -294,20 +300,24 @@ Flags.validate = async function (payload) {
user.isPrivileged(target.uid),
user.isPrivileged(reporter.uid),
]);

if (targetPrivileged && !reporterPrivileged) {
throw new Error('[[error:cant-flag-privileged]]');
}

if (payload.type === 'post') {
const editable = await privileges.posts.canEdit(payload.id, payload.uid);

if (!editable.flag && !meta.config['reputation:disabled'] && reporter.reputation < meta.config['min:rep:flag']) {
throw new Error(`[[error:not-enough-reputation-to-flag, ${meta.config['min:rep:flag']}]]`);
}
} else if (payload.type === 'user') {
if (parseInt(payload.id, 10) === parseInt(payload.uid, 10)) {
throw new Error('[[error:cant-flag-self]]');
}

const editable = await privileges.users.canEdit(payload.uid, payload.id);

if (!editable && !meta.config['reputation:disabled'] && reporter.reputation < meta.config['min:rep:flag']) {
throw new Error(`[[error:not-enough-reputation-to-flag, ${meta.config['min:rep:flag']}]]`);
}
Expand Down