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

feat: check mute when messaging, closes #11932

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-08-19 17:15:06 -04:00
parent 8b533d5467
commit 9534f9b9b9
3 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/messaging/index.js
View File

@@ -380,6 +380,7 @@ Messaging.canMessageRoom = async (uid, roomId) => {
Messaging.isUserInRoom(uid, roomId),
privileges.global.can('chat', uid),
checkReputation(uid),
user.checkMuted(uid),
]);
if (!roomData) {
throw new Error('[[error:no-room]]');

26
src/user/posts.js
View File

@@ -13,6 +13,20 @@ module.exports = function (User) {
await isReady(uid, cid, 'lastqueuetime');
};
User.checkMuted = async function (uid) {
const now = Date.now();
const mutedUntil = await User.getUserField(uid, 'mutedUntil');
if (mutedUntil > now) {
let muteLeft = ((mutedUntil - now) / (1000 * 60));
if (muteLeft > 60) {
muteLeft = (muteLeft / 60).toFixed(0);
throw new Error(`[[error:user-muted-for-hours, ${muteLeft}]]`);
} else {
throw new Error(`[[error:user-muted-for-minutes, ${muteLeft.toFixed(0)}]]`);
}
}
};
async function isReady(uid, cid, field) {
if (parseInt(uid, 10) === 0) {
return;
@@ -30,17 +44,9 @@ module.exports = function (User) {
return;
}
const now = Date.now();
if (userData.mutedUntil > now) {
let muteLeft = ((userData.mutedUntil - now) / (1000 * 60));
if (muteLeft > 60) {
muteLeft = (muteLeft / 60).toFixed(0);
throw new Error(`[[error:user-muted-for-hours, ${muteLeft}]]`);
} else {
throw new Error(`[[error:user-muted-for-minutes, ${muteLeft.toFixed(0)}]]`);
}
}
await User.checkMuted(uid);
const now = Date.now();
if (now - userData.joindate < meta.config.initialPostDelay * 1000) {
throw new Error(`[[error:user-too-new, ${meta.config.initialPostDelay}]]`);
}

22
test/messaging.js
View File

@@ -113,6 +113,28 @@ describe('Messaging Library', () => {
});
});
});
it('should not allow messaging room if user is muted', async () => {
const twoMinutesFromNow = Date.now() + (2 * 60 * 1000);
const twoHoursFromNow = Date.now() + (2 * 60 * 60 * 1000);
const roomId = 0;
await User.setUserField(mocks.users.herp.uid, 'mutedUntil', twoMinutesFromNow);
await assert.rejects(Messaging.canMessageRoom(mocks.users.herp.uid, roomId), (err) => {
assert(err.message.startsWith('[[error:user-muted-for-minutes,'));
return true;
});
await User.setUserField(mocks.users.herp.uid, 'mutedUntil', twoHoursFromNow);
await assert.rejects(Messaging.canMessageRoom(mocks.users.herp.uid, roomId), (err) => {
assert(err.message.startsWith('[[error:user-muted-for-hours,'));
return true;
});
await db.deleteObjectField(`user:${mocks.users.herp.uid}`, 'mutedUntil');
await assert.rejects(Messaging.canMessageRoom(mocks.users.herp.uid, roomId), {
message: '[[error:no-room]]',
});
});
});
describe('rooms', () => {