start to fix issues caused by yanking solid out of revolt.js

Signed-off-by: Jersey <[email protected]>

Author: williamhorning

Diff for: .gitmodules

@@ -1,10 +1,7 @@
-[submodule "packages/revolt.js"]
-	path = packages/revolt.js
-	url = https://github.com/revoltchat/revolt.js
 [submodule "components/i18n/locales"]
-	path = packages/client/components/i18n/locales
-	url = https://github.com/revoltchat/translations
+path = packages/client/components/i18n/locales
+url = https://github.com/revoltchat/translations
 [submodule "packages/client/assets"]
-	path = packages/client/assets
-	url = https://github.com/revoltchat/assets
-	update = none
+path = packages/client/assets
+url = https://github.com/revoltchat/assets
+update = none

Diff for: packages/client/components/ui/components/navigation/channels/ServerSidebar.tsx

@@ -75,6 +75,7 @@ type CategoryData = Omit<API.Category, "channels"> & { channels: Channel[] };
 /**
  * Display server information and channels
  */
+// TODO: fix reactivity here on channel add/edit/delete
 export const ServerSidebar = (props: Props) => {
   const navigate = useNavigate();
   const keybinds = useKeybindActions();

Diff for: packages/client/package.json

@@ -111,4 +111,4 @@
     "zod": "3.23.8"
   },
   "private": true
-}
+}

Diff for: packages/client/src/interface/Friends.tsx

@@ -77,6 +77,7 @@ type FriendLists = Accessor<{
 /**
  * Friends menu
  */
+// TODO: fix reactivity
 export function Friends() {
   const client = useClient();
 

Diff for: packages/client/src/interface/Home.tsx

@@ -117,6 +117,7 @@ export function HomePage() {
 
   return (
     // TODO: i18n
+    // TODO: reactivity
     <Base>
       <Header placement="primary">
         <HeaderIcon>

Diff for: packages/client/src/interface/Sidebar.tsx

@@ -10,6 +10,8 @@ import { Route, useParams, useSmartParams } from "@revolt/routing";
 import { state } from "@revolt/state";
 import { HomeSidebar, ServerList, ServerSidebar } from "@revolt/ui";
 
+// TODO: fix reactivity
+
 /**
  * Left-most channel navigation sidebar
  */

Diff for: packages/client/src/interface/channels/text/Composition.tsx

@@ -6,7 +6,7 @@ import {
 } from "solid-icons/bi";
 import { For, Match, Show, Switch, onCleanup, onMount } from "solid-js";
 
-import { API, Channel } from "revolt.js";
+import { Channel } from "revolt.js";
 
 import { useClient } from "@revolt/client";
 import { debounce } from "@revolt/common";
@@ -23,7 +23,10 @@ import {
   MessageBox,
   MessageReplyPreview,
 } from "@revolt/ui";
-import { registerKeybindWithPriority, unregisterKeybindWithPriority } from "../../../shared/lib/priorityKeybind";
+import {
+  registerKeybindWithPriority,
+  unregisterKeybindWithPriority,
+} from "../../../shared/lib/priorityKeybind";
 
 interface Props {
   /**
@@ -74,7 +77,7 @@ export function MessageComposition(props: Props) {
     if (typeof isTyping === "number" && +new Date() < isTyping) return;
 
     const ws = client()!.events;
-    if (ws.state() === 2) {
+    if (ws.state === 2) {
       isTyping = +new Date() + 2500;
       ws.send({
         type: "BeginTyping",
@@ -89,7 +92,7 @@ export function MessageComposition(props: Props) {
   function stopTyping() {
     if (isTyping) {
       const ws = client()!.events;
-      if (ws.state() === 2) {
+      if (ws.state === 2) {
         isTyping = undefined;
         ws.send({
           type: "EndTyping",

Diff for: packages/client/src/interface/channels/text/MemberSidebar.tsx

@@ -1,4 +1,4 @@
-import { For, Match, Show, Switch, createMemo, onMount } from "solid-js";
+import { Match, Show, Switch, createMemo, onMount } from "solid-js";
 
 import { VirtualContainer } from "@minht11/solid-virtual-container";
 import { Channel, ServerMember, User } from "revolt.js";
@@ -51,6 +51,8 @@ export function MemberSidebar(props: Props) {
  */
 const IGNORE_ALL = ["01F7ZSBSFHQ8TA81725KQCSDDP", "01F80118K1F2EYD9XAMCPQ0BCT"];
 
+// TODO: fix reactivity with revolt.js changes
+
 /**
  * Server Member Sidebar
  */

Diff for: packages/client/src/interface/channels/text/TextChannel.tsx

@@ -119,6 +119,8 @@ export function TextChannel(props: ChannelPageProps) {
     )
   );
 
+  // TODO: fix message unread floater, typing indicator, editing messages, member sidebar
+
   return (
     <>
       <Header placement="primary">