Changeset 423 in code for trunk/downstream.go

Timestamp:

Oct 25, 2020, 4:47:38 PM (5 years ago)

Author:

contact

Message:

Add message store abstraction

Introduce a messageStore type, which will allow for multiple
implementations (e.g. in the DB or in-memory instead of on-disk).

The message store is per-user so that we don't need to deal with locking
and it's easier to implement per-user limits.

File:

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

trunk/downstream.go

@@ -864 +864 @@
                         }
 
-                        lastID, err := lastMsgID(net, target, time.Now())
+                        lastID, err := dc.user.msgStore.LastMsgID(net, target, time.Now())
                         if err != nil {
                                 dc.logger.Printf("failed to get last message ID: %v", err)
@@ -877 +877 @@
 
 func (dc *downstreamConn) sendNetworkHistory(net *network) {
-        if dc.caps["draft/chathistory"] || dc.srv.LogPath == "" {
+        if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
                 return
         }
@@ -891 +891 @@
 
                 limit := 4000
-                history, err := loadHistoryLatestID(net, target, lastDelivered, limit)
+                history, err := dc.user.msgStore.LoadLatestID(net, target, lastDelivered, limit)
                 if err != nil {
                         dc.logger.Printf("failed to send implicit history for %q: %v", target, err)
@@ -1602 +1602 @@
                 }
 
-                if dc.srv.LogPath == "" {
+                if dc.user.msgStore == nil {
                         return ircError{&irc.Message{
                                 Command: irc.ERR_UNKNOWNCOMMAND,
@@ -1642 +1642 @@
                 switch subcommand {
                 case "BEFORE":
-                        history, err = loadHistoryBeforeTime(uc.network, entity, timestamp, limit)
+                        history, err = dc.user.msgStore.LoadBeforeTime(uc.network, entity, timestamp, limit)
                 case "AFTER":
-                        history, err = loadHistoryAfterTime(uc.network, entity, timestamp, limit)
+                        history, err = dc.user.msgStore.LoadAfterTime(uc.network, entity, timestamp, limit)
                 default:
                         // TODO: support LATEST, BETWEEN