Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: support rescinding user flags

Browse Source
This commit is contained in:
Opliko
2024-04-30 01:07:09 +02:00
parent 53b352d0d8
commit 61a595def2
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/user.json
View File

@@ -60,6 +60,7 @@
"chat-with": "Continue chat with %1", "chat-with": "Continue chat with %1",
"new-chat-with": "Start new chat with %1", "new-chat-with": "Start new chat with %1",
"flag-profile": "Flag Profile", "flag-profile": "Flag Profile",
"profile-flagged": "Already flagged",
"follow": "Follow", "follow": "Follow",
"unfollow": "Unfollow", "unfollow": "Unfollow",
"more": "More", "more": "More",

13
public/src/client/account/header.js
View File

@@ -56,6 +56,7 @@ define('forum/account/header', [
components.get('account/delete-content').on('click', () => AccountsDelete.content(ajaxify.data.theirid)); components.get('account/delete-content').on('click', () => AccountsDelete.content(ajaxify.data.theirid));
components.get('account/delete-all').on('click', () => AccountsDelete.purge(ajaxify.data.theirid)); components.get('account/delete-all').on('click', () => AccountsDelete.purge(ajaxify.data.theirid));
components.get('account/flag').on('click', flagAccount); components.get('account/flag').on('click', flagAccount);
components.get('account/already-flagged').on('click', rescindAccountFlag);
components.get('account/block').on('click', () => toggleBlockAccount('block')); components.get('account/block').on('click', () => toggleBlockAccount('block'));
components.get('account/unblock').on('click', () => toggleBlockAccount('unblock')); components.get('account/unblock').on('click', () => toggleBlockAccount('unblock'));
}; };
@@ -130,6 +131,18 @@ define('forum/account/header', [
}); });
} }
function rescindAccountFlag() {
const flagId = $(this).data('flag-id')
require(['flags'], function (flags) {
bootbox.confirm('[[flags:modal-confirm-rescind]]', function (confirm) {
if (!confirm) {
return;
}
flags.rescind(flagId);
});
});
}
function toggleBlockAccount(action) { function toggleBlockAccount(action) {
socket.emit('user.toggleBlock', { socket.emit('user.toggleBlock', {
blockeeUid: ajaxify.data.uid, blockeeUid: ajaxify.data.uid,

12
src/controllers/accounts/helpers.js
View File

@@ -15,6 +15,7 @@ const messaging = require('../../messaging');
const categories = require('../../categories'); const categories = require('../../categories');
const posts = require('../../posts'); const posts = require('../../posts');
const activitypub = require('../../activitypub'); const activitypub = require('../../activitypub');
const flags = require('../../flags');
const relative_path = nconf.get('relative_path'); const relative_path = nconf.get('relative_path');
@@ -26,7 +27,12 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
return null; return null;
} }
const results = await getAllData(uid, callerUID); const [results, canFlag, flagged, flagId] = await Promise.all([
getAllData(uid, callerUID),
privileges.users.canFlag(callerUID, uid),
flags.exists('user', uid, callerUID),
flags.getFlagIdByTarget('user', uid),
]);
if (!results.userData) { if (!results.userData) {
throw new Error('[[error:invalid-uid]]'); throw new Error('[[error:invalid-uid]]');
} }
@@ -80,7 +86,9 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {})
userData.canEdit = results.canEdit; userData.canEdit = results.canEdit;
userData.canBan = results.canBanUser; userData.canBan = results.canBanUser;
userData.canMute = results.canMuteUser; userData.canMute = results.canMuteUser;
userData.canFlag = (await privileges.users.canFlag(callerUID, userData.uid)).flag; userData.canFlag = canFlag.flag;
userData.flagged = flagged;
userData.flagId = flagId;
userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']); userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']);
userData.isSelf = isSelf; userData.isSelf = isSelf;
userData.isFollowing = results.isFollowing; userData.isFollowing = results.isFollowing;