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

- Accepted and Refused Group Entering

Browse Source 
- Report a User
This commit is contained in:
paoloar77
2022-08-04 17:30:57 +02:00
parent d902783336
commit 8a587dc715
16 changed files with 529 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/router/index_router.js
View File

@@ -78,6 +78,7 @@ const UserCost = {
'profile.teleg_id',
'profile.manage_telegram',
'deleted',
'reported',
],
FIELDS_REQUISITI: [
@@ -247,6 +248,11 @@ router.post('/settable', authenticate, async (req, res) => {
mydata.userId = req.user._id;
}
if (shared_consts.TABLES_CREATEDBY.includes(params.table)) {
if (!mydata.createdBy)
mydata.createdBy = req.user.username;
}
if (shared_consts.TABLES_PERM_NEWREC.includes(params.table)) {
if (!consentito) {
mydata.verifyrec = false;
@@ -332,7 +338,7 @@ router.post('/settable', authenticate, async (req, res) => {
let setnotif = false;
let typedir = 0;
let typeid = 0;
let groupNameDest = '';
let groupnameDest = '';
if (shared_consts.TABLES_ADV_NOTIFICATION.includes(params.table)) {
typedir = shared_consts.TypeNotifs.TYPEDIR_BACHECA;
@@ -349,12 +355,12 @@ router.post('/settable', authenticate, async (req, res) => {
if (shared_consts.TABLES_GROUPS_NOTIFICATION.includes(params.table)) {
typedir = shared_consts.TypeNotifs.TYPEDIR_GROUPS;
typeid = shared_consts.TypeNotifs.ID_GROUP_NEW_REC;
groupNameDest = myrec ? myrec.groupname : '';
groupnameDest = myrec ? myrec.groupname : '';
setnotif = true;
}
if (setnotif) {
await SendNotif.createNewNotification(req, res, {groupNameDest}, params.table, myrec, typedir, typeid);
await SendNotif.createNewNotification(req, res, {groupnameDest}, params.table, myrec, typedir, typeid);
}
if (params.table === shared_consts.TAB_MYGROUPS && isnewrec) {
@@ -502,6 +508,7 @@ router.post('/getexp', authenticate, (req, res) => {
{
username: 1,
email: 1,
'reported': 1,
'profile.teleg_id': 1,
'verified_by_aportador': 1,
'profile.username_telegram': 1,

8
src/server/router/mygroups_router.js
View File

@@ -18,9 +18,11 @@ const {ObjectID} = require('mongodb');
async function getGroupRecAdminsInfo(idapp, data) {
for (const admin of data.admins) {
const myuser = await User.findOne({idapp, username: admin.username}).lean();
admin.profile = { img: myuser.profile.img };
if (data && data.admins) {
for (const admin of data.admins) {
const myuser = await User.findOne({idapp, username: admin.username}, {'profile.img': 1}).lean();
admin.profile = {img: myuser.profile.img};
}
}
return data;

14
src/server/router/users_router.js
View File

@@ -424,9 +424,19 @@ router.post('/panel', authenticate, async (req, res) => {
try {
const myuser = await User.findOne({idapp, username},
{
username: 1, email: 1, verified_by_aportador: 1, aportador_solidario: 1,
username: 1,
name: 1,
surname: 1,
email: 1,
verified_by_aportador: 1,
aportador_solidario: 1,
lasttimeonline: 1,
deleted: 1,
sospeso: 1,
blocked: 1,
reported: 1,
username_who_report: 1,
date_report: 1,
profile: 1,
}).lean();
if (!!myuser) {
@@ -647,7 +657,7 @@ router.post('/friends/cmd', authenticate, async (req, res) => {
usernameOrig = await User.getRealUsernameByUsername(idapp, usernameOrig);
usernameDest = await User.getRealUsernameByUsername(idapp, usernameDest);
return User.setFriendsCmd(idapp, usernameOrig, usernameDest, cmd, value).
return User.setFriendsCmd(req, idapp, usernameOrig, usernameDest, cmd, value).
then((ris) => {
res.send(ris);
}).