Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated RequestGuildMembers method and GuildMembersChunk event struct #1156

Merged
merged 5 commits into from Apr 15, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions events.go
Expand Up @@ -187,11 +187,13 @@ type GuildEmojisUpdate struct {

// A GuildMembersChunk is the data for a GuildMembersChunk event.
type GuildMembersChunk struct {
GuildID string `json:"guild_id"`
Members []*Member `json:"members"`
ChunkIndex int `json:"chunk_index"`
ChunkCount int `json:"chunk_count"`
Presences []*Presence `json:"presences,omitempty"`
GuildID string `json:"guild_id"`
Members []*Member `json:"members"`
ChunkIndex int `json:"chunk_index"`
ChunkCount int `json:"chunk_count"`
NotFound []json.Number `json:"not_found,omitempty"`
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
Presences []*Presence `json:"presences,omitempty"`
Nonce string `json:"nonce,omitempty"`
}

// GuildIntegrationsUpdate is the data for a GuildIntegrationsUpdate event.
Expand Down
26 changes: 19 additions & 7 deletions wsapi.go
Expand Up @@ -409,10 +409,12 @@ func (s *Session) UpdateStatusComplex(usd UpdateStatusData) (err error) {
}

type requestGuildMembersData struct {
GuildIDs []string `json:"guild_id"`
Query string `json:"query"`
Limit int `json:"limit"`
Presences bool `json:"presences"`
GuildIDs []string `json:"guild_id"`
Query *string `json:"query,omitempty"`
Limit int `json:"limit"`
Presences bool `json:"presences"`
UserIDs *[]string `json:"user_ids,omitempty"`
Nonce string `json:"nonce,omitempty"`
}

type requestGuildMembersOp struct {
Expand All @@ -426,12 +428,22 @@ type requestGuildMembersOp struct {
// query : String that username starts with, leave empty to return all members
// limit : Max number of items to return, or 0 to request all members matched
// presences : Whether to request presences of guild members
func (s *Session) RequestGuildMembers(guildID string, query string, limit int, presences bool) (err error) {
// userIDs : Used to specify which users you wish to fetch
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
// nonce : Nonce to identify the Guild Members Chunk response
func (s *Session) RequestGuildMembers(guildID, query string, limit int, presences bool, userIDs *[]string, nonce string) (err error) {
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
// One of query or user_ids
var queryPt *string
if userIDs == nil {
queryPt = &query
}
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved

data := requestGuildMembersData{
GuildIDs: []string{guildID},
Query: query,
Query: queryPt,
Limit: limit,
Presences: presences,
UserIDs: userIDs,
Nonce: nonce,
}
err = s.requestGuildMembers(data)
return
Expand All @@ -446,7 +458,7 @@ func (s *Session) RequestGuildMembers(guildID string, query string, limit int, p
func (s *Session) RequestGuildMembersBatch(guildIDs []string, query string, limit int, presences bool) (err error) {
Pancake-e marked this conversation as resolved.
Show resolved Hide resolved
data := requestGuildMembersData{
GuildIDs: guildIDs,
Query: query,
Query: &query,
Limit: limit,
Presences: presences,
}
Expand Down