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

Lista Navi

Browse Source
This commit is contained in:
Paolo Arena
2020-04-07 14:34:29 +02:00
parent 8c9a5f7518
commit 7c575c0687
14 changed files with 317 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/server/telegram/telegrambot.js
View File

@@ -192,8 +192,8 @@ const Menu = {
},
si: {
ACCEDI: emo.PERSON + ' Prijava',
LAVAGNA: emoji.get('om_symbol') + ' Predstavitev',
LINK_CONDIVIDERE: emoji.get('link') + ' Povezava za skupno rabo',
LAVAGNA: emoji.get('om_symbol') + ' Tabla',
LINK_CONDIVIDERE: emoji.get('link') + ' Link za vpis oseb',
ZOOM: emoji.get('information_source') + ' Zoom (Konference)',
INFO: emoji.get('information_source') + ' Informacije',
ASSISTENZA: emoji.get('open_hands') + ' AYNI-jev klepet',
@@ -382,7 +382,7 @@ const txt_fr = {
};
const txt_si = {
MSG_SCEGLI_MENU: emoji.get('dizzy') + 'Meni za prikaz glasov:' + emoji.get('omotično'),
MSG_SCEGLI_MENU: emoji.get('dizzy') + 'Izbirni meni:' + emoji.get('dizzy'),
MSG_ASK_USERNAME_BO: 'Vpiši svoje uporabniško ime in e-naslov s katerimi si se registriral na spletni strani % s: ',
MSG_ERRORE_USERNAME: 'Pozor! Vpiši samo uporabniško ime (40 znakov) maksimalno',
MSG_ERRORE_USERNAME_NOT_FOUND: 'Ponovno preverite telegram BOT Uporabniško ime ali e-poštno sporočilo, s katerim ste registrirali na spletni strani AYNI: ',
@@ -478,7 +478,7 @@ module.exports = {
NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp, userdest) + aportador;
aportador = NameFrom;
}
text = printf(getstr(langdest, txt.MSG_APORTADOR_USER_REGISTERED), `${mylocalsconf.user.name} ${mylocalsconf.user.surname} (${mylocalsconf.user.username})`, ind_order, aportador);
text = printf(getstr(langdest, 'MSG_APORTADOR_USER_REGISTERED'), `${mylocalsconf.user.name} ${mylocalsconf.user.surname} (${mylocalsconf.user.username})`, ind_order, aportador);
}
let addtext = "";
@@ -516,7 +516,12 @@ module.exports = {
if (mydata.tipomsg === tools.TipoMsg.SEND_LINK_CHAT_DONATORI) {
return printf(tools.gettranslate('SEND_LINK_CHAT_DONATORI', lang), user.name, mydata.msgpar1);
} else if (mydata.tipomsg === tools.TipoMsg.SEND_MSG || mydata.tipomsg === tools.TipoMsg.SEND_MSG_SINGOLO) {
return mydata.msgpar1;
let mymsg = '';
if (!!mydata.username_mitt) {
mymsg = '[' + tools.gettranslate('MSG_SEND_FROM', lang) + ' ' + mydata.username_mitt + ']:' + tools.ACAPO;
}
mymsg += mydata.msgpar1;
return mymsg;
}
},
@@ -555,12 +560,11 @@ module.exports = {
}
if ((nummsgsent === 1) && (mydata.inviareale)) {
try {
this.sendMsgTelegramToTheManagers(idapp, 'Inviato messaggio a tutti i Donatori della Nave ' + mydata.navemediatore.riga + '.' + mydata.navemediatore.col + '\n' + mymsg)
await this.sendMsgTelegramToTheManagers(idapp, 'Inviato messaggio a tutti i Donatori della Nave ' + mydata.navemediatore.riga + '.' + mydata.navemediatore.col + '\n' + mymsg)
} catch (e) {
}
}
}
}
@@ -612,7 +616,7 @@ module.exports = {
},
sendMsgTelegram: async function (idapp, username, text, alsotomanagers) {
sendMsgTelegram: async function (idapp, username, text, alsotomanagers, username_mitt) {
const teleg_id = await User.TelegIdByUsername(idapp, username);
const cl = getclTelegByidapp(idapp);
let ris = null;
@@ -624,6 +628,12 @@ module.exports = {
if (alsotomanagers) {
await this.sendMsgTelegramToTheManagers(idapp, text)
}
if (!!username_mitt) {
const rec = cl.getRecByUsername(username);
if (rec) {
rec.msgall_username_specifico = username_mitt;
}
}
}
return ris;
@@ -717,7 +727,7 @@ function getstr(lang, key) {
let mystr = '';
if (lang === 'si') {
if ((lang === 'si') || (lang === 'sl-si')) {
try {
mystr = txt_si[key]
} catch (e) {
@@ -1336,6 +1346,8 @@ class Telegram {
mystr += emo.STARS + tools.get__('ZOOM_CONFERENCE', this.getlang(msg)) + emo.STARS + '\n\n';
let pwd = 'Password: 123123';
let index = 1;
listazoom.forEach((evento) => {
let iniziata = false;
@@ -1352,7 +1364,8 @@ class Telegram {
if (nextzoom) {
if (iniziata) {
mystr += emo.FIRE + tools.get__('CLICCA_ENTRA', this.getlang(msg)) + ' ' + emo.FIRE + '\n';
mystr += tools.getlinkzoom(evento.id_conf_zoom) + '\n\n';
mystr += tools.getlinkzoom(evento.id_conf_zoom) + '\n';
mystr += pwd + '\n\n';
}
}
@@ -1362,7 +1375,7 @@ class Telegram {
if (!nextzoom && index > 1) {
mystr += "✨✨✨✨✨✨✨✨✨✨✨✨\n" +
tools.get__('CLICCA_PER_ZOOM', this.getlang(msg)) + ':\n' + tools.getlinkzoom(listazoom[0].id_conf_zoom) + '\n' + "✨✨✨✨✨✨✨✨✨✨✨✨\n" + '\n';
tools.get__('CLICCA_PER_ZOOM', this.getlang(msg)) + ':\n' + tools.getlinkzoom(listazoom[0].id_conf_zoom) + '\n' + "✨✨✨✨✨✨✨✨✨✨✨✨\n" + pwd + '\n\n';
}
return mystr
@@ -1742,7 +1755,6 @@ class Telegram {
tools.writeEventsLog(msgris);
await this.sendMsg(msg.chat.id, msgris);
}
}
rec.start_write_msgall = false;
} catch (e) {
@@ -1978,17 +1990,23 @@ class Telegram {
}
}
let mylang = 'it';
if (!!recmem) {
mylang = recmem.lang;
}
try {
if (!form) {
form = {
"message_id": msg_id,
"reply_markup": {
"resize_keyboard": true,
"keyboard": await this.getKeyboard(id, menu, recmem.lang)
"keyboard": await this.getKeyboard(id, menu, mylang)
}
};
}
const res = this.bot.sendMessage(id, text, form)
const res = await this.bot.sendMessage(id, text, form)
.catch((e) => {
let blocked = false;
if ((e.message.indexOf('Forbidden') > 0) || (e.message.indexOf('chat not found') > 0)) {
@@ -2029,7 +2047,7 @@ class Telegram {
async sendMsg(id, text, menu, form, msg_id, chat_id, ripr_menuPrec) {
return this._inviaMsg(id, text, form, menu, msg_id, chat_id, ripr_menuPrec);
return await this._inviaMsg(id, text, form, menu, msg_id, chat_id, ripr_menuPrec);
}