Merge pull request #434 from bbernhard/multimaster_mode

Multimaster mode
bbernhard · Oct 30, 2023 · c493655 · c493655
2 parents b36d28f + 6feb707
commit c493655
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 174 deletions.
diff --git a/src/api/api.go b/src/api/api.go
@@ -385,7 +385,7 @@ func (a *Api) SendV2(c *gin.Context) {
 }
 
 func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan struct{}) {
-	receiveChannel, err := a.signalClient.GetReceiveChannel(number)
+	receiveChannel, err := a.signalClient.GetReceiveChannel()
 	if err != nil {
 		log.Error("Couldn't get receive channel: ", err.Error())
 		return
@@ -405,12 +405,24 @@ func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan s
 
 			if err == nil {
 				if data != "" {
-					err = ws.WriteMessage(websocket.TextMessage, []byte(data))
+					type Response struct {
+						Account string `json:"account"`
+					}
+					var response Response
+					err = json.Unmarshal([]byte(data), &response)
 					if err != nil {
-						if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
-							log.Error("Couldn't write message: " + err.Error())
+						log.Error("Couldn't parse message ", data, ":", err.Error())
+						continue
+					}
+
+					if response.Account == number {
+						err = ws.WriteMessage(websocket.TextMessage, []byte(data))
+						if err != nil {
+							if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
+								log.Error("Couldn't write message: " + err.Error())
+							}
+							return
 						}
-						return
 					}
 				}
 			} else {