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

simplify 'isNewChannel' rpc

Browse Source
This commit is contained in:
ansuz 2019-08-21 12:54:24 +02:00
parent 7e13f7e3ca
commit b360d79a76
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpc.js
View File

@ -1453,30 +1453,22 @@ var removeLoginBlock = function (Env, msg, cb) {
var ARRAY_LINE = /^\[/; var ARRAY_LINE = /^\[/;
// since we're changing how metadata works this can lead to false positives /* Files can contain metadata but not content
// XXX rewrite this such that we can abort once we have a conclusive answer call back with true if the channel log has no content other than metadata
otherwise false
*/
var isNewChannel = function (Env, channel, cb) { var isNewChannel = function (Env, channel, cb) {
if (!isValidId(channel)) { return void cb('INVALID_CHAN'); } if (!isValidId(channel)) { return void cb('INVALID_CHAN'); }
if (channel.length !== 32) { return void cb('INVALID_CHAN'); } if (channel.length !== 32) { return void cb('INVALID_CHAN'); }
var count = 0;
var done = false; var done = false;
Env.msgStore.getMessages(channel, function (msg) { Env.msgStore.getMessages(channel, function (msg) {
if (done) { return; } if (done) { return; }
var parsed;
try { try {
if (count === 0 && typeof(msg) === 'string' && ARRAY_LINE.test(msg)) { if (typeof(msg) === 'string' && ARRAY_LINE.test(msg)) {
done = true; done = true;
count++;
return void cb(void 0, false); return void cb(void 0, false);
} }
parsed = JSON.parse(msg);
if (parsed && typeof(parsed) === 'object') { count++; }
if (count >= 2) {
done = true;
cb(void 0, false); // it is not a new file
}
} catch (e) { } catch (e) {
WARN('invalid message read from store', e); WARN('invalid message read from store', e);
} }