Skip to content

Commit

Permalink
feat: fire new hooks on chat message editing
Browse files Browse the repository at this point in the history
  • Loading branch information
julianlam committed Jul 7, 2020
1 parent 7b04d89 commit 4f51838
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
6 changes: 6 additions & 0 deletions public/src/client/chats/messages.js
Expand Up @@ -130,6 +130,12 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
// message, instead of posting a new one.
inputEl.attr('data-mid', messageId).addClass('editing');
inputEl.val(raw).focus();

$(window).trigger('action:chat.prepEdit', {
inputEl: inputEl,
messageId: messageId,
roomId: roomId,
});
}
});
};
Expand Down
14 changes: 11 additions & 3 deletions src/messaging/data.js
Expand Up @@ -19,8 +19,8 @@ module.exports = function (Messaging) {

const keys = mids.map(mid => 'message:' + mid);
const messages = await (fields.length ? db.getObjectsFields(keys, fields) : db.getObjects(keys));
messages.forEach(message => modifyMessage(message, fields));
return messages;

return await Promise.all(messages.map(async (message, idx) => modifyMessage(message, fields, parseInt(mids[idx], 10))));
};

Messaging.getMessageField = async (mid, field) => {
Expand Down Expand Up @@ -133,7 +133,7 @@ module.exports = function (Messaging) {
};
};

function modifyMessage(message, fields) {
async function modifyMessage(message, fields, mid) {
if (message) {
db.parseIntFields(message, intFields, fields);
if (message.hasOwnProperty('timestamp')) {
Expand All @@ -143,4 +143,12 @@ function modifyMessage(message, fields) {
message.editedISO = utils.toISOString(message.edited);
}
}

const payload = await plugins.fireHook('filter:messaging.getFields', {
mid: mid,
message: message,
fields: fields,
});

return payload.message;
}
12 changes: 8 additions & 4 deletions src/messaging/edit.js
Expand Up @@ -2,6 +2,7 @@

const meta = require('../meta');
const user = require('../user');
const plugins = require('../plugins');

const sockets = require('../socket.io');

Expand All @@ -13,14 +14,17 @@ module.exports = function (Messaging) {
if (raw === content) {
return;
}
if (!String(content).trim()) {
throw new Error('[[error:invalid-chat-message]]');
}
await Messaging.setMessageFields(mid, {

const payload = await plugins.fireHook('filter:messaging.edit', {
content: content,
edited: Date.now(),
});

if (!String(payload.content).trim()) {
throw new Error('[[error:invalid-chat-message]]');
}
await Messaging.setMessageFields(mid, payload);

// Propagate this change to users in the room
const [uids, messages] = await Promise.all([
Messaging.getUidsInRoom(roomId, 0, -1),
Expand Down

0 comments on commit 4f51838

Please sign in to comment.