surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
Surya Paolo
2024-04-26 00:49:05 +02:00
parent 7773c2a87b
commit 2cdb83cddf
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/models/circuit.js
View File

@@ -1595,9 +1595,9 @@ CircuitSchema.statics.replaceAllCircuitNames = async function (idapp) {
newname = 'Circuito RIS Roma Sud e Litora';
} else if (circuit.name.trim() === 'RISO Roma Nord' || circuit.name.trim() === 'Circuito RISO Roma Nord') {
newname = 'Circuito RIS Roma Nord';
/* } else if (circuit.name == 'Circuito RIS Benevento' || circuit.name == 'Circuito RIS Campania') {
} else if (circuit.name == 'Circuito RIS Benevento' || circuit.name == 'Circuito RIS Campania') {
newname = 'Circuito RIS Campania';
path = 'riscampania'; */
path = 'riscampania';
} else if (circuit.name == 'Circuito RIS Milano Est') {
newname = 'Circuito RIS Milano Est';
} else if (circuit.name == 'Circuito RIS Repubblica di San Marino') {

14
src/server/models/user.js
View File

@@ -1719,7 +1719,17 @@ UserSchema.statics.SvuotaTuttiGliAccessiOnlineConToken = async function (idapp)
const User = this;
return await User.updateMany({ idapp },
{ $pull: { tokens: { refreshToken: { $exists: false } } } });
{
$pull: {
tokens:
{
$or: [{ refreshToken: { $exists: false } },
{ refreshToken: { $exists: true, $eq: '' } }
]
},
}
});
};
@@ -2484,7 +2494,7 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
if (!disablenotif) {
const userDest = await User.getRecLangAndIdByUsername(idapp, usernameDest);
const user = await User.getRecLangAndIdByUsername(idapp, usernameOrig);
let msgDest = i18n.__({ phrase: 'HANDSHAKE_SENT_FROM_YOU', locale: userDest.lang }, usernameDest);
if (already_stretta)
msgDest = i18n.__({ phrase: 'HANDSHAKE_CONFIRMED', locale: userDest.lang }, usernameDest);