From ae38f1e2716253d5c7fb789f14f784ce41e7379b Mon Sep 17 00:00:00 2001 From: caneleex Date: Sat, 3 Sep 2022 20:45:30 +0200 Subject: [PATCH 1/3] replace UpdateSelfNick with UpdateCurrentMember --- discord/member.go | 6 +++--- rest/members.go | 6 +++--- rest/rest_endpoints.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/discord/member.go b/discord/member.go index 356ac9bb..e108d837 100644 --- a/discord/member.go +++ b/discord/member.go @@ -83,7 +83,7 @@ type MemberUpdate struct { CommunicationDisabledUntil *json.Nullable[time.Time] `json:"communication_disabled_until,omitempty"` } -// SelfNickUpdate is used to update your own nick -type SelfNickUpdate struct { - Nick string `json:"nick"` +// CurrentMemberUpdate is used to update your own member +type CurrentMemberUpdate struct { + Nick *string `json:"nick"` } diff --git a/rest/members.go b/rest/members.go index 8e33e794..7f11781e 100644 --- a/rest/members.go +++ b/rest/members.go @@ -22,7 +22,7 @@ type Members interface { AddMemberRole(guildID snowflake.ID, userID snowflake.ID, roleID snowflake.ID, opts ...RequestOpt) error RemoveMemberRole(guildID snowflake.ID, userID snowflake.ID, roleID snowflake.ID, opts ...RequestOpt) error - UpdateSelfNick(guildID snowflake.ID, nick string, opts ...RequestOpt) (*string, error) + UpdateCurrentMember(guildID snowflake.ID, nick *string, opts ...RequestOpt) (*string, error) UpdateCurrentUserVoiceState(guildID snowflake.ID, currentUserVoiceStateUpdate discord.UserVoiceStateUpdate, opts ...RequestOpt) error UpdateUserVoiceState(guildID snowflake.ID, userID snowflake.ID, userVoiceStateUpdate discord.UserVoiceStateUpdate, opts ...RequestOpt) error @@ -95,8 +95,8 @@ func (s *memberImpl) RemoveMemberRole(guildID snowflake.ID, userID snowflake.ID, return s.client.Do(RemoveMemberRole.Compile(nil, guildID, userID, roleID), nil, nil, opts...) } -func (s *memberImpl) UpdateSelfNick(guildID snowflake.ID, nick string, opts ...RequestOpt) (nickName *string, err error) { - err = s.client.Do(UpdateSelfNick.Compile(nil, guildID), discord.SelfNickUpdate{Nick: nick}, nickName, opts...) +func (s *memberImpl) UpdateCurrentMember(guildID snowflake.ID, nick *string, opts ...RequestOpt) (nickName *string, err error) { + err = s.client.Do(UpdateCurrentMember.Compile(nil, guildID), discord.CurrentMemberUpdate{Nick: nick}, nickName, opts...) return } diff --git a/rest/rest_endpoints.go b/rest/rest_endpoints.go index b6743aaa..fdd9c6f5 100644 --- a/rest/rest_endpoints.go +++ b/rest/rest_endpoints.go @@ -73,7 +73,7 @@ var ( AddMemberRole = NewEndpoint(http.MethodPut, "/guilds/{guild.id}/members/{user.id}/roles/{role.id}") RemoveMemberRole = NewEndpoint(http.MethodDelete, "/guilds/{guild.id}/members/{user.id}/roles/{role.id}") - UpdateSelfNick = NewEndpoint(http.MethodPatch, "/guilds/{guild.id}/members/@me/nick") + UpdateCurrentMember = NewEndpoint(http.MethodPatch, "/guilds/{guild.id}/members/@me") GetPruneMembersCount = NewEndpoint(http.MethodGet, "/guilds/{guild.id}/prune") PruneMembers = NewEndpoint(http.MethodPost, "/guilds/{guild.id}/prune") From ebf18a6f6d0d35d4be492a5d469c2d2df811c730 Mon Sep 17 00:00:00 2001 From: caneleex Date: Sat, 3 Sep 2022 21:22:51 +0200 Subject: [PATCH 2/3] change wording --- discord/member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/member.go b/discord/member.go index e108d837..f76e8239 100644 --- a/discord/member.go +++ b/discord/member.go @@ -83,7 +83,7 @@ type MemberUpdate struct { CommunicationDisabledUntil *json.Nullable[time.Time] `json:"communication_disabled_until,omitempty"` } -// CurrentMemberUpdate is used to update your own member +// CurrentMemberUpdate is used to update the current member type CurrentMemberUpdate struct { Nick *string `json:"nick"` } From 1bf9a0bb8f488e918dae4f27469b6d260c6c3044 Mon Sep 17 00:00:00 2001 From: caneleex Date: Sun, 4 Sep 2022 17:11:28 +0200 Subject: [PATCH 3/3] remove pointer --- discord/member.go | 2 +- rest/members.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/discord/member.go b/discord/member.go index f76e8239..4e1f9347 100644 --- a/discord/member.go +++ b/discord/member.go @@ -85,5 +85,5 @@ type MemberUpdate struct { // CurrentMemberUpdate is used to update the current member type CurrentMemberUpdate struct { - Nick *string `json:"nick"` + Nick string `json:"nick"` } diff --git a/rest/members.go b/rest/members.go index 7f11781e..c101a3bb 100644 --- a/rest/members.go +++ b/rest/members.go @@ -22,7 +22,7 @@ type Members interface { AddMemberRole(guildID snowflake.ID, userID snowflake.ID, roleID snowflake.ID, opts ...RequestOpt) error RemoveMemberRole(guildID snowflake.ID, userID snowflake.ID, roleID snowflake.ID, opts ...RequestOpt) error - UpdateCurrentMember(guildID snowflake.ID, nick *string, opts ...RequestOpt) (*string, error) + UpdateCurrentMember(guildID snowflake.ID, nick string, opts ...RequestOpt) (*string, error) UpdateCurrentUserVoiceState(guildID snowflake.ID, currentUserVoiceStateUpdate discord.UserVoiceStateUpdate, opts ...RequestOpt) error UpdateUserVoiceState(guildID snowflake.ID, userID snowflake.ID, userVoiceStateUpdate discord.UserVoiceStateUpdate, opts ...RequestOpt) error @@ -95,7 +95,7 @@ func (s *memberImpl) RemoveMemberRole(guildID snowflake.ID, userID snowflake.ID, return s.client.Do(RemoveMemberRole.Compile(nil, guildID, userID, roleID), nil, nil, opts...) } -func (s *memberImpl) UpdateCurrentMember(guildID snowflake.ID, nick *string, opts ...RequestOpt) (nickName *string, err error) { +func (s *memberImpl) UpdateCurrentMember(guildID snowflake.ID, nick string, opts ...RequestOpt) (nickName *string, err error) { err = s.client.Do(UpdateCurrentMember.Compile(nil, guildID), discord.CurrentMemberUpdate{Nick: nick}, nickName, opts...) return }