Update 'go.mod'

feat: implement sendable embeds

README.md

@@ -4,9 +4,11 @@ Revoltgo is a go package for writing bots / self-bots in revolt easily.
 
 **NOTE**: This package is still under development and not finished. Create an issue if you found a bug.
 
+**NOTE 2**: This package requires go 1.17.
+
 ## Features
 
-- Can listen an event multiple times
+- Multiple event listen
 - Easy to use
 - Supports self-bots
 - Simple cache system
@@ -18,7 +20,7 @@ Revoltgo is a go package for writing bots / self-bots in revolt easily.
 
 ## API Reference
 
-Click [here](https://pkg.go.dev/github.com/5elenay/revoltgo) for api reference.
+Click [here](https://pkg.go.dev/github.com/5elenay/revoltgo@v0.3.1) for api reference.
 
 ## Ping Pong Example (Bot)
 

bot.go

@@ -0,0 +1,56 @@
+package revoltgo
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/oklog/ulid/v2"
+)
+
+// Bot struct.
+type Bot struct {
+	Client    *Client
+	CreatedAt time.Time
+
+	Id              string `json:"_id"`
+	OwnerId         string `json:"owner"`
+	Token           string `json:"token"`
+	IsPublic        bool   `json:"public"`
+	InteractionsUrl string `json:"interactionsURL"`
+}
+
+// Fetched bots struct.
+type FetchedBots struct {
+	Bots  []*Bot  `json:"bots"`
+	Users []*User `json:"users"`
+}
+
+// Calculate creation date and edit the struct.
+func (b *Bot) CalculateCreationDate() error {
+	ulid, err := ulid.Parse(b.Id)
+
+	if err != nil {
+		return err
+	}
+
+	b.CreatedAt = time.UnixMilli(int64(ulid.Time()))
+	return nil
+}
+
+// Edit the bot.
+func (b *Bot) Edit(eb *EditBot) error {
+	data, err := json.Marshal(eb)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = b.Client.Request("PATCH", "/bots/"+b.Id, data)
+	return err
+}
+
+// Delete the bot.
+func (b *Bot) Delete() error {
+	_, err := b.Client.Request("DELETE", "/bots/"+b.Id, []byte{})
+	return err
+}

cache.go

@@ -0,0 +1,123 @@
+package revoltgo
+
+import "fmt"
+
+// Client cache struct.
+type Cache struct {
+	Users    []*User    `json:"users"`
+	Servers  []*Server  `json:"servers"`
+	Channels []*Channel `json:"channels"`
+	Members  []*Member  `json:"members"`
+}
+
+// Get a channel from cache by Id.
+// Will return an empty channel struct if not found.
+func (c *Cache) GetChannel(id string) *Channel {
+	for _, i := range c.Channels {
+		if i.Id == id {
+			return i
+		}
+	}
+
+	return &Channel{}
+}
+
+// Get a server from cache by Id.
+// Will return an empty server struct if not found.
+func (c *Cache) GetServer(id string) *Server {
+	for _, i := range c.Servers {
+		if i.Id == id {
+			return i
+		}
+	}
+
+	return &Server{}
+}
+
+// Get an user from cache by Id.
+// Will return an empty user struct if not found.
+func (c *Cache) GetUser(id string) *User {
+	for _, i := range c.Users {
+		if i.Id == id {
+			return i
+		}
+	}
+
+	return &User{}
+}
+
+// Get a member from cache by Id.
+// Will return an empty member struct if not found.
+func (c *Cache) GetMember(id string) *Member {
+	for _, i := range c.Members {
+		if i.Informations.UserId == id {
+			return i
+		}
+	}
+
+	return &Member{}
+}
+
+// Remove a channel from cache by Id.
+// Will not delete the channel, just deletes the channel from cache.
+// Will change the entire channel cache order!
+func (c *Cache) RemoveChannel(id string) error {
+	for i, v := range c.Channels {
+		if v.Id == id {
+			c.Channels[i] = c.Channels[len(c.Channels)-1]
+			c.Channels = c.Channels[:len(c.Channels)-1]
+
+			return nil
+		}
+	}
+
+	return fmt.Errorf("channel not found")
+}
+
+// Remove a server from cache by Id.
+// Will not delete the server, just deletes the server from cache.
+// Will change the entire server cache order!
+func (c *Cache) RemoveServer(id string) error {
+	for i, v := range c.Servers {
+		if v.Id == id {
+			c.Servers[i] = c.Servers[len(c.Servers)-1]
+			c.Servers = c.Servers[:len(c.Servers)-1]
+
+			return nil
+		}
+	}
+
+	return fmt.Errorf("server not found")
+}
+
+// Remove an user from cache by Id.
+// Will not delete the user, just deletes the user from cache.
+// Will change the entire user cache order!
+func (c *Cache) RemoveUser(id string) error {
+	for i, v := range c.Users {
+		if v.Id == id {
+			c.Users[i] = c.Users[len(c.Users)-1]
+			c.Users = c.Users[:len(c.Users)-1]
+
+			return nil
+		}
+	}
+
+	return fmt.Errorf("user not found")
+}
+
+// Remove a member from cache by Id.
+// Will not delete the member, just deletes the member from cache.
+// Will change the entire member cache order!
+func (c *Cache) RemoveMember(id string) error {
+	for i, v := range c.Members {
+		if v.Informations.UserId == id {
+			c.Members[i] = c.Members[len(c.Members)-1]
+			c.Members = c.Members[:len(c.Members)-1]
+
+			return nil
+		}
+	}
+
+	return fmt.Errorf("member not found")
+}

channel.go

@@ -143,12 +143,7 @@ func (c Channel) FetchMessage(id string) (*Message, error) {
 	}
 
 	err = json.Unmarshal(resp, msg)
-
-	if err != nil {
-		return msg, err
-	}
-
-	return msg, nil
+	return msg, err
 }
 
 // Edit channel.
