tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Add support for admin redactions in groups

Browse source
This commit is contained in:
Tulir Asokan 2022-07-30 11:30:55 +03:00
parent 3617b991c8
commit 5ba69f7e8e
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
messagetracking.go
View file

@ -49,7 +49,8 @@ var (
errReactionDatabaseNotFound = errors.New("reaction database entry not found") errReactionDatabaseNotFound = errors.New("reaction database entry not found")
errReactionTargetNotFound = errors.New("reaction target message not found") errReactionTargetNotFound = errors.New("reaction target message not found")
errTargetIsFake = errors.New("target is a fake event") errTargetIsFake = errors.New("target is a fake event")
errTargetSentBySomeoneElse = errors.New("target is a fake event") errReactionSentBySomeoneElse = errors.New("target reaction was sent by someone else")
errDMSentByOtherUser = errors.New("target message was sent by the other user in a DM")
errBroadcastReactionNotSupported = errors.New("reacting to status messages is not currently supported") errBroadcastReactionNotSupported = errors.New("reacting to status messages is not currently supported")
errBroadcastSendDisabled = errors.New("sending status messages is disabled") errBroadcastSendDisabled = errors.New("sending status messages is disabled")
@ -82,7 +83,8 @@ func errorToStatusReason(err error) (reason event.MessageStatusReason, status ev
errors.Is(err, errTargetIsFake), errors.Is(err, errTargetIsFake),
errors.Is(err, errReactionDatabaseNotFound), errors.Is(err, errReactionDatabaseNotFound),
errors.Is(err, errReactionTargetNotFound), errors.Is(err, errReactionTargetNotFound),
errors.Is(err, errTargetSentBySomeoneElse): errors.Is(err, errReactionSentBySomeoneElse),
errors.Is(err, errDMSentByOtherUser):
return event.MessageStatusGenericError, event.MessageStatusFail, true, false, "" return event.MessageStatusGenericError, event.MessageStatusFail, true, false, ""
case errors.Is(err, whatsmeow.ErrNotConnected), case errors.Is(err, whatsmeow.ErrNotConnected),
errors.Is(err, errUserNotConnected): errors.Is(err, errUserNotConnected):

35
portal.go
View file

@ -3106,6 +3106,14 @@ func (portal *Portal) convertMatrixMessage(ctx context.Context, sender *User, ev
FileSha256: media.FileSHA256, FileSha256: media.FileSHA256,
FileLength: proto.Uint64(uint64(media.FileLength)), FileLength: proto.Uint64(uint64(media.FileLength)),
} }
if media.Caption != "" {
msg.DocumentWithCaptionMessage = &waProto.FutureProofMessage{
Message: &waProto.Message{
DocumentMessage: msg.DocumentMessage,
},
}
msg.DocumentMessage = nil
}
case event.MsgLocation: case event.MsgLocation:
lat, long, err := parseGeoURI(content.GeoURI) lat, long, err := parseGeoURI(content.GeoURI)
if err != nil { if err != nil {
@ -3333,13 +3341,12 @@ func (portal *Portal) HandleMatrixRedaction(sender *User, evt *event.Event) {
go portal.sendMessageMetrics(evt, errTargetNotFound, "Ignoring", nil) go portal.sendMessageMetrics(evt, errTargetNotFound, "Ignoring", nil)
} else if msg.IsFakeJID() { } else if msg.IsFakeJID() {
go portal.sendMessageMetrics(evt, errTargetIsFake, "Ignoring", nil) go portal.sendMessageMetrics(evt, errTargetIsFake, "Ignoring", nil)
} else if msg.Sender.User != sender.JID.User {
go portal.sendMessageMetrics(evt, errTargetSentBySomeoneElse, "Ignoring", nil)
} else if portal.Key.JID == types.StatusBroadcastJID && portal.bridge.Config.Bridge.DisableStatusBroadcastSend { } else if portal.Key.JID == types.StatusBroadcastJID && portal.bridge.Config.Bridge.DisableStatusBroadcastSend {
go portal.sendMessageMetrics(evt, errBroadcastSendDisabled, "Ignoring", nil) go portal.sendMessageMetrics(evt, errBroadcastSendDisabled, "Ignoring", nil)
return
} else if msg.Type == database.MsgReaction { } else if msg.Type == database.MsgReaction {
if reaction := portal.bridge.DB.Reaction.GetByMXID(evt.Redacts); reaction == nil { if msg.Sender.User != sender.JID.User {
go portal.sendMessageMetrics(evt, errReactionSentBySomeoneElse, "Ignoring", nil)
} else if reaction := portal.bridge.DB.Reaction.GetByMXID(evt.Redacts); reaction == nil {
go portal.sendMessageMetrics(evt, errReactionDatabaseNotFound, "Ignoring", nil) go portal.sendMessageMetrics(evt, errReactionDatabaseNotFound, "Ignoring", nil)
} else if reactionTarget := reaction.GetTarget(); reactionTarget == nil { } else if reactionTarget := reaction.GetTarget(); reactionTarget == nil {
go portal.sendMessageMetrics(evt, errReactionTargetNotFound, "Ignoring", nil) go portal.sendMessageMetrics(evt, errReactionTargetNotFound, "Ignoring", nil)
@ -3349,8 +3356,26 @@ func (portal *Portal) HandleMatrixRedaction(sender *User, evt *event.Event) {
go portal.sendMessageMetrics(evt, err, "Error sending", nil) go portal.sendMessageMetrics(evt, err, "Error sending", nil)
} }
} else { } else {
key := &waProto.MessageKey{
FromMe: proto.Bool(true),
Id: proto.String(msg.JID),
RemoteJid: proto.String(portal.Key.JID.String()),
}
if msg.Sender.User != sender.JID.User {
if portal.IsPrivateChat() {
go portal.sendMessageMetrics(evt, errDMSentByOtherUser, "Ignoring", nil)
return
}
key.FromMe = proto.Bool(false)
key.Participant = proto.String(msg.Sender.ToNonAD().String())
}
portal.log.Debugfln("Sending redaction %s of %s/%s to WhatsApp", evt.ID, msg.MXID, msg.JID) portal.log.Debugfln("Sending redaction %s of %s/%s to WhatsApp", evt.ID, msg.MXID, msg.JID)
_, err := sender.Client.RevokeMessage(portal.Key.JID, msg.JID) _, err := sender.Client.SendMessage(context.TODO(), portal.Key.JID, "", &waProto.Message{
ProtocolMessage: &waProto.ProtocolMessage{
Type: waProto.ProtocolMessage_REVOKE.Enum(),
Key: key,
},
})
go portal.sendMessageMetrics(evt, err, "Error sending", nil) go portal.sendMessageMetrics(evt, err, "Error sending", nil)
} }
} }