Browse Source

Change incoming call notices back to m.text

Tulir Asokan 5 years ago
parent
commit
e4bc254a65
2 changed files with 13 additions and 3 deletions
  1. 8 1
      portal.go
  2. 5 2
      user.go

+ 8 - 1
portal.go

@@ -919,7 +919,14 @@ func (portal *Portal) HandleFakeMessage(source *User, message FakeMessage) {
 		return
 	}
 
-	_, err := portal.MainIntent().SendNotice(portal.MXID, message.Text)
+	content := event.MessageEventContent{
+		MsgType: event.MsgNotice,
+		Body:    message.Text,
+	}
+	if message.Alert {
+		content.MsgType = event.MsgText
+	}
+	_, err := portal.sendMainIntentMessage(content)
 	if err != nil {
 		portal.log.Errorfln("Failed to handle fake message %s: %v", message.ID, err)
 		return

+ 5 - 2
user.go

@@ -675,8 +675,9 @@ func (user *User) HandleMessageRevoke(message whatsappExt.MessageRevocation) {
 }
 
 type FakeMessage struct {
-	Text string
-	ID   string
+	Text  string
+	ID    string
+	Alert bool
 }
 
 func (user *User) HandleCallInfo(info whatsappExt.CallInfo) {
@@ -692,11 +693,13 @@ func (user *User) HandleCallInfo(info whatsappExt.CallInfo) {
 			return
 		}
 		data.Text = "Incoming call"
+		data.Alert = true
 	case whatsappExt.CallOfferVideo:
 		if !user.bridge.Config.Bridge.CallNotices.Start {
 			return
 		}
 		data.Text = "Incoming video call"
+		data.Alert = true
 	case whatsappExt.CallTerminate:
 		if !user.bridge.Config.Bridge.CallNotices.End {
 			return