@@ -160,23 +155,13 @@ func (c Channel) Edit(ec *EditChannel) error {
 	}
 
 	_, err = c.Client.Request("PATCH", "/channels/"+c.Id, data)
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // Delete channel.
 func (c Channel) Delete() error {
 	_, err := c.Client.Request("DELETE", "/channels/"+c.Id, []byte{})
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // Create a new invite.
@@ -193,12 +178,7 @@ func (c Channel) CreateInvite() (string, error) {
 	}{}
 
 	err = json.Unmarshal(data, dataStruct)
-
-	if err != nil {
-		return dataStruct.InviteCode, err
-	}
-
-	return dataStruct.InviteCode, nil
+	return dataStruct.InviteCode, err
 }
 
 // Set channel permissions for a role.
@@ -209,10 +189,44 @@ func (c Channel) SetPermissions(role_id string, permissions uint) error {
 	}
 
 	_, err := c.Client.Request("PUT", "/channels/"+c.Id+"/permissions/"+role_id, []byte(fmt.Sprintf("{\"permissions\":%d}", permissions)))
+	return err
+}
+
+// Fetch all of the members from group.
+// This function is only for GroupChannel.
+func (c Channel) FetchGroupMembers() ([]*User, error) {
+	var groupMembers []*User
+
+	resp, err := c.Client.Request("GET", "/channels/"+c.Id+"/members", []byte{})
 
 	if err != nil {
-		return err
+		return groupMembers, err
 	}
 
-	return nil
+	err = json.Unmarshal(resp, &groupMembers)
+	return groupMembers, err
+}
+
+// Add a new group recipient.
+// This function is only for GroupChannel.
+func (c Channel) AddGroupRecipient(user_id string) error {
+	_, err := c.Client.Request("PUT", "/channels/"+c.Id+"/recipients/"+user_id, []byte{})
+	return err
+}
+
+// Delete a group recipient.
+// This function is only for GroupChannel.
+func (c Channel) DeleteGroupRecipient(user_id string) error {
+	_, err := c.Client.Request("DELETE", "/channels/"+c.Id+"/recipients/"+user_id, []byte{})
+	return err
+}
+
+// Send a typing start event to the channel.
+func (c *Channel) BeginTyping() {
+	c.Client.Socket.SendText(fmt.Sprintf("{\"type\":\"BeginTyping\",\"channel\":\"%s\"}", c.Id))
+}
+
+// End the typing event in the channel.
+func (c *Channel) EndTyping() {
+	c.Client.Socket.SendText(fmt.Sprintf("{\"type\":\"EndTyping\",\"channel\":\"%s\"}", c.Id))
 }

client.go

@@ -9,8 +9,8 @@ import (
 )
 
 const (
-	WS_URL  = "wss://ws.revolt.chat"
-	API_URL = "https://api.revolt.chat"
+	WS_URL  = "wss://ws.divolt.xyz"
+	API_URL = "https://api.divolt.xyz"
 )
 
 // Client struct.
@@ -34,14 +34,9 @@ type Client struct {
 	OnChannelStopTypingFunctions  []func(channel_id, user_id string)
 	OnServerUpdateFunctions       []func(server_id, clear string, payload map[string]interface{})
 	OnServerDeleteFunctions       []func(server_id string)
-}
-
-// Client cache struct.
-type Cache struct {
-	Users    []*User    `json:"users"`
-	Servers  []*Server  `json:"servers"`
-	Channels []*Channel `json:"channels"`
-	Members  []*Member  `json:"members"`
+	OnServerMemberUpdateFunctions []func(server_id, clear string, payload map[string]interface{})
+	OnServerMemberJoinFunctions   []func(server_id, user_id string)
+	OnServerMemberLeaveFunctions  []func(server_id, user_id string)
 }
 
 // Self bot struct.
@@ -113,6 +108,21 @@ func (c *Client) OnServerDelete(fn func(server_id string)) {
 	c.OnServerDeleteFunctions = append(c.OnServerDeleteFunctions, fn)
 }
 
