diff --git a/src/server/locales/it.json b/src/server/locales/it.json
index 306bb3b..9dd725d 100644
--- a/src/server/locales/it.json
+++ b/src/server/locales/it.json
@@ -57,6 +57,8 @@
"CIRCUIT_EXIT_USER_TO_ME": "❌ Sei uscito dal Circuito %s",
"CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)",
"CIRCUIT_SENDCOINSREQ": "%s ti sta inviando %s %s.",
+ "CIRCUIT_SENDCOINSREQ_GROUP": "%s sta inviando %s %s al Conto Comunitario '%s'.",
+ "CIRCUIT_SENDCOINSREQ_FROM_GROUP": "il conto comunitario '%s' sta inviando %s %s a %s.",
"CIRCUIT_SENDCOINSREQ_TO_ME": "Stai inviando %s %s a %s. \nIl destinatario deve accettare la transazione.",
"ID_CIRCUIT_COINS_ACCEPTED": "%s %s accettati da %s.",
"SALDO_UPDATE": "[Saldo %s %s]",
diff --git a/src/server/models/sendnotif.js b/src/server/models/sendnotif.js
index 0eb9082..9b91854 100755
--- a/src/server/models/sendnotif.js
+++ b/src/server/models/sendnotif.js
@@ -349,8 +349,16 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
}
tag = 'removeadmincircuit';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ) {
- newdescr = i18n.__('CIRCUIT_SENDCOINSREQ', tools.getAhref(recnotif.paramsObj.username_action, await tools.getLinkUserTelegram(recnotif.idapp, recnotif.paramsObj.username_action)), recnotif.paramsObj.extrarec.qty.toString(),
- recnotif.paramsObj.extrarec.symbol);
+ if (recnotif.paramsObj.extrarec.groupdest) {
+ newdescr = i18n.__('CIRCUIT_SENDCOINSREQ_GROUP', tools.getAhref(recnotif.paramsObj.username_action, await tools.getLinkUserTelegram(recnotif.idapp, recnotif.paramsObj.username_action)), recnotif.paramsObj.extrarec.qty.toString(),
+ recnotif.paramsObj.extrarec.symbol, recnotif.paramsObj.extrarec.groupdest);
+ } else if (recnotif.paramsObj.extrarec.grouporig) {
+ newdescr = i18n.__('CIRCUIT_SENDCOINSREQ_FROM_GROUP', recnotif.paramsObj.extrarec.grouporig, recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol, recnotif.paramsObj.usernameDest);
+ } else {
+ newdescr = i18n.__('CIRCUIT_SENDCOINSREQ', tools.getAhref(recnotif.paramsObj.username_action, await tools.getLinkUserTelegram(recnotif.idapp, recnotif.paramsObj.username_action)), recnotif.paramsObj.extrarec.qty.toString(),
+ recnotif.paramsObj.extrarec.symbol);
+ }
+
tag = 'sendcoin';
recnotif.openUrl = '/circuit/' + recnotif.paramsObj.path; //++Todo: dove lo mando ?
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ_SENT) {
@@ -367,9 +375,10 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
);
tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED_SENT) {
+ const destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : recnotif.paramsObj.extrarec.groupdest;
+
newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(),
- recnotif.paramsObj.extrarec.symbol,
- recnotif.paramsObj.extrarec.dest) + `\n` + i18n.__('SALDO_UPDATE', recnotif.paramsObj.extrarec.saldoOrig,
+ recnotif.paramsObj.extrarec.symbol, destinatario) + `\n` + i18n.__('SALDO_UPDATE', recnotif.paramsObj.extrarec.saldoOrig,
recnotif.paramsObj.extrarec.symbol);
tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED) {
@@ -377,9 +386,11 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
recnotif.paramsObj.username_action);
tag = 'sendcoin';
} else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED_SENT) {
+ const destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : recnotif.paramsObj.extrarec.groupdest;
+
newdescr = i18n.__('ID_CIRCUIT_COINS_REFUSED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
- recnotif.paramsObj.extrarec.dest);
- tag = 'sendcoin'; ac
+ destinatario);
+ tag = 'sendcoin';
}
}
diff --git a/src/server/models/user.js b/src/server/models/user.js
index eaf613b..6e3d397 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -1656,7 +1656,7 @@ UserSchema.statics.getUserProfileByUsername = async function (
'useraport.profile.img': 1,
};
}
-
+
let regexpusername = new RegExp(`^${username}$`, 'i');
const myfind = {
@@ -1993,7 +1993,7 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use
const userprofile = await User.getInfoFriendByUsername(idapp, usernameDest);
const myuser = await User.getInfoFriendByUsername(idapp, usernameOrig);
- ris = {rec, userprofile, myuser };
+ ris = { rec, userprofile, myuser };
} else if (cmd === shared_consts.FRIENDSCMD.REQFRIEND) {
// Aggiungo la richiesta di Amicizia a me
const foundIfAlreadyAskFriend = await User.findOne({
@@ -4538,11 +4538,13 @@ UserSchema.statics.addExtraInfo = async function (idapp, recUser, recUserSave) {
const circuitobj = await Circuit.getCircuitsByUsername(idapp, recUser.username, recUser);
const useraccounts = await Account.getUserAccounts(idapp, recUser.username);
-
+
for (const group of listManageGroups) {
const myaccounts = await Account.getGroupAccounts(idapp, group.groupname);
if (myaccounts && myaccounts.length > 0)
- group.account = myaccounts[0]
+ group.account = myaccounts[0];
+ else
+ group.account = null;
}
recUser.profile = { ...recUser.profile, ...circuitobj, useraccounts };