Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handlediscord: bridge message deletes

Browse Source
This commit is contained in:
Skip R
2026-02-09 14:33:56 -08:00
parent 7a6f59ad73
commit 9013e01b49
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/connector/handlediscord.go
View File

@@ -62,9 +62,13 @@ var (
_ bridgev2.RemoteMessage = (*DiscordMessage)(nil) _ bridgev2.RemoteMessage = (*DiscordMessage)(nil)
_ bridgev2.RemoteMessageWithTransactionID = (*DiscordMessage)(nil) _ bridgev2.RemoteMessageWithTransactionID = (*DiscordMessage)(nil)
// _ bridgev2.RemoteEdit = (*DiscordMessage)(nil) // _ bridgev2.RemoteEdit = (*DiscordMessage)(nil)
// _ bridgev2.RemoteMessageRemove = (*DiscordMessage)(nil) _ bridgev2.RemoteMessageRemove = (*DiscordMessage)(nil)
) )
func (m *DiscordMessage) GetTargetMessage() networkid.MessageID {
return discordid.MakeMessageID(m.Data.ID)
}
func (m *DiscordMessage) GetTransactionID() networkid.TransactionID { func (m *DiscordMessage) GetTransactionID() networkid.TransactionID {
if m.Data.Nonce == "" { if m.Data.Nonce == "" {
return "" return ""
@@ -81,19 +85,24 @@ func (m *DiscordMessage) GetID() networkid.MessageID {
} }
func (m *DiscordMessage) GetSender() bridgev2.EventSender { func (m *DiscordMessage) GetSender() bridgev2.EventSender {
if m.Data.Author == nil {
// Message deletions don't have a sender associated with them.
return bridgev2.EventSender{}
}
return m.Client.makeEventSender(m.Data.Author) return m.Client.makeEventSender(m.Data.Author)
} }
func (d *DiscordClient) wrapDiscordMessage(evt *discordgo.MessageCreate) DiscordMessage { func (d *DiscordClient) wrapDiscordMessage(msg *discordgo.Message, typ bridgev2.RemoteEventType) DiscordMessage {
return DiscordMessage{ return DiscordMessage{
DiscordEventMeta: &DiscordEventMeta{ DiscordEventMeta: &DiscordEventMeta{
Type: bridgev2.RemoteEventMessage, Type: typ,
PortalKey: networkid.PortalKey{ PortalKey: networkid.PortalKey{
ID: discordid.MakePortalID(evt.ChannelID), ID: discordid.MakePortalID(msg.ChannelID),
Receiver: d.UserLogin.ID, Receiver: d.UserLogin.ID,
}, },
}, },
Data: evt.Message, Data: msg,
Client: d, Client: d,
} }
} }
@@ -208,10 +217,14 @@ func (d *DiscordClient) handleDiscordEvent(rawEvt any) {
return return
} }
d.userCache.UpdateWithMessage(evt.Message) d.userCache.UpdateWithMessage(evt.Message)
wrappedEvt := d.wrapDiscordMessage(evt) wrappedEvt := d.wrapDiscordMessage(evt.Message, bridgev2.RemoteEventMessage)
d.UserLogin.Bridge.QueueRemoteEvent(d.UserLogin, &wrappedEvt) d.UserLogin.Bridge.QueueRemoteEvent(d.UserLogin, &wrappedEvt)
case *discordgo.UserUpdate: case *discordgo.UserUpdate:
d.userCache.UpdateWithUserUpdate(evt) d.userCache.UpdateWithUserUpdate(evt)
case *discordgo.MessageDelete:
wrappedEvt := d.wrapDiscordMessage(evt.Message, bridgev2.RemoteEventMessageRemove)
d.UserLogin.Bridge.QueueRemoteEvent(d.UserLogin, &wrappedEvt)
// TODO *discordgo.MessageDeleteBulk
case *discordgo.MessageReactionAdd: case *discordgo.MessageReactionAdd:
wrappedEvt := d.wrapDiscordReaction(evt.MessageReaction, true) wrappedEvt := d.wrapDiscordReaction(evt.MessageReaction, true)
d.UserLogin.Bridge.QueueRemoteEvent(d.UserLogin, &wrappedEvt) d.UserLogin.Bridge.QueueRemoteEvent(d.UserLogin, &wrappedEvt)