fmt

Author: kdudkov

cmd/goatak_server/main.go

@@ -96,7 +96,7 @@ func (app *App) Run() {
 	if err := app.messages.Start(); err != nil {
 		log.Fatal(err)
 	}
-	
+
 	ctx, cancel := context.WithCancel(context.Background())
 
 	if addr := app.config.String("udp_addr"); addr != "" {

cmd/goatak_server/processors.go

@@ -36,7 +36,7 @@ func (app *App) InitMessageProcessors() {
 
 	app.AddEventProcessor("metrics", app.metricsProcessor, "t-x-c-m")
 	app.AddEventProcessor("remove", app.removeItemProcessor, "t-x-d-d")
-	app.AddEventProcessor("chat", app.chatProcessor, "b-t-f", "b-t-f-")
+	app.AddEventProcessor("chat", app.chatProcessor, "b-t-f", "b-t-f-", "b-f-t-")
 	app.AddEventProcessor("items", app.saveItemProcessor, "a-", "b-", "u-")
 	app.AddEventProcessor("filter_control", filterProcessor, "t-")
 
@@ -94,7 +94,7 @@ func (app *App) removeItemProcessor(msg *cot.CotMessage) bool {
 }
 
 func (app *App) chatProcessor(msg *cot.CotMessage) bool {
-	if msg.IsChat() {
+	if msg.IsChat() || msg.IsFileTransfer() {
 		c := chat.FromCot(msg)
 		app.messages.Add(c)
 
@@ -125,7 +125,6 @@ func (app *App) saveItemProcessor(msg *cot.CotMessage) bool {
 		if cl == model.CONTACT && !online {
 			app.newContact(c, lastSeen)
 		}
-
 	} else {
 		app.logger.Info(fmt.Sprintf("new %s %s (%s) %s", cl, msg.GetUID(), msg.GetCallsign(), msg.GetType()))
 		item := model.FromMsg(msg)

cmd/goatak_server/tak_ws/tak_ws.go

@@ -3,6 +3,7 @@ package tak_ws
 import (
 	"bufio"
 	"bytes"
+	"errors"
 	"fmt"
 	"log/slog"
 	"strings"
@@ -114,7 +115,7 @@ func (w *WsClientHandler) SendCot(msg *cotproto.TakMessage) error {
 		return nil
 	}
 
-	return fmt.Errorf("client is off")
+	return errors.New("client is off")
 }
 
 func (w *WsClientHandler) tryAddPacket(msg []byte) bool {

pkg/chat/chat_message.go

@@ -6,18 +6,19 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+
 	"github.com/kdudkov/goatak/pkg/cot"
 	"github.com/kdudkov/goatak/pkg/cotproto"
 )
 
 type ChatMessage struct {
-	msg *cot.CotMessage
+	msg      *cot.CotMessage
 	received time.Time
 }
 
 func FromCot(c *cot.CotMessage) *ChatMessage {
 	return &ChatMessage{
-		msg: c,
+		msg:      c,
 		received: time.Now(),
 	}
 }
@@ -26,59 +27,71 @@ func (c *ChatMessage) GetMessageID() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
+
 	return c.msg.GetDetail().GetFirst("__chat").GetAttr("messageId")
 }
 
 func (c *ChatMessage) GetChatroom() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
+
 	return c.msg.GetDetail().GetFirst("__chat").GetAttr("chatroom")
 }
 
 func (c *ChatMessage) GetCallsignFrom() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
-	return c.msg.GetDetail().GetFirst("__chat").GetAttr("senderCallsign")
+
+	if cs := c.msg.GetDetail().GetFirst("__chat").GetAttr("senderCallsign"); cs != "" {
+		return cs
+	}
+
+	if cs := c.msg.GetDetail().GetFirst("fileshare").GetAttr("senderCallsign"); cs != "" {
+		return cs
+	}
+
+	return ""
 }
 
 func (c *ChatMessage) GetUIDTo() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
+
 	return c.msg.GetDetail().GetFirst("__chat").GetAttr("id")
 }
 
 func (c *ChatMessage) GetUIDFrom() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
+
 	if uid := c.msg.GetDetail().GetFirst("__chat").GetFirst("chatgrp").GetAttr("uid0"); uid != "" {
 		return uid
 	}
-	
+
+	if uid := c.msg.GetDetail().GetFirst("fileshare").GetAttr("senderUid"); uid != "" {
+		return uid
+	}
+
 	if uid := c.msg.GetFirstLink("p-p").GetAttr("uid"); uid != "" {
-		return uid	
+		return uid
 	}
-	
+
 	return ""
 }
 
 func (c *ChatMessage) GetText() string {
 	if c == nil || c.msg == nil {
 		return ""
 	}
-	
+
 	if rem := c.msg.GetDetail().GetFirst("remarks"); rem != nil {
 		return html.UnescapeString(rem.GetText())
 	}
-	
+
 	return ""
 }
 
@@ -119,7 +132,7 @@ func (c *ChatMessage) GetText() string {
 
 // 	return c
 // }
-// 
+//
 
 func MakeChatMessage(toUID, fromUID, chatroom, from, parent, text string) *cotproto.TakMessage {
 	t := time.Now().UTC().Format(time.RFC3339)
@@ -143,4 +156,4 @@ func MakeChatMessage(toUID, fromUID, chatroom, from, parent, text string) *cotpr
 	msg.CotEvent.Detail = &cotproto.Detail{XmlDetail: xd.AsXMLString()}
 
 	return msg
-}
+}

pkg/chat/storage.go

@@ -25,12 +25,11 @@ func (s *Storage) Add(c *ChatMessage) {
 
 func (s *Storage) Start() error {
 	go func() {
-		for range time.Tick(time.Second*60) {
+		for range time.Tick(time.Second * 60) {
 			s.clean()
 		}
-
 	}()
-	
+
 	return nil
 }
 
@@ -59,13 +58,15 @@ func (s *Storage) GetFor(item *model.Item, t time.Time) []*cot.CotMessage {
 		if dest := c.msg.GetDetail().GetDestCallsign(); len(dest) > 0 {
 			if slices.Contains(dest, item.GetCallsign()) {
 				res = append(res, c.msg)
+
 				return true
 			}
 
 			return true
 		}
 
 		res = append(res, c.msg)
+
 		return true
 	})
 

pkg/cot/cotmessage.go

@@ -207,7 +207,8 @@ func (m *CotMessage) IsChatReceipt() bool {
 		return false
 	}
 
-	return m.GetType() == "b-t-f-r" || m.GetType() == "b-t-f-d"
+	return m.GetType() == "b-t-f-d" || m.GetType() == "b-t-f-p" ||
+		m.GetType() == "b-t-f-r" || m.GetType() == "b-t-f-s" || m.GetType() == "b-t-f-u"
 }
 
 func (m *CotMessage) IsFileTransfer() bool {

pkg/cot/messages.go

@@ -68,6 +68,7 @@ var messages = map[string]string{
 	"b-t-f-p":       "Chat pending receipt",
 	"b-t-f-r":       "Chat read receipt",
 	"b-t-f-s":       "Chat delivery failure",
+	"b-t-f-u":       "Chat ??",
 	"b-w":           "Weather",
 	"c":             "Capability",
 	"r":             "Area restrictions",

pkg/cot/node.go

@@ -2,10 +2,10 @@
 package cot
 
 import (
-	"slices"
 	"bytes"
 	"encoding/xml"
 	"fmt"
+	"slices"
 	"strings"
 )