Changeset 360 in code for trunk/downstream.go

Timestamp:

Jul 15, 2020, 3:47:57 PM (5 years ago)

Author:

contact

Message:

Implement CHATHISTORY AFTER

References: ​https://todo.sr.ht/~emersion/soju/12

File:

• trunk/downstream.go (modified) (5 diffs)

trunk/downstream.go

@@ -1599 +1599 @@
                 }
 
+                batchRef := "history"
+                maxTries := 100
                 switch subcommand {
                 case "BEFORE":
-                        batchRef := "history"
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -1612 +1613 @@
 
                         tries := 0
-                        for remaining > 0 {
+                        for remaining > 0 && tries < maxTries {
                                 buf, err := parseMessagesBefore(uc.network, entity, timestamp, remaining)
                                 if err != nil {
@@ -1620 +1621 @@
                                 if len(buf) == 0 {
                                         tries++
-                                        if tries >= 100 {
-                                                break
-                                        }
                                 } else {
                                         tries = 0
@@ -1632 +1630 @@
                         }
 
-                        for _, m := range history[remaining:] {
-                                m.Tags["batch"] = irc.TagValue(batchRef)
-                                dc.SendMessage(dc.marshalMessage(m, uc.network))
+                        for _, msg := range history[remaining:] {
+                                msg.Tags["batch"] = irc.TagValue(batchRef)
+                                dc.SendMessage(dc.marshalMessage(msg, uc.network))
                         }
 
@@ -1642 +1640 @@
                                 Params:  []string{"-" + batchRef},
                         })
+                case "AFTER":
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BATCH",
+                                Params:  []string{"+" + batchRef, "chathistory", target},
+                        })
+
+                        remaining := limit
+                        tries := 0
+                        now := time.Now()
+                        for remaining > 0 && tries < maxTries && timestamp.Before(now) {
+                                buf, err := parseMessagesAfter(uc.network, entity, timestamp, remaining)
+                                if err != nil {
+                                        dc.logger.Printf("failed parsing log messages for chathistory: %v", err)
+                                        return newChatHistoryError(subcommand, target)
+                                }
+                                if len(buf) == 0 {
+                                        tries++
+                                } else {
+                                        tries = 0
+                                }
+                                for _, msg := range buf {
+                                        msg.Tags["batch"] = irc.TagValue(batchRef)
+                                        dc.SendMessage(dc.marshalMessage(msg, uc.network))
+                                }
+                                remaining -= len(buf)
+                                year, month, day := timestamp.Date()
+                                timestamp = time.Date(year, month, day + 1, 0, 0, 0, 0, timestamp.Location())
+                        }
+
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BATCH",
+                                Params:  []string{"-" + batchRef},
+                        })
                 default:
-                        // TODO: support AFTER, LATEST, BETWEEN
+                        // TODO: support LATEST, BETWEEN
                         return ircError{&irc.Message{
                                 Command: "FAIL",