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

Fetch channel info if necessary when creating portal

Browse Source
This commit is contained in:
Tulir Asokan
2022-05-30 20:46:21 +03:00
parent ef18505c27
commit 06dbb3612c
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
portal.go
View File

@@ -287,6 +287,9 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
portal.log.Infoln("Creating Matrix room for channel") portal.log.Infoln("Creating Matrix room for channel")
channel = portal.UpdateInfo(user, channel) channel = portal.UpdateInfo(user, channel)
if channel == nil {
return fmt.Errorf("didn't find channel metadata")
}
intent := portal.MainIntent() intent := portal.MainIntent()
if err := intent.EnsureRegistered(); err != nil { if err := intent.EnsureRegistered(); err != nil {
@@ -1522,6 +1525,20 @@ func (portal *Portal) updateSpace() bool {
func (portal *Portal) UpdateInfo(source *User, meta *discordgo.Channel) *discordgo.Channel { func (portal *Portal) UpdateInfo(source *User, meta *discordgo.Channel) *discordgo.Channel {
changed := false changed := false
if meta == nil {
portal.log.Debugfln("UpdateInfo called without metadata, fetching from %s's state cache", source.DiscordID)
meta, _ = source.Session.State.Channel(portal.Key.ChannelID)
if meta == nil {
portal.log.Warnfln("No metadata found in state cache, fetching from server via %s", source.DiscordID)
var err error
meta, err = source.Session.Channel(portal.Key.ChannelID)
if err != nil {
portal.log.Errorfln("Failed to fetch meta via %s: %v", source.DiscordID, err)
return nil
}
}
}
if portal.Type != meta.Type { if portal.Type != meta.Type {
portal.log.Warnfln("Portal type changed from %d to %d", portal.Type, meta.Type) portal.log.Warnfln("Portal type changed from %d to %d", portal.Type, meta.Type)
portal.Type = meta.Type portal.Type = meta.Type