darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25 from DarkKirb/update-mautrix-discord-patch-v2

Browse source 
Correct the expected space id for channels in categories
This commit is contained in:
Charlotte 🦝 Delenk 2022-11-19 17:45:13 +01:00 committed by GitHub
commit 17e87d5bf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
matrix/mautrix-discord/no-category-spaces.patch
View file

@ -1,5 +1,5 @@
diff --git a/portal.go b/portal.go
index 25e0dc2..7a14a3d 100644
index 25e0dc2..9f6a5b3 100644
--- a/portal.go
+++ b/portal.go
@@ -351,7 +351,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
@ -11,7 +11,7 @@ index 25e0dc2..7a14a3d 100644
}
if !portal.bridge.Config.Bridge.FederateRooms {
creationContent["m.federate"] = false
@@ -1777,11 +1777,7 @@ func (portal *Portal) UpdateParent(parentID string) bool {
@@ -1777,18 +1777,12 @@ func (portal *Portal) UpdateParent(parentID string) bool {
}
portal.log.Debugfln("Updating parent ID %q -> %q", portal.ParentID, parentID)
portal.ParentID = parentID
@ -24,3 +24,11 @@ index 25e0dc2..7a14a3d 100644
return true
}
func (portal *Portal) ExpectedSpaceID() id.RoomID {
- if portal.Parent != nil {
- return portal.Parent.MXID
- } else if portal.Guild != nil {
+ if portal.Guild != nil {
return portal.Guild.MXID
}
return ""