global fix and update bot Api
This commit is contained in:
@@ -53,6 +53,10 @@ type EditMessageReplyMarkupPayload = ChatPayload & {
|
||||
reply_markup?: unknown;
|
||||
};
|
||||
|
||||
type PinChatMessagePayload = ChatPayload & {
|
||||
disable_notification?: boolean;
|
||||
};
|
||||
|
||||
type AnswerCallbackQueryPayload = {
|
||||
callback_query_id?: string;
|
||||
text?: string;
|
||||
@@ -125,12 +129,18 @@ export class BotApiService {
|
||||
switch (normalizedMethod) {
|
||||
case 'getMe':
|
||||
return this.wrapOk(this.buildUserObject(bot));
|
||||
case 'getChat':
|
||||
return this.getChat(bot, payload as ChatPayload);
|
||||
case 'sendMessage':
|
||||
return this.sendMessage(bot, payload as SendMessagePayload);
|
||||
case 'editMessageText':
|
||||
return this.editMessageText(bot, payload as EditMessageTextPayload);
|
||||
case 'editMessageReplyMarkup':
|
||||
return this.editMessageReplyMarkup(bot, payload as EditMessageReplyMarkupPayload);
|
||||
case 'pinChatMessage':
|
||||
return this.setMessagePinned(bot, payload as PinChatMessagePayload, true);
|
||||
case 'unpinChatMessage':
|
||||
return this.setMessagePinned(bot, payload as ChatPayload, false);
|
||||
case 'answerCallbackQuery':
|
||||
return this.answerCallbackQuery(payload as AnswerCallbackQueryPayload);
|
||||
case 'sendPhoto':
|
||||
@@ -277,7 +287,9 @@ export class BotApiService {
|
||||
messageType: 'text',
|
||||
messageId: item.telegramMsgId,
|
||||
createdAt: item.createdAt.toISOString(),
|
||||
replyMarkupJson: null as string | null
|
||||
replyMarkupJson: null as string | null,
|
||||
isPinned: false,
|
||||
pinnedAt: null as string | null
|
||||
})),
|
||||
...outbound.map((item) => {
|
||||
const payload = this.serializer.readPayload(item.payload);
|
||||
@@ -289,7 +301,9 @@ export class BotApiService {
|
||||
messageType: item.messageType ?? 'text',
|
||||
messageId: item.telegramMsgId,
|
||||
createdAt: item.createdAt.toISOString(),
|
||||
replyMarkupJson: replyMarkup ? JSON.stringify(replyMarkup) : null
|
||||
replyMarkupJson: replyMarkup ? JSON.stringify(replyMarkup) : null,
|
||||
isPinned: item.isPinned,
|
||||
pinnedAt: item.pinnedAt?.toISOString() ?? null
|
||||
};
|
||||
})
|
||||
].sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
||||
@@ -564,6 +578,82 @@ export class BotApiService {
|
||||
return this.wrapOk(this.buildTelegramMessage(bot, located, updated));
|
||||
}
|
||||
|
||||
private async getChat(bot: ValidatedBot, payload: ChatPayload) {
|
||||
if (!payload.chat_id) {
|
||||
return this.wrapBadRequest('Bad Request: chat_id is required');
|
||||
}
|
||||
|
||||
const context = await this.resolveChatContext(bot.id, String(payload.chat_id));
|
||||
if (!context) {
|
||||
return this.wrapBadRequest('Bad Request: chat not found');
|
||||
}
|
||||
|
||||
const pinned = await this.prisma.botMessage.findFirst({
|
||||
where: {
|
||||
botId: bot.id,
|
||||
botChatId: context.chat.id,
|
||||
isPinned: true
|
||||
},
|
||||
orderBy: { pinnedAt: 'desc' }
|
||||
});
|
||||
|
||||
return this.wrapOk({
|
||||
id: Number(context.chat.telegramChatId),
|
||||
type: context.chat.chatType,
|
||||
first_name: context.recipient.displayName,
|
||||
...(context.recipient.username ? { username: context.recipient.username } : {}),
|
||||
...(pinned ? { pinned_message: this.buildTelegramMessage(bot, context, pinned) } : {})
|
||||
});
|
||||
}
|
||||
|
||||
private async setMessagePinned(bot: ValidatedBot, payload: ChatPayload, pinned: boolean) {
|
||||
if (!payload.chat_id) {
|
||||
return this.wrapBadRequest('Bad Request: chat_id is required');
|
||||
}
|
||||
if (pinned && payload.message_id === undefined) {
|
||||
return this.wrapBadRequest('Bad Request: message_id is required');
|
||||
}
|
||||
|
||||
const messageId = payload.message_id === undefined ? undefined : Number(payload.message_id);
|
||||
if (messageId !== undefined && !Number.isFinite(messageId)) {
|
||||
return this.wrapBadRequest('Bad Request: message_id is invalid');
|
||||
}
|
||||
|
||||
const context = await this.resolveChatContext(bot.id, String(payload.chat_id));
|
||||
if (!context) {
|
||||
return this.wrapBadRequest('Bad Request: chat not found');
|
||||
}
|
||||
|
||||
const message = messageId === undefined
|
||||
? await this.prisma.botMessage.findFirst({
|
||||
where: {
|
||||
botId: bot.id,
|
||||
botChatId: context.chat.id,
|
||||
isPinned: true
|
||||
},
|
||||
orderBy: { pinnedAt: 'desc' }
|
||||
})
|
||||
: await this.prisma.botMessage.findFirst({
|
||||
where: {
|
||||
botId: bot.id,
|
||||
botChatId: context.chat.id,
|
||||
telegramMsgId: messageId
|
||||
}
|
||||
});
|
||||
|
||||
if (!message) {
|
||||
return this.wrapBadRequest(pinned ? 'Bad Request: message to pin not found' : 'Bad Request: message to unpin not found');
|
||||
}
|
||||
|
||||
const updated = await this.prisma.botMessage.update({
|
||||
where: { id: message.id },
|
||||
data: pinned ? { isPinned: true, pinnedAt: new Date() } : { isPinned: false, pinnedAt: null }
|
||||
});
|
||||
|
||||
await this.publishBotMessagePinned(context.recipient.id, bot, context.chat, updated);
|
||||
return this.wrapOk(true);
|
||||
}
|
||||
|
||||
private async answerCallbackQuery(payload: AnswerCallbackQueryPayload) {
|
||||
const callbackQueryId = payload.callback_query_id?.trim();
|
||||
if (!callbackQueryId) {
|
||||
@@ -743,6 +833,8 @@ export class BotApiService {
|
||||
createdAt: Date;
|
||||
editedAt?: Date | null;
|
||||
payload?: unknown;
|
||||
isPinned?: boolean;
|
||||
pinnedAt?: Date | null;
|
||||
}
|
||||
) {
|
||||
return this.serializer.buildBotMessageObject({
|
||||
@@ -786,6 +878,26 @@ export class BotApiService {
|
||||
});
|
||||
}
|
||||
|
||||
private async publishBotMessagePinned(
|
||||
userId: string,
|
||||
bot: ValidatedBot,
|
||||
chat: { telegramChatId: bigint; chatType: string },
|
||||
message: {
|
||||
telegramMsgId: number;
|
||||
isPinned?: boolean;
|
||||
pinnedAt?: Date | null;
|
||||
}
|
||||
) {
|
||||
await this.notifications.publishRealtime(userId, 'bot_message_pinned', bot.name, '', {
|
||||
botId: bot.id,
|
||||
botUsername: bot.username,
|
||||
chatId: chat.telegramChatId.toString(),
|
||||
messageId: message.telegramMsgId,
|
||||
isPinned: Boolean(message.isPinned),
|
||||
pinnedAt: message.pinnedAt?.toISOString() ?? null
|
||||
});
|
||||
}
|
||||
|
||||
private async publishBotMessageEdited(
|
||||
userId: string,
|
||||
bot: ValidatedBot,
|
||||
|
||||
Reference in New Issue
Block a user