ids: add support for split portals

mautrix · Sep 14, 2024 · c24c3d4 · c24c3d4
1 parent 36d9467
commit c24c3d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	golang.org/x/net v0.29.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
-	maunium.net/go/mautrix v0.20.1-0.20240913095532-e12ecbe82d36
+	maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -94,5 +94,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.20.1-0.20240913095532-e12ecbe82d36 h1:XKDqeDfRHmgke2N16A41eOckQQqezosxaEyehG/rupM=
-maunium.net/go/mautrix v0.20.1-0.20240913095532-e12ecbe82d36/go.mod h1:amzKPIZVO7v1piD2JhKG1RvGZoV+5wEZfoHaEXOjjqA=
+maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0 h1:fTX1P8TPv+oUqHGu08jj6FYH+Q/fC9jtmvkXcAw+KTo=
+maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0/go.mod h1:amzKPIZVO7v1piD2JhKG1RvGZoV+5wEZfoHaEXOjjqA=
diff --git a/pkg/connector/ids.go b/pkg/connector/ids.go
@@ -33,15 +33,15 @@ func (m *MetaClient) makeWAPortalKey(chatJID types.JID) networkid.PortalKey {
 	key := networkid.PortalKey{
 		ID: metaid.MakeWAPortalID(chatJID),
 	}
-	if chatJID.Server == types.MessengerServer || chatJID.Server == types.DefaultUserServer {
+	if m.Main.Bridge.Config.SplitPortals || chatJID.Server == types.MessengerServer || chatJID.Server == types.DefaultUserServer {
 		key.Receiver = m.UserLogin.ID
 	}
 	return key
 }
 
 func (m *MetaClient) makeFBPortalKey(threadID int64, threadType table.ThreadType) networkid.PortalKey {
 	key := networkid.PortalKey{ID: metaid.MakeFBPortalID(threadID)}
-	if threadType == table.UNKNOWN_THREAD_TYPE || threadType.IsOneToOne() {
+	if m.Main.Bridge.Config.SplitPortals || threadType == table.UNKNOWN_THREAD_TYPE || threadType.IsOneToOne() {
 		key.Receiver = m.UserLogin.ID
 	}
 	return key