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

Merge pull request #36 from DarkKirb/fix-foreign-key-error

Browse source 
try to fix the foreign key error
This commit is contained in:
Charlotte 🦝 Delenk 2022-11-24 13:55:56 +01:00 committed by GitHub
commit 3cf22e0913
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,24 @@
diff --git a/portal.go b/portal.go diff --git a/portal.go b/portal.go
index 25e0dc2..7f60709 100644 index 25e0dc2..e305942 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 @@ -108,15 +108,6 @@ func (br *DiscordBridge) loadPortal(dbPortal *database.Portal, key *database.Por
if portal.GuildID != "" {
portal.Guild = portal.bridge.GetGuildByID(portal.GuildID, true)
}
- if portal.ParentID != "" {
- parentKey := database.NewPortalKey(portal.ParentID, "")
- var ok bool
- portal.Parent, ok = br.portalsByID[parentKey]
- if !ok {
- portal.Parent = br.loadPortal(br.DB.Portal.GetByID(parentKey), nil, -1)
- }
- }
-
return portal
}
@@ -351,7 +342,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
creationContent := make(map[string]interface{}) creationContent := make(map[string]interface{})
if portal.Type == discordgo.ChannelTypeGuildCategory { if portal.Type == discordgo.ChannelTypeGuildCategory {
@ -11,7 +27,7 @@ index 25e0dc2..7f60709 100644
} }
if !portal.bridge.Config.Bridge.FederateRooms { if !portal.bridge.Config.Bridge.FederateRooms {
creationContent["m.federate"] = false creationContent["m.federate"] = false
@@ -1777,18 +1777,12 @@ func (portal *Portal) UpdateParent(parentID string) bool { @@ -1777,18 +1768,12 @@ func (portal *Portal) UpdateParent(parentID string) bool {
} }
portal.log.Debugfln("Updating parent ID %q -> %q", portal.ParentID, parentID) portal.log.Debugfln("Updating parent ID %q -> %q", portal.ParentID, parentID)
portal.ParentID = parentID portal.ParentID = parentID
@ -32,7 +48,7 @@ index 25e0dc2..7f60709 100644
return portal.Guild.MXID return portal.Guild.MXID
} }
return "" return ""
@@ -1798,9 +1792,7 @@ func (portal *Portal) updateSpace() bool { @@ -1798,9 +1783,7 @@ func (portal *Portal) updateSpace() bool {
if portal.MXID == "" { if portal.MXID == "" {
return false return false
} }