Skip to content
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

Jump to bottom

fix(telegram/updates): treat all messages from getChannelDifference as channel messages #870

Merged
merged 1 commit into from Aug 30, 2022
Merged

fix(telegram/updates): treat all messages from getChannelDifference as channel messages #870

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions telegram/updates/state.go
View file
Open in desktop
Expand Up @@ -374,7 +374,7 @@ func (s *state) getDifference() error {
if len(diff.NewMessages) > 0 || len(diff.NewEncryptedMessages) > 0 {
if err := s.handler.Handle(s.ctx, &tg.Updates{
Updates: append(
msgsToUpdates(diff.NewMessages),
msgsToUpdates(diff.NewMessages, false),
encryptedMsgsToUpdates(diff.NewEncryptedMessages)...,
),
Users: diff.Users,
Expand Down Expand Up @@ -413,7 +413,7 @@ func (s *state) getDifference() error {
if len(diff.NewMessages) > 0 || len(diff.NewEncryptedMessages) > 0 {
if err := s.handler.Handle(s.ctx, &tg.Updates{
Updates: append(
msgsToUpdates(diff.NewMessages),
msgsToUpdates(diff.NewMessages, false),
encryptedMsgsToUpdates(diff.NewEncryptedMessages)...,
),
Users: diff.Users,
Expand Down
2 changes: 1 addition & 1 deletion telegram/updates/state_channel.go
View file
Open in desktop
Expand Up @@ -259,7 +259,7 @@ func (s *channelState) getDifference() error {

if len(diff.NewMessages) > 0 {
if err := s.handler.Handle(s.ctx, &tg.Updates{
Updates: msgsToUpdates(diff.NewMessages),
Updates: msgsToUpdates(diff.NewMessages, true),
Users: diff.Users,
Chats: diff.Chats,
}); err != nil {
Expand Down
25 changes: 13 additions & 12 deletions telegram/updates/utils.go
View file
Open in desktop
Expand Up @@ -52,35 +52,36 @@ func getDialogPts(dialog tg.DialogClass) (int, error) {
return pts, nil
}

func msgsToUpdates(msgs []tg.MessageClass) []tg.UpdateClass {
var updates []tg.UpdateClass
func msgsToUpdates(msgs []tg.MessageClass, channel bool) []tg.UpdateClass {
updates := make([]tg.UpdateClass, 0, len(msgs))
for _, msg := range msgs {
if msg, ok := msg.(*tg.Message); ok {
if _, ok := msg.PeerID.(*tg.PeerChannel); ok {
updates = append(updates, &tg.UpdateNewChannelMessage{
Message: msg,
Pts: -1,
PtsCount: -1,
})
continue
}
if channel {
updates = append(updates, &tg.UpdateNewChannelMessage{
Message: msg,
Pts: -1,
PtsCount: -1,
})
continue
}

updates = append(updates, &tg.UpdateNewMessage{
Message: msg,
Pts: -1,
PtsCount: -1,
})
}

return updates
}

func encryptedMsgsToUpdates(msgs []tg.EncryptedMessageClass) []tg.UpdateClass {
var updates []tg.UpdateClass
updates := make([]tg.UpdateClass, 0, len(msgs))
for _, msg := range msgs {
updates = append(updates, &tg.UpdateNewEncryptedMessage{
Message: msg,
Qts: -1,
})
}

return updates
}