- nella lista circuiti ora si vedono tutti gli annunci del circuito stesso

This commit is contained in:
Surya Paolo
2025-01-15 15:39:53 +01:00
parent 5ba86e3641
commit 332b8992a9
4 changed files with 25 additions and 6 deletions

View File

@@ -1432,6 +1432,12 @@ module.exports = {
},
getAdminsByCircuit(circuit) {
// return circuit.admins
return [...circuit.admins, shared_consts.USER_ADMIN_CIRCUITS]
},
sendNotificationByCircuit: async function (idapp, usernameOrig, circuitname, cmd, value, telegram, username_action, extrarec) {
const { Circuit } = require('../models/circuit');
@@ -1509,7 +1515,7 @@ module.exports = {
const groupOrig = '' //++Todo: extrarec.groupOrig
for (const singleadmin of circuit.admins) {
for (const singleadmin of this.getAdminsByCircuit(circuit) {
try {
if (singleadmin.username) {
if (usernameOrig === singleadmin.username)
@@ -1616,12 +1622,12 @@ module.exports = {
const telegrambot = require('../telegram/telegrambot');
if (!circuit || !circuit.admins) {
if (!circuit || !this.getAdminsByCircuit(circuit)) {
console.error('sendNotifToCircuitsAdmin: missing circuit or circuit.admins', circuit);
return;
}
for (const singleadmin of circuit.admins) {
for (const singleadmin of this.getAdminsByCircuit(circuit)) {
try {
if (singleadmin && singleadmin.username) {
const user = await User.getUserShortDataByUsername(idapp, singleadmin.username);

View File

@@ -54,6 +54,7 @@ module.exports = {
FILTER_NOTE: 536870912,
FILTER_SENZA_NOTE: 1073741824,
FILTER_DA_CONTATTARE: 2147483648,
FILTER_FACILITATORE: 4294967296,
OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
@@ -1004,6 +1005,7 @@ module.exports = {
username_who_report: 1,
namecomplete: 1,
date_reg: 1,
perm: 1,
};
if (proj_add)