till/klarbild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: telegram callback_data <64 bytes (BUTTON_DATA_INVALID) — recipe uuid only, resolve draft by chat; send before status update

Browse Source
This commit is contained in:
Till Heidrich
2026-07-23 18:31:28 +00:00
parent d680b3f67a
commit dba5620ff6
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/telegram.ts
+14 -7
View File
@@ -92,14 +92,17 @@ export async function sweepDrafts(): Promise<void> {
for (const d of drafts) { for (const d of drafts) {
const recipes = await query<any>('SELECT id, name FROM recipes ORDER BY is_default DESC, name LIMIT 8'); const recipes = await query<any>('SELECT id, name FROM recipes ORDER BY is_default DESC, name LIMIT 8');
const kb = new InlineKeyboard(); const kb = new InlineKeyboard();
recipes.forEach((r, i) => { kb.text(r.name, `r:${r.id}:${d.id}`); if (i % 2 === 1) kb.row(); }); // Callback-Daten <64 Bytes: nur Rezept-UUID; der Draft wird beim Klick über den Chat gefunden.
recipes.forEach((r, i) => { kb.text(r.name, `r:${r.id}`); if (i % 2 === 1) kb.row(); });
const n = (d.file_refs || []).length; const n = (d.file_refs || []).length;
const compressed = (d.file_refs || []).some((f: any) => f.quality === 'compressed'); const compressed = (d.file_refs || []).some((f: any) => f.quality === 'compressed');
await query(`UPDATE telegram_drafts SET status='awaiting_recipe' WHERE id=$1`, [d.id]); try {
await b.api.sendMessage(d.chat_id, await b.api.sendMessage(d.chat_id,
`${n} Bild${n > 1 ? 'er' : ''} empfangen. Welches Rezept?` + `${n} Bild${n > 1 ? 'er' : ''} empfangen. Welches Rezept?` +
(compressed ? '\n⚠️ Als Foto gesendet (komprimiert). Für volle Qualität als *Datei* senden.' : ''), (compressed ? '\n⚠️ Als Foto gesendet (komprimiert). Für volle Qualität als *Datei* senden.' : ''),
{ reply_markup: kb, parse_mode: 'Markdown' }); { reply_markup: kb, parse_mode: 'Markdown' });
await query(`UPDATE telegram_drafts SET status='awaiting_recipe' WHERE id=$1`, [d.id]);
} catch (e) { console.error('[telegram] sweep send:', e); }
} }
} }
@@ -224,15 +227,19 @@ function register(b: Bot) {
}); });
b.on('callback_query:data', async (ctx) => { b.on('callback_query:data', async (ctx) => {
const [kind, a, bId] = ctx.callbackQuery.data.split(':'); const [kind, recipeId] = ctx.callbackQuery.data.split(':');
await ctx.answerCallbackQuery(); await ctx.answerCallbackQuery();
if (kind === 'd') { // Standard-Rezept setzen if (kind === 'd') { // Standard-Rezept setzen
await query(`UPDATE telegram_links SET default_recipe_id=$2 WHERE chat_id=$1`, [ctx.chat!.id, a]); await query(`UPDATE telegram_links SET default_recipe_id=$2 WHERE chat_id=$1`, [ctx.chat!.id, recipeId]);
return ctx.editMessageText('Standard-Rezept gesetzt.'); return ctx.editMessageText('Standard-Rezept gesetzt.');
} }
if (kind === 'r') { // Rezept für Draft gewählt if (kind === 'r') { // Rezept gewählt → offenen Draft dieses Chats verarbeiten
await ctx.editMessageText('Alles klar.'); const draft = await one<{ id: string }>(
const b2 = await getBot(); if (b2) await dispatchDraft(ctx.chat!.id, bId, a, b2); `SELECT id FROM telegram_drafts WHERE chat_id=$1 AND status='awaiting_recipe'
ORDER BY last_received_at DESC LIMIT 1`, [ctx.chat!.id]);
if (!draft) return ctx.editMessageText('Kein offener Bild-Stapel gefunden — bitte Bilder neu senden.');
await ctx.editMessageText('Alles klar, los geht’s.');
const b2 = await getBot(); if (b2) await dispatchDraft(ctx.chat!.id, draft.id, recipeId, b2);
} }
}); });
} }