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

Notify the other user when we kick them from a team

Browse Source
This commit is contained in:
yflory
2019-09-23 10:51:46 +02:00
parent 977198122f
commit 1a9229e0ec
3 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,7 @@ define([
if (invitedTo[content.team.channel]) { return void cb(true); }
var myTeams = Util.find(ctx, ['store', 'proxy', 'teams']);
var myTeams = Util.find(ctx, ['store', 'proxy', 'teams']) || {};
var alreadyMember = Object.keys(myTeams).some(function (k) {
var team = myTeams[k];
return team.channel === content.team.channel;
@@ -339,6 +339,19 @@ define([
delete invitedTo[channel];
};
handlers['KICKED_FROM_TEAM'] = function (ctx, box, data, cb) {
var msg = data.msg;
var content = msg.content;
if (msg.author !== content.user.curvePublic) { return void cb(true); }
if (!content.teamChannel) {
console.log('Remove invalid notification');
return void cb(true);
}
cb(false);
};
handlers['INVITE_TO_TEAM_ANSWER'] = function (ctx, box, data, cb) {
var msg = data.msg;
var content = msg.content;
@@ -349,7 +362,7 @@ define([
return void cb(true);
}
var myTeams = Util.find(ctx, ['store', 'proxy', 'teams']);
var myTeams = Util.find(ctx, ['store', 'proxy', 'teams']) || {};
var teamId;
var team;
Object.keys(myTeams).some(function (k) {