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

Reuse existing getEvent function

Browse Source
This commit is contained in:
Tulir Asokan
2024-01-06 11:11:39 +02:00
parent 3f5484c73e
commit 5de499a3b5
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
portal.go
View File

@@ -1114,7 +1114,7 @@ func (portal *Portal) getEvent(mxid id.EventID) (*event.Event, error) {
if evt.Type == event.EventEncrypted { if evt.Type == event.EventEncrypted {
decryptedEvt, err := portal.bridge.Crypto.Decrypt(evt) decryptedEvt, err := portal.bridge.Crypto.Decrypt(evt)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to decrypt event: %w", err)
} else { } else {
evt = decryptedEvt evt = decryptedEvt
} }
@@ -1410,19 +1410,9 @@ func cutBody(body string) string {
} }
func (portal *Portal) convertReplyMessageToEmbed(eventID id.EventID, url string) (*discordgo.MessageEmbed, error) { func (portal *Portal) convertReplyMessageToEmbed(eventID id.EventID, url string) (*discordgo.MessageEmbed, error) {
evt, err := portal.MainIntent().GetEvent(portal.MXID, eventID) evt, err := portal.getEvent(eventID)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch event: %w", err) return nil, fmt.Errorf("failed to get reply target event: %w", err)
}
if evt.Type == event.EventEncrypted {
evt, err = portal.bridge.Crypto.Decrypt(evt)
if err != nil {
return nil, fmt.Errorf("failed to decrypt event: %w", err)
}
}
err = evt.Content.ParseRaw(evt.Type)
if err != nil {
return nil, fmt.Errorf("failed to parse event content: %w", err)
} }
content, ok := evt.Content.Parsed.(*event.MessageEventContent) content, ok := evt.Content.Parsed.(*event.MessageEventContent)
if !ok { if !ok {