diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js index 07a7530..2c13c26 100755 --- a/src/server/models/circuit.js +++ b/src/server/models/circuit.js @@ -31,6 +31,9 @@ const CircuitSchema = new Schema({ longdescr: { type: String, }, + regulation: { + type: String, + }, systemUserDescr: { type: String, }, diff --git a/src/server/models/user.js b/src/server/models/user.js index 3abd8c5..ed6c55c 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -1372,9 +1372,12 @@ UserSchema.statics.getUserProfileByUsername = async function( username_who_report: 1, verified_email: 1, verified_by_aportador: 1, + aportador_solidario: 1, date_reg: 1, 'profile.username_telegram': 1, 'profile.img': 1, + "useraport.username": 1, + "useraport.profile.img": 1, }; } else if (perm === tools.Perm.PERM_FRIEND) { @@ -1411,6 +1414,8 @@ UserSchema.statics.getUserProfileByUsername = async function( 'profile.born_country': 1, email: 1, date_reg: 1, + "useraport.username": 1, + "useraport.profile.img": 1, }; } else if (perm === tools.Perm.PERM_ALL) { @@ -1450,6 +1455,8 @@ UserSchema.statics.getUserProfileByUsername = async function( 'comune': 1, email: 1, date_reg: 1, + "useraport.username": 1, + "useraport.profile.img": 1, }; } @@ -1468,6 +1475,31 @@ UserSchema.statics.getUserProfileByUsername = async function( as: 'mycities', }, }, + { + "$lookup": { + "from": 'users', + let: { + "idapp": "$idapp", + "user_name": "$aportador_solidario" + }, + pipeline: [ + { "$match": { + "$expr": { + $and: [ + { $eq: ['$username', '$$user_name'] }, + { $eq: ['$idapp','$$idapp'] } + ] + } + } + } + ], + as: 'useraport' + } + }, + { + $unwind:'$useraport' + }, + { '$replaceRoot': { 'newRoot': { diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index 7a8e6af..7cbb69a 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -1164,6 +1164,7 @@ const MyTelegramBot = { }; let invia = false; + let content = ''; let tipomsgtempl = 0; @@ -1176,6 +1177,8 @@ const MyTelegramBot = { if (params.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) { tipomsgtempl = shared_consts.TypeMsgTemplate.MS_SHARE_LINK; invia = true; + } else if (params.cmd === shared_consts.MsgTeleg.SHARE_TEXT) { + invia = !!params.content; } if (tipomsgtempl > 0) { diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js index a82f10b..ad1c32b 100755 --- a/src/server/tools/shared_nodejs.js +++ b/src/server/tools/shared_nodejs.js @@ -281,6 +281,7 @@ module.exports = { MsgTeleg: { SHARE_MSGREG: 1, + SHARE_TEXT: 2, }, TypeMsgTemplate: {