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

Don't pin broadcast channel

pull/1/head
yflory 2021-04-22 11:26:55 +02:00
parent 2f25664c28
commit 4f1195fdaf
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/common/outer/async-store.js
View File

@ -1,4 +1,5 @@
define([
'/api/config',
'json.sortify',
'/common/userObject.js',
'/common/proxy-manager.js',
@ -30,7 +31,7 @@ define([
'/bower_components/netflux-websocket/netflux-client.js',
'/bower_components/nthen/index.js',
'/bower_components/saferphore/index.js',
], function (Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback,
], function (ApiConfig, Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback,
Realtime, Messaging, Pinpad, Cache,
SF, Cursor, OnlyOffice, Mailbox, Profile, Team, Messenger, History,
Calendar, NetConfig, AppConfig,
@ -226,8 +227,9 @@ define([
if (store.proxy.mailboxes) {
var mList = Object.keys(store.proxy.mailboxes).map(function (m) {
if (m === "broadcast" && !store.isAdmin) { return; }
return store.proxy.mailboxes[m].channel;
});
}).filter(Boolean);
list = list.concat(mList);
}
@ -2927,6 +2929,12 @@ define([
onReady(clientId, returned, cb);
});
}
if (rt.proxy.edPublic && Array.isArray(ApiConfig.adminKeys) &&
ApiConfig.adminKeys.indexOf(rt.proxy.edPublic) !== -1) {
store.isAdmin = true;
}
onReady(clientId, returned, cb);
})
.on('change', ['drive', 'migrate'], function () {