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

@ -5,8 +5,9 @@ import spamwatchMiddlewareModule from '../spamwatch/Middleware';
import axios from 'axios';
import verifyInput from '../plugins/verifyInput';
import { Context, Telegraf } from 'telegraf';
import { languageCode } from '../utils/language-code';
import { replyToMessageId } from '../utils/reply-to-message-id';
import * as schema from '../db/schema';
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
const spamwatchMiddleware = spamwatchMiddlewareModule(isOnSpamWatch);
@ -29,10 +30,31 @@ export async function getDeviceByCodename(codename: string): Promise<Device | nu
}
}
export default (bot: Telegraf<Context>) => {
async function getUserAndStrings(ctx: Context, db?: NodePgDatabase<typeof schema>): Promise<{ Strings: any, languageCode: string }> {
let languageCode = 'en';
if (!ctx.from) {
const Strings = getStrings(languageCode);
return { Strings, languageCode };
}
const from = ctx.from;
if (db && from.id) {
const dbUser = await db.query.usersTable.findMany({ where: (fields, { eq }) => eq(fields.telegramId, String(from.id)), limit: 1 });
if (dbUser.length > 0) {
languageCode = dbUser[0].languageCode;
}
}
if (from.language_code && languageCode === 'en') {
languageCode = from.language_code;
console.warn('[WARN !] Falling back to Telegram language_code for user', from.id);
}
const Strings = getStrings(languageCode);
return { Strings, languageCode };
}
export default (bot: Telegraf<Context>, db) => {
bot.command(['codename', 'whatis'], spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
const userInput = ctx.message.text.split(" ").slice(1).join(" ");
const Strings = getStrings(languageCode(ctx));
const { Strings } = await getUserAndStrings(ctx, db);
const { noCodename } = Strings.codenameCheck;
const reply_to_message_id = replyToMessageId(ctx);