hibas123/TelegramRSS
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add small UX improvements
All checks were successful
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Fabian Stamm 2023-04-26 19:53:45 +02:00
parent a2a352efe0
commit 96d457ab11
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "rss-telegram-bot", "name": "rss-telegram-bot",
"version": "2.0.0", "version": "2.0.1",
"main": "lib/index.js", "main": "lib/index.js",
"author": "Fabian Stamm <dev@fabianstamm.de>", "author": "Fabian Stamm <dev@fabianstamm.de>",
"license": "MIT", "license": "MIT",

24
src/telegram.ts
View File

@ -64,23 +64,35 @@ bot.command("delete", botHandler(async ctx => {
bot.on("callback_query", botHandler(async ctx => { bot.on("callback_query", botHandler(async ctx => {
Logging.info("Callback Query received"); Logging.info("Callback Query received");
const remove_options = () => { const remove_options = (message: string) => {
ctx.editMessageReplyMarkup({ ctx.editMessageReplyMarkup({
inline_keyboard: [] inline_keyboard: [],
}) })
ctx.editMessageText(message)
} }
let data = (ctx.callbackQuery as any).data; let data = (ctx.callbackQuery as any).data;
if (!data) { if (!data) {
ctx.answerCbQuery("Invalid data"); ctx.answerCbQuery("Invalid data");
remove_options(); remove_options("Delete failed. Invalid data received.");
return return
} }
let [action, id] = data.split(":"); let [action, id] = data.split(":");
if (!action || !id) { if (!action || !id) {
ctx.answerCbQuery("Invalid data"); ctx.answerCbQuery("Invalid data");
remove_options(); remove_options("Delete failed. Invalid data received.");
return
}
let feed = await AppDataSource.manager.findOne(Feed, {
where: {
id: Number(id)
}
});
if (!feed) {
ctx.answerCbQuery("Invalid action");
remove_options("Delete failed. Feed not available.");
return return
} }
@ -100,12 +112,12 @@ bot.on("callback_query", botHandler(async ctx => {
} }
} else { } else {
ctx.answerCbQuery("Invalid action"); ctx.answerCbQuery("Invalid action");
remove_options(); remove_options("Delete failed. Invalid data received.");
return return
} }
ctx.answerCbQuery("Success"); ctx.answerCbQuery("Success");
remove_options(); remove_options("Deleted feed: " + feed.url);
})); }));
bot.on(message("text", "entities"), botHandler(async ctx => { bot.on(message("text", "entities"), botHandler(async ctx => {