Changeset 585 in code for trunk

Timestamp:

Sep 13, 2021, 9:25:38 AM (4 years ago)

Author:

contact

Message:

Don't require upstream to be connected for CHATHISTORY

Closes: ​https://todo.sr.ht/~emersion/soju/127

File:

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

trunk/downstream.go

@@ -2107 +2107 @@
                 }
 
-                uc, entity, err := dc.unmarshalEntity(target)
+                network, entity, err := dc.unmarshalEntityNetwork(target)
                 if err != nil {
                         return err
                 }
-                entity = uc.network.casemap(entity)
+                entity = network.casemap(entity)
 
                 // TODO: support msgid criteria
@@ -2144 +2144 @@
                 switch subcommand {
                 case "BEFORE":
-                        history, err = store.LoadBeforeTime(uc.network, entity, bounds[0], time.Time{}, limit)
+                        history, err = store.LoadBeforeTime(network, entity, bounds[0], time.Time{}, limit)
                 case "AFTER":
-                        history, err = store.LoadAfterTime(uc.network, entity, bounds[0], time.Now(), limit)
+                        history, err = store.LoadAfterTime(network, entity, bounds[0], time.Now(), limit)
                 case "BETWEEN":
                         if bounds[0].Before(bounds[1]) {
-                                history, err = store.LoadAfterTime(uc.network, entity, bounds[0], bounds[1], limit)
+                                history, err = store.LoadAfterTime(network, entity, bounds[0], bounds[1], limit)
                         } else {
-                                history, err = store.LoadBeforeTime(uc.network, entity, bounds[0], bounds[1], limit)
+                                history, err = store.LoadBeforeTime(network, entity, bounds[0], bounds[1], limit)
                         }
                 case "TARGETS":
                         // TODO: support TARGETS in multi-upstream mode
-                        targets, err := store.ListTargets(uc.network, bounds[0], bounds[1], limit)
+                        targets, err := store.ListTargets(network, bounds[0], bounds[1], limit)
                         if err != nil {
                                 dc.logger.Printf("failed fetching targets for chathistory: %v", target, err)
@@ -2166 +2166 @@
                         dc.SendBatch("draft/chathistory-targets", nil, nil, func(batchRef irc.TagValue) {
                                 for _, target := range targets {
-                                        if ch := uc.network.channels.Value(target.Name); ch != nil && ch.Detached {
+                                        if ch := network.channels.Value(target.Name); ch != nil && ch.Detached {
                                                 continue
                                         }
@@ -2189 +2189 @@
                         for _, msg := range history {
                                 msg.Tags["batch"] = batchRef
-                                dc.SendMessage(dc.marshalMessage(msg, uc.network))
+                                dc.SendMessage(dc.marshalMessage(msg, network))
                         }
                 })