business messages work now

Author: codebam

packages/main/src/telegram_api.ts

@@ -47,13 +47,15 @@ export default class TelegramApi {
 	async sendMessage(
 		botApi: string,
 		data: {
-			reply_to_message_id: number | string;
+			reply_to_message_id?: number | string;
 			chat_id: number | string;
 			text: string;
 			parse_mode: string;
+			business_connection_id?: number | string;
 		},
 	) {
 		const url = this.getApiUrl(botApi, 'sendMessage', data);
+		console.log(url.url);
 		return await fetch(url);
 	}
 
@@ -111,7 +113,6 @@ export default class TelegramApi {
 		return await fetch(url);
 	}
 
-
 	/**
 	 * Send an callback response to a given botApi
 	 * @param botApi - full URL to the telegram API without slug

packages/main/src/telegram_execution_context.ts

@@ -35,6 +35,8 @@ export default class TelegramExecutionContext {
 			this.update_type = 'document';
 		} else if (this.update.callback_query?.id) {
 			this.update_type = 'callback';
+		} else if (this.update.business_message?.text) {
+			this.update_type = 'business_message';
 		}
 	}
 
@@ -125,10 +127,9 @@ export default class TelegramExecutionContext {
 				});
 			case 'business_message':
 				return await this.api.sendMessage(this.bot.api.toString(), {
-					...options,
 					chat_id: this.update.business_message?.chat.id.toString() ?? '',
-					reply_to_message_id: this.update.business_message?.message_id.toString() ?? '',
 					text: message,
+					business_connection_id: this.update.business_message?.business_connection_id.toString(),
 					parse_mode,
 				});
 			case 'photo':

packages/worker/src/worker.ts

@@ -268,7 +268,13 @@ export default {
 						case 'business_message': {
 							const prompt = bot.update.business_message?.text?.toString() ?? '';
 							const { results } = await env.DB.prepare('SELECT * FROM Messages WHERE userId=?')
-								.bind(bot.update.inline_query ? bot.update.inline_query.from.id : bot.update.message?.from.id)
+								.bind(
+									bot.update.inline_query
+										? bot.update.inline_query.from.id
+										: bot.update.business_message
+											? bot.update.business_message.from.id
+											: bot.update.message?.from.id,
+								)
 								.all();
 							const message_history = results.map((col) => ({ role: 'system', content: col.content as string }));
 							const messages = [
@@ -294,7 +300,11 @@ export default {
 									await env.DB.prepare('INSERT INTO Messages (id, userId, content) VALUES (?, ?, ?)')
 										.bind(
 											crypto.randomUUID(),
-											bot.update.inline_query ? bot.update.inline_query.from.id : bot.update.message?.from.id,
+											bot.update.inline_query
+												? bot.update.inline_query.from.id
+												: bot.update.business_message
+													? bot.update.business_message.from.id
+													: bot.update.message?.from.id,
 											`'[INST] ${prompt} [/INST] \n ${response.response}`,
 										)
 										.run();