Skip to content
This repository has been archived by the owner on Jul 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' into feature/fixServerJs
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxelweb committed May 14, 2020
2 parents a1dfe47 + eb26626 commit e20660a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Telegram Bot - ThiReMa

:fire: Versione componente: `v0.2.0-rc`
:fire: Versione componente: `v1.0.0-rc`

:pushpin: Main repo: [swe-thirema](https://github.com/Maxelweb/swe-thirema)

Expand All @@ -14,7 +14,7 @@

![Repository Checker](https://github.com/RedRoundRobin/swe-telegram/workflows/Repository%20Checker/badge.svg)

[![Coverage Status](https://coveralls.io/repos/github/RedRoundRobin/swe-telegram/badge.svg?branch=develop)](https://coveralls.io/github/RedRoundRobin/swe-telegram?branch=develop)
[Coverage Status](https://coveralls.io/github/RedRoundRobin/swe-telegram?branch=develop)


### Telegram link
Expand Down
8 changes: 4 additions & 4 deletions utils/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ const jwtAuth = (axiosInstance, message, displayReply = false) => {
}
if (displayReply) {
switch (code) {
case 0:
return message.reply(
"Username non trovato, registra il tuo username Telegram dalle impostazioni della web-app."
);
case 1:
return message.reply("Username trovato, registrazione riuscita!");
case 2:
return message.reply(
"Account già registrato, nessuna modifica apportata."
);
case 3:
return message.reply(
"Username non trovato, registra il tuo username Telegram dalle impostazioni della web-app."
);
default:
break;
}
Expand Down
1 change: 0 additions & 1 deletion utils/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ const botServer = http.createServer((req, res) => {
- *Dispositivo:* ${deviceName} (D#${response.deviceId})
- *Gateway:* \`${gatewayName}\`
- *Valore:* ${response.currentValue} *${valueType}* alla soglia ${threshold}`;

// eslint-disable-next-line guard-for-in
for (const index in chatIds) {
const chatId = chatIds[index];
Expand Down

0 comments on commit e20660a

Please sign in to comment.