README.md

@@ -20,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@v0.3.1) for api reference.
+Click [here](https://pkg.go.dev/github.com/5elenay/revoltgo@v0.2.0) for api reference.
 
 ## Ping Pong Example (Bot)
 

bot.go

@@ -1,56 +0,0 @@
-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
-}

channel.go

@@ -220,13 +220,3 @@ 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.divolt.xyz"
+	WS_URL  = "wss://ws.revolt.chat"
-	API_URL = "https://api.divolt.xyz"
+	API_URL = "https://api.revolt.chat"
 )
 
 // Client struct.
@@ -189,7 +189,7 @@ func (c *Client) Auth() error {
 		return fmt.Errorf("can't auth user (not a self-bot.)")
 	}
 
-	resp, err := c.Request("POST", "/auth/session/login", []byte("{\"email\":\""+c.SelfBot.Email+"\",\"password\":\""+c.SelfBot.Password+"\",\"name\":\"Revoltgo\"}"))
+	resp, err := c.Request("POST", "/auth/login", []byte("{\"email\":\""+c.SelfBot.Email+"\",\"password\":\""+c.SelfBot.Password+"\",\"captcha\": \"\"}"))
 
 	if err != nil {
 		return err
@@ -312,68 +312,3 @@ func (c Client) RemoveFriend(username string) (*UserRelations, error) {
 	err = json.Unmarshal(resp, relationshipData)
 	return relationshipData, err
 }
-
-// Create a new bot.
-func (c *Client) CreateBot(name string) (*Bot, error) {
-	botData := &Bot{}
-	botData.Client = c
-
-	resp, err := c.Request("POST", "/bots/create", []byte("{\"name\":\""+name+"\"}"))
-
-	if err != nil {
-		return botData, err
-	}
-
-	err = json.Unmarshal(resp, botData)
-	return botData, err
-
-}
-
-// Fetch client bots.
-func (c *Client) FetchBots() (*FetchedBots, error) {
-	bots := &FetchedBots{}
-
-	resp, err := c.Request("GET", "/bots/@me", []byte{})
-
-	if err != nil {
-		return bots, err
-	}
-
-	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 git.cesium.pw/matthew/revoltgo
+module github.com/5elenay/revoltgo
 
 go 1.17
 

http.go

@@ -23,6 +23,7 @@ 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)
 	}
 

other.go

@@ -7,27 +7,14 @@ import (
 
 // Similar to message, but created for send message function.
 type SendMessage struct {
-	Content     string          `json:"content"`
+	Content     string   `json:"content,omitempty"`
-	Nonce       string          `json:"nonce,omitempty"`
+	Attachments []string `json:"attachments,omitempty"`
-	Attachments []string        `json:"attachments,omitempty"`
+	Nonce       string   `json:"nonce,omitempty"`
-	Replies     []Replies       `json:"replies,omitempty"`
+	DeleteAfter uint     `json:"-"`
-	Embeds      []SendableEmbed `json:"embeds,omitempty"`
+	Replies     []struct {
-	DeleteAfter uint            `json:"-"`
+		Id      string `json:"id,omitempty"`
-}
+		Mention bool   `json:"mention"`
-
+	} `json:"replies,omitempty"`
-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.
@@ -56,7 +43,10 @@ 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, Replies{
+	sms.Replies = append(sms.Replies, struct {
+		Id      string "json:\"id,omitempty\""
+		Mention bool   "json:\"mention\""
+	}{
 		Id:      id,
 		Mention: mention,
 	})
@@ -289,36 +279,3 @@ type Binary struct {
 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
-}

websocket.go

@@ -25,8 +25,6 @@ func (c *Client) Start() {
 	}
 
 	c.Socket.OnTextMessage = func(message string, _ gowebsocket.Socket) {
-		fmt.Println(message)
-
 		// Parse data
 		rawData := &struct {
 			Type string `json:"type"`
@@ -56,7 +54,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\",\"result\":\"Success\",\"_id\":\"%s\",\"token\":\"%s\",\"user_id\":\"%s\",\"name\":\"Revoltgo\"}", c.SelfBot.Id, c.SelfBot.SessionToken, c.SelfBot.UserId))
+		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Authenticate\",\"id\":\"%s\",\"session_token\":\"%s\",\"user_id\":\"%s\"}", c.SelfBot.Id, c.SelfBot.SessionToken, c.SelfBot.UserId))
 	}
 }
 
@@ -69,7 +67,7 @@ func (c *Client) Destroy() {
 func (c *Client) ping() {
 	for {
 		time.Sleep(30 * time.Second)
-		c.Socket.SendText("{\"type\":\"Ping\",\"data\":0}")
+		c.Socket.SendText(fmt.Sprintf("{\"type\":\"Ping\",\"time\":%d}", time.Now().Unix()))
 	}
 }