add postgres db, use settings and user data, lots of cleanup and logic fixes, bug fixes, better error handling, update docs and docker
Some checks are pending
njsscan sarif / njsscan code scanning (push) Waiting to run
Update AUTHORS File / update-authors (push) Waiting to run

This commit is contained in:
Aidan 2025-06-30 02:04:32 -04:00
parent 765b1144fa
commit 4d540078f5
30 changed files with 1664 additions and 727 deletions

View file

@ -9,124 +9,131 @@ import { languageCode } from '../utils/language-code';
const spamwatchMiddleware = spamwatchMiddlewareModule(isOnSpamWatch);
export default (bot: Telegraf<Context>) => {
bot.command("duck", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.duckApi);
ctx.replyWithPhoto(response.data.url, {
caption: "🦆",
...({ reply_to_message_id })
});
} catch (error) {
const Strings = getStrings(languageCode(ctx));
const message = Strings.duckApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
return;
}
});
bot.command("fox", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
export const duckHandler = async (ctx: Context & { message: { text: string } }) => {
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.duckApi);
ctx.replyWithPhoto(response.data.url, {
caption: "🦆",
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
} catch (error) {
const Strings = getStrings(languageCode(ctx));
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.foxApi);
ctx.replyWithPhoto(response.data.image, {
caption: "🦊",
...({ reply_to_message_id })
});
} catch (error) {
const message = Strings.foxApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
return;
}
});
const message = Strings.duckApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
return;
}
};
bot.command("dog", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
const Strings = getStrings(languageCode(ctx));
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.dogApi);
ctx.replyWithPhoto(response.data.message, {
caption: "🐶",
...({ reply_to_message_id })
});
} catch (error) {
const message = Strings.foxApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
return;
}
});
export const foxHandler = async (ctx: Context & { message: { text: string } }) => {
const Strings = getStrings(languageCode(ctx));
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.foxApi);
ctx.replyWithPhoto(response.data.image, {
caption: "🦊",
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
} catch (error) {
const message = Strings.foxApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
return;
}
};
bot.command("cat", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
const Strings = getStrings(languageCode(ctx));
const apiUrl = `${Resources.catApi}?json=true`;
export const dogHandler = async (ctx: Context & { message: { text: string } }) => {
const Strings = getStrings(languageCode(ctx));
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios(Resources.dogApi);
ctx.replyWithPhoto(response.data.message, {
caption: "🐶",
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
} catch (error) {
const message = Strings.dogApiErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
return;
}
};
export const catHandler = async (ctx: Context & { message: { text: string } }) => {
const Strings = getStrings(languageCode(ctx));
const apiUrl = `${Resources.catApi}?json=true`;
const reply_to_message_id = replyToMessageId(ctx);
try {
const response = await axios.get(apiUrl);
const data = response.data;
const imageUrl = `${data.url}`;
const reply_to_message_id = replyToMessageId(ctx);
await ctx.replyWithPhoto(imageUrl, {
caption: `🐱`,
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
} catch (error) {
const message = Strings.catImgErr.replace('{error}', error.message);
ctx.reply(message, {
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
return;
}
};
try {
await ctx.replyWithPhoto(imageUrl, {
caption: `🐱`,
export const soggyHandler = async (ctx: Context & { message: { text: string } }) => {
const userInput = ctx.message.text.split(' ')[1];
const reply_to_message_id = replyToMessageId(ctx);
switch (true) {
case (userInput === "2" || userInput === "thumb"):
ctx.replyWithPhoto(
Resources.soggyCat2, {
caption: Resources.soggyCat2,
parse_mode: 'Markdown',
...({ reply_to_message_id })
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
} catch (error) {
ctx.reply(Strings.catImgErr, {
break;
case (userInput === "3" || userInput === "sticker"):
ctx.replyWithSticker(
Resources.soggyCatSticker,
reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : undefined
);
break;
case (userInput === "4" || userInput === "alt"):
ctx.replyWithPhoto(
Resources.soggyCatAlt, {
caption: Resources.soggyCatAlt,
parse_mode: 'Markdown',
...({ reply_to_message_id })
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
};
});
break;
bot.command(['soggy', 'soggycat'], spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
const userInput = ctx.message.text.split(' ')[1];
const reply_to_message_id = replyToMessageId(ctx);
default:
ctx.replyWithPhoto(
Resources.soggyCat, {
caption: Resources.soggyCat,
parse_mode: 'Markdown',
...(reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : {})
});
break;
};
};
switch (true) {
case (userInput === "2" || userInput === "thumb"):
ctx.replyWithPhoto(
Resources.soggyCat2, {
caption: Resources.soggyCat2,
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
break;
case (userInput === "3" || userInput === "sticker"):
ctx.replyWithSticker(
Resources.soggyCatSticker,
reply_to_message_id ? { reply_parameters: { message_id: reply_to_message_id } } : undefined
);
break;
case (userInput === "4" || userInput === "alt"):
ctx.replyWithPhoto(
Resources.soggyCatAlt, {
caption: Resources.soggyCatAlt,
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
break;
default:
ctx.replyWithPhoto(
Resources.soggyCat, {
caption: Resources.soggyCat,
parse_mode: 'Markdown',
...({ reply_to_message_id })
});
break;
};
});
export default (bot: Telegraf<Context>) => {
bot.command("duck", spamwatchMiddleware, duckHandler);
bot.command("fox", spamwatchMiddleware, foxHandler);
bot.command("dog", spamwatchMiddleware, dogHandler);
bot.command("cat", spamwatchMiddleware, catHandler);
bot.command(['soggy', 'soggycat'], spamwatchMiddleware, soggyHandler);
}