dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

send basic team info along with support tickets 

...and fix a server bug that had broken /api/config.supportMailbox
This commit is contained in:
ansuz 2020-10-15 15:12:12 +05:30
parent 713c8c574b
commit 804443e5f7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -189,7 +189,7 @@ var serveConfig = (function () {
adminEmail: Env.adminEmail,
adminKeys: Env.admins,
inactiveTime: Env.inactiveTime,
supportMailbox: Env.supportMailboxPublicKey,
supportMailbox: Env.supportMailbox,
maxUploadSize: Env.maxUploadSize,
premiumUploadSize: Env.premiumUploadSize,
}, null, '\t'),

12
www/support/ui.js
View File

@ -26,7 +26,6 @@ define([
curvePublic: user.curvePublic,
edPublic: privateData.edPublic,
notifications: user.notifications,
blockLocation: privateData.blockLocation || '',
};
if (typeof(ctx.pinUsage) === 'object') {
@ -39,8 +38,19 @@ define([
data.id = id;
data.time = +new Date();
var teams = privateData.teams || {};
if (!ctx.isAdmin) {
data.sender.userAgent = window.navigator && window.navigator.userAgent;
data.sender.blockLocation = privateData.blockLocation || '';
data.sender.teams = Object.keys(teams).map(function (key) {
var team = teams[key];
if (!teams) { return; }
var ret = {};
['edPublic', 'owner', 'viewer', 'hasSecondaryKey'].forEach(function (k) {
ret[k] = team[k];
});
return ret;
}).filter(Boolean);
}
// Send the message to the admin mailbox and to the user mailbox