Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create category space if necessary when creating channel room

Browse Source
This commit is contained in:
Tulir Asokan
2024-06-24 21:36:38 +03:00
parent 2da2aa47e9
commit 1fef7a0ee2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands.go
View File

@@ -757,7 +757,7 @@ func fnBridge(ce *WrappedCommandEvent) {
portal.updateRoomName() portal.updateRoomName()
portal.updateRoomAvatar() portal.updateRoomAvatar()
portal.updateRoomTopic() portal.updateRoomTopic()
portal.updateSpace() portal.updateSpace(ce.User)
portal.UpdateBridgeInfo() portal.UpdateBridgeInfo()
state, err := portal.MainIntent().State(portal.MXID) state, err := portal.MainIntent().State(portal.MXID)
if err != nil { if err != nil {

14
portal.go
View File

@@ -519,7 +519,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
if portal.GuildID == "" { if portal.GuildID == "" {
user.addPrivateChannelToSpace(portal) user.addPrivateChannelToSpace(portal)
} else { } else {
portal.updateSpace() portal.updateSpace(user)
} }
portal.ensureUserInvited(user, true) portal.ensureUserInvited(user, true)
user.syncChatDoublePuppetDetails(portal, true) user.syncChatDoublePuppetDetails(portal, true)
@@ -2321,11 +2321,19 @@ func (portal *Portal) ExpectedSpaceID() id.RoomID {
return "" return ""
} }
func (portal *Portal) updateSpace() bool { func (portal *Portal) updateSpace(source *User) bool {
if portal.MXID == "" { if portal.MXID == "" {
return false return false
} }
if portal.Parent != nil { if portal.Parent != nil {
if portal.Parent.MXID != "" {
portal.log.Warn().Str("parent_id", portal.ParentID).Msg("Parent portal has no Matrix room, creating...")
err := portal.Parent.CreateMatrixRoom(source, nil)
if err != nil {
portal.log.Err(err).Str("parent_id", portal.ParentID).Msg("Failed to create Matrix room for parent")
return false
}
}
return portal.addToSpace(portal.Parent.MXID) return portal.addToSpace(portal.Parent.MXID)
} else if portal.Guild != nil { } else if portal.Guild != nil {
return portal.addToSpace(portal.Guild.MXID) return portal.addToSpace(portal.Guild.MXID)
@@ -2416,7 +2424,7 @@ func (portal *Portal) UpdateInfo(source *User, meta *discordgo.Channel) *discord
changed = portal.UpdateParent(meta.ParentID) || changed changed = portal.UpdateParent(meta.ParentID) || changed
// Private channels are added to the space in User.handlePrivateChannel // Private channels are added to the space in User.handlePrivateChannel
if portal.GuildID != "" && portal.MXID != "" && portal.ExpectedSpaceID() != portal.InSpace { if portal.GuildID != "" && portal.MXID != "" && portal.ExpectedSpaceID() != portal.InSpace {
changed = portal.updateSpace() || changed changed = portal.updateSpace(source) || changed
} }
if changed { if changed {
portal.UpdateBridgeInfo() portal.UpdateBridgeInfo()