Add handling for group metadata changes and refactor things

Group metadata temporarily broken until power level bridging is implemented

whatsapp-ext/chat.go

@@ -0,0 +1,144 @@
+// mautrix-whatsapp - A Matrix-WhatsApp puppeting bridge.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type ChatUpdateCommand string
+
+const (
+	ChatUpdateCommandAction ChatUpdateCommand = "action"
+)
+
+type ChatUpdate struct {
+	JID     string            `json:"id"`
+	Command ChatUpdateCommand `json:"cmd"`
+	Data    ChatUpdateData    `json:"data"`
+}
+
+type ChatActionType string
+
+const (
+	ChatActionNameChange  ChatActionType = "subject"
+	ChatActionAddTopic    ChatActionType = "desc_add"
+	ChatActionRemoveTopic ChatActionType = "desc_remove"
+	ChatActionRestrict    ChatActionType = "restrict"
+	ChatActionAnnounce    ChatActionType = "announce"
+	ChatActionPromote     ChatActionType = "promote"
+	ChatActionDemote      ChatActionType = "demote"
+)
+
+type ChatUpdateData struct {
+	Action    ChatActionType
+	SenderJID string
+
+	NameChange struct {
+		Name  string `json:"subject"`
+		SetAt int64  `json:"s_t"`
+		SetBy string `json:"s_o"`
+	}
+
+	AddTopic struct {
+		Topic string `json:"desc"`
+		ID    string `json:"descId"`
+		SetAt int64  `json:"descTime"`
+	}
+
+	RemoveTopic struct {
+		ID string `json:"descId"`
+	}
+
+	Restrict bool
+
+	Announce bool
+
+	PermissionChange struct {
+		JIDs []string `json:"participants"`
+	}
+}
+
+func (cud *ChatUpdateData) UnmarshalJSON(data []byte) error {
+	var arr []json.RawMessage
+	err := json.Unmarshal(data, &arr)
+	if err != nil {
+		return err
+	} else if len(arr) < 3 {
+		return nil
+	}
+
+	err = json.Unmarshal(arr[0], &cud.Action)
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(arr[1], &cud.SenderJID)
+	if err != nil {
+		return err
+	}
+	cud.SenderJID = strings.Replace(cud.SenderJID, OldUserSuffix, NewUserSuffix, 1)
+
+	var unmarshalTo interface{}
+	switch cud.Action {
+	case ChatActionNameChange:
+		unmarshalTo = &cud.NameChange
+	case ChatActionAddTopic:
+		unmarshalTo = &cud.AddTopic
+	case ChatActionRemoveTopic:
+		unmarshalTo = &cud.RemoveTopic
+	case ChatActionRestrict:
+		unmarshalTo = &cud.Restrict
+	case ChatActionAnnounce:
+		unmarshalTo = &cud.Announce
+	case ChatActionPromote, ChatActionDemote:
+		unmarshalTo = &cud.PermissionChange
+	default:
+		return nil
+	}
+	err = json.Unmarshal(arr[2], unmarshalTo)
+	if err != nil {
+		return err
+	}
+	cud.NameChange.SetBy = strings.Replace(cud.NameChange.SetBy, OldUserSuffix, NewUserSuffix, 1)
+	return nil
+}
+
+type ChatUpdateHandler interface {
+	whatsapp.Handler
+	HandleChatUpdate(ChatUpdate)
+}
+
+func (ext *ExtendedConn) handleMessageChatUpdate(message []byte) {
+	var event ChatUpdate
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
+	for _, handler := range ext.handlers {
+		chatUpdateHandler, ok := handler.(ChatUpdateHandler)
+		if !ok {
+			continue
+		}
+		go chatUpdateHandler.HandleChatUpdate(event)
+	}
+}

whatsapp-ext/cmd.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"
@@ -41,7 +41,7 @@ type CommandHandler interface {
 	HandleCommand(Command)
 }
 
-func (ext *ExtendedConn) handleMessageCommand(msgType JSONMessageType, message []byte) {
+func (ext *ExtendedConn) handleMessageCommand(message []byte) {
 	var event Command
 	err := json.Unmarshal(message, &event)
 	if err != nil {

whatsapp-ext/conn.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"

whatsapp-ext/jsonmessage.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"
@@ -34,6 +34,7 @@ const (
 	MessageConn     JSONMessageType = "Conn"
 	MessageProps    JSONMessageType = "Props"
 	MessageCmd      JSONMessageType = "Cmd"
+	MessageChat     JSONMessageType = "Chat"
 )
 
 func (ext *ExtendedConn) AddHandler(handler whatsapp.Handler) {
@@ -85,7 +86,9 @@ func (ext *ExtendedConn) HandleJsonMessage(message string) {
 	case MessageMsgInfo, MessageMsg:
 		ext.handleMessageMsgInfo(msgType, msg[1])
 	case MessageCmd:
-		ext.handleMessageCommand(msgType, msg[1])
+		ext.handleMessageCommand(msg[1])
+	case MessageChat:
+		ext.handleMessageChatUpdate(msg[1])
 	default:
 		for _, handler := range ext.handlers {
 			ujmHandler, ok := handler.(UnhandledJSONMessageHandler)

whatsapp-ext/msginfo.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"

whatsapp-ext/presence.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"

whatsapp-ext/props.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"github.com/Rhymen/go-whatsapp"

whatsapp-ext/stream.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"encoding/json"

whatsapp-ext/whatsapp.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package whatsapp_ext
+package whatsappExt
 
 import (
 	"fmt"
@@ -83,6 +83,8 @@ func (ext *ExtendedConn) GetGroupMetaData(jid string) (*GroupInfo, error) {
 	for index, participant := range info.Participants {
 		info.Participants[index].JID = strings.Replace(participant.JID, OldUserSuffix, NewUserSuffix, 1)
 	}
+	info.NameSetBy = strings.Replace(info.NameSetBy, OldUserSuffix, NewUserSuffix, 1)
+	info.TopicSetBy = strings.Replace(info.TopicSetBy, OldUserSuffix, NewUserSuffix, 1)
 
 	return info, nil
 }