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

Group Page corrected

Browse Source
This commit is contained in:
paoloar77
2022-08-09 17:32:06 +02:00
parent fc8e8d8034
commit 680b353535
8 changed files with 96 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,6 +703,8 @@ UserSchema.statics.getUserShortDataByUsername = async function(idapp, username)
surname: 1,
deleted: 1,
reported: 1,
date_report: 1,
username_who_report: 1,
sospeso: 1,
verified_email: 1,
verified_by_aportador: 1,
@@ -1366,6 +1368,8 @@ UserSchema.statics.getUserProfileByUsername = async function(
deleted: 1,
sospeso: 1,
reported: 1,
date_report: 1,
username_who_report: 1,
verified_email: 1,
verified_by_aportador: 1,
date_reg: 1,
@@ -1384,6 +1388,8 @@ UserSchema.statics.getUserProfileByUsername = async function(
deleted: 1,
sospeso: 1,
reported: 1,
date_report: 1,
username_who_report: 1,
verified_email: 1,
verified_by_aportador: 1,
'profile.nationality': 1,
@@ -1418,6 +1424,8 @@ UserSchema.statics.getUserProfileByUsername = async function(
deleted: 1,
sospeso: 1,
reported: 1,
date_report: 1,
username_who_report: 1,
verified_email: 1,
verified_by_aportador: 1,
notask_verif: 1,
@@ -1923,11 +1931,9 @@ UserSchema.statics.setGroupsCmd = async function(idapp, usernameOrig, groupnameD
// Invia una notifica alla persona
await tools.sendNotificationByGroupname(idapp, usernameOrig, groupnameDest, cmd, false, true, username_action);
} else if (cmd === shared_consts.GROUPSCMD.REFUSE_REQ_GROUP) {
} else if (cmd === shared_consts.GROUPSCMD.REMOVE_FROM_MYGROUP) {
ris = await MyGroup.refuseReqGroup(idapp, usernameOrig, groupnameDest); // Aggiungi alla lista utenti Rifiutati
ris = await MyGroup.removeReqGroup(idapp, usernameOrig, groupnameDest); // Rimuovo la richiesta di entrare nel gruppo
ris = await User.removeFromMyGroups(idapp, usernameOrig, groupnameDest); // Rimuovo l'Amicizia da me
console.log('ris', ris);
// Invia una notifica alla persona
@@ -1964,6 +1970,18 @@ UserSchema.statics.setGroupsCmd = async function(idapp, usernameOrig, groupnameD
//++Todo: Send Notification to Admin and Group's manager
tools.sendNotificationByGroupname(idapp, usernameOrig, groupnameDest, cmd, false, true, username_action);
} else if (cmd === shared_consts.GROUPSCMD.ADDADMIN_OFMYGROUP) {
ris = await MyGroup.addToAdminOfMyGroup(idapp, usernameOrig, groupnameDest); // Rimuovo la richiesta di entrare nel gruppo
// Invia una notifica alla persona
await tools.sendNotificationByGroupname(idapp, usernameOrig, groupnameDest, cmd, false, true, username_action);
} else if (cmd === shared_consts.GROUPSCMD.REMOVEADMIN_OFMYGROUP) {
ris = await MyGroup.removeAdminOfMyGroup(idapp, usernameOrig, groupnameDest); // Rimuovo la richiesta di entrare nel gruppo
// Invia una notifica alla persona
await tools.sendNotificationByGroupname(idapp, usernameOrig, groupnameDest, cmd, false, true, username_action);
}
} catch (e) {
console.error('Error: ', e);
@@ -1981,6 +1999,8 @@ function getWhatToShow(idapp, username) {
deleted: 1,
sospeso: 1,
reported: 1,
date_report: 1,
username_who_report: 1,
verified_email: 1,
verified_by_aportador: 1,
notask_verif: 1,