Changeset 670 in code for trunk

Timestamp:

Nov 3, 2021, 5:29:21 PM (4 years ago)

Author:

contact

Message:

Turn CHATHISTORY and backlog limits into constants

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• server.go (modified) (3 diffs)

trunk/downstream.go

@@ -1162 +1162 @@
 
         isupport := []string{
-                fmt.Sprintf("CHATHISTORY=%v", dc.srv.HistoryLimit),
+                fmt.Sprintf("CHATHISTORY=%v", chatHistoryLimit),
                 "CASEMAPPING=ascii",
         }
@@ -1332 +1332 @@
         defer cancel()
 
-        limit := 4000
         targetCM := net.casemap(target)
-        history, err := dc.user.msgStore.LoadLatestID(ctx, &net.Network, targetCM, msgID, limit)
+        history, err := dc.user.msgStore.LoadLatestID(ctx, &net.Network, targetCM, msgID, backlogLimit)
         if err != nil {
                 dc.logger.Printf("failed to send backlog for %q: %v", target, err)
@@ -2329 +2328 @@
 
                 limit, err := strconv.Atoi(limitStr)
-                if err != nil || limit < 0 || limit > dc.srv.HistoryLimit {
+                if err != nil || limit < 0 || limit > chatHistoryLimit {
                         return ircError{&irc.Message{
                                 Command: "FAIL",

trunk/server.go

@@ -27 +27 @@
 var upstreamMessageBurst = 10
 var messageStoreTimeout = 10 * time.Second
+var chatHistoryLimit = 1000
+var backlogLimit = 4000
 
 type Logger interface {
@@ -54 +56 @@
         Title           string
         Logger          Logger
-        HistoryLimit    int
         LogPath         string
         Debug           bool
@@ -76 +77 @@
         srv := &Server{
                 Logger:          log.New(log.Writer(), "", log.LstdFlags),
-                HistoryLimit:    1000,
                 MaxUserNetworks: -1,
                 db:              db,