diff --git a/src/server/locales/en.json b/src/server/locales/en.json
index d66f12e..97d939e 100755
--- a/src/server/locales/en.json
+++ b/src/server/locales/en.json
@@ -1,5 +1,5 @@
{
- "L'Email è già stata Verificata": "L'Email è già stata Verificata"
+ "L'Email è già stata Verificata": "L'Email è già stata Verificata",
"Email Verificata!": "Email Verificada! Cierre esta ventana y regrese a la otra.",
"Nuova Registrazione": "Nuevo Registro",
"Effettuata una Nuova Registrazione": "Se ha realizado un nuevo registro",
diff --git a/src/server/locales/it.json b/src/server/locales/it.json
index 2054a0f..c601a7a 100644
--- a/src/server/locales/it.json
+++ b/src/server/locales/it.json
@@ -11,11 +11,7 @@
"%s refused your Friendship": "%s ha rifiutato l'Amicizia",
"✅ %s accepted your Friendship request !": "✅ %s ha accettato la tua richiesta di Amicizia !",
"✅ You have accepted %s' Friendship request!": "✅ Hai accettato la richiesta di Amicizia di %s !",
- "%s asked you HandShake": "%s ti ha chiesto la Stretta di mano",
- "%s accepted your HandShake": "%s ha accettato la Stretta di mano",
- "%s refused your HandShake": "%s ha rifiutato la Stretta di mano",
- "✅ %s accepted your HandShake request !": "✅ %s ha accettato la tua richiesta di Stretta di mano !",
- "✅ You have accepted %s HandShake request!": "✅ Hai accettato la richiesta di Stretta di mano di %s !",
+ "HANDSHAKE_SET": "%s ha comunicato che ti conosce personalmente e ha fiducia in te.",
"GROUPS_ACCEPTED": "✅ Sei stato accettato da %s a far parte del Gruppo %s (da parte di %s)",
"GROUPS_REFUSED": "❌ Ti è stato rifiutato l'accesso da %s a far parte del Gruppo %s. Se pensi sia un'errore, contatta l'amministratore del Gruppo.",
"GROUPS_REMOVED": "❌ l'utente %s è stato rimosso del Gruppo %s (da parte di %s)",
diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js
index 09e0e3c..98a35c7 100755
--- a/src/server/models/sendnotif.js
+++ b/src/server/models/sendnotif.js
@@ -213,18 +213,9 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
}
} else if (recnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_HANDSHAKE) {
recnotif.openUrl = '/my/' + userorig;
- if (recnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_NEW_REC) {
- newdescr = i18n.__('%s asked you HandShake', userorig, mydescr);
- tag = 'newhandshake';
- } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED) {
- newdescr = i18n.__('%s accepted your HandShake', userorig, mydescr);
+ if (recnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED) {
+ newdescr = i18n.__('HANDSHAKE_SET', userorig, mydescr);
tag = 'acceptedhandshake';
- } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED_MY_REQUEST) {
- newdescr = i18n.__('✅ You have accepted %s HandShake request!', userorig, mydescr);
- tag = 'acceptedhandshake';
- } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_REFUSED) {
- newdescr = i18n.__('%s refused your HandShake', userorig, mydescr);
- tag = 'refusedhandshake';
}
} else if (recnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_GROUPS) {
tag = 'group';
@@ -522,19 +513,6 @@ sendNotifSchema.statics.updateStatusAndDescr = async function (myrecnotif, onlys
newstatus = shared_consts.StatusNotifs.STATUS_FRIENDS_REFUSED;
dest = myrecnotif.sender;
}
- } else if (myrecnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_HANDSHAKE) {
- typeidsearch = shared_consts.TypeNotifs.ID_HANDSHAKE_NEW_REC;
- if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED) {
- newstatus = shared_consts.StatusNotifs.STATUS_HANDSHAKE_ACCEPTED;
- dest = myrecnotif.sender;
- } else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED_MY_REQUEST) {
- newstatus = shared_consts.StatusNotifs.STATUS_HANDSHAKE_ACCEPTED;
- newdest = myrecnotif.sender;
- sender = myrecnotif.dest;
- } else if (myrecnotif.typeid === shared_consts.TypeNotifs.ID_HANDSHAKE_REFUSED) {
- newstatus = shared_consts.StatusNotifs.STATUS_HANDSHAKE_REFUSED;
- dest = myrecnotif.sender;
- }
} else if (myrecnotif.typedir === shared_consts.TypeNotifs.TYPEDIR_GROUPS) {
typeidsearch = shared_consts.TypeNotifs.ID_GROUP_NEW_REC;
dest = myrecnotif.dest;
diff --git a/src/server/models/user.js b/src/server/models/user.js
index fe1936e..73d1941 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -385,12 +385,6 @@ const UserSchema = new mongoose.Schema({
username: { type: String },
date: { type: Date },
}], // username
- req_handshake: [
- {
- _id: false,
- username: { type: String },
- date: { type: Date },
- }], // username
mygroups: [
{
_id: false,
@@ -1565,7 +1559,6 @@ UserSchema.statics.getUserProfileByUsername = async function (
'profile.born_province': 1,
'profile.born_country': 1,
'profile.calc': 1,
- 'profile.req_handshake': 1,
'profile.handshake': 1,
'profile.friends': 1,
email: 1,
@@ -1610,7 +1603,6 @@ UserSchema.statics.getUserProfileByUsername = async function (
'profile.born_country': 1,
'profile.calc': 1,
'profile.handshake': 1,
- 'profile.req_handshake': 1,
'profile.friends': 1,
email: 1,
date_reg: 1,
@@ -1655,7 +1647,6 @@ UserSchema.statics.getUserProfileByUsername = async function (
'profile.born_country': 1,
'profile.calc': 1,
'profile.handshake': 1,
- 'profile.req_handshake': 1,
'profile.friends': 1,
'mycities': 1,
'comune': 1,
@@ -1789,13 +1780,6 @@ UserSchema.statics.getUsernameFriendsByUsername = async function (
return await this.getArrUsernameFromFieldByUsername(idapp, username, 'profile',
'friends');
-};
-UserSchema.statics.getUsernameReqHandShakeByUsername = async function (
- idapp, username) {
-
- return await this.getArrUsernameFromFieldByUsername(idapp, username, 'profile',
- 'req_handshake');
-
};
UserSchema.statics.getUsernameHandShakeByUsername = async function (
@@ -1867,13 +1851,6 @@ UserSchema.statics.removeReqFriend = async function (
{ $pull: { 'profile.req_friends': { username: { $in: [usernameDest] } } } });
};
-// Rimuovo la Stretta di Mano
-UserSchema.statics.removeReqHandShake = async function (
- idapp, username, usernameDest) {
- return await User.updateOne({ idapp, username: username },
- { $pull: { 'profile.req_handshake': { username: { $in: [usernameDest] } } } });
-};
-
UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, usernameDest, cmd, value, disablenotif) {
const { SendNotif } = require('../models/sendnotif');
@@ -2004,52 +1981,12 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
if (!disablenotif) {
// Send a notification to the DESTINATION HANDSHAKE !
- let req = tools.getReqByPar(idapp, usernameOrig);
- await SendNotif.createNewNotifToSingleUser(req, null, { usernameDest }, true, shared_consts.TypeNotifs.TYPEDIR_HANDSHAKE,
- shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED_MY_REQUEST);
+ let req = tools.getReqByPar(idapp, usernameDest);
+ await SendNotif.createNewNotifToSingleUser(req, null, { usernameDest: usernameOrig }, true, shared_consts.TypeNotifs.TYPEDIR_HANDSHAKE,
+ shared_consts.TypeNotifs.ID_HANDSHAKE_ACCEPTED);
}
-
- if (ris) {
- try {
- if (!disablenotif) {
- const userDest = await User.getRecLangAndIdByUsername(idapp, usernameDest);
- const user = await User.getRecLangAndIdByUsername(idapp, usernameOrig);
- const msgDest = i18n.__({ phrase: '✅ %s accepted your HandShake request !', locale: userDest.lang }, usernameDest);
- const msgOrig = i18n.__({ phrase: '✅ You have accepted %s HandShake request!', locale: user.lang }, usernameOrig);
-
- await telegrambot.sendMsgTelegram(idapp, usernameOrig, msgDest);
- await telegrambot.sendMsgTelegram(idapp, usernameDest, msgOrig);
- }
- } catch (e) {
- console.error('Notification : ', e);
- }
- }
-
}
- // Controlla se lui aveva già la mia amicizia
- const foundIfAlreadyFriend2 = await User.findOne({
- idapp,
- username: usernameDest,
- 'profile.handshake': {
- $elemMatch: { username: { $eq: usernameOrig } },
- },
- }, { _id: 1 }).lean();
-
- if (!foundIfAlreadyFriend2) {
- update = {
- $push: {
- 'profile.handshake': {
- username: usernameOrig,
- date: new Date(),
- },
- },
- };
- ris = await User.updateOne({ idapp, username: usernameDest }, update);
-
- this.removeReqHandShake(idapp, usernameDest, usernameOrig); // Rimuovo l'Amicizia da me
- this.removeReqHandShake(idapp, usernameOrig, usernameDest); // Rimuovo l'Amicizia da te
- }
//if (ris) {
ris = await User.getInfoFriendByUsername(idapp, usernameDest);
//}
@@ -2080,42 +2017,6 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
tools.sendNotificationByUsername(idapp, usernameDest, cmd, true, usernameOrig);
}
}
- } else if (cmd === shared_consts.FRIENDSCMD.REQHANDSHAKE) {
- // Aggiungo la richiesta di Amicizia a me
- const foundIfAlreadyAskFriend = await User.findOne({
- idapp,
- username: usernameDest,
- 'profile.req_handshake': {
- $elemMatch: { username: { $eq: usernameOrig } },
- },
- }, { _id: 1 }).lean();
-
- if (value) {
- if (!foundIfAlreadyAskFriend) {
- update = {
- $push: {
- 'profile.req_handshake': {
- username: usernameOrig,
- date: new Date(),
- },
- },
- };
- ris = await User.updateOne({ idapp, username: usernameDest }, update);
- }
- if (ris) {
- // Invia una notifica alla persona
- tools.sendNotificationByUsername(idapp, usernameDest, cmd, true, usernameOrig);
- }
- } else {
- if (foundIfAlreadyAskFriend) {
- ris = await this.removeReqHandShake(idapp, usernameDest, usernameOrig); // Rimuovo l'Amicizia da me
- }
- }
-
- // if (ris) {
- ris = await User.getInfoAskFriendByUsername(idapp, usernameDest);
- // }
-
} else if (cmd === shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS) {
// Rimuovi anche le eventuali richieste di Amicizia !
@@ -2127,7 +2028,7 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
} else if (cmd === shared_consts.FRIENDSCMD.REMOVE_FROM_MYHANDSHAKE) {
- ris = await this.removeHandShake(idapp, usernameDest, usernameOrig); // Rimuovo l'Amicizia da lui
+ ris = await this.removeHandShake(idapp, usernameOrig, usernameDest); // Rimuovo l'Amicizia da lui
} else if (cmd === shared_consts.FRIENDSCMD.CANCEL_REQ_FRIEND) {
@@ -2136,16 +2037,6 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
await SendNotif.createNewNotifToSingleUser(req, null, { usernameDest }, true, shared_consts.TypeNotifs.TYPEDIR_FRIENDS,
shared_consts.TypeNotifs.ID_FRIENDS_REFUSED);
- } else if (cmd === shared_consts.FRIENDSCMD.CANCEL_REQ_HANDSHAKE) {
-
- // CREATE NOTIFICATION IN TABLE SENDNOTIF
- const req = tools.getReqByPar(idapp, usernameOrig);
- await SendNotif.createNewNotifToSingleUser(req, null, { usernameDest }, true, shared_consts.TypeNotifs.TYPEDIR_HANDSHAKE,
- shared_consts.TypeNotifs.ID_HANDSHAKE_REFUSED);
-
- await this.removeReqHandShake(idapp, usernameDest, usernameOrig); // Rimuovo la Richiesta di Amicizia da lui
- ris = await this.removeHandShake(idapp, usernameOrig, usernameDest); // Rimuovo l'Amicizia da me
-
} else if (cmd === shared_consts.FRIENDSCMD.BLOCK_USER) {
await this.removeReqFriend(idapp, usernameDest, usernameOrig); // Rimuovo la Richiesta di Amicizia da lui
@@ -2775,7 +2666,6 @@ function getWhatToShow(idapp, username) {
date_reg: 1,
'profile.friends': 1,
'profile.handshake': 1,
- 'profile.req_handshake': 1,
};
}
@@ -2869,22 +2759,6 @@ UserSchema.statics.getAskedFriendsByUsername = async function (idapp, username)
};
-UserSchema.statics.getAskedHandShakeByUsername = async function (idapp, username) {
-
- const whatToShow_Unknown = getWhatToShow_Unknown(idapp, username);
-
- return await User.find({
- idapp,
- 'profile.req_handshake': {
- $elemMatch: { username: { $eq: username } },
- },
- $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }],
- }, whatToShow_Unknown).then((rec) => {
-
- //return rec.map(m => m.username);
- });
-
-};
UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
@@ -2894,8 +2768,6 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
listRequestFriends: [],
listTrusted: [],
listSentRequestFriends: [],
- listSentRequestHandShake: [],
- listRequestHandShake: [],
}
}
@@ -2908,8 +2780,6 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
idapp, username);
const arrUsernameHandShake = await User.getUsernameHandShakeByUsername(idapp,
username);
- const arrUsernameReqHandShake = await User.getUsernameReqHandShakeByUsername(
- idapp, username);
let listFriends = await User.find({
idapp,
@@ -2935,14 +2805,6 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
{ deleted: { $exists: true, $eq: false } }],
}, whatToShow_Unknown);
- let listRequestHandShake = await User.find({
- idapp,
- username: { $in: arrUsernameReqHandShake },
- $or: [
- { deleted: { $exists: false } },
- { deleted: { $exists: true, $eq: false } }],
- }, whatToShow_Unknown);
-
let listSentRequestFriends = await User.find({
idapp,
'profile.req_friends': {
@@ -2953,16 +2815,6 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
{ deleted: { $exists: true, $eq: false } }],
}, whatToShow_Unknown);
- let listSentRequestHandShake = await User.find({
- idapp,
- 'profile.req_handshake': {
- $elemMatch: { username: { $eq: username } },
- },
- $or: [
- { deleted: { $exists: false } },
- { deleted: { $exists: true, $eq: false } }],
- }, whatToShow_Unknown);
-
let listTrusted = await User.find({
idapp, aportador_solidario: username,
'profile.teleg_id': { $gt: 0 },
@@ -2975,10 +2827,8 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
listFriends,
listHandShake,
listRequestFriends,
- listRequestHandShake,
listTrusted,
listSentRequestFriends,
- listSentRequestHandShake,
};
} catch (e) {
@@ -2989,10 +2839,8 @@ UserSchema.statics.getFriendsByUsername = async function (idapp, username) {
listFriends: [],
listHandShake: [],
listRequestFriends: [],
- listRequestHandShake: [],
listTrusted: [],
listSentRequestFriends: [],
- listSentRequestHandShake: [],
};
};
@@ -4152,7 +4000,8 @@ UserSchema.statics.getQueryUsersStretteDiMano = function (idapp) {
const query = [
{
$match: {
- idapp,
+ idapp: "13",
+ 'profile.handshake': { $exists: true },
$or: [
{
deleted: {
@@ -4168,22 +4017,16 @@ UserSchema.statics.getQueryUsersStretteDiMano = function (idapp) {
],
},
},
+
{
- $group: {
- _id: "$profile.handshake",
- count: {
- $sum: 1,
- },
- },
- },
- {
- $match: { "count": { $gte: 2 } }
- },
- {
- $sort: {
- count: -1,
- },
+ $group:
+ {
+ _id: "$username",
+ count:
+ { $sum: { $size: "$profile.handshake" } }
+ }
},
+ { $sort: { count: -1 } },
{ $limit: 20 },
{
$lookup: {
@@ -4604,20 +4447,20 @@ UserSchema.statics.getExtraInfoByUsername = async function (idapp, username) {
let myuser = await User.findOne({ idapp, username }).lean();
if (myuser) {
- myuserextra = await User.addExtraInfo(idapp, myuser);
+ myuserextra = await User.addExtraInfo(idapp, myuser, null);
}
return myuser.profile;
};
-UserSchema.statics.addExtraInfo = async function (idapp, recUser) {
+UserSchema.statics.addExtraInfo = async function (idapp, recUser, recUserSave) {
try {
try {
- if (recUser.profile && recUser.profile.notifs && recUser.profile.notifs.length <= 0) {
+ if (recUserSave && recUser.profile && recUser.profile.notifs && recUser.profile.notifs.length <= 0) {
recUser.profile.notifs = shared_consts.DEFAULT_NOTIFS_USER;
- await recUser.save();
+ await recUserSave.save();
}
} catch (e) {
console.error('Err addExtraInfo notifs ', e);
@@ -4637,20 +4480,6 @@ UserSchema.statics.addExtraInfo = async function (idapp, recUser) {
? listSentMyRequestFriends
: [];
- const listSentMyRequestHandShake = await User.find({
- idapp,
- 'profile.req_handshake': {
- $elemMatch: { username: { $eq: recUser.username } },
- },
- $or: [
- { deleted: { $exists: false } },
- { deleted: { $exists: true, $eq: false } }],
- }, { username: 1 }).lean();
-
- recUser.profile.asked_handshake = listSentMyRequestHandShake
- ? listSentMyRequestHandShake
- : [];
-
const listSentMyRequestGroups = await MyGroup.find({
idapp,
'req_users': {
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 235cfc8..d0efe06 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -1347,7 +1347,7 @@ function load(req, res, version) {
let myuserextra = null;
if (req.user) {
// askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username);
- myuserextra = User.addExtraInfo(idapp, req.user._doc);
+ myuserextra = User.addExtraInfo(idapp, req.user._doc, req.user);
}
return Promise.all([
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index 0775c41..3af8a62 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -986,13 +986,9 @@ const MyTelegramBot = {
keyb = cl.getInlineKeyboard(myuser.lang, [
{
- text: '✅👤 Accetta Stretta di mano',
+ text: '✅🤝 Ricambia la fiducia',
callback_data: InlineConferma.RISPOSTA_SI + myfunc + tools.SEP + myuser.username + tools.SEP + userDest + tools.SEP + '',
},
- {
- text: '🚫👤 Rifiuta Stretta di mano',
- callback_data: InlineConferma.RISPOSTA_NO + myfunc + tools.SEP + myuser.username + tools.SEP + userDest + tools.SEP + '',
- },
]);
}
@@ -4129,19 +4125,6 @@ if (true) {
}
}
- } else if (data.action === InlineConferma.RISPOSTA_NO + shared_consts.CallFunz.RICHIESTA_HANDSHAKE) {
-
- if (userDest) {
- cmd = shared_consts.FRIENDSCMD.REMOVE_FROM_MYHANDSHAKE;
- // Rimuovilo nelle HandShake
- const req = tools.getReqByPar(user.idapp, username_action);
- const ris = await User.setFriendsCmd(req, user.idapp, data.username, data.userDest, cmd);
- if (ris) {
- const msgDest = printf(getstr(user.lang, 'MSG_HANDSHAKE_NOT_ACCEPTED_CONFIRMED'), data.username);
-
- await local_sendMsgTelegram(user.idapp, data.userDest, msgDest);
- }
- }
}
}
}
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index 409a4dd..3547bb5 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -125,7 +125,7 @@ const textlang = {
'MSG_SEND_FROM': 'Msg Inviato da',
'ZOOM_CONFERMATO': 'Sei stato confermato ad aver visto la Video Conferenza di Benvenuto!',
'RICHIESTA_AMICIZIA': '🌈 Richiesta d\'Amicizia da parte di %s',
- 'RICHIESTA_HANDSHAKE': '🌈 Confermi che hai conosciuto personalmente e dai la tua fiducia a %s ?',
+ 'RICHIESTA_HANDSHAKE': '🌈 %s ha comunicato che ti conosce personalmente e ha fiducia in te.',
'ACCETTATO_SUL_GRUPPO': '✅ Sei stato accettato da %s a far parte del Gruppo %s',
'CREATO_NUOVO_GRUPPO': '✅ Hai appena creato un nuovo Gruppo chiamato %s',
'ACCETTATO_NOTIFICA_ADMINS': '✅ l\'utente %s è stato accettato a far parte del Gruppo %s (da parte di %s)',
@@ -913,17 +913,21 @@ module.exports = {
telegrambot.askConfirmationUserFriend(idapp, shared_consts.CallFunz.RICHIESTA_AMICIZIA, userrecDest, username, usernameOrig);
}
- } else if (cmd === shared_consts.FRIENDSCMD.REQHANDSHAKE) {
+ } else if (cmd === shared_consts.FRIENDSCMD.SETHANDSHAKE) {
descr = printf(this.get__('RICHIESTA_HANDSHAKE', lang), usernameOrig);
openUrl = '/my/' + usernameOrig;
- tag = 'reqfriends';
+ tag = 'reqhandshake';
const userrecDest = await User.getUserShortDataByUsername(idapp, usernameOrig);
+ const foundIfAlreadyHandShake = await User.isMyHandShake(idapp, username, usernameOrig);
+
if (userrecDest) {
sendmynotif = false; // non lo rimandare 2 volte !
- // SEND TELEGRAM NOTIFICATION
- telegrambot.askConfirmationUserFriend(idapp, shared_consts.CallFunz.RICHIESTA_HANDSHAKE, userrecDest, username, usernameOrig);
+ if (!foundIfAlreadyHandShake) {
+ // SEND TELEGRAM NOTIFICATION
+ telegrambot.askConfirmationUserFriend(idapp, shared_consts.CallFunz.RICHIESTA_HANDSHAKE, userrecDest, username, usernameOrig);
+ }
}
}
diff --git a/src/server/tools/globalTables.js b/src/server/tools/globalTables.js
index 1bb5c5a..7277aff 100755
--- a/src/server/tools/globalTables.js
+++ b/src/server/tools/globalTables.js
@@ -500,13 +500,6 @@ module.exports = {
});
console.log('handshake.username result = ', ris);
- ris = await User.updateMany({ idapp, 'profile.req_handshake.username': search_username },
- {
- $set:
- { 'profile.req_handshake.$.username': replace_username }
- });
- console.log('req_handshake.username result = ', ris);
-
ris = await Circuit.updateMany({ idapp, 'admins.username': search_username },
{ $set: { 'admins.$.username': replace_username } });
console.log('Circuit.admins.username result = ', ris);
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index 5a839da..5743a2e 100755
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -45,15 +45,12 @@ module.exports = {
FRIENDSCMD: {
SETTRUST: 121,
REQFRIEND: 125,
- REQHANDSHAKE: 128,
SETFRIEND: 132,
SETHANDSHAKE: 133,
REMOVE_FROM_MYFRIENDS: 144,
REFUSE_REQ_FRIEND: 145,
CANCEL_REQ_FRIEND: 146,
REMOVE_FROM_MYHANDSHAKE: 147,
- REFUSE_REQ_HANDSHAKE: 148,
- CANCEL_REQ_HANDSHAKE: 149,
BLOCK_USER: 155,
UNBLOCK_USER: 156,
REPORT_USER: 158,
@@ -426,10 +423,7 @@ module.exports = {
ID_MSGS_NEW_REC: 1,
TYPEDIR_HANDSHAKE: 10,
- ID_HANDSHAKE_NEW_REC: 1,
ID_HANDSHAKE_ACCEPTED: 2,
- ID_HANDSHAKE_REFUSED: 4,
- ID_HANDSHAKE_ACCEPTED_MY_REQUEST: 8,
TYPEDIR_TEST: 444,
ID_TEST_NEW_REC: 1,