Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,26 @@ async function callTelegram(env, method, payload, fetcher) {
return result.result
}

export async function handleTextMessage(message, env, fetcher = fetch) {
if (!message || typeof message.text !== 'string' || message.chat?.id == null) {
return null
}

const replies = isStartCommand(message.text, env.BOT_USERNAME)
? [START_MESSAGE]
: splitIntoMessages(message.text)
const results = []

for (const text of replies) {
results.push(await callTelegram(env, 'sendMessage', {
chat_id: message.chat.id,
text,
}, fetcher))
}

return results.length === 1 ? results[0] : results
}

export async function handleUpdate(update, env, fetcher = fetch) {
if (update.inline_query) {
const query = update.inline_query.query || '114514'
Expand All @@ -121,24 +141,7 @@ export async function handleUpdate(update, env, fetcher = fetch) {
}, fetcher)
}

const message = update.message
if (!message || typeof message.text !== 'string') {
return null
}

const replies = isStartCommand(message.text, env.BOT_USERNAME)
? [START_MESSAGE]
: splitIntoMessages(message.text)
const results = []

for (const text of replies) {
results.push(await callTelegram(env, 'sendMessage', {
chat_id: message.chat.id,
text,
}, fetcher))
}

return results.length === 1 ? results[0] : results
return handleTextMessage(update.message, env, fetcher)
}

export async function handleRequest(request, env, fetcher = fetch) {
Expand Down
8 changes: 6 additions & 2 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,15 @@ test('start commands addressed to another bot are ignored', () => {
assert.equal(isStartCommand('/start@kongebot'), false)
})

test('text messages are sent back with spaces', async () => {
test('private text messages are sent back to the same chat with spaces', async () => {
const mock = telegramMock()

await handleUpdate({
message: { chat: { id: 42 }, text: '你好' },
message: {
message_id: 123,
chat: { id: 42, type: 'private' },
text: '你好',
},
}, { BOT_TOKEN: 'test-token' }, mock.fetcher)

assert.equal(mock.calls.length, 1)
Expand Down
Loading