zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-08-28 12:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Message ACS improvements & minor fixes

Browse source 
+ getSuitableMessageConfAndAreaTags(): Get a suitable conf/area tag pair with priority on defaults
+ hasMessageConfAndAreaRead() helper
+ filterMessageAreaTagsByReadACS() helper
* Always include confTag/areaTag when fetching a conf or area (convenience)
* Fix 'toRemoteUser' assignment in message
* Better kick out of message conf/areas users does not have access to
This commit is contained in:
Bryan Ashby 2019-09-11 21:21:33 -06:00
parent 8027a73ea5
commit dff8e12dcc
No known key found for this signature in database
GPG key ID: B49EB437951D2542
3 changed files with 84 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/user_login.js
View file

@ -21,6 +21,7 @@ const {
getMessageAreaByTag,
getDefaultMessageConferenceTag,
getDefaultMessageAreaTagByConfTag,
getSuitableMessageConfAndAreaTags,
} = require('./message_area.js');
const {
getFileAreaByTag,
@ -128,15 +129,6 @@ function userLogin(client, username, password, options, cb) {
}
function postLoginPrep(client, cb) {
const defaultMsgAreaTag = (confTag) => {
return (
getDefaultMessageAreaTagByConfTag(client, confTag) ||
getDefaultMessageAreaTagByConfTag(client, getDefaultMessageConferenceTag(client)) ||
''
);
};
async.series(
[
(callback) => {
@ -144,23 +136,20 @@ function postLoginPrep(client, cb) {
// User may (no longer) have read (view) rights to their current
// message, conferences and/or areas. Move them out if so.
//
let confTag = client.user.getProperty(UserProps.MessageConfTag);
const conf = getMessageConferenceByTag(confTag) || {};
const area = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
const confTag = client.user.getProperty(UserProps.MessageConfTag);
const conf = getMessageConferenceByTag(confTag) || {};
const area = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
if(!client.acs.hasMessageConfRead(conf)) {
confTag = getDefaultMessageConferenceTag(client) || '';
if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
// move them out of both area and possibly conf to something suitable, hopefully.
const [newConfTag, newAreaTag] = getSuitableMessageConfAndAreaTags(client);
client.user.persistProperties({
[ UserProps.MessageConfTag ] : confTag,
[ UserProps.MessageAreaTag ] : defaultMsgAreaTag(confTag),
[ UserProps.MessageConfTag ] : newConfTag,
[ UserProps.MessageAreaTag ] : newAreaTag,
},
err => {
return callback(err);
});
} else if (!client.acs.hasMessageAreaRead(area)) {
client.user.persistProperty(UserProps.MessageAreaTag, defaultMsgAreaTag(confTag), err => {
return callback(err);
});
} else {
return callback(null);
}