Skip to content

fix: prevent edited posts from bypassing AllowEdited. #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
annihilatorrrr wants to merge 1 commit into from
Closed

fix: prevent edited posts from bypassing AllowEdited. #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions ext/handlers/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,30 @@ func (m Message) SetAllowBusiness(allow bool) Message {
}

func (m Message) CheckUpdate(b *gotgbot.Bot, ctx *ext.Context) bool {
if ctx.Message != nil {
// Handle NEW normal messages ONLY
if ctx.Message != nil && ctx.EditedMessage == nil {
return m.Filter == nil || m.Filter(ctx.Message)
}
// If edits are allowed, and message is edited.
// Handle EDITED normal messages ONLY if enabled
if m.AllowEdited && ctx.EditedMessage != nil {
return m.Filter == nil || m.Filter(ctx.EditedMessage)
}

// If channel posts are allowed, and message is channel post.
if m.AllowChannel && ctx.ChannelPost != nil {
// Handle NEW channel posts ONLY
if m.AllowChannel && ctx.ChannelPost != nil && ctx.EditedChannelPost == nil {
return m.Filter == nil || m.Filter(ctx.ChannelPost)
}
// If channel posts and edits are allowed, and post is edited.
// Handle EDITED channel posts ONLY if both allowed
if m.AllowChannel && m.AllowEdited && ctx.EditedChannelPost != nil {
return m.Filter == nil || m.Filter(ctx.EditedChannelPost)
}

// Same logic, for business messages
if m.AllowBusiness && ctx.BusinessMessage != nil {
// Handle NEW business messages ONLY
if m.AllowBusiness && ctx.BusinessMessage != nil && ctx.EditedBusinessMessage == nil {
return m.Filter == nil || m.Filter(ctx.BusinessMessage)
}
// Handle EDITED business messages ONLY if both allowed
if m.AllowBusiness && m.AllowEdited && ctx.EditedBusinessMessage != nil {
return m.Filter == nil || m.Filter(ctx.EditedBusinessMessage)
}

return false
}

Expand Down