diff options
| author | Xe Iaso <me@xeiaso.net> | 2023-06-13 23:15:13 -0400 |
|---|---|---|
| committer | Xe Iaso <me@xeiaso.net> | 2023-06-13 23:15:13 -0400 |
| commit | 4f101bd479a355e5231dbc83910a8c0fdcb8fb8c (patch) | |
| tree | 4fd4f0fa74a0e9145d65055cb547d3be9765784b /web | |
| parent | a8e8958a16e60c89e79353235d1912288fe93a31 (diff) | |
| download | x-4f101bd479a355e5231dbc83910a8c0fdcb8fb8c.tar.xz x-4f101bd479a355e5231dbc83910a8c0fdcb8fb8c.zip | |
web/revolt: implement better websocket logic thanks to chatgpt
Signed-off-by: Xe Iaso <me@xeiaso.net>
Diffstat (limited to 'web')
| -rw-r--r-- | web/revolt/client.go | 157 | ||||
| -rw-r--r-- | web/revolt/handler.go | 7 | ||||
| -rw-r--r-- | web/revolt/http.go | 2 | ||||
| -rw-r--r-- | web/revolt/message.go | 6 | ||||
| -rw-r--r-- | web/revolt/other.go | 28 | ||||
| -rw-r--r-- | web/revolt/server.go | 32 | ||||
| -rw-r--r-- | web/revolt/websocket.go | 704 |
7 files changed, 487 insertions, 449 deletions
diff --git a/web/revolt/client.go b/web/revolt/client.go index 76fe65c..5ab47f1 100644 --- a/web/revolt/client.go +++ b/web/revolt/client.go @@ -1,20 +1,36 @@ package revolt import ( - "context" "encoding/json" "fmt" "net/http" - "sync" - "time" "github.com/sacOO7/gowebsocket" ) -const ( - WS_URL = "wss://ws.revolt.chat" - API_URL = "https://api.revolt.chat" -) +// New creates a new client with the default Revolt server details. +// +// Use NewWithEndpoint to create a client with a custom endpoint. +func New(token string) *Client { + return &Client{ + HTTP: &http.Client{}, + Token: token, + BaseURL: "https://api.revolt.chat", + WSURL: "wss://ws.revolt.chat", + } +} + +// NewWithEndpoint creates a new client with a custom Revolt endpoint. +// +// You can use this to test the library against an arbirtary Revolt server. +func NewWithEndpoint(token, baseURL, wsURL string) *Client { + return &Client{ + HTTP: &http.Client{}, + Token: token, + BaseURL: baseURL, + WSURL: wsURL, + } +} // Client struct. type Client struct { @@ -23,32 +39,8 @@ type Client struct { Socket gowebsocket.Socket HTTP *http.Client Cache *Cache - - // Event Functions - OnUnknownEventFunctions []func(ctx context.Context, message string) - OnReadyFunctions []func(ctx context.Context) - OnMessageFunctions []func(ctx context.Context, message *Message) - OnMessageAppendFunctions []func(ctx context.Context, channelID, messageID string, payload map[string]any) - OnMessageUpdateFunctions []func(ctx context.Context, channelID, messageID string, payload map[string]interface{}) - OnMessageDeleteFunctions []func(ctx context.Context, channelID, messageID string) - OnChannelCreateFunctions []func(ctx context.Context, channel *Channel) - OnChannelUpdateFunctions []func(ctx context.Context, channelID, clear string, payload map[string]interface{}) - OnChannelDeleteFunctions []func(ctx context.Context, channelID string) - OnGroupCreateFunctions []func(ctx context.Context, group *Group) - OnGroupMemberAddedFunctions []func(ctx context.Context, groupID, userID string) - OnGroupMemberRemovedFunctions []func(ctx context.Context, groupID, userID string) - OnChannelStartTypingFunctions []func(ctx context.Context, channelID, userID string) - OnChannelStopTypingFunctions []func(ctx context.Context, channelID, userID string) - OnServerCreateFunctions []func(ctx context.Context, serverID *Server) - OnServerUpdateFunctions []func(ctx context.Context, serverID, clear string, payload map[string]interface{}) - OnServerDeleteFunctions []func(ctx context.Context, serverID string) - OnServerMemberUpdateFunctions []func(ctx context.Context, serverID, clear string, payload map[string]interface{}) - OnServerMemberJoinFunctions []func(ctx context.Context, serverID, userID string) - OnServerMemberLeaveFunctions []func(ctx context.Context, serverID, userID string) - - // ping timer - pingMutex sync.Mutex - lastPing time.Time + BaseURL string + WSURL string } // Self bot struct. @@ -60,105 +52,6 @@ type SelfBot struct { SessionToken string `json:"token"` } -// On ready event will run when websocket connection is started and bot is ready to work. -func (c *Client) OnReady(fn func(context.Context)) { - c.OnReadyFunctions = append(c.OnReadyFunctions, fn) -} - -// On message event will run when someone sends a message. -func (c *Client) OnMessage(fn func(ctx context.Context, message *Message)) { - c.OnMessageFunctions = append(c.OnMessageFunctions, fn) -} - -func (c *Client) OnMessageAppend(fn func(ctx context.Context, channelID, messageID string, payload map[string]any)) { - c.OnMessageAppendFunctions = append(c.OnMessageAppendFunctions, fn) -} - -// On message update event will run when someone updates a message. -func (c *Client) OnMessageUpdate(fn func(ctx context.Context, channel_id, message_id string, payload map[string]interface{})) { - c.OnMessageUpdateFunctions = append(c.OnMessageUpdateFunctions, fn) -} - -// On message delete event will run when someone deletes a message. -func (c *Client) OnMessageDelete(fn func(ctx context.Context, channel_id, message_id string)) { - c.OnMessageDeleteFunctions = append(c.OnMessageDeleteFunctions, fn) -} - -// On channel create event will run when someone creates a channel. -func (c *Client) OnChannelCreate(fn func(ctx context.Context, channel *Channel)) { - c.OnChannelCreateFunctions = append(c.OnChannelCreateFunctions, fn) -} - -// On channel update event will run when someone updates a channel. -func (c *Client) OnChannelUpdate(fn func(ctx context.Context, channel_id, clear string, payload map[string]interface{})) { - c.OnChannelUpdateFunctions = append(c.OnChannelUpdateFunctions, fn) -} - -// On channel delete event will run when someone deletes a channel. -func (c *Client) OnChannelDelete(fn func(ctx context.Context, channel_id string)) { - c.OnChannelDeleteFunctions = append(c.OnChannelDeleteFunctions, fn) -} - -// On group channel create event will run when someones creates a group channel. -func (c *Client) OnGroupCreate(fn func(ctx context.Context, group *Group)) { - c.OnGroupCreateFunctions = append(c.OnGroupCreateFunctions, fn) -} - -// On group member added will run when someone is added to a group channel. -func (c *Client) OnGroupMemberAdded(fn func(ctx context.Context, group_id string, user_id string)) { - c.OnGroupMemberAddedFunctions = append(c.OnGroupMemberAddedFunctions, fn) -} - -// On group member removed will run when someone is removed from a group channel. -func (c *Client) OnGroupMemberRemoved(fn func(ctx context.Context, group_id string, user_id string)) { - c.OnGroupMemberRemovedFunctions = append(c.OnGroupMemberRemovedFunctions, fn) -} - -// On unknown event will run when client gets a unknown event. -func (c *Client) OnUnknownEvent(fn func(ctx context.Context, message string)) { - c.OnUnknownEventFunctions = append(c.OnUnknownEventFunctions, fn) -} - -// On channel start typing will run when someone starts to type a message. -func (c *Client) OnChannelStartTyping(fn func(ctx context.Context, channel_id, user_id string)) { - c.OnChannelStartTypingFunctions = append(c.OnChannelStartTypingFunctions, fn) -} - -// On channel stop typing will run when someone stops the typing status. -func (c *Client) OnChannelStopTyping(fn func(ctx context.Context, channel_id, user_id string)) { - c.OnChannelStopTypingFunctions = append(c.OnChannelStopTypingFunctions, fn) -} - -// On server create event will run when someone creates a server. -func (c *Client) OnServerCreate(fn func(ctx context.Context, server *Server)) { - c.OnServerCreateFunctions = append(c.OnServerCreateFunctions, fn) -} - -// On server update will run when someone updates a server. -func (c *Client) OnServerUpdate(fn func(ctx context.Context, server_id, clear string, payload map[string]interface{})) { - c.OnServerUpdateFunctions = append(c.OnServerUpdateFunctions, fn) -} - -// On server delete will run when someone deletes a server. -func (c *Client) OnServerDelete(fn func(ctx context.Context, 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(ctx context.Context, 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(ctx context.Context, 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(ctx context.Context, 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{} diff --git a/web/revolt/handler.go b/web/revolt/handler.go index fae588b..c88c744 100644 --- a/web/revolt/handler.go +++ b/web/revolt/handler.go @@ -6,6 +6,7 @@ type NullHandler struct{} func (NullHandler) UnknownEvent(context.Context, string, []byte) error { return nil } func (NullHandler) Ready(context.Context) error { return nil } +func (NullHandler) Authenticated(context.Context) error { return nil } func (NullHandler) MessageCreate(context.Context, *Message) error { return nil } func (NullHandler) MessageAppend(context.Context, string, string, *MessageAppend) error { return nil @@ -24,7 +25,7 @@ func (NullHandler) MessageRemoveReaction(context.Context, string, string, string return nil } func (NullHandler) ChannelCreate(context.Context, *Channel) error { return nil } -func (NullHandler) ChannelUpdate(context.Context, string, string, *Channel) error { +func (NullHandler) ChannelUpdate(context.Context, string, *Channel, []string) error { return nil } func (NullHandler) ChannelDelete(context.Context, string) error { return nil } @@ -91,6 +92,7 @@ func (NullHandler) EmojiDelete(context.Context, string) error { type Handler interface { UnknownEvent(ctx context.Context, kind string, data []byte) error + Authenticated(context.Context) error Ready(context.Context) error // Messages @@ -106,7 +108,7 @@ type Handler interface { // Channels ChannelCreate(ctx context.Context, channel *Channel) error - ChannelUpdate(ctx context.Context, channelID, clear string, channel *Channel) error + ChannelUpdate(ctx context.Context, channelID string, channel *Channel, clear []string) error ChannelDelete(ctx context.Context, channelID string) error ChannelAck(ctx context.Context, channelID, userID, messageID string) error ChannelStartTyping(ctx context.Context, channelID, userID string) error @@ -126,6 +128,7 @@ type Handler interface { ServerMemberJoin(ctx context.Context, serverID, userID string) error ServerMemberLeave(ctx context.Context, serverID, userID string) error ServerRoleUpdate(ctx context.Context, serverID, roleID string, role *Role, clear []string) error + ServerRoleDelete(ctx context.Context, serverID, roleID string) error // Users UserUpdate(ctx context.Context, userID string, user *User, clear []string) error diff --git a/web/revolt/http.go b/web/revolt/http.go index af60a94..a2eb2df 100644 --- a/web/revolt/http.go +++ b/web/revolt/http.go @@ -12,7 +12,7 @@ func (c Client) Request(method, path string, data []byte) ([]byte, error) { reqBody := bytes.NewBuffer(data) // Prepare request - req, err := http.NewRequest(method, API_URL+path, reqBody) + req, err := http.NewRequest(method, c.BaseURL+path, reqBody) if err != nil { return []byte{}, err } diff --git a/web/revolt/message.go b/web/revolt/message.go index cf7a6dc..bf4651a 100644 --- a/web/revolt/message.go +++ b/web/revolt/message.go @@ -25,6 +25,10 @@ type Message struct { Masquerade *Masquerade `json:"masquerade"` } +type MessageAppend struct { + Embeds []*MessageEmbed `json:"embeds"` +} + type Masquerade struct { Name string `json:"name"` AvatarURL string `json:"avatar"` @@ -33,7 +37,7 @@ type Masquerade struct { // Attachment struct. type Attachment struct { - Id string `json:"_id"` + ID string `json:"_id"` Tag string `json:"tag"` Size int `json:"size"` FileName string `json:"filename"` diff --git a/web/revolt/other.go b/web/revolt/other.go index 179ee06..98ead74 100644 --- a/web/revolt/other.go +++ b/web/revolt/other.go @@ -13,7 +13,7 @@ type SendMessage struct { Replies []Replies `json:"replies,omitempty"` Embeds []SendableEmbed `json:"embeds,omitempty"` DeleteAfter uint `json:"-"` - Masquerade *Masquerade `json:"masquerade,omitempty"` + Masquerade *Masquerade `json:"masquerade,omitempty"` } type SendableEmbed struct { @@ -23,7 +23,7 @@ type SendableEmbed struct { Title string `json:"title,omitempty"` Description string `json:"description,omitempty"` Media string `json:"media,omitempty"` - Colour string `json:"colour,omitempty"` + Color string `json:"colour,omitempty"` } type Replies struct { @@ -107,13 +107,13 @@ func (ec *EditChannel) RemoveItem(item string) *EditChannel { // Edit server struct. // Please see https://developers.revolt.chat/api/#tag/Server-Information/paths/~1servers~1:server/patch for more detail. type EditServer struct { - Name string `json:"name,omitempty"` - Description string `json:"description,omitempty"` - Icon string `json:"icon,omitempty"` - Banner string `json:"banner,omitempty"` - Categories []*ServerCategory `json:"categories,omitempty"` - SystemMessages *ServerSystemMessages `json:"system_messages,omitempty"` - Remove string `json:"remove,omitempty"` + Name string `json:"name,omitempty"` + Description string `json:"description,omitempty"` + Icon string `json:"icon,omitempty"` + Banner string `json:"banner,omitempty"` + Categories []*ServerCategory `json:"categories,omitempty"` + SystemMessages *ServerSystemMessages `json:"system_messages,omitempty"` + Remove string `json:"remove,omitempty"` } // Set name for struct @@ -194,7 +194,7 @@ func (em *EditMember) RemoveItem(item string) *EditMember { // Edit role struct. type EditRole struct { Name string `json:"name,omitempty"` - Colour string `json:"colour,omitempty"` + Color string `json:"colour,omitempty"` Hoist bool `json:"hoist,omitempty"` Rank int `json:"rank,omitempty"` Remove string `json:"remove,omitempty"` @@ -207,8 +207,8 @@ func (er *EditRole) SetName(name string) *EditRole { } // Set valid HTML color for struct. -func (er *EditRole) SetColour(color string) *EditRole { - er.Colour = color +func (er *EditRole) SetColor(color string) *EditRole { + er.Color = color return er } @@ -260,8 +260,8 @@ func (eu *EditUser) SetStatus(text, presence string) *EditUser { // 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 string `json:"content,omitempty"` + Background string `json:"background,omitempty"` }{ Content: content, Background: background, diff --git a/web/revolt/server.go b/web/revolt/server.go index 1345015..001fe6a 100644 --- a/web/revolt/server.go +++ b/web/revolt/server.go @@ -13,18 +13,26 @@ type Server struct { Client *Client CreatedAt time.Time - Id string `json:"_id"` - Nonce string `json:"nonce"` - OwnerId string `json:"owner"` - Name string `json:"name"` - Description string `json:"description"` - ChannelIds []string `json:"channels"` - Categories []*ServerCategory `json:"categories"` - SystemMessages *ServerSystemMessages `json:"system_messages"` - Roles map[string]interface{} `json:"roles"` - DefaultPermissions uint `json:"default_permissions"` - Icon *Attachment `json:"icon"` - Banner *Attachment `json:"banner"` + Id string `json:"_id"` + Nonce string `json:"nonce"` + OwnerId string `json:"owner"` + Name string `json:"name"` + Description string `json:"description"` + ChannelIds []string `json:"channels"` + Categories []*ServerCategory `json:"categories"` + SystemMessages *ServerSystemMessages `json:"system_messages"` + Roles map[string]interface{} `json:"roles"` + DefaultPermissions uint `json:"default_permissions"` + Icon *Attachment `json:"icon"` + Banner *Attachment `json:"banner"` +} + +type Role struct { + Name string `json:"name"` + Permissions map[string]int `json:"permissions"` + Color string `json:"colour"` + Hoist bool `json:"hoist"` + Rank int `json:"int"` } // Server categories struct. diff --git a/web/revolt/websocket.go b/web/revolt/websocket.go index 8ca78a9..f13b1af 100644 --- a/web/revolt/websocket.go +++ b/web/revolt/websocket.go @@ -4,367 +4,497 @@ import ( "context" "encoding/json" "fmt" - "net/http" "time" - "github.com/sacOO7/gowebsocket" + "nhooyr.io/websocket" "within.website/ln" "within.website/ln/opname" + "within.website/x/cardio" ) -func (c *Client) Start(ctx context.Context) { - // Create new socket - c.Socket = gowebsocket.New(WS_URL) - c.HTTP = &http.Client{} - - // Auth the user if self-bot. - // if c.SelfBot != nil { - // c.Auth() - // } - - // Send auth when connected - c.Socket.OnConnected = func(_ gowebsocket.Socket) { - c.handleWebsocketAuth() - } - - c.Socket.OnTextMessage = func(message string, _ gowebsocket.Socket) { - //fmt.Println(message) - - // Parse data - rawData := &struct { - Type string `json:"type"` - }{} - err := json.Unmarshal([]byte(message), rawData) - - if err != nil { - c.Close() - panic(err) - } - - if rawData.Type == "Authenticated" { - go c.ping() +func (c *Client) Connect(ctx context.Context, handler Handler) { + ctx = opname.With(ctx, "websocket-connect") + heartbeat, slower, faster := cardio.Heartbeat(ctx, time.Second, time.Second) + + go func(ctx context.Context) { + for { + select { + case <-ctx.Done(): + return + case <-heartbeat: + if err := c.doWebsocket(ctx, c.Token, c.WSURL, handler); err != nil { + ln.Error(ctx, err, ln.Info("websocket error, retrying")) + slower() + } + default: + faster() + } } + }(ctx) +} - // Handle events. - c.handleEvents(ctx, rawData, message) - // fmt.Println(message) +func (c *Client) doWebsocket(ctx context.Context, token, wsURL string, handler Handler) error { + ln.Log(ctx, ln.Info("connecting to websocket"), ln.F{"server": wsURL}) + conn, _, err := websocket.Dial(ctx, wsURL, &websocket.DialOptions{}) + if err != nil { + return err } - - c.Socket.OnDisconnected = func (err error, sock gowebsocket.Socket) { - ctx := opname.With(ctx, "websocket-ondisconnect") - ln.Error(ctx, err) - sock.Conn.Close() + defer conn.Close(websocket.StatusNormalClosure, "doWebsocket function returned") + + data, err := json.Marshal(struct { + Type string `json:"type"` + Token string `json:"token"` + }{ + Type: "Authenticate", + Token: token, + }) + if err != nil { + return err } - // Start connection. - c.Socket.Connect() - - go func() { - <-ctx.Done() - c.Close() - }() -} + heartbeat, faster, slower := cardio.Heartbeat(opname.With(ctx, "websocket-pingloop"), 30*time.Second, time.Minute) + go func(ctx context.Context) { + for { + select { + case <-ctx.Done(): + return + case <-heartbeat: + data, err := json.Marshal(struct { + Type string `json:"type"` + Data int `json:"data"` + }{ + Type: "Ping", + Data: 0, + }) + if err != nil { + ln.Error(ctx, err, ln.Info("error marshaling ping")) + slower() + continue + } + if err := conn.Write(ctx, websocket.MessageText, data); err != nil { + ln.Error(ctx, err, ln.Info("error writing ping")) + slower() + continue + } + default: + faster() + } + } + }(ctx) -// Handle on connected. -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\":\"revolt\"}", c.SelfBot.Id, c.SelfBot.SessionToken, c.SelfBot.UserId)) + if err := conn.Write(ctx, websocket.MessageText, data); err != nil { + return err } -} -// Close the websocket and clean up associated resources. -func (c *Client) Close() { - c.Socket.Close() -} + lastMsgSeen := time.Now() + go func(ctx context.Context) { + for { + select { + case <-ctx.Done(): + return + case <-heartbeat: + if time.Since(lastMsgSeen) > 5*time.Minute { + conn.Close(websocket.StatusNormalClosure, "ping timeout") + return + } + } + } + }(ctx) -// Ping websocket. -func (c *Client) ping() { for { - time.Sleep(30 * time.Second) - c.Socket.SendText("{\"type\":\"Ping\",\"data\":0}") + typ, data, err := conn.Read(ctx) + if err != nil { + return err + } + if typ != websocket.MessageText { + return fmt.Errorf("unexpected message type: %v", typ) + } + lastMsgSeen = time.Now() + + if err := c.handleOneMessage(ctx, data, handler, slower); err != nil { + return err + } } } -// Handle events. -func (c *Client) handleEvents(ctx context.Context, rawData *struct { - Type string `json:"type"` -}, message string) { - type junk struct { - Channel string `json:"channel"` - ID string `json:"id"` - User string `json:"user"` +func (c *Client) handleOneMessage(ctx context.Context, data []byte, handler Handler, slower func()) error { + var msg typeResolver + if err := json.Unmarshal(data, &msg); err != nil { + return err } - - ctx = opname.With(ctx, "handleEvents."+rawData.Type) - - switch rawData.Type { - case "Pong", "Authenticated": // ignore these messages + ctx = opname.With(ctx, msg.Type) + switch msg.Type { + case "Pong": + slower() + case "Authenticated": + if err := handler.Authenticated(ctx); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.Authenticated")) + } case "Ready": - // Add cache. - c.handleCache(message) - - // onReady event - if c.OnReadyFunctions != nil { - for _, i := range c.OnReadyFunctions { - i(ctx) + if err := handler.Ready(ctx); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.Ready")) + } + case "Error": + var wserr WSError + if err := json.Unmarshal(data, &wserr); err != nil { + return err + } + return wserr + case "Bulk": + var bulk struct { + Type string `json:"type"` + Messages []json.RawMessage `json:"v"` + } + if err := json.Unmarshal(data, &bulk); err != nil { + return err + } + for _, msg := range bulk.Messages { + if err := c.handleOneMessage(ctx, msg, handler, slower); err != nil { + return err } } + return nil case "Message": - // Message create event. - msgData := &Message{} - msgData.Client = c - - if err := json.Unmarshal([]byte(message), msgData); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var msg Message + if err := json.Unmarshal(data, &msg); err != nil { + return err } - - for _, i := range c.OnMessageFunctions { - i(ctx, msgData) + msg.Client = c + if err := handler.MessageCreate(ctx, &msg); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.Message")) } - case "MessageAppend": - data := struct{ - ChannelId string `json:"channel"` - MessageId string `json:"id"` - Append map[string]interface{} `json:"append"` - }{} - - if err := json.Unmarshal([]byte(message), &data); err != nil { - ln.Error(ctx, err, ln.F{"type": rawData.Type}) - fmt.Printf("Unexcepted Error: %s", err) + case "MessageUpdate": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel"` + Data *Message `json:"data"` } - - for _, i := range c.OnMessageAppendFunctions { - i(ctx, data.ChannelId, data.MessageId, data.Append) + if err := json.Unmarshal(data, &msg); err != nil { + return err } - case "MessageUpdate": - // Message update event. - data := &struct { - ChannelId string `json:"channel"` - MessageId string `json:"id"` - Payload map[string]interface{} `json:"data"` - }{} - - if err := json.Unmarshal([]byte(message), data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + if err := handler.MessageUpdate(ctx, msg.ChannelID, msg.MessageID, msg.Data); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageUpdate")) } - - for _, i := range c.OnMessageUpdateFunctions { - i(ctx, data.ChannelId, data.MessageId, data.Payload) + case "MessageAppend": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel"` + Append *MessageAppend `json:"append"` } - case "MessageDelete": - // Message delete event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + if err := json.Unmarshal(data, &msg); err != nil { + return err } - - for _, i := range c.OnMessageDeleteFunctions { - i(ctx, data.Channel, data.ID) + if err := handler.MessageAppend(ctx, msg.ChannelID, msg.MessageID, msg.Append); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageAppend")) + } + case "MessageDelete": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel"` + } + if err := json.Unmarshal(data, &msg); err != nil { + return err + } + if err := handler.MessageDelete(ctx, msg.ChannelID, msg.MessageID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageDelete")) + } + case "MessageReact": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel_id"` + UserID string `json:"user_id"` + Emoji string `json:"emoji_id"` + } + if err := json.Unmarshal(data, &msg); err != nil { + return err + } + if err := handler.MessageReact(ctx, msg.ChannelID, msg.MessageID, msg.UserID, msg.Emoji); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageReact")) + } + case "MessageUnreact": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel_id"` + UserID string `json:"user_id"` + Emoji string `json:"emoji_id"` + } + if err := json.Unmarshal(data, &msg); err != nil { + return err + } + if err := handler.MessageUnreact(ctx, msg.ChannelID, msg.MessageID, msg.UserID, msg.Emoji); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageReact")) + } + case "MessageRemoveReaction": + var msg struct { + Type string `json:"type"` + MessageID string `json:"id"` + ChannelID string `json:"channel_id"` + EmojiID string `json:"emoji_id"` + } + if err := json.Unmarshal(data, &msg); err != nil { + return err + } + if err := handler.MessageRemoveReaction(ctx, msg.ChannelID, msg.MessageID, msg.EmojiID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.MessageRemoveReaction")) } case "ChannelCreate": - // Channel create event. - channelData := &Channel{} - channelData.Client = c - - if err := json.Unmarshal([]byte(message), channelData); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var ch Channel + if err := json.Unmarshal(data, &ch); err != nil { + return err } - - for _, i := range c.OnChannelCreateFunctions { - i(ctx, channelData) + if err := handler.ChannelCreate(ctx, &ch); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelCreate")) } case "ChannelUpdate": - // Channel update event. - data := &struct { - ChannelId string `json:"id"` - Clear string `json:"clear"` - Payload map[string]interface{} `json:"data"` - }{} - - if err := json.Unmarshal([]byte(message), data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + Data Channel `json:"data"` + Clear []string `json:"clear"` } - - for _, i := range c.OnChannelUpdateFunctions { - i(ctx, data.ChannelId, data.Clear, data.Payload) + if err := json.Unmarshal(data, &ch); err != nil { + return err } - case "ChannelDelete": - // Channel delete event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + if err := handler.ChannelUpdate(ctx, ch.ChannelID, &ch.Data, ch.Clear); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelUpdate")) } - - for _, i := range c.OnChannelDeleteFunctions { - i(ctx, data.ID) + case "ChannelDelete": + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` } - case "GroupCreate": - // Group channel create event. - groupChannelData := &Group{} - groupChannelData.Client = c - - if err := json.Unmarshal([]byte(message), groupChannelData); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + if err := json.Unmarshal(data, &ch); err != nil { + return err } - - for _, i := range c.OnGroupCreateFunctions { - i(ctx, groupChannelData) + if err := handler.ChannelDelete(ctx, ch.ChannelID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelDelete")) } - case "GroupMemeberAdded": - // Group member added event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + case "ChannelAck": + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + UserID string `json:"user_id"` + MessageID string `json:"message_id"` } - - for _, i := range c.OnGroupMemberAddedFunctions { - i(ctx, data.ID, data.User) - } - case "GroupMemberRemoved": - // Group member removed event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + if err := json.Unmarshal(data, &ch); err != nil { + return err } - - for _, i := range c.OnGroupMemberRemovedFunctions { - i(ctx, data.ID, data.User) + if err := handler.ChannelAck(ctx, ch.ChannelID, ch.UserID, ch.MessageID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelAck")) } case "ChannelStartTyping": - // Channel start typing event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + UserID string `json:"user_id"` } - - for _, i := range c.OnChannelStartTypingFunctions { - i(ctx, data.ID, data.User) + if err := json.Unmarshal(data, &ch); err != nil { + return err + } + if err := handler.ChannelStartTyping(ctx, ch.ChannelID, ch.UserID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelStartTyping")) } case "ChannelStopTyping": - // Channel stop typing event. - var data junk - - if err := json.Unmarshal([]byte(message), &data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + UserID string `json:"user_id"` } - - for _, i := range c.OnChannelStopTypingFunctions { - i(ctx, data.ID, data.User) + if err := json.Unmarshal(data, &ch); err != nil { + return err + } + if err := handler.ChannelStopTyping(ctx, ch.ChannelID, ch.UserID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelStopTyping")) + } + case "ChannelGroupJoin": + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + UserID string `json:"user_id"` + } + if err := json.Unmarshal(data, &ch); err != nil { + return err + } + if err := handler.ChannelGroupJoin(ctx, ch.ChannelID, ch.UserID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelGroupJoin")) + } + case "ChannelGroupLeave": + var ch struct { + Type string `json:"type"` + ChannelID string `json:"id"` + UserID string `json:"user_id"` + } + if err := json.Unmarshal(data, &ch); err != nil { + return err + } + if err := handler.ChannelGroupLeave(ctx, ch.ChannelID, ch.UserID); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ChannelGroupLeave")) } case "ServerCreate": - // Server create event. - serverData := &Server{} - serverData.Client = c - - if err := json.Unmarshal([]byte(message), serverData); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var srv Server + if err := json.Unmarshal(data, &srv); err != nil { + return err } - - for _, i := range c.OnServerCreateFunctions { - i(ctx, serverData) + if err := handler.ServerCreate(ctx, &srv); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ServerCreate")) } case "ServerUpdate": - // Server update event. - data := &struct { - ServerId string `json:"id"` - Clear string `json:"clear"` - Payload map[string]interface{} `json:"data"` - }{} - - if err := json.Unmarshal([]byte(message), data); err != nil { - fmt.Printf("Unexcepted Error: %s", err) + var srv struct { + Type string `json:"type"` + ServerID string `json:"id"` + Data Server `json:"data"` + Clear []string `json:"clear"` } - - for _, i := range c.OnServerUpdateFunctions { - i(ctx, data.ServerId, data.Clear, data.Payload) + if err := json.Unmarshal(data, &srv); err != nil { + return err + } + if err := handler.ServerUpdate(ctx, srv.ServerID, &srv.Data, srv.Clear); err != nil { + ln.Error(ctx, err, ln.Info("error in handler.ServerUpdate")) } case "ServerDelete": - // Server delete eve |
