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

refactor: messaging

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-01-23 22:19:15 -05:00
parent cd1fa27a8b
commit 30c503611c
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/messaging/create.js
View File

@@ -1,9 +1,9 @@
'use strict'; 'use strict';
var meta = require('../meta'); const meta = require('../meta');
var plugins = require('../plugins'); const plugins = require('../plugins');
var db = require('../database'); const db = require('../database');
var user = require('../user'); const user = require('../user');
module.exports = function (Messaging) { module.exports = function (Messaging) {
Messaging.sendMessage = async (data) => { Messaging.sendMessage = async (data) => {
@@ -21,7 +21,7 @@ module.exports = function (Messaging) {
throw new Error('[[error:invalid-chat-message]]'); throw new Error('[[error:invalid-chat-message]]');
} }
const maximumChatMessageLength = (meta.config.maximumChatMessageLength || 1000); const maximumChatMessageLength = meta.config.maximumChatMessageLength || 1000;
const data = await plugins.fireHook('filter:messaging.checkContent', { content: content }); const data = await plugins.fireHook('filter:messaging.checkContent', { content: content });
content = String(data.content).trim(); content = String(data.content).trim();
if (!content) { if (!content) {

8
src/messaging/data.js
View File

@@ -2,10 +2,10 @@
const validator = require('validator'); const validator = require('validator');
var db = require('../database'); const db = require('../database');
var user = require('../user'); const user = require('../user');
var utils = require('../utils'); const utils = require('../utils');
var plugins = require('../plugins'); const plugins = require('../plugins');
const intFields = ['timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system']; const intFields = ['timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system'];

2
src/messaging/delete.js
View File

@@ -11,6 +11,6 @@ module.exports = function (Messaging) {
throw new Error('[[error:chat-' + field + '-already]]'); throw new Error('[[error:chat-' + field + '-already]]');
} }
return await Messaging.setMessageField(mid, 'deleted', state); await Messaging.setMessageField(mid, 'deleted', state);
} }
}; };

8
src/messaging/edit.js
View File

@@ -1,9 +1,9 @@
'use strict'; 'use strict';
var meta = require('../meta'); const meta = require('../meta');
var user = require('../user'); const user = require('../user');
var sockets = require('../socket.io'); const sockets = require('../socket.io');
module.exports = function (Messaging) { module.exports = function (Messaging) {
@@ -63,7 +63,7 @@ module.exports = function (Messaging) {
if (isAdmin && !messageData.system) { if (isAdmin && !messageData.system) {
return; return;
} }
var chatConfigDuration = meta.config[durationConfig]; const chatConfigDuration = meta.config[durationConfig];
if (chatConfigDuration && Date.now() - messageData.timestamp > chatConfigDuration * 1000) { if (chatConfigDuration && Date.now() - messageData.timestamp > chatConfigDuration * 1000) {
throw new Error('[[error:chat-' + type + '-duration-expired, ' + meta.config[durationConfig] + ']]'); throw new Error('[[error:chat-' + type + '-duration-expired, ' + meta.config[durationConfig] + ']]');
} }

10
src/messaging/index.js
View File

@@ -139,14 +139,8 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
}); });
}; };
Messaging.generateUsernames = (users, excludeUid) => { Messaging.generateUsernames = (users, excludeUid) => users.filter(user => user && parseInt(user.uid, 10) !== excludeUid)
users = users.filter(function (user) { .map(user => user.username).join(', ');
return user && parseInt(user.uid, 10) !== excludeUid;
});
return users.map(function (user) {
return user.username;
}).join(', ');
};
Messaging.getTeaser = async (uid, roomId) => { Messaging.getTeaser = async (uid, roomId) => {
const mid = await Messaging.getLatestUndeletedMessage(uid, roomId); const mid = await Messaging.getLatestUndeletedMessage(uid, roomId);