From f9ba906bbd2cd2457240f718d8b5710c842564ec Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 13 Feb 2023 11:53:00 +0200 Subject: [PATCH] Update ghost info on incoming reactions --- go.mod | 2 +- go.sum | 4 ++-- portal.go | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 113b874..43382f8 100644 --- a/go.mod +++ b/go.mod @@ -34,4 +34,4 @@ require ( maunium.net/go/mauflag v1.0.0 // indirect ) -replace github.com/bwmarrin/discordgo => github.com/beeper/discordgo v0.0.0-20230204143248-0297f8603688 +replace github.com/bwmarrin/discordgo => github.com/beeper/discordgo v0.0.0-20230213095219-cc0cb7eff931 diff --git a/go.sum b/go.sum index 52437ef..6ae7fda 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= -github.com/beeper/discordgo v0.0.0-20230204143248-0297f8603688 h1:VVfY1w8H07PubyMCq9LOkRyvqmQcsvkraoFY+g0CKyA= -github.com/beeper/discordgo v0.0.0-20230204143248-0297f8603688/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= +github.com/beeper/discordgo v0.0.0-20230213095219-cc0cb7eff931 h1:onKdjXUlvbfXypckrTV0XzSUuPfXZI6TvOKzysFvi3A= +github.com/beeper/discordgo v0.0.0-20230213095219-cc0cb7eff931/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/portal.go b/portal.go index ea15b9a..5eaa3ec 100644 --- a/portal.go +++ b/portal.go @@ -1930,7 +1930,11 @@ func (portal *Portal) handleMatrixReaction(sender *User, evt *event.Event) { } func (portal *Portal) handleDiscordReaction(user *User, reaction *discordgo.MessageReaction, add bool, thread *Thread) { - intent := portal.bridge.GetPuppetByID(reaction.UserID).IntentFor(portal) + puppet := portal.bridge.GetPuppetByID(reaction.UserID) + if reaction.Member != nil && reaction.Member.User != nil { + puppet.UpdateInfo(nil, reaction.Member.User) + } + intent := puppet.IntentFor(portal) var discordID string var matrixReaction string