web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

identify classic metadata messages by the presence of a channel attribute

Browse Source
This commit is contained in:
ansuz 2019-08-14 17:05:18 +02:00
parent 1c89e8d6ac
commit 79e5edbdfe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
historyKeeper.js
View File

@ -291,6 +291,10 @@ module.exports.create = function (cfg) {
}); });
}; };
const isMetadataMessage = function (parsed) {
return Boolean(parsed && parsed.channel);
};
var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/; var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/;
/* onChannelMessage /* onChannelMessage
@ -514,7 +518,7 @@ module.exports.create = function (cfg) {
// and don't send metadata, since: // and don't send metadata, since:
// 1. the user won't be interested in it // 1. the user won't be interested in it
// 2. this metadata is potentially incomplete/incorrect // 2. this metadata is potentially incomplete/incorrect
if (parsed.channel) { return; } if (isMetadataMessage(parsed)) { return; }
var content = parsed[4]; var content = parsed[4];
if (typeof(content) !== 'string') { return; } if (typeof(content) !== 'string') { return; }
@ -713,7 +717,7 @@ module.exports.create = function (cfg) {
// check for the channel because it's the one thing that should // check for the channel because it's the one thing that should
// always exist in "classic metadata" // always exist in "classic metadata"
if (msg.channel && metadata_cache[channelName]) { return readMore(); } if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)], readMore); sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)], readMore);
}, (err) => { }, (err) => {
if (err && err.code !== 'ENOENT') { if (err && err.code !== 'ENOENT') {