migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

Updated RequestGuildMembers method and GuildMembersChunk event struct (#1156)

Browse source 
* Updated RequestGuildMembers method and GuildMembersChunk event struct

* Added nonce support to RequestGuildMembersBatch and code refactoring

* Minor change to RequestGuildMembersBatchList

* Removed usage of []json.Number in RequestGuildMembersBatchList

* Minor update to GuildMembersChunk struct and comments
This commit is contained in:
Pancake-e 2022-04-16 02:20:02 +08:00 committed by GitHub
parent 24828068bc
commit 6f6516bf79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
events.go
View file

@ -191,7 +191,9 @@ type GuildMembersChunk struct {
Members []*Member `json:"members"` Members []*Member `json:"members"`
ChunkIndex int `json:"chunk_index"` ChunkIndex int `json:"chunk_index"`
ChunkCount int `json:"chunk_count"` ChunkCount int `json:"chunk_count"`
NotFound []string `json:"not_found,omitempty"`
Presences []*Presence `json:"presences,omitempty"` Presences []*Presence `json:"presences,omitempty"`
Nonce string `json:"nonce,omitempty"`
} }
// GuildIntegrationsUpdate is the data for a GuildIntegrationsUpdate event. // GuildIntegrationsUpdate is the data for a GuildIntegrationsUpdate event.

63
wsapi.go
View file

@ -409,10 +409,13 @@ func (s *Session) UpdateStatusComplex(usd UpdateStatusData) (err error) {
} }
type requestGuildMembersData struct { type requestGuildMembersData struct {
GuildIDs []string `json:"guild_id"` // TODO: Deprecated. Use string instead of []string
Query string `json:"query"` GuildIDs []string `json:"guild_id"`
Limit int `json:"limit"` Query *string `json:"query,omitempty"`
Presences bool `json:"presences"` UserIDs *[]string `json:"user_ids,omitempty"`
Limit int `json:"limit"`
Nonce string `json:"nonce,omitempty"`
Presences bool `json:"presences"`
} }
type requestGuildMembersOp struct { type requestGuildMembersOp struct {
@ -425,16 +428,21 @@ type requestGuildMembersOp struct {
// guildID : Single Guild ID to request members of // guildID : Single Guild ID to request members of
// query : String that username starts with, leave empty to return all members // 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 // limit : Max number of items to return, or 0 to request all members matched
// nonce : Nonce to identify the Guild Members Chunk response
// presences : Whether to request presences of guild members // presences : Whether to request presences of guild members
func (s *Session) RequestGuildMembers(guildID string, query string, limit int, presences bool) (err error) { func (s *Session) RequestGuildMembers(guildID, query string, limit int, nonce string, presences bool) error {
data := requestGuildMembersData{ return s.RequestGuildMembersBatch([]string{guildID}, query, limit, nonce, presences)
GuildIDs: []string{guildID}, }
Query: query,
Limit: limit, // RequestGuildMembersList requests guild members from the gateway
Presences: presences, // The gateway responds with GuildMembersChunk events
} // guildID : Single Guild ID to request members of
err = s.requestGuildMembers(data) // userIDs : IDs of users to fetch
return // limit : Max number of items to return, or 0 to request all members matched
// nonce : Nonce to identify the Guild Members Chunk response
// presences : Whether to request presences of guild members
func (s *Session) RequestGuildMembersList(guildID string, userIDs []string, limit int, nonce string, presences bool) error {
return s.RequestGuildMembersBatchList([]string{guildID}, userIDs, limit, nonce, presences)
} }
// RequestGuildMembersBatch requests guild members from the gateway // RequestGuildMembersBatch requests guild members from the gateway
@ -442,12 +450,37 @@ func (s *Session) RequestGuildMembers(guildID string, query string, limit int, p
// guildID : Slice of guild IDs to request members of // guildID : Slice of guild IDs to request members of
// query : String that username starts with, leave empty to return all members // 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 // limit : Max number of items to return, or 0 to request all members matched
// nonce : Nonce to identify the Guild Members Chunk response
// presences : Whether to request presences of guild members // presences : Whether to request presences of guild members
func (s *Session) RequestGuildMembersBatch(guildIDs []string, query string, limit int, presences bool) (err error) { //
// NOTE: this function is deprecated, please use RequestGuildMembers instead
func (s *Session) RequestGuildMembersBatch(guildIDs []string, query string, limit int, nonce string, presences bool) (err error) {
data := requestGuildMembersData{ data := requestGuildMembersData{
GuildIDs: guildIDs, GuildIDs: guildIDs,
Query: query, Query: &query,
Limit: limit, Limit: limit,
Nonce: nonce,
Presences: presences,
}
err = s.requestGuildMembers(data)
return
}
// RequestGuildMembersBatchList requests guild members from the gateway
// The gateway responds with GuildMembersChunk events
// guildID : Slice of guild IDs to request members of
// userIDs : IDs of users to fetch
// limit : Max number of items to return, or 0 to request all members matched
// nonce : Nonce to identify the Guild Members Chunk response
// presences : Whether to request presences of guild members
//
// NOTE: this function is deprecated, please use RequestGuildMembersList instead
func (s *Session) RequestGuildMembersBatchList(guildIDs []string, userIDs []string, limit int, nonce string, presences bool) (err error) {
data := requestGuildMembersData{
GuildIDs: guildIDs,
UserIDs: &userIDs,
Limit: limit,
Nonce: nonce,
Presences: presences, Presences: presences,
} }
err = s.requestGuildMembers(data) err = s.requestGuildMembers(data)