From f39226c665d8a25dbd3ae183a90f9f291d395bc6 Mon Sep 17 00:00:00 2001 From: Gary Kramlich Date: Wed, 6 Apr 2022 05:36:26 -0500 Subject: [PATCH] Fix double puppeting. This was caused by some early attempts at not replaying messages. That was fixed by tracking messages explicitly but these early returns with no logging were never removed. Fixes #23 --- bridge/portal.go | 5 +---- bridge/puppet.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bridge/portal.go b/bridge/portal.go index c1d3c0d..224072a 100644 --- a/bridge/portal.go +++ b/bridge/portal.go @@ -226,6 +226,7 @@ func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error CreationContent: creationContent, }) if err != nil { + p.log.Warnln("Failed to create room:", err) return err } @@ -387,10 +388,6 @@ func (p *Portal) handleDiscordAttachment(intent *appservice.IntentAPI, msgID str } func (p *Portal) handleDiscordMessageCreate(user *User, msg *discordgo.Message) { - if msg.Author != nil && user.ID == msg.Author.ID { - return - } - if p.MXID == "" { p.log.Warnln("handle message called without a valid portal") diff --git a/bridge/puppet.go b/bridge/puppet.go index fb745f5..c5741c4 100644 --- a/bridge/puppet.go +++ b/bridge/puppet.go @@ -153,7 +153,7 @@ func (p *Puppet) DefaultIntent() *appservice.IntentAPI { } func (p *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI { - if p.customIntent == nil || portal.Key.Receiver == p.ID { + if p.customIntent == nil { return p.DefaultIntent() }