Use both logs for WhatsApp import cutoffs

[onechat] / log.go

diff --git a/log.go b/log.go
index 24feb3bb21ec63acf0187420a23c2723f821ecdb..6d0d4784dfa9390f9f4a905d7c95539104be338a 100644 (file)
--- a/log.go
+++ b/log.go
@@ -111,6 +111,7 @@ func (l *Log) AppendDated(kind, text, date string) (Message, error) {
        }
 
        var err error
+
        now := l.clock()
        if date == "" {
                date = now.Format(time.RFC3339Nano)
@@ -176,6 +177,7 @@ func (l *Log) Message(id int) (Message, error) {
        }
 
        var message Message
+
        err = json.Unmarshal(line, &message)
        if err != nil {
                return Message{}, fmt.Errorf("decode message %d: %w", id, err)
@@ -206,9 +208,10 @@ func (l *Log) catchUp(ctx context.Context) error {
 
        return l.journal.Scan(ctx, start, func(line []byte, place Position) error {
                var message Message
+
                err := json.Unmarshal(line, &message)
                if err != nil {
-                       return err
+                       return fmt.Errorf("decode log message: %w", err)
                }
 
                if message.ID != l.index.count {