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
This commit is contained in:
Gary Kramlich
2022-04-06 05:36:26 -05:00
parent 2285b5b9f2
commit f39226c665
2 changed files with 2 additions and 5 deletions

View File

@@ -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")

View File

@@ -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()
}