+// On server member update will run when a server member updates.
+func (c *Client) OnServerMemberUpdate(fn func(server_id, clear string, payload map[string]interface{})) {
+	c.OnServerMemberUpdateFunctions = append(c.OnServerMemberUpdateFunctions, fn)
+}
+
+// On server member join will run when someone joins to the server.
+func (c *Client) OnServerMemberJoin(fn func(server_id string, user_id string)) {
+	c.OnServerMemberJoinFunctions = append(c.OnServerMemberJoinFunctions, fn)
+}
+
+// On server member leave will run when someone left from server.
+func (c *Client) OnServerMemberLeave(fn func(server_id string, user_id string)) {
+	c.OnServerMemberLeaveFunctions = append(c.OnServerMemberLeaveFunctions, fn)
+}
+
 // Fetch a channel by Id.
 func (c *Client) FetchChannel(id string) (*Channel, error) {
 	channel := &Channel{}
@@ -125,11 +135,7 @@ func (c *Client) FetchChannel(id string) (*Channel, error) {
 	}
 
 	err = json.Unmarshal(data, channel)
-
-	if err != nil {
-		return channel, err
-	}
-	return channel, nil
+	return channel, err
 }
 
 // Fetch an user by Id.
@@ -144,12 +150,7 @@ func (c *Client) FetchUser(id string) (*User, error) {
 	}
 
 	err = json.Unmarshal(data, user)
-
-	if err != nil {
-		return user, err
-	}
-
-	return user, nil
+	return user, err
 }
 
 // Fetch a server by Id.
@@ -164,12 +165,7 @@ func (c *Client) FetchServer(id string) (*Server, error) {
 	}
 
 	err = json.Unmarshal(data, server)
-
-	if err != nil {
-		return server, err
-	}
-
-	return server, nil
+	return server, err
 }
 
 // Create a server.
@@ -184,12 +180,7 @@ func (c *Client) CreateServer(name, description string) (*Server, error) {
 	}
 
 	err = json.Unmarshal(data, server)
-
-	if err != nil {
-		return server, err
-	}
-
-	return server, nil
+	return server, err
 }
 
 // Auth client user.
@@ -198,129 +189,191 @@ func (c *Client) Auth() error {
 		return fmt.Errorf("can't auth user (not a self-bot.)")
 	}
 
-	resp, err := c.Request("POST", "/auth/login", []byte("{\"email\":\""+c.SelfBot.Email+"\",\"password\":\""+c.SelfBot.Password+"\",\"captcha\": \"\"}"))
+	resp, err := c.Request("POST", "/auth/session/login", []byte("{\"email\":\""+c.SelfBot.Email+"\",\"password\":\""+c.SelfBot.Password+"\",\"name\":\"Revoltgo\"}"))
 
 	if err != nil {
 		return err
 	}
 
 	err = json.Unmarshal(resp, c.SelfBot)
+	return err
+}
+
+// Fetch all of the DMs.
+func (c *Client) FetchDirectMessages() ([]*Channel, error) {
+	var dmChannels []*Channel
+
+	resp, err := c.Request("GET", "/users/dms", []byte{})
+
+	if err != nil {
+		return dmChannels, err
+	}
+
+	err = json.Unmarshal(resp, &dmChannels)
+
+	if err != nil {
+		return dmChannels, err
+	}
+
+	// Prepare channels.
+	for _, i := range dmChannels {
+		i.Client = c
+	}
+
+	return dmChannels, nil
+}
+
+// Edit client user.
+func (c Client) Edit(eu *EditUser) error {
+	data, err := json.Marshal(eu)
 
 	if err != nil {
 		return err
 	}
 
-	return nil
+	_, err = c.Request("PATCH", "/users/@me", data)
+	return err
 }
 
