welcome_msg per scope

Author: kdudkov

cmd/goatak_server/processors.go

@@ -123,25 +123,27 @@ func (app *App) saveItemProcessor(msg *cot.CotMessage) bool {
 		app.items.Store(c)
 
 		if cl == model.CONTACT && !online {
-			app.newContact(c, lastSeen)
+			app.processNewContact(c, lastSeen)
 		}
 	} else {
 		app.logger.Info(fmt.Sprintf("new %s %s (%s) %s", cl, msg.GetUID(), msg.GetCallsign(), msg.GetType()))
 		item := model.FromMsg(msg)
 		app.items.Store(item)
 
 		if cl == model.CONTACT {
-			app.newContact(item, time.Now().Add(-1*model.StaleContactDelete))
+			app.processNewContact(item, time.Now().Add(-1*model.StaleContactDelete))
 		}
 	}
 
 	return true
 }
 
-func (app *App) newContact(item *model.Item, lastSeen time.Time) {
-	if time.Since(lastSeen) > time.Hour*24 && app.config.WelcomeMsg() != "" {
-		chat := chat.MakeChatMessage(item.GetUID(), WELCOME_MESSAGE_FROM_UID, item.GetCallsign(), "", "RootContactGroup", app.config.WelcomeMsg())
-		app.sendToUID(item.GetUID(), cot.LocalCotMessage(chat))
+func (app *App) processNewContact(item *model.Item, lastSeen time.Time) {
+	if time.Since(lastSeen) > time.Hour*24 {
+		if msg := app.config.WelcomeForScope(item.GetScope()); msg != "" {
+			chat := chat.MakeChatMessage(item.GetUID(), WELCOME_MESSAGE_FROM_UID, item.GetCallsign(), "", "RootContactGroup", msg)
+			app.sendToUID(item.GetUID(), cot.LocalCotMessage(chat))
+		}
 	}
 
 	msgs := app.messages.GetFor(item, lastSeen)

goatak_server.yml

@@ -20,7 +20,9 @@ log: false
 data_dir: data
 # Webtak files root folder
 webtak_root: ""
-
+welcome_msg:
+  test: "Welcome to test group"
+  
 me:
   lat: 35.462939
   lon: -97.537283

internal/config/config.go

@@ -102,7 +102,15 @@ func (c *AppConfig) UsersFile() string {
 }
 
 func (c *AppConfig) WelcomeMsg() string {
-	return c.k.String("welcome_msg")
+	if len(c.k.StringMap("welcome_msg")) == 0 {
+		return c.k.String("welcome_msg")
+	}
+
+	return ""
+}
+
+func (c *AppConfig) WelcomeForScope(scope string) string {
+	return c.k.StringMap("welcome_msg")[scope]
 }
 
 func (c *AppConfig) LogAll() bool {

internal/config/config_test.go

@@ -0,0 +1,37 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestWelcome(t *testing.T) {
+	f, err := os.CreateTemp("", "atak_test")
+	require.NoError(t, err)
+	
+	fmt.Fprint(f, "---\nwelcome_msg:\n    aaa\n")
+	f.Close()
+	
+	c := NewAppConfig()
+	c.Load(f.Name())
+	
+	require.Empty(t, c.WelcomeForScope("test"))
+	require.Equal(t, "aaa", c.WelcomeMsg())
+}
+
+func TestWelcomeScope(t *testing.T) {
+	f, err := os.CreateTemp("", "atak_test")
+	require.NoError(t, err)
+	
+	fmt.Fprint(f, "---\nwelcome_msg:\n    test: \"aaa\"\n")
+	f.Close()
+	
+	c := NewAppConfig()
+	c.Load(f.Name())
+	
+	require.Empty(t, c.WelcomeMsg())
+	require.Equal(t, "aaa", c.WelcomeForScope("test"))
+}