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

fix: #7086

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-12-08 19:36:38 -05:00
parent 71163421aa
commit e55fb43703
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/error.json
View File

@@ -144,7 +144,7 @@
"chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting",
"chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting", "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting",
"chat-deleted-already": "This chat message has already been deleted.", "chat-deleted-already": "This chat message has already been deleted.",
"chat-restored'already": "This chat message has already been restored.", "chat-restored-already": "This chat message has already been restored.",
"already-voting-for-this-post": "You have already voted for this post.", "already-voting-for-this-post": "You have already voted for this post.",
"reputation-system-disabled": "Reputation system is disabled.", "reputation-system-disabled": "Reputation system is disabled.",

5
src/messaging/create.js
View File

@@ -36,7 +36,10 @@ module.exports = function (Messaging) {
return callback(err); return callback(err);
} }
content = String(data.content); content = String(data.content).trim();
if (!content) {
return callback(new Error('[[error:invalid-chat-message]]'));
}
var maximumChatMessageLength = (meta.config.maximumChatMessageLength || 1000); var maximumChatMessageLength = (meta.config.maximumChatMessageLength || 1000);
if (content.length > maximumChatMessageLength) { if (content.length > maximumChatMessageLength) {

4
src/messaging/edit.js
View File

@@ -19,7 +19,9 @@ module.exports = function (Messaging) {
if (raw === content) { if (raw === content) {
return callback(); return callback();
} }
if (!String(content).trim()) {
return callback(new Error('[[error:invalid-chat-message]]'));
}
Messaging.setMessageFields(mid, { Messaging.setMessageFields(mid, {
content: content, content: content,
edited: Date.now(), edited: Date.now(),

14
test/messaging.js
View File

@@ -276,6 +276,13 @@ describe('Messaging Library', function () {
}); });
}); });
it('should fail to send chat if content is empty', function (done) {
socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: ' ' }, function (err) {
assert.equal(err.message, '[[error:invalid-chat-message]]');
done();
});
});
it('should send a message to a room', function (done) { it('should send a message to a room', function (done) {
socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: 'first chat message' }, function (err, messageData) { socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: 'first chat message' }, function (err, messageData) {
assert.ifError(err); assert.ifError(err);
@@ -554,6 +561,13 @@ describe('Messaging Library', function () {
}); });
}); });
it('should fail to edit message if new content is empty string', function (done) {
socketModules.chats.edit({ uid: fooUid }, { mid: 5, roomId: roomId, message: ' ' }, function (err) {
assert.equal(err.message, '[[error:invalid-chat-message]]');
done();
});
});
it('should fail to edit message if not own message', function (done) { it('should fail to edit message if not own message', function (done) {
socketModules.chats.edit({ uid: herpUid }, { mid: 5, roomId: roomId, message: 'message edited' }, function (err) { socketModules.chats.edit({ uid: herpUid }, { mid: 5, roomId: roomId, message: 'message edited' }, function (err) {
assert.equal(err.message, '[[error:cant-edit-chat-message]]'); assert.equal(err.message, '[[error:cant-edit-chat-message]]');