Merge 0e24fffde0 into 2ec439a63f

api/channel.go

@@ -487,6 +487,18 @@ func (c *Client) ThreadMembers(threadID discord.ChannelID) ([]discord.ThreadMemb
 	return m, c.RequestJSON(&m, "GET", EndpointChannels+threadID.String()+"/thread-members")
 }
 
+// ThreadMember returns a thread member for the user ID if the user is a member of the thread.
+func (c *Client) ThreadMember(
+	threadID discord.ChannelID, userID discord.UserID) (*discord.ThreadMember, error) {
+
+	var m *discord.ThreadMember
+	return m, c.RequestJSON(
+		&m,
+		"GET",
+		EndpointChannels+threadID.String()+"/thread-members/"+userID.String(),
+	)
+}
+
 // https://discord.com/developers/docs/resources/guild#list-active-threads-response-body
 type ActiveThreads struct {
 	// Threads are the active threads, ordered by descending ID.

discord/interaction.go

@@ -540,16 +540,16 @@ var optionSupportedSnowflakeTypes = map[reflect.Type]CommandOptionType{
 }
 
 var optionKindMap = map[reflect.Kind]CommandOptionType{
-	reflect.Int:     NumberOptionType,
-	reflect.Int8:    NumberOptionType,
-	reflect.Int16:   NumberOptionType,
-	reflect.Int32:   NumberOptionType,
-	reflect.Int64:   NumberOptionType,
-	reflect.Uint:    NumberOptionType,
-	reflect.Uint8:   NumberOptionType,
-	reflect.Uint16:  NumberOptionType,
-	reflect.Uint32:  NumberOptionType,
-	reflect.Uint64:  NumberOptionType,
+	reflect.Int:     IntegerOptionType,
+	reflect.Int8:    IntegerOptionType,
+	reflect.Int16:   IntegerOptionType,
+	reflect.Int32:   IntegerOptionType,
+	reflect.Int64:   IntegerOptionType,
+	reflect.Uint:    IntegerOptionType,
+	reflect.Uint8:   IntegerOptionType,
+	reflect.Uint16:  IntegerOptionType,
+	reflect.Uint32:  IntegerOptionType,
+	reflect.Uint64:  IntegerOptionType,
 	reflect.Float32: NumberOptionType,
 	reflect.Float64: NumberOptionType,
 	reflect.String:  StringOptionType,