GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-15 08:29:31 +01:00
Code Issues Projects Releases Wiki Activity

fix timestamp syntax in MARKREAD

Browse Source
This commit is contained in:
Shivaram Lingamneni 2022-05-20 01:32:39 -04:00
parent 67b2f4ccd2
commit c3d4be45f1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
irc/getters.go
View File

@ -4,6 +4,7 @@
package irc package irc
import ( import (
"fmt"
"net" "net"
"sync/atomic" "sync/atomic"
"time" "time"
@ -493,7 +494,7 @@ func (client *Client) GetReadMarker(cfname string) (result string) {
t, ok := client.readMarkers[cfname] t, ok := client.readMarkers[cfname]
client.stateMutex.RUnlock() client.stateMutex.RUnlock()
if ok { if ok {
return t.Format(IRCv3TimestampFormat) return fmt.Sprintf("timestamp=%s", t.Format(IRCv3TimestampFormat))
} }
return "*" return "*"
} }

4
irc/handlers.go
View File

@ -2770,14 +2770,14 @@ func markReadHandler(server *Server, client *Client, msg ircmsg.Message, rb *Res
} }
// "MARKREAD client set command": MARKREAD <target> <timestamp> // "MARKREAD client set command": MARKREAD <target> <timestamp>
readTimestamp := msg.Params[1] readTimestamp := strings.TrimPrefix(msg.Params[1], "timestamp=")
readTime, err := time.Parse(IRCv3TimestampFormat, readTimestamp) readTime, err := time.Parse(IRCv3TimestampFormat, readTimestamp)
if err != nil { if err != nil {
rb.Add(nil, server.name, "FAIL", "MARKREAD", "INVALID_PARAMS", utils.SafeErrorParam(readTimestamp), client.t("Invalid timestamp")) rb.Add(nil, server.name, "FAIL", "MARKREAD", "INVALID_PARAMS", utils.SafeErrorParam(readTimestamp), client.t("Invalid timestamp"))
return return
} }
result := client.SetReadMarker(cftarget, readTime) result := client.SetReadMarker(cftarget, readTime)
readTimestamp = result.Format(IRCv3TimestampFormat) readTimestamp = fmt.Sprintf("timestamp=%s", result.Format(IRCv3TimestampFormat))
// inform the originating session whether it was a success or a no-op: // inform the originating session whether it was a success or a no-op:
rb.Add(nil, server.name, "MARKREAD", unfoldedTarget, readTimestamp) rb.Add(nil, server.name, "MARKREAD", unfoldedTarget, readTimestamp)
if result.Equal(readTime) { if result.Equal(readTime) {