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

Merge pull request #33 from DarkKirb/fix-mautrix-discord-pt-3

Browse source 
hopefully actually don’t use spaces for categories
This commit is contained in:
Charlotte 🦝 Delenk 2022-11-23 11:12:10 +01:00 committed by GitHub
commit afc068bb8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
diff --git a/portal.go b/portal.go diff --git a/portal.go b/portal.go
index 25e0dc2..9f6a5b3 100644 index 25e0dc2..7f60709 100644
--- a/portal.go --- a/portal.go
+++ b/portal.go +++ b/portal.go
@@ -351,7 +351,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e @@ -351,7 +351,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
@ -32,3 +32,14 @@ index 25e0dc2..9f6a5b3 100644
return portal.Guild.MXID return portal.Guild.MXID
} }
return "" return ""
@@ -1798,9 +1792,7 @@ func (portal *Portal) updateSpace() bool {
if portal.MXID == "" {
return false
}
- if portal.Parent != nil {
- return portal.addToSpace(portal.Parent.MXID)
- } else if portal.Guild != nil {
+ if portal.Guild != nil {
return portal.addToSpace(portal.Guild.MXID)
}
return false