Skip to content

Commit

Permalink
bot: large messages fix for all cases
Browse files Browse the repository at this point in the history
  • Loading branch information
bit0r1n committed Sep 5, 2024
1 parent 167950f commit 1f23c90
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 27 deletions.
4 changes: 2 additions & 2 deletions bot/src/commands/hears/daySchedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export class DayScheduleCommand extends AbstractHearsCommand {
for (let i = 0; i < messagesContent.length; i++) {
let content = ''
if (i === 0) content = `Расписание ${ctx.user.group!.display} на ${ctx.message.text.toLowerCase()}\n`
content += (messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>')
content += messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'

await ctx.reply(content, { parse_mode: 'HTML', disable_web_page_preview: true })
}
Expand Down
91 changes: 66 additions & 25 deletions bot/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,22 @@ bot.on(callbackQuery('data'), async (ctx) => {
? (await parser.getGroups())
: undefined

await ctx.editMessageText([
`Расписание ${groupName} на неделю с ${target}`,
lessonsToMessage(lessons, groups),
null,
'❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'
].join('\n'), { parse_mode: 'HTML', disable_web_page_preview: true })
const messagesContent = lessonsToMessage(lessons, groups)

for (let i = 0; i < messagesContent.length; i++) {
let content = i === 0
? `Расписание ${groupName} на неделю с ${target}\n`
: ''

content += messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'

if (i === 0) {
await ctx.editMessageText(content, { parse_mode: 'HTML', disable_web_page_preview: true })
} else {
await ctx.reply(content, { parse_mode: 'HTML', disable_web_page_preview: true })
}
}

break
}
Expand Down Expand Up @@ -278,17 +288,28 @@ bot.on(callbackQuery('data'), async (ctx) => {

if (!lessons.length) {
await ctx.answerCbQuery()
await ctx.editMessageText(`🤯 Распиания на ${target} нету`)
await ctx.editMessageText(`🤯 Расписания на ${target} нету`)
return
}

await ctx.answerCbQuery()
await ctx.editMessageText([
`Расписание ${groupName} на ${target}`,
lessonsToMessage(lessons),
null,
'❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'
].join('\n'), { parse_mode: 'HTML', disable_web_page_preview: true })

const messagesContent = lessonsToMessage(lessons)

for (let i = 0; i < messagesContent.length; i++) {
let content = i === 0
? `Расписание ${groupName} на ${target}\n`
: ''

content += messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'

if (i === 0) {
await ctx.editMessageText(content, { parse_mode: 'HTML', disable_web_page_preview: true })
} else {
await ctx.reply(content, { parse_mode: 'HTML', disable_web_page_preview: true })
}
}
} else if (command === 'teacher_week') {
const [ teacherName, weekStartRaw ] = args

Expand Down Expand Up @@ -369,12 +390,22 @@ bot.on(callbackQuery('data'), async (ctx) => {

const target = weekDiff === 0 ? 'текущую неделю' : `${weekDiff + 1} неделю`

await ctx.editMessageText([
`Распиание на ${target} у ${teacherName}`,
lessonsToMessage(lessons, groups),
null,
'❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'
].join('\n'), { parse_mode: 'HTML', disable_web_page_preview: true })
const messagesContent = lessonsToMessage(lessons, groups)

for (let i = 0; i < messagesContent.length; i++) {
let content = i === 0
? `Расписание на ${target} у ${teacherName}\n`
: ''

content += messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'

if (i === 0) {
await ctx.editMessageText(content, { parse_mode: 'HTML', disable_web_page_preview: true })
} else {
await ctx.reply(content, { parse_mode: 'HTML', disable_web_page_preview: true })
}
}
}
} else if (command === 'group_week') {
const [ groupId, weekStartRaw ] = args
Expand Down Expand Up @@ -480,12 +511,22 @@ bot.on(callbackQuery('data'), async (ctx) => {

const target = weekDiff === 0 ? 'текущую неделю' : `${weekDiff + 1} неделю`

await ctx.editMessageText([
`Распиание на ${target} для ${group.display}`,
lessonsToMessage(lessons),
null,
'❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'
].join('\n'), { parse_mode: 'HTML', disable_web_page_preview: true })
const messagesContent = lessonsToMessage(lessons)

for (let i = 0; i < messagesContent.length; i++) {
let content = i === 0
? `Расписание на ${target} для ${group.display}\n`
: ''

content += messagesContent + '\n\n'
+ '❤️‍🔥 <a href="https://bitor.in/donate">ПОДДЕРЖАТЬ МАТЕРИАЛЬНО!!</a>'

if (i === 0) {
await ctx.editMessageText(content, { parse_mode: 'HTML', disable_web_page_preview: true })
} else {
await ctx.reply(content, { parse_mode: 'HTML', disable_web_page_preview: true })
}
}
}
}
})
Expand Down

0 comments on commit 1f23c90

Please sign in to comment.