-// Get a channel from cache by Id.
-// Will return an empty channel struct if not found.
-func (c *Cache) GetChannel(id string) *Channel {
-	for _, i := range c.Channels {
-		if i.Id == id {
-			return i
-		}
+// Create a new group.
+// Users parameter is a list of users will be added.
+func (c *Client) CreateGroup(name, description string, users []string) (*Channel, error) {
+	groupChannel := &Channel{}
+	groupChannel.Client = c
+
+	dataStruct := &struct {
+		Name        string   `json:"name"`
+		Description string   `json:"description,omitempty"`
+		Users       []string `json:"users"`
+		Nonce       string   `json:"nonce"`
+	}{
+		Nonce:       genULID(),
+		Name:        name,
+		Description: description,
+		Users:       users,
 	}
 
-	return &Channel{}
-}
+	data, err := json.Marshal(dataStruct)
 
-// Get a server from cache by Id.
-// Will return an empty server struct if not found.
-func (c *Cache) GetServer(id string) *Server {
-	for _, i := range c.Servers {
-		if i.Id == id {
-			return i
-		}
+	if err != nil {
+		return groupChannel, err
 	}
 
-	return &Server{}
-}
+	resp, err := c.Request("POST", "/channels/create", data)
 
-// Get an user from cache by Id.
-// Will return an empty user struct if not found.
-func (c *Cache) GetUser(id string) *User {
-	for _, i := range c.Users {
-		if i.Id == id {
-			return i
-		}
+	if err != nil {
+		return groupChannel, err
 	}
 
-	return &User{}
+	err = json.Unmarshal(resp, groupChannel)
+	return groupChannel, err
 }
 
-// Get a member from cache by Id.
-// Will return an empty member struct if not found.
-func (c *Cache) GetMember(id string) *Member {
-	for _, i := range c.Members {
-		if i.Informations.UserId == id {
-			return i
-		}
+// Fetch relationships.
+func (c Client) FetchRelationships() ([]*UserRelations, error) {
+	relationshipDatas := []*UserRelations{}
+
+	resp, err := c.Request("GET", "/users/relationships", []byte{})
+
+	if err != nil {
+		return relationshipDatas, err
 	}
 
-	return &Member{}
+	err = json.Unmarshal(resp, &relationshipDatas)
+	return relationshipDatas, err
 }
 
-// Remove a channel from cache by Id.
-// Will not delete the channel, just deletes the channel from cache.
-// Will change the entire channel cache order!
-func (c *Cache) RemoveChannel(id string) error {
-	for i, v := range c.Channels {
-		if v.Id == id {
-			c.Channels[i] = c.Channels[len(c.Channels)-1]
-			c.Channels = c.Channels[:len(c.Channels)-1]
+// Send friend request. / Accept friend request.
+// User relations struct only will have status. id is not defined for this function.
+func (c Client) AddFriend(username string) (*UserRelations, error) {
+	relationshipData := &UserRelations{}
 
-			return nil
-		}
+	resp, err := c.Request("PUT", "/users/"+username+"/friend", []byte{})
+
+	if err != nil {
+		return relationshipData, err
 	}
 
-	return fmt.Errorf("channel not found")
+	err = json.Unmarshal(resp, relationshipData)
+	return relationshipData, err
 }
 
-// Remove a server from cache by Id.
-// Will not delete the server, just deletes the server from cache.
-// Will change the entire server cache order!
-func (c *Cache) RemoveServer(id string) error {
-	for i, v := range c.Servers {
-		if v.Id == id {
-			c.Servers[i] = c.Servers[len(c.Servers)-1]
-			c.Servers = c.Servers[:len(c.Servers)-1]
+// Deny friend request. / Remove friend.
+// User relations struct only will have status. id is not defined for this function.
+func (c Client) RemoveFriend(username string) (*UserRelations, error) {
+	relationshipData := &UserRelations{}
 
-			return nil
-		}
+	resp, err := c.Request("DELETE", "/users/"+username+"/friend", []byte{})
+
+	if err != nil {
+		return relationshipData, err
 	}
 
-	return fmt.Errorf("server not found")
+	err = json.Unmarshal(resp, relationshipData)
+	return relationshipData, err
 }
 
-// Remove an user from cache by Id.
-// Will not delete the user, just deletes the user from cache.
-// Will change the entire user cache order!
-func (c *Cache) RemoveUser(id string) error {
-	for i, v := range c.Users {
-		if v.Id == id {
-			c.Users[i] = c.Users[len(c.Users)-1]
-			c.Users = c.Users[:len(c.Users)-1]
+// Create a new bot.
+func (c *Client) CreateBot(name string) (*Bot, error) {
+	botData := &Bot{}
+	botData.Client = c
 
-			return nil
-		}
+	resp, err := c.Request("POST", "/bots/create", []byte("{\"name\":\""+name+"\"}"))
+
+	if err != nil {
+		return botData, err
 	}
 
-	return fmt.Errorf("user not found")
+	err = json.Unmarshal(resp, botData)
+	return botData, err
+
 }
 
-// Remove a member from cache by Id.
-// Will not delete the member, just deletes the member from cache.
-// Will change the entire member cache order!
-func (c *Cache) RemoveMember(id string) error {
-	for i, v := range c.Members {
-		if v.Informations.UserId == id {
-			c.Members[i] = c.Members[len(c.Members)-1]
-			c.Members = c.Members[:len(c.Members)-1]
+// Fetch client bots.
+func (c *Client) FetchBots() (*FetchedBots, error) {
+	bots := &FetchedBots{}
 
-			return nil
-		}
+	resp, err := c.Request("GET", "/bots/@me", []byte{})
+
+	if err != nil {
+		return bots, err
 	}
 
-	return fmt.Errorf("member not found")
+	err = json.Unmarshal(resp, bots)
+
+	if err != nil {
+		return bots, err
+	}
+
+	// Add client for bots.
+	for _, i := range bots.Bots {
+		i.Client = c
+	}
+
+	// Add client for users.
+	for _, i := range bots.Users {
+		i.Client = c
+	}
+
+	return bots, nil
+}
+
+// Fetch a bot.
+func (c *Client) FetchBot(id string) (*Bot, error) {
+	bot := &struct {
+		Bot *Bot `json:"bot"`
+	}{
+		Bot: &Bot{
+			Client: c,
+		},
+	}
+
+	resp, err := c.Request("GET", "/bots/"+id, []byte{})
+
+	if err != nil {
+		return bot.Bot, err
+	}
+
+	err = json.Unmarshal(resp, bot)
+	return bot.Bot, err
 }

go.mod

@@ -1,4 +1,4 @@
-module github.com/5elenay/revoltgo
+module git.cesium.pw/matthew/revoltgo
 
 go 1.17
 

http.go

@@ -23,7 +23,6 @@ func (c Client) Request(method, path string, data []byte) ([]byte, error) {
 	if c.SelfBot == nil {
 		req.Header.Set("x-bot-token", c.Token)
 	} else if c.SelfBot.SessionToken != "" && c.SelfBot.UserId != "" {
-		req.Header.Set("x-user-id", c.SelfBot.UserId)
 		req.Header.Set("x-session-token", c.SelfBot.SessionToken)
 	}
 

message.go

@@ -108,12 +108,7 @@ func (m *Message) Edit(content string) error {
 // Delete the message.
 func (m Message) Delete() error {
 	_, err := m.Client.Request("DELETE", "/channels/"+m.ChannelId+"/messages/"+m.Id, []byte{})
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // Reply to the message.

other.go

@@ -1,17 +1,33 @@
 package revoltgo
 
-import "fmt"
+import (
+	"fmt"
+	"os"
+)
 
 // Similar to message, but created for send message function.
 type SendMessage struct {
-	Content     string   `json:"content,omitempty"`
-	Attachments []string `json:"attachments,omitempty"`
-	Nonce       string   `json:"nonce,omitempty"`
-	DeleteAfter uint     `json:"-"`
-	Replies     []struct {
-		Id      string `json:"id,omitempty"`
-		Mention bool   `json:"mention,omitempty"`
-	} `json:"replies,omitempty"`
+	Content     string          `json:"content"`
+	Nonce       string          `json:"nonce,omitempty"`
+	Attachments []string        `json:"attachments,omitempty"`
+	Replies     []Replies       `json:"replies,omitempty"`
+	Embeds      []SendableEmbed `json:"embeds,omitempty"`
+	DeleteAfter uint            `json:"-"`
+}
+
+type SendableEmbed struct {
+	Type        string `json:"type"`
+	IconUrl     string `json:"icon_url,omitempty"`
+	Url         string `json:"url,omitempty"`
+	Title       string `json:"title,omitempty"`
+	Description string `json:"description,omitempty"`
+	Media       string `json:"media,omitempty"`
+	Colour      string `json:"colour,omitempty"`
+}
+
+type Replies struct {
+	Id      string `json:"id"`
+	Mention bool   `json:"mention"`
 }
 
 // Set content.
@@ -40,10 +56,7 @@ func (sms *SendMessage) AddAttachment(attachment string) *SendMessage {
 
 // Add a new reply.
 func (sms *SendMessage) AddReply(id string, mention bool) *SendMessage {
-	sms.Replies = append(sms.Replies, struct {
-		Id      string "json:\"id,omitempty\""
-		Mention bool   "json:\"mention,omitempty\""
-	}{
+	sms.Replies = append(sms.Replies, Replies{
 		Id:      id,
 		Mention: mention,
 	})
@@ -68,40 +81,24 @@ type EditChannel struct {
 
 // Set name for struct.
 func (ec *EditChannel) SetName(name string) *EditChannel {
-	if len(name) < 1 || len(name) > 32 {
-		return ec
-	}
-
 	ec.Name = name
 	return ec
 }
 
 // Set description for struct.
 func (ec *EditChannel) SetDescription(desc string) *EditChannel {
-	if len(desc) > 1024 {
-		return ec
-	}
-
 	ec.Description = desc
 	return ec
 }
 
 // Set icon for struct.
 func (ec *EditChannel) SetIcon(autumn_id string) *EditChannel {
-	if len(autumn_id) < 1 || len(autumn_id) > 128 {
-		return ec
-	}
-
 	ec.Icon = autumn_id
 	return ec
 }
 
 // Set remove item.
 func (ec *EditChannel) RemoveItem(item string) *EditChannel {
-	if item != "Description" && item != "Icon" {
-		return ec
-	}
-
 	ec.Remove = item
 	return ec
 }
@@ -120,40 +117,24 @@ type EditServer struct {
 
 // Set name for struct
 func (es *EditServer) SetName(name string) *EditServer {
-	if len(name) < 1 || len(name) > 32 {
-		return es
-	}
-
 	es.Name = name
 	return es
 }
 
 // Set description for struct.
 func (es *EditServer) SetDescription(desc string) *EditServer {
-	if len(desc) > 1024 {
-		return es
-	}
-
 	es.Description = desc
 	return es
 }
 
 // Set icon for struct.
 func (es *EditServer) SetIcon(autumn_id string) *EditServer {
-	if len(autumn_id) < 1 || len(autumn_id) > 128 {
-		return es
-	}
-
 	es.Icon = autumn_id
 	return es
 }
 
 // Set banner for struct.
 func (es *EditServer) SetBanner(autumn_id string) *EditServer {
-	if len(autumn_id) < 1 || len(autumn_id) > 128 {
-		return es
-	}
-
 	es.Banner = autumn_id
 	return es
 }
@@ -172,10 +153,6 @@ func (es *EditServer) SetSystemMessages(sm *SystemMessages) *EditServer {
 
 // Set remove item.
 func (es *EditServer) RemoveItem(item string) *EditServer {
-	if item != "Description" && item != "Banner" && item != "Icon" {
-		return es
-	}
-
 	es.Remove = item
 	return es
 }
@@ -191,20 +168,12 @@ type EditMember struct {
 
 // Set nickname for struct.
 func (em *EditMember) SetNickname(nick string) *EditMember {
-	if len(nick) < 1 || len(nick) > 32 {
-		return em
-	}
-
 	em.Nickname = nick
 	return em
 }
 
 // Set avatar for struct.
 func (em *EditMember) SetAvatar(autumn_id string) *EditMember {
-	if len(autumn_id) < 1 || len(autumn_id) > 128 {
-		return em
-	}
-
 	em.Avatar = autumn_id
 	return em
 }
@@ -217,10 +186,6 @@ func (em *EditMember) AddRole(role_id string) *EditMember {
 
 // Set remove item.
 func (em *EditMember) RemoveItem(item string) *EditMember {
-	if item != "Avatar" && item != "Nickname" {
-		return em
-	}
-
 	em.Remove = item
 	return em
 }
@@ -236,20 +201,12 @@ type EditRole struct {
 
 // Set name for struct.
 func (er *EditRole) SetName(name string) *EditRole {
-	if len(name) < 1 || len(name) > 32 {
-		return er
-	}
-
 	er.Name = name
 	return er
 }
 
 // Set valid HTML color for struct.
 func (er *EditRole) SetColour(color string) *EditRole {
-	if len(color) < 1 || len(color) > 32 {
-		return er
-	}
-
 	er.Colour = color
 	return er
 }
@@ -271,3 +228,97 @@ func (er *EditRole) RemoveColour() *EditRole {
 	er.Remove = "Colour"
 	return er
 }
+
+// Edit client user struct.
+// See https://developers.revolt.chat/api/#tag/User-Information/paths/~1users~1@me/patch for more information.
+type EditUser struct {
+	Status struct {
+		Text     string `json:"text,omitempty"`
+		Presence string `json:"presence,omitempty"`
+	} `json:"status,omitempty"`
+	Profile struct {
+		Content    string `json:"content,omitempty"`
+		Background string `json:"background,omitempty"`
+	} `json:"profile,omitempty"`
+	Avatar string `json:"avatar,omitempty"`
+	Remove string `json:"remove,omitempty"`
+}
+
+// Set status for struct.
+func (eu *EditUser) SetStatus(text, presence string) *EditUser {
+	eu.Status = struct {
+		Text     string "json:\"text,omitempty\""
+		Presence string "json:\"presence,omitempty\""
+	}{
+		Text:     text,
+		Presence: presence,
+	}
+	return eu
+}
+
+// Set profile informations for struct.
+func (eu *EditUser) SetProfile(content, background string) *EditUser {
+	eu.Profile = struct {
+		Content    string "json:\"content,omitempty\""
+		Background string "json:\"background,omitempty\""
+	}{
+		Content:    content,
+		Background: background,
+	}
+	return eu
+}
+
+// Set avatar for struct.
+func (eu *EditUser) SetAvatar(autumn_id string) *EditUser {
+	eu.Avatar = autumn_id
+	return eu
+}
+
+// Set remove item for struct.
+func (eu *EditUser) SetRemove(item string) *EditUser {
+	eu.Remove = item
+	return eu
+}
+
+// Revoltgo binary struct.
+type Binary struct {
+	Data []byte
+}
+
+// Save data to the given path.
+func (b Binary) Save(path string) error {
+	return os.WriteFile(path, b.Data, 0666)
+}
+
+// Edit bot struct
+// Please see https://developers.revolt.chat/api/#tag/Bots/paths/~1bots~1:bot/patch for more information.
+type EditBot struct {
+	Name            string `json:"name,omitempty"`
+	Public          bool   `json:"public,omitempty"`
+	InteractionsUrl string `json:"interactionsURL,omitempty"`
+	Remove          string `json:"remove,omitempty"`
+}
+
+// Set name for struct.
+func (eb *EditBot) SetName(name string) *EditBot {
+	eb.Name = name
+	return eb
+}
+
+// Set public value for struct.
+func (eb *EditBot) SetPublicValue(is_public bool) *EditBot {
+	eb.Public = is_public
+	return eb
+}
+
+// Set interaction url for struct.
+func (eb *EditBot) SetInteractionsUrl(url string) *EditBot {
+	eb.InteractionsUrl = url
+	return eb
+}
+
+// Remove interaction url for struct.
+func (eb *EditBot) RemoveInteractionsUrl() *EditBot {
+	eb.Remove = "InteractionsURL"
+	return eb
+}

server.go

@@ -336,10 +336,3 @@ func (s Server) DeleteRole(id string) error {
 
 	return nil
 }
-
-// // Fetch all server invites.
-// func (s Server) FetchInvites() {
-// 	data, _ := s.Client.Request("GET", "/servers/"+s.Id+"/invites", []byte{})
-
-// 	fmt.Println("\n\n" + string(data) + "\n\n")
-// }

user.go

@@ -1,6 +1,7 @@
 package revoltgo
 
 import (
+	"encoding/json"
 	"time"
 
 	"github.com/oklog/ulid/v2"
@@ -56,3 +57,77 @@ func (u *User) CalculateCreationDate() error {
 func (u User) FormatMention() string {
 	return "<@" + u.Id + ">"
 }
+
+// Create a DM with the user.
+func (u User) CreateDirectMessage() (*Channel, error) {
+	dmChannel := &Channel{}
+	dmChannel.Client = u.Client
+
+	resp, err := u.Client.Request("GET", "/users/"+u.Id+"/dm", []byte{})
+
+	if err != nil {
+		return dmChannel, err
+	}
+
+	err = json.Unmarshal(resp, dmChannel)
+	return dmChannel, err
+}
+
+// Fetch default user avatar.
+func (u User) FetchDefaultAvatar() (*Binary, error) {
+	avatarData := &Binary{}
+
+	resp, err := u.Client.Request("GET", "/users/"+u.Id+"/default_avatar", []byte{})
+
+	if err != nil {
+		return avatarData, err
+	}
+
+	avatarData.Data = resp
+	return avatarData, nil
+}
+
+// Fetch user relationship.
+func (u User) FetchRelationship() (*UserRelations, error) {
+	relationshipData := &UserRelations{}
+	relationshipData.Id = u.Id
+
+	resp, err := u.Client.Request("GET", "/users/"+u.Id+"/relationship", []byte{})
+
+	if err != nil {
+		return relationshipData, err
+	}
+
+	err = json.Unmarshal(resp, relationshipData)
+	return relationshipData, err
+}
+
+// Block user.
+func (u User) Block() (*UserRelations, error) {
+	relationshipData := &UserRelations{}
+	relationshipData.Id = u.Id
+
+	resp, err := u.Client.Request("PUT", "/users/"+u.Id+"/block", []byte{})
+
+	if err != nil {
+		return relationshipData, err
+	}
+
+	err = json.Unmarshal(resp, relationshipData)
+	return relationshipData, err
+}
+
+// Un-block user.
+func (u User) Unblock() (*UserRelations, error) {
+	relationshipData := &UserRelations{}
+	relationshipData.Id = u.Id
+
+	resp, err := u.Client.Request("DELETE", "/users/"+u.Id+"/block", []byte{})
+
+	if err != nil {
+		return relationshipData, err
+	}
+
+	err = json.Unmarshal(resp, relationshipData)
+	return relationshipData, err
+}

websocket.go

@@ -25,6 +25,8 @@ func (c *Client) Start() {
 	}
 
 	c.Socket.OnTextMessage = func(message string, _ gowebsocket.Socket) {
+		fmt.Println(message)
+
 		// Parse data
 		rawData := &struct {
 			Type string `json:"type"`
@@ -54,7 +56,7 @@ func (c *Client) handleWebsocketAuth() {
 	if c.SelfBot == nil {
 		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Authenticate\",\"token\":\"%s\"}", c.Token))
 	} else {
-		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Authenticate\",\"id\":\"%s\",\"session_token\":\"%s\",\"user_id\":\"%s\"}", c.SelfBot.Id, c.SelfBot.SessionToken, c.SelfBot.UserId))
+		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Authenticate\",\"result\":\"Success\",\"_id\":\"%s\",\"token\":\"%s\",\"user_id\":\"%s\",\"name\":\"Revoltgo\"}", c.SelfBot.Id, c.SelfBot.SessionToken, c.SelfBot.UserId))
 	}
 }
 
@@ -67,7 +69,7 @@ func (c *Client) Destroy() {
 func (c *Client) ping() {
 	for {
 		time.Sleep(30 * time.Second)
-		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Ping\",\"time\":%d}", time.Now().Unix()))
+		c.Socket.SendText("{\"type\":\"Ping\",\"data\":0}")
 	}
 }
 
@@ -88,14 +90,14 @@ func (c *Client) handleEvents(rawData *struct {
 	} else if rawData.Type == "Message" && c.OnMessageFunctions != nil {
 		// Message Event
 		msgData := &Message{}
+		msgData.Client = c
+
 		err := json.Unmarshal([]byte(message), msgData)
 
 		if err != nil {
 			fmt.Printf("Unexcepted Error: %s", err)
 		}
 
-		msgData.Client = c
-
 		for _, i := range c.OnMessageFunctions {
 			i(msgData)
 		}
@@ -118,10 +120,7 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 	} else if rawData.Type == "MessageDelete" && c.OnMessageDeleteFunctions != nil {
 		// Message Delete Event
-		data := &struct {
-			ChannelId string `json:"channel"`
-			MessageId string `json:"id"`
-		}{}
+		data := &map[string]string{}
 
 		err := json.Unmarshal([]byte(message), data)
 
@@ -130,11 +129,12 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 
 		for _, i := range c.OnMessageDeleteFunctions {
-			i(data.ChannelId, data.MessageId)
+			i((*data)["channel"], (*data)["id"])
 		}
 	} else if rawData.Type == "ChannelCreate" && c.OnChannelCreateFunctions != nil {
 		// Channel create event.
 		channelData := &Channel{}
+		channelData.Client = c
 
 		err := json.Unmarshal([]byte(message), channelData)
 
@@ -142,8 +142,6 @@ func (c *Client) handleEvents(rawData *struct {
 			fmt.Printf("Unexcepted Error: %s", err)
 		}
 
-		channelData.Client = c
-
 		for _, i := range c.OnChannelCreateFunctions {
 			i(channelData)
 		}
@@ -166,9 +164,7 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 	} else if rawData.Type == "ChannelDelete" && c.OnChannelDeleteFunctions != nil {
 		// Channel delete event.
-		data := &struct {
-			ChannelId string `json:"id"`
-		}{}
+		data := &map[string]string{}
 
 		err := json.Unmarshal([]byte(message), data)
 
@@ -177,14 +173,11 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 
 		for _, i := range c.OnChannelDeleteFunctions {
-			i(data.ChannelId)
+			i((*data)["id"])
 		}
 	} else if rawData.Type == "ChannelStartTyping" && c.OnChannelStartTypingFunctions != nil {
 		// Channel start typing event.
-		data := &struct {
-			ChannelId string `json:"id"`
-			UserId    string `json:"user"`
-		}{}
+		data := &map[string]string{}
 
 		err := json.Unmarshal([]byte(message), data)
 
@@ -193,14 +186,11 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 
 		for _, i := range c.OnChannelStartTypingFunctions {
-			i(data.ChannelId, data.UserId)
+			i((*data)["id"], (*data)["user"])
 		}
 	} else if rawData.Type == "ChannelStopTyping" && c.OnChannelStopTypingFunctions != nil {
 		// Channel stop typing event.
-		data := &struct {
-			ChannelId string `json:"id"`
-			UserId    string `json:"user"`
-		}{}
+		data := &map[string]string{}
 
 		err := json.Unmarshal([]byte(message), data)
 
@@ -209,7 +199,7 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 
 		for _, i := range c.OnChannelStopTypingFunctions {
-			i(data.ChannelId, data.UserId)
+			i((*data)["id"], (*data)["user"])
 		}
 	} else if rawData.Type == "ServerUpdate" && c.OnServerUpdateFunctions != nil {
 		// Server update event.
@@ -230,9 +220,7 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 	} else if rawData.Type == "ServerDelete" && c.OnServerDeleteFunctions != nil {
 		// Server delete event.
-		data := &struct {
-			ServerId string `json:"id"`
-		}{}
+		data := &map[string]string{}
 
 		err := json.Unmarshal([]byte(message), data)
 
@@ -241,7 +229,50 @@ func (c *Client) handleEvents(rawData *struct {
 		}
 
 		for _, i := range c.OnServerDeleteFunctions {
-			i(data.ServerId)
+			i((*data)["id"])
+		}
+	} else if rawData.Type == "ServerMemberUpdate" && c.OnServerMemberUpdateFunctions != nil {
+		// Member update event.
+		data := &struct {
+			ServerId string                 `json:"id"`
+			Clear    string                 `json:"clear"`
+			Payload  map[string]interface{} `json:"data"`
+		}{}
+
+		err := json.Unmarshal([]byte(message), data)
+
+		if err != nil {
+			fmt.Printf("Unexcepted Error: %s", err)
+		}
+
+		for _, i := range c.OnServerMemberUpdateFunctions {
+			i(data.ServerId, data.Clear, data.Payload)
+		}
+	} else if rawData.Type == "ServerMemberJoin" && c.OnServerMemberJoinFunctions != nil {
+		// Member join event.
+		data := &map[string]string{}
+
+		err := json.Unmarshal([]byte(message), data)
+
+		if err != nil {
+			fmt.Printf("Unexcepted Error: %s", err)
+		}
+
+		for _, i := range c.OnServerMemberJoinFunctions {
+			i((*data)["id"], (*data)["user"])
+		}
+	} else if rawData.Type == "ServerMemberLeave" && c.OnServerMemberLeaveFunctions != nil {
+		// Member left event.
+		data := &map[string]string{}
+
+		err := json.Unmarshal([]byte(message), data)
+
+		if err != nil {
+			fmt.Printf("Unexcepted Error: %s", err)
+		}
+
+		for _, i := range c.OnServerMemberLeaveFunctions {
+			i((*data)["id"], (*data)["user"])
 		}
 	} else {
 		// Unknown event.