Improve bot features (#12)

This PR adds small improvements to the bot feature.

- Censor messages depending on the recipient group (CRF internal or not)
- Handle concurrent usage of the whatsapp client (cronned runs will always disconnect the client)

bot-service.go

@@ -23,7 +23,7 @@ func (b *BotService) SendActivitySummary(recipient types.JID, kind ActivityKind)
 
 	day := time.Now().AddDate(0, 0, 1).Format("2006-01-02")
 	log.Info("Fetching activity summary for day ", day)
-	summary, err := b.pegassClient.GetActivityOnDay(day, kind)
+	summary, err := b.pegassClient.GetActivityOnDay(day, kind, false)
 	if err != nil {
 		log.Errorf("failed to generate activity summary for day '%s' and kind '%d'", day, kind)
 		return

config.go

@@ -1,10 +1,11 @@
 package main
 
 type Config struct {
-	Username                  string `json:"username"`
-	Password                  string `json:"password"`
-	TotpSecretKey             string `json:"totp_secret_key"`
-	WhatsAppNotificationGroup string `json:"whatsapp_notification_group"`
+	Username                  string   `json:"username"`
+	Password                  string   `json:"password"`
+	TotpSecretKey             string   `json:"totp_secret_key"`
+	WhatsAppNotificationGroup string   `json:"whatsapp_notification_group"`
+	WhatsAppBotGroups         []string `json:"whatsapp_bot_groups"`
 }
 
 type AuthTicket struct {

main.go

@@ -239,8 +239,14 @@ func main() {
 				}
 
 				day := time.Now().AddDate(0, 0, 1).Format("2006-01-02")
+
+				var shouldCensorData = true
+				if isGroupOwnedByCRF(conf.WhatsAppBotGroups, conf.WhatsAppNotificationGroup) {
+					shouldCensorData = false
+				}
+
 				log.Info("Fetching activity summary for day ", day)
-				summary, err := pegassClient.GetActivityOnDay(day, SAMU)
+				summary, err := pegassClient.GetActivityOnDay(day, SAMU, shouldCensorData)
 				if err != nil {
 					return err
 				}
@@ -250,8 +256,8 @@ func main() {
 				if conf.WhatsAppNotificationGroup == "" {
 					return fmt.Errorf("no WhatsApp group Id provided. Skipping WhatsApp notification")
 				}
-				whatsAppClient := whatsapp.NewClient()
 				jid, err := types.ParseJID(conf.WhatsAppNotificationGroup)
+				whatsAppClient := whatsapp.NewClient()
 				if err != nil {
 					return err
 				}
@@ -285,7 +291,7 @@ func main() {
 		{
 			Name: "start-bot",
 			Action: func(c *cli.Context) error {
-				_, err := initClient()
+				config, err := initClient()
 				if err != nil {
 					return err
 				}
@@ -296,11 +302,13 @@ func main() {
 					chatClient:   &whatsAppClient,
 				}
 				whatsAppClient.SetMessageCallback(func(senderName string, senderId types.JID, chatId types.JID, content string) {
-					log.Infof("Received message from '%s': %s", senderName, content)
-					var recipient = senderId
-					if chatId != (types.JID{}) {
-						recipient = chatId
+					if !isGroupOwnedByCRF(config.WhatsAppBotGroups, chatId.String()) {
+						// Security: only whitelisted groups are able to use bot features
+						return
 					}
+					log.Infof("Received message from '%s': %s", senderName, content)
+
+					var recipient = chatId
 					lowerMessage := strings.ToLower(content)
 
 					if strings.HasPrefix(lowerMessage, "!psr") {
@@ -337,3 +345,12 @@ func parseConfig() Config {
 	}
 	return configData
 }
+
+func isGroupOwnedByCRF(allowedGroups []string, groupId string) bool {
+	for _, allowedId := range allowedGroups {
+		if allowedId == groupId {
+			return true
+		}
+	}
+	return false
+}

pegass-client.go

@@ -830,7 +830,7 @@ func (p *PegassClient) lintActivity(activity redcross.Activity) (string, error)
 	return buf.String(), nil
 }
 
-func (p *PegassClient) GetActivityOnDay(day string, kind ActivityKind) (string, error) {
+func (p *PegassClient) GetActivityOnDay(day string, kind ActivityKind, shouldCensorData bool) (string, error) {
 	err := p.init()
 	if err != nil {
 		return "", err
@@ -893,7 +893,7 @@ func (p *PegassClient) GetActivityOnDay(day string, kind ActivityKind) (string,
 		}
 
 		var comment string
-		if isCRFActivity {
+		if isCRFActivity && !shouldCensorData {
 			comment, err = p.lintActivity(act)
 			if err != nil {
 				return "", err

whatsapp/whatsapp-client.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 )
 
 type WhatsAppClient struct {
@@ -144,6 +145,20 @@ func (w *WhatsAppClient) eventHandler(evt interface{}) {
 		if w.onMessageReceived != nil {
 			w.onMessageReceived(v.Info.PushName, v.Info.Sender, v.Info.Chat, v.Message.GetConversation())
 		}
+	case *events.Disconnected:
+		log.Warn("WhatsApp client was disconnected")
+	case *events.ConnectFailure:
+		log.Warnf("failed to connect to whatsapp: %#v", v.Reason)
+	case *events.LoggedOut:
+		log.Warnf("Received 'loged out' event: %#v", v.Reason)
+	case *events.StreamReplaced:
+		log.Warnf("Another WhatsApp client connected and stole our session! Will reconnect in a few seconds")
+		w.client.Disconnect()
+		time.Sleep(5 * time.Second)
+		err := w.initAndConnectIfNecessary()
+		if err != nil {
+			log.Error("failed to reconnect to whatsapp", err)
+		}
 	}
 }