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

Add logs when updating portal details

Browse Source
This commit is contained in:
Tulir Asokan
2022-07-08 20:55:31 +03:00
parent f4bc11770a
commit 5b4c078874
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guildportal.go
View File

@@ -244,6 +244,7 @@ func (guild *Guild) UpdateName(meta *discordgo.Guild) bool {
if guild.PlainName == meta.Name && guild.Name == name && guild.NameSet { if guild.PlainName == meta.Name && guild.Name == name && guild.NameSet {
return false return false
} }
guild.log.Debugfln("Updating name %q -> %q", guild.Name, name)
guild.Name = name guild.Name = name
guild.PlainName = meta.Name guild.PlainName = meta.Name
guild.NameSet = false guild.NameSet = false
@@ -262,6 +263,7 @@ func (guild *Guild) UpdateAvatar(iconID string) bool {
if guild.Avatar == iconID && guild.AvatarSet { if guild.Avatar == iconID && guild.AvatarSet {
return false return false
} }
guild.log.Debugfln("Updating avatar %q -> %q", guild.Avatar, iconID)
guild.AvatarSet = false guild.AvatarSet = false
guild.Avatar = iconID guild.Avatar = iconID
guild.AvatarURL = id.ContentURI{} guild.AvatarURL = id.ContentURI{}

7
portal.go
View File

@@ -1536,6 +1536,7 @@ func (portal *Portal) UpdateNameDirect(name string) bool {
} else if !portal.Encrypted && !portal.bridge.Config.Bridge.PrivateChatPortalMeta && portal.IsPrivateChat() { } else if !portal.Encrypted && !portal.bridge.Config.Bridge.PrivateChatPortalMeta && portal.IsPrivateChat() {
return false return false
} }
portal.log.Debugfln("Updating name %q -> %q", portal.Name, name)
portal.Name = name portal.Name = name
portal.NameSet = false portal.NameSet = false
if portal.MXID != "" { if portal.MXID != "" {
@@ -1553,6 +1554,7 @@ func (portal *Portal) UpdateAvatarFromPuppet(puppet *Puppet) bool {
if portal.Avatar == puppet.Avatar && portal.AvatarURL == puppet.AvatarURL && (portal.AvatarSet || portal.MXID == "") { if portal.Avatar == puppet.Avatar && portal.AvatarURL == puppet.AvatarURL && (portal.AvatarSet || portal.MXID == "") {
return false return false
} }
portal.log.Debugfln("Updating avatar from puppet %q -> %q", portal.Avatar, puppet.Avatar)
portal.Avatar = puppet.Avatar portal.Avatar = puppet.Avatar
portal.AvatarURL = puppet.AvatarURL portal.AvatarURL = puppet.AvatarURL
portal.AvatarSet = false portal.AvatarSet = false
@@ -1564,6 +1566,7 @@ func (portal *Portal) UpdateGroupDMAvatar(iconID string) bool {
if portal.Avatar == iconID && (iconID == "") == portal.AvatarURL.IsEmpty() && (portal.AvatarSet || portal.MXID == "") { if portal.Avatar == iconID && (iconID == "") == portal.AvatarURL.IsEmpty() && (portal.AvatarSet || portal.MXID == "") {
return false return false
} }
portal.log.Debugfln("Updating group DM avatar %q -> %q", portal.Avatar, iconID)
portal.Avatar = iconID portal.Avatar = iconID
portal.AvatarSet = false portal.AvatarSet = false
portal.AvatarURL = id.ContentURI{} portal.AvatarURL = id.ContentURI{}
@@ -1596,6 +1599,7 @@ func (portal *Portal) UpdateTopic(topic string) bool {
if portal.Topic == topic && (portal.TopicSet || portal.MXID == "") { if portal.Topic == topic && (portal.TopicSet || portal.MXID == "") {
return false return false
} }
portal.log.Debugfln("Updating topic %q -> %q", portal.Topic, topic)
portal.Topic = topic portal.Topic = topic
portal.TopicSet = false portal.TopicSet = false
if portal.MXID != "" { if portal.MXID != "" {
@@ -1614,6 +1618,7 @@ func (portal *Portal) removeFromSpace() {
return return
} }
portal.log.Debugfln("Removing room from space %s", portal.InSpace)
_, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, portal.InSpace.String(), struct{}{}) _, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, portal.InSpace.String(), struct{}{})
if err != nil { if err != nil {
portal.log.Warnfln("Failed to unset canonical space %s: %v", portal.InSpace, err) portal.log.Warnfln("Failed to unset canonical space %s: %v", portal.InSpace, err)
@@ -1634,6 +1639,7 @@ func (portal *Portal) addToSpace(mxid id.RoomID) bool {
return true return true
} }
portal.log.Debugfln("Adding room to space %s", mxid)
_, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, mxid.String(), &event.SpaceParentEventContent{ _, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, mxid.String(), &event.SpaceParentEventContent{
Via: []string{portal.bridge.AS.HomeserverDomain}, Via: []string{portal.bridge.AS.HomeserverDomain},
Canonical: true, Canonical: true,
@@ -1658,6 +1664,7 @@ func (portal *Portal) UpdateParent(parentID string) bool {
if portal.ParentID == parentID { if portal.ParentID == parentID {
return false return false
} }
portal.log.Debugfln("Updating parent ID %q -> %q", portal.ParentID, parentID)
portal.ParentID = parentID portal.ParentID = parentID
if portal.ParentID != "" { if portal.ParentID != "" {
portal.Parent = portal.bridge.GetPortalByID(database.NewPortalKey(parentID, ""), discordgo.ChannelTypeGuildCategory) portal.Parent = portal.bridge.GetPortalByID(database.NewPortalKey(parentID, ""), discordgo.ChannelTypeGuildCategory)