Merge remote-tracking branch 'origin/main'

# Conflicts:
#	package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatenium/chatenium-sdk",
-  "version": "1.1.6",
+  "version": "1.2",
   "description": "A library for interacting with the Chatenium API",
   "type": "module",
   "main": "dist/index.js",

src/core/permissions.ts

@@ -0,0 +1,32 @@
+export const permissions = {
+    createAndEditCategories: 2,
+    deleteCategories: 4,
+    createAndEditChannels: 8,
+    deleteChannels: 16,
+    deleteAnyMessage: 32,
+    pinMessages: 64,
+    createAndEditRanks: 128,
+    deleteRanks: 256,
+    changeNetworkNamePictureAndVisibility: 512,
+    createEmojis: 1024,
+    deleteEmojis: 2048,
+    manageEmbed: 4096,
+    createWebhooks: 8192,
+    deleteWebhooks: 16384,
+    createInvites: 32768,
+    deleteInvites: 65536,
+    sendMessages: 131072,
+    seeChannels: 262144,
+    banMembers: 524288,
+    kickMembers: 1048576,
+    unAndAssignRanksToMember: 2097152,
+}
+
+/**
+ * Determines whether the set of permissions includes the permission. Note that network owners have regular permissions just like the other members, so if the userid matches with the network's creator ID, then the permission is automatically granted. This logic is not included in this function.
+ * @param permissions
+ * @param permission
+ */
+export function permissionGranted(permissions: number, permission: number): Boolean {
+    return (permissions & permission) === permission;
+}

src/core/webSocketHandler.ts

@@ -43,6 +43,13 @@ export class WebSocketHandler {
             this.connection = new WebSocket(`${environment.get().wsUrl}/v2/ws?userid=${userid}&access_token=${resp.data.token}`)
             console.log("Connected to websocket successfully")
             this.startListening()
+
+            this.connection.onclose = () => {
+                console.error("The WebSocket connection was closed unexpectedly. Reconnecting...")
+                setTimeout(() => {
+                    this.connect(userid, token)
+                }, 3000)
+            }
             return
         } catch (e) {
             console.log(e)

src/domain/common.schema.ts

@@ -24,5 +24,5 @@ export interface Attachment {
     path: string
     height: number
     width: number
-    extraMetaData: Record<string, string> // Used by clients
+    extraMetaData: Record<string, any> // Used by clients
 }

src/domain/networkService.schema.ts

@@ -208,9 +208,11 @@ export interface GetMembersReq {
 }
 
 export interface UploadNewPictureReq {
-    picId: string
     userid: string
     networkId: string
+    data: string
+    isImage: boolean
+    monogramColors: RGB | null
 }
 
 export interface ChangeVisibilityReq {

src/services/chatService.ts

@@ -58,7 +58,7 @@ export class ChatService {
         }
     }
 
-    async getQuick(): Promise<Message[]> {
+    async getQuick(): Promise<Chat[]> {
         const chats = await this.database.get("chats", this.userid)
         if (chats) {
             return JSON.parse(chats)

src/services/networkService.ts

@@ -108,7 +108,7 @@ export class NetworkService {
         }
     }
 
-    async getQuick(): Promise<Message[]> {
+    async getQuick(): Promise<Network[]> {
         const networks = await this.database.get("networks", this.userid)
         if (networks) {
             return JSON.parse(networks)
@@ -711,14 +711,18 @@ export class NetworkService {
 
     /**
      * Uploads a new network picture
-     * @param picId
+     * @param isImage
+     * @param image
+     * @param colors
      */
-    async uploadNewPic(picId: string): Promise<void> {
+    async uploadNewPic(isImage: boolean, image: string | null, colors: RGB | null): Promise<void> {
         try {
-            await this.client.patch<PublicUserData[]>("network/uploadNewPic", <UploadNewPictureReq>{
+            await this.client.patch<PublicUserData[]>("v2/network/uploadNewPic", <UploadNewPictureReq>{
                 userid: this.userid,
                 networkId: this.networkId,
-                picId: picId,
+                data: image,
+                isImage: isImage,
+                monogramColors: colors
             });
             return
         } catch (e) {

src/services/textChannelService.ts

@@ -48,6 +48,7 @@ export class TextChannelServiceService {
     private onNewConnId(newConnId: string) {
         console.log("NetworkService: New connection id")
         this.client.defaults.headers["X-WS-ID"] = newConnId;
+        this.joinWebSocketRoom().then()
     }
 
     /**
@@ -263,7 +264,7 @@ export class TextChannelServiceService {
      */
     async joinWebSocketRoom(): Promise<void> {
         try {
-            const resp = await this.client.patch("v2/network/channel/joinWebSocketRoom", <JoinWsRoomReq>{
+            const resp = await this.client.post("v2/network/channel/joinWebSocketRoom", <JoinWsRoomReq>{
                 networkId: this.networkId,
                 channelId: this.channelId,
                 categoryId: this.categoryId,