GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-02-16 21:50:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1813 from slingamn/message_error

Browse Source 
CHATHISTORY with nonexistent msgid should send empty batch
This commit is contained in:
Shivaram Lingamneni 2021-11-02 20:59:02 -04:00 committed by GitHub
commit 7e93770540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
irc/mysql/history.go
View File

@ -1043,14 +1043,22 @@ func (s *mySQLHistorySequence) Between(start, end history.Selector, limit int) (
if start.Msgid != "" { if start.Msgid != "" {
startTime, _, _, err = s.mysql.lookupMsgid(ctx, start.Msgid, false) startTime, _, _, err = s.mysql.lookupMsgid(ctx, start.Msgid, false)
if err != nil { if err != nil {
return nil, err if err == sql.ErrNoRows {
return nil, nil
} else {
return nil, err
}
} }
} }
endTime := end.Time endTime := end.Time
if end.Msgid != "" { if end.Msgid != "" {
endTime, _, _, err = s.mysql.lookupMsgid(ctx, end.Msgid, false) endTime, _, _, err = s.mysql.lookupMsgid(ctx, end.Msgid, false)
if err != nil { if err != nil {
return nil, err if err == sql.ErrNoRows {
return nil, nil
} else {
return nil, err
}
} }
} }