Jelajahi Sumber

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
Gary Kramlich 3 tahun lalu
induk
melakukan
f39226c665
2 mengubah file dengan 2 tambahan dan 5 penghapusan
  1. 1 4
      bridge/portal.go
  2. 1 1
      bridge/puppet.go

+ 1 - 4
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")
 

+ 1 - 1
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()
 	}