diff --git a/README.md b/README.md index 3b2d04a..69eecc1 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ This has always been the future intention of this project. - [x] Token generation - [x] Frontend implementation - - [ ] Token generator + - [x] Token generator - [ ] Test if they even work correctly - [x] Permission groups and permissions - [x] Probable permission groups: owner, admin, mod, trialmod, default @@ -130,6 +130,9 @@ This has always been the future intention of this project. - fork? - Probably use a simple in-memory cache - Likely store with leveldb or JSON +- Socket events could all be handled in one emitter + - Maybe use one external emitter so the functions aren't copied on each conncetion + - Does JS/Bun use symbols for such a thing already? ## How to run diff --git a/src/util/types.d.ts b/src/util/types.d.ts index e120573..7b70231 100644 --- a/src/util/types.d.ts +++ b/src/util/types.d.ts @@ -25,7 +25,7 @@ declare type UserFlags = Partial<{ }>; type TChannelFlags = Partial<{ - limit: number; + limit: number; // slightly different compared to mppnet owner_id: string; // brandonism no_crown: boolean; rainbow: boolean; @@ -90,18 +90,18 @@ declare type Notification = Partial<{ declare type CustomTarget = { global?: boolean; } & ( - | { - mode: "subscribed"; - } - | { - mode: "ids"; - ids: string[]; - } - | { - mode: "id"; - id: string; - } -); + | { + mode: "subscribed"; + } + | { + mode: "ids"; + ids: string[]; + } + | { + mode: "id"; + id: string; + } + ); declare interface Crown { userId: string; diff --git a/src/ws/Socket.ts b/src/ws/Socket.ts index bab1748..7c7914a 100644 --- a/src/ws/Socket.ts +++ b/src/ws/Socket.ts @@ -39,12 +39,9 @@ import type { RateLimit } from "./ratelimit/RateLimit"; import type { RateLimitChain } from "./ratelimit/RateLimitChain"; import { getUserPermissions, - hasPermission, validatePermission } from "~/data/permissions"; -import { getRoles } from "~/data/role"; import { removeTag, setTag } from "~/util/tags"; -import { bus } from "~/event/bus"; import { notificationConfig } from "~/util/notificationConfig"; const logger = new Logger("Sockets"); @@ -72,9 +69,9 @@ export class Socket extends EventEmitter { _id: string | undefined; set: Partial | undefined; } = { - _id: undefined, - set: {} - }; + _id: undefined, + set: {} + }; public currentChannelID: string | undefined; private cursorPos: Vector2 = { x: 200, y: 100 }; @@ -91,9 +88,8 @@ export class Socket extends EventEmitter { this.ip = ws.data.ip; } else { // Fake user - this.ip = `::ffff:${Math.random() * 255}.${Math.random() * 255}.${ - Math.random() * 255 - }.${Math.random() * 255}`; + this.ip = `::ffff:${Math.random() * 255}.${Math.random() * 255}.${Math.random() * 255 + }.${Math.random() * 255}`; } // User ID @@ -395,7 +391,7 @@ export class Socket extends EventEmitter { try { if (typeof this.user.tag === "string") tag = JSON.parse(this.user.tag) as Tag; - } catch (err) {} + } catch (err) { } return { _id: facadeID,