fix: 分享按钮

MewoLab · Oct 1, 2024 · 784db1b · 784db1b
1 parent bacdaf4
commit 784db1b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/apps/tgbot/src/adapter/MessageAction.ts b/apps/tgbot/src/adapter/MessageAction.ts
@@ -1,4 +1,4 @@
-import { SendMessageResult as SendMessageResultBase, EditMessageAction as EditMessageActionBase, SendMessageAction as SendMessageActionBase, MessageButtonUrl, MessageButtonCallback, MessageButtonSwitchInline, MessageButton } from '@clansty/maibot-firm';
+import { SendMessageResult as SendMessageResultBase, EditMessageAction as EditMessageActionBase, SendMessageAction as SendMessageActionBase, MessageButtonUrl, MessageButtonCallback, MessageButtonSwitchInline, MessageButton, MessageButtonSwitchInlineOtherChat } from '@clansty/maibot-firm';
 import { BotAdapter, BotTypes } from './Bot';
 import { InlineKeyboardButton, Message } from 'grammy/types';
 import { Context } from 'grammy';
@@ -42,6 +42,11 @@ export const convertMessageButtons = (buttons: MessageButton[][]): InlineKeyboar
 					text: button.text,
 					callback_data: button.callbackData
 				});
+			} else if (button instanceof MessageButtonSwitchInlineOtherChat) {
+				inlineKeyboardRow.push({
+					text: button.text,
+					switch_inline_query: button.callbackData
+				});
 			} else if (button instanceof MessageButtonSwitchInline) {
 				inlineKeyboardRow.push({
 					text: button.text,

diff --git a/packages/botcore/src/UserContext.ts b/packages/botcore/src/UserContext.ts
@@ -2,7 +2,7 @@ import { UserProfile } from '@clansty/maibot-clients';
 import { Env, UserProfilesKVStorage } from '@clansty/maibot-types';
 import NoReportError from './utils/NoReportError';
 import XXH from 'xxhashjs';
-import { BotTypes, MessageButton, MessageButtonSwitchInline, SendMessageAction } from '@clansty/maibot-firm';
+import { BotTypes, MessageButton, MessageButtonSwitchInline, MessageButtonSwitchInlineOtherChat, SendMessageAction } from '@clansty/maibot-firm';
 
 export default class UserContext<T extends BotTypes> {
 	public constructor(
@@ -97,7 +97,7 @@ export default class UserContext<T extends BotTypes> {
 				.addPhoto(cached.fileId);
 
 			if (cached.type === 'image' && shareKw) {
-				inlineKeyboard.push([new MessageButtonSwitchInline('分享', shareKw)]);
+				inlineKeyboard.push([new MessageButtonSwitchInlineOtherChat('分享', shareKw)]);
 			} else if (cached?.type === 'document') {
 				reply.filesAsDocument();
 			}
@@ -118,7 +118,7 @@ export default class UserContext<T extends BotTypes> {
 		if (height / width > 2) {
 			messageToSent.filesAsDocument();
 		} else if (shareKw) {
-			inlineKeyboard.push([new MessageButtonSwitchInline('分享', shareKw)]);
+			inlineKeyboard.push([new MessageButtonSwitchInlineOtherChat('分享', shareKw)]);
 			isFromStart = false;
 		}
 		const messageSent = await messageToSent

diff --git a/packages/botfirm/src/MessageAction.ts b/packages/botfirm/src/MessageAction.ts
@@ -139,6 +139,9 @@ export class MessageButtonSwitchInline implements MessageButton {
 	}
 }
 
+export class MessageButtonSwitchInlineOtherChat extends MessageButtonSwitchInline {
+}
+
 export class MessageButtonUrl implements MessageButton {
 	constructor(
 		public readonly text: string,