Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 02:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

show max message length in error message

Browse Source
This commit is contained in:
barisusakli
2017-04-19 20:56:12 -04:00
parent d500e7f2aa
commit b45111d44b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@
"chat-disabled": "Chat system disabled", "chat-disabled": "Chat system disabled",
"too-many-messages": "You have sent too many messages, please wait awhile.", "too-many-messages": "You have sent too many messages, please wait awhile.",
"invalid-chat-message": "Invalid chat message", "invalid-chat-message": "Invalid chat message",
"chat-message-too-long": "Chat message is too long", "chat-message-too-long": "Chat messages can not be longer than %1 characters.",
"cant-edit-chat-message": "You are not allowed to edit this message", "cant-edit-chat-message": "You are not allowed to edit this message",
"cant-remove-last-user": "You can't remove the last user", "cant-remove-last-user": "You can't remove the last user",
"cant-delete-chat-message": "You are not allowed to delete this message", "cant-delete-chat-message": "You are not allowed to delete this message",

2
public/src/client/chats/messages.js
View File

@@ -9,7 +9,7 @@ define('forum/chats/messages', ['components', 'sounds', 'translator'], function
var mid = inputEl.attr('data-mid'); var mid = inputEl.attr('data-mid');
if (msg.length > ajaxify.data.maximumChatMessageLength) { if (msg.length > ajaxify.data.maximumChatMessageLength) {
return app.alertError('[[error:chat-message-too-long]]'); return app.alertError('[[error:chat-message-too-long,' + ajaxify.data.maximumChatMessageLength + ']]');
} }
if (!msg.length) { if (!msg.length) {

8
src/messaging/create.js
View File

@@ -30,9 +30,11 @@ module.exports = function (Messaging) {
if (!content) { if (!content) {
return callback(new Error('[[error:invalid-chat-message]]')); return callback(new Error('[[error:invalid-chat-message]]'));
} }
content = String(content);
if (content.length > (meta.config.maximumChatMessageLength || 1000)) { var maximumChatMessageLength = (meta.config.maximumChatMessageLength || 1000);
return callback(new Error('[[error:chat-message-too-long]]')); if (content.length > maximumChatMessageLength) {
return callback(new Error('[[error:chat-message-too-long, ' + maximumChatMessageLength + ']]'));
} }
callback(); callback();
}; };
@@ -52,7 +54,7 @@ module.exports = function (Messaging) {
function (_mid, next) { function (_mid, next) {
mid = _mid; mid = _mid;
message = { message = {
content: content, content: String(content),
timestamp: timestamp, timestamp: timestamp,
fromuid: fromuid, fromuid: fromuid,
roomId: roomId, roomId: roomId,