message -> msg
Deploy app frontend / app frontend (push) Successful in 2m28s
Deploy service message-delivery-method-web-push / service message-delivery-method-web-push (push) Successful in 1m35s
Deploy service tg-bot / service tg-bot (push) Successful in 1m57s

This commit is contained in:
2024-12-15 11:26:43 +02:00
parent ff9eebafb4
commit 7b654c11d8
4 changed files with 4 additions and 4 deletions
@@ -3,7 +3,7 @@
<div <div
v-for="message in messages" v-for="message in messages"
:key="message._id" :key="message._id"
:id="`message-${message.created_at}`" :id="`msg-${message.created_at}`"
class="mb-4 max-w-md" class="mb-4 max-w-md"
:class="{ :class="{
'ml-auto text-right': message.from === userRole, 'ml-auto text-right': message.from === userRole,
@@ -145,7 +145,7 @@ const start = async () => {
requireInteraction: true, requireInteraction: true,
timestamp, timestamp,
data: { data: {
url: `/manage/qr/${msgDoc.qr_code_uri}/chat/${msgDoc.chat}#message-${msgDoc.created_at}`, url: `/manage/qr/${msgDoc.qr_code_uri}/chat/${msgDoc.chat}#msg-${msgDoc.created_at}`,
payload: { tag }, payload: { tag },
}, },
} as const; } as const;
@@ -90,7 +90,7 @@ export const forwardQrCodeMessageMiddleware = async (
await messagesDb.put(message); await messagesDb.put(message);
const hashTag = `#qr${qr_code_uri}_c${chat}`; const hashTag = `#qr${qr_code_uri}_c${chat}`;
const manageMessageUrl = `${env.APP_BASE_URL}/manage/qr/${qr_code_uri}/chat/${chat}#message-${encodeURIComponent(created_at)}`; const manageMessageUrl = `${env.APP_BASE_URL}/manage/qr/${qr_code_uri}/chat/${chat}#msg-${encodeURIComponent(created_at)}`;
const text = `<i>сообщение отправлено <a href="${escapeHtml(manageMessageUrl)}">в диалог QR-кода <b>«${escapeHtml(qrCodeDoc.name)}»</b></a> ${escapeHtml(hashTag)}</i>`; const text = `<i>сообщение отправлено <a href="${escapeHtml(manageMessageUrl)}">в диалог QR-кода <b>«${escapeHtml(qrCodeDoc.name)}»</b></a> ${escapeHtml(hashTag)}</i>`;
// await ctx.react("⚡"); // await ctx.react("⚡");
@@ -53,7 +53,7 @@ async function handleChange(msgDoc: MessageDocument, bot: Bot<MyContext>) {
} }
const hashTag = `#qr${qrDoc.uri}_c${msgDoc.chat}`; const hashTag = `#qr${qrDoc.uri}_c${msgDoc.chat}`;
const manageMessageUrl = `${env.APP_BASE_URL}/manage/qr/${qrDoc.uri}/chat/${msgDoc.chat}#message-${encodeURIComponent(msgDoc.created_at)}`; const manageMessageUrl = `${env.APP_BASE_URL}/manage/qr/${qrDoc.uri}/chat/${msgDoc.chat}#msg-${encodeURIComponent(msgDoc.created_at)}`;
const text = `${escapeHtml(msgDoc.body.trim())} — <i><a href="${escapeHtml(manageMessageUrl)}">сообщение диалога QR-кода «${escapeHtml(qrDoc.name)}»</a> ${escapeHtml(hashTag)}</i>`; const text = `${escapeHtml(msgDoc.body.trim())} — <i><a href="${escapeHtml(manageMessageUrl)}">сообщение диалога QR-кода «${escapeHtml(qrDoc.name)}»</a> ${escapeHtml(hashTag)}</i>`;
for (const telegramUserDoc of telegramUsersDocs) { for (const telegramUserDoc of telegramUsersDocs) {
await bot.api.sendMessage(telegramUserDoc.telegram_id, text, { await bot.api.sendMessage(telegramUserDoc.telegram_id, text, {