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

discordid: remove all ID-related casts

Browse Source 
In the same vein as mautrix-whatsapp, -slack and others, do not make
assumptions about how the ID is represented in the connector code. Let
the discordid package be entirely responsible.
This commit is contained in:
Skip R
2026-02-01 21:03:17 -08:00
parent e7554b212f
commit 92352ce603
12 changed files with 134 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/connector/userinfo.go
View File

@@ -25,19 +25,21 @@ import (
"go.mau.fi/util/ptr"
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"
"go.mau.fi/mautrix-discord/pkg/discordid"
)
func (d *DiscordClient) IsThisUser(ctx context.Context, userID networkid.UserID) bool {
// We define `UserID`s and `UserLoginID`s to be interchangeable, i.e. they map
// directly to Discord user IDs ("snowflakes"), so we can perform a direct comparison.
return userID == networkid.UserID(d.UserLogin.ID)
return userID == discordid.UserLoginIDToUserID(d.UserLogin.ID)
}
func makeUserAvatar(u *discordgo.User) *bridgev2.Avatar {
url := u.AvatarURL("256")
return &bridgev2.Avatar{
ID: networkid.AvatarID(url),
ID: discordid.MakeAvatarID(url),
Get: func(ctx context.Context) ([]byte, error) {
return simpleDownload(ctx, url, "user avatar")
},
@@ -54,9 +56,9 @@ func (d *DiscordClient) GetUserInfo(ctx context.Context, ghost *bridgev2.Ghost)
// FIXME(skip): This won't work for users in guilds.
user, ok := d.usersFromReady[string(ghost.ID)]
user, ok := d.usersFromReady[discordid.ParseUserID(ghost.ID)]
if !ok {
log.Error().Str("ghost_id", string(ghost.ID)).Msg("Couldn't find corresponding user from READY for ghost")
log.Error().Str("ghost_id", discordid.ParseUserID(ghost.ID)).Msg("Couldn't find corresponding user from READY for ghost")
return nil, nil
}