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

This commit is contained in:
Tulir Asokan 2021-11-06 21:28:42 +02:00
parent a2bdb84414
commit 95453a4748

View file

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