Use an updated recfile library

diff --git a/cmd/mmc/post.go b/cmd/mmc/post.go
index f16ae785a32845ae1cbc17aeceffcfc15942a10f..660618f6375b4db1821b31b5e5a39cab1f71caf3 100644 (file)
--- a/cmd/mmc/post.go
+++ b/cmd/mmc/post.go
@@ -26,7 +26,7 @@ import (
 
        "github.com/davecgh/go-spew/spew"
        "github.com/mattermost/mattermost-server/v6/model"
-       "go.cypherpunks.su/recfile/v2"
+       "go.cypherpunks.su/recfile/v3"
        "go.stargrave.org/mmc/internal"
 )
 

diff --git a/cmd/rd/main.go b/cmd/rd/main.go
index 297ac29ca2e4ef321865bc35f1376829fc22b09a..4b39359e68042cae21b50d11cbc57c585a6a5bb2 100644 (file)
--- a/cmd/rd/main.go
+++ b/cmd/rd/main.go
@@ -28,7 +28,7 @@ import (
 
        "github.com/fsnotify/fsnotify"
        "github.com/mattermost/mattermost-server/v6/model"
-       "go.cypherpunks.su/recfile/v2"
+       "go.cypherpunks.su/recfile/v3"
        "go.stargrave.org/mmc/internal"
 )
 

diff --git a/cmd/sb/main.go b/cmd/sb/main.go
index 47f9388cf58b5cfb1de737254a7a51c394c633a2..ccfdf09575d9b567cf5b53f1d3221c0d309a5cc3 100644 (file)
--- a/cmd/sb/main.go
+++ b/cmd/sb/main.go
@@ -25,7 +25,7 @@ import (
 
        "github.com/mattermost/mattermost-server/v6/model"
        "go.cypherpunks.su/netrc/v2"
-       "go.cypherpunks.su/recfile/v2"
+       "go.cypherpunks.su/recfile/v3"
        "go.stargrave.org/mmc/internal"
 )
 

diff --git a/go.mod b/go.mod
index e86e5b2a8fe2b6efe98148a4cac33bf55542d939..2763684442a180dd920507fe2c6364b4cfd48175 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module go.stargrave.org/mmc
 
-go 1.21
+go 1.24
 
-toolchain go1.22.5
+toolchain go1.24.5
 
 require (
        github.com/davecgh/go-spew v1.1.1
@@ -10,7 +10,7 @@ require (
        github.com/gorilla/websocket v1.5.0
        github.com/mattermost/mattermost-server/v6 v6.7.2
        go.cypherpunks.su/netrc/v2 v2.0.0
-       go.cypherpunks.su/recfile/v2 v2.0.0
+       go.cypherpunks.su/recfile/v3 v3.0.0
        golang.org/x/sys v0.11.0
 )
 

diff --git a/go.sum b/go.sum
index 2cde86ed635f9ed6686adf7831221a6a9184d1f2..17350f181dbe87d74ed5075651a0ba64174bde81 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1354,8 +1354,8 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.cypherpunks.su/netrc/v2 v2.0.0 h1:IWJ0fPcQoccn8VbqzAQf1/4rj8zw0Bf6X5kAkzwEd48=
 go.cypherpunks.su/netrc/v2 v2.0.0/go.mod h1:F5Ea8ii3R9dNUE0ixE61OYIhvJQVLLdIJjrU/3qROjw=
-go.cypherpunks.su/recfile/v2 v2.0.0 h1:Q2o+OzM1H2O1WnshU88r+waBqylkqZj8plBdBWZitcU=
-go.cypherpunks.su/recfile/v2 v2.0.0/go.mod h1:36EnyBwx6VpsSM5MMcYGTDiKrVEP49S09p33EFuhQYU=
+go.cypherpunks.su/recfile/v3 v3.0.0 h1:cHuH9GK153v+XJogb4XxuDMaC+RGmn4G2G5MLJ3SIpc=
+go.cypherpunks.su/recfile/v3 v3.0.0/go.mod h1:JAkipcy9IUNuYMR+vfNqf/f6KydLdhw1TBaOnNjdHv4=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=

diff --git a/internal/post.go b/internal/post.go
index efef167f4890a138f6b6ed450a7b9f1e56a8a1b0..4eb09137641156d8b4666e018968bdc9a0725b2d 100644 (file)
--- a/internal/post.go
+++ b/internal/post.go
@@ -17,11 +17,10 @@
 package mmc
 
 import (
-       "strings"
        "time"
 
        "github.com/mattermost/mattermost-server/v6/model"
-       "go.cypherpunks.su/recfile/v2"
+       "go.cypherpunks.su/recfile/v3"
 )
 
 type Post struct {
@@ -41,28 +40,28 @@ func PostToRec(w *recfile.Writer, users map[string]*model.User, post Post) error
                sender = user.Username
        }
        fields := []recfile.Field{
-               {Name: "Id", Value: post.P.Id},
-               {Name: "Created", Value: created.Format("2006-01-02 15:04:05")},
-               {Name: "Sender", Value: sender},
+               {F: "Id", V: post.P.Id},
+               {F: "Created", V: created.Format("2006-01-02 15:04:05")},
+               {F: "Sender", V: sender},
        }
        if post.E != model.WebsocketEventPosted {
-               fields = append(fields, recfile.Field{Name: "Event", Value: post.E})
+               fields = append(fields, recfile.Field{F: "Event", V: post.E})
        }
        if post.P.RootId != "" {
-               fields = append(fields, recfile.Field{Name: "RootId", Value: post.P.RootId})
+               fields = append(fields, recfile.Field{F: "RootId", V: post.P.RootId})
        }
        if post.P.Metadata != nil {
                for _, fi := range post.P.Metadata.Files {
                        fields = append(
                                fields,
-                               recfile.Field{Name: "File", Value: fi.Id},
-                               recfile.Field{Name: "FileName", Value: fi.Name},
+                               recfile.Field{F: "File", V: fi.Id},
+                               recfile.Field{F: "FileName", V: fi.Name},
                        )
                }
        }
+       fields = append(fields, recfile.Field{F: "Text", V: post.P.Message})
        if _, err = w.WriteFields(fields...); err != nil {
                return err
        }
-       _, err = w.WriteFieldMultiline("Text", strings.Split(post.P.Message, "\n"))
        return err
 }