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

Move automatic double puppeting to correct place

Browse Source
This commit is contained in:
Tulir Asokan
2023-01-11 18:50:50 +02:00
parent ad9ead6e81
commit de59f449f1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
user.go
View File

@@ -530,6 +530,7 @@ func (user *User) readyHandler(_ *discordgo.Session, r *discordgo.Ready) {
user.DiscordID = r.User.ID user.DiscordID = r.User.ID
user.Update() user.Update()
} }
user.tryAutomaticDoublePuppeting()
user.BridgeState.Send(status.BridgeState{StateEvent: status.StateBackfilling}) user.BridgeState.Send(status.BridgeState{StateEvent: status.StateBackfilling})
updateTS := time.Now() updateTS := time.Now()
@@ -705,7 +706,6 @@ func (user *User) handleGuild(meta *discordgo.Guild, timestamp time.Time, isInSp
func (user *User) connectedHandler(_ *discordgo.Session, c *discordgo.Connect) { func (user *User) connectedHandler(_ *discordgo.Session, c *discordgo.Connect) {
user.log.Debugln("Connected to discord") user.log.Debugln("Connected to discord")
user.tryAutomaticDoublePuppeting()
// FIXME this check can fail if the previous event didn't get sent before reconnecting // FIXME this check can fail if the previous event didn't get sent before reconnecting
if user.BridgeState.GetPrev().StateEvent == status.StateTransientDisconnect { if user.BridgeState.GetPrev().StateEvent == status.StateTransientDisconnect {
user.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected}) user.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected})