Browse Source

Maybe fix backfilling when double puppeting isn't enabled at all

Tulir Asokan 3 years ago
parent
commit
95453a4748
1 changed files with 1 additions and 2 deletions
  1. 1 2
      historysync.go

+ 1 - 2
historysync.go

@@ -394,14 +394,13 @@ func (portal *Portal) backfill(source *User, messages []*waProto.WebMessageInfo)
 		intent := puppet.IntentFor(portal)
 		if intent.IsCustomPuppet && !portal.bridge.Config.CanDoublePuppetBackfill(puppet.CustomMXID) {
 			intent = puppet.DefaultIntent()
-			addMember(puppet)
 		}
 		converted := portal.convertMessage(intent, source, info, webMsg.GetMessage())
 		if converted == nil {
 			portal.log.Debugfln("Skipping unsupported message %s in backfill", info.ID)
 			continue
 		}
-		if history && !portal.IsPrivateChat() && !intent.IsCustomPuppet && !portal.bridge.StateStore.IsInRoom(portal.MXID, puppet.MXID) {
+		if !intent.IsCustomPuppet && !portal.bridge.StateStore.IsInRoom(portal.MXID, puppet.MXID) {
 			addMember(puppet)
 		}
 		// TODO this won't work for history