infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Don't show your own team notifications

pull/1/head
yflory 2020-06-05 12:04:28 +02:00
parent cb36a49908
commit 0390d3df75
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-ui-elements.js
View File

@ -281,7 +281,6 @@ define([
if (mailbox) { // Friend
if (friends[curve] && !mailbox.notifications) { return; }
if (mailbox.notifications && mailbox.curvePublic) {
// XXX we should mark this notification as "viewed" in our own proxy
common.mailbox.sendTo("SHARE_PAD", {
href: href,
password: config.password,
@ -289,6 +288,7 @@ define([
name: myName,
title: title
}, {
viewed: team && team.id,
channel: mailbox.notifications,
curvePublic: mailbox.curvePublic
});

11
www/common/outer/mailbox.js
View File

@ -109,6 +109,17 @@ proxy.mailboxes = {
});
var ciphertext = crypto.encrypt(text, user.curvePublic);
// If we've sent this message to one of our teams' mailbox, we may want to "dismiss" it
// automatically
if (user.viewed) {
var team = Util.find(ctx, ['store', 'proxy', 'teams', user.viewed]);
if (team) {
var hash = ciphertext.slice(0,64);
var viewed = Util.find(team, ['keys', 'mailbox', 'viewed']);
if (Array.isArray(viewed)) { viewed.push(hash); }
}
}
anonRpc.send("WRITE_PRIVATE_MESSAGE", [
user.channel,
ciphertext