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

Teams app improvements

Browse Source
This commit is contained in:
yflory
2019-09-25 18:21:45 +02:00
parent 0f685c9446
commit 7c4bc1d583
7 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
www/common/outer/mailbox-handlers.js
View File

@@ -321,7 +321,16 @@ define([
return void cb(true);
}
if (invitedTo[content.team.channel]) { return void cb(true); }
var invited = invitedTo[content.team.channel];
if (invited) {
console.log('removing old invitation');
cb(false, invited);
invitedTo[content.team.channel] = {
type: box.type,
hash: data.hash
};
return;
}
var myTeams = Util.find(ctx, ['store', 'proxy', 'teams']) || {};
var alreadyMember = Object.keys(myTeams).some(function (k) {
@@ -330,7 +339,10 @@ define([
});
if (alreadyMember) { return void cb(true); }
invitedTo[content.team.channel] = true;
invitedTo[content.team.channel] = {
type: box.type,
hash: data.hash
};
cb(false);
};
@@ -349,6 +361,10 @@ define([
return void cb(true);
}
if (invitedTo[content.teamChannel] && content.pending) {
return void cb(true, invitedTo[content.teamChannel]);
}
cb(false);
};