From ab84de8b0349a0dee42257a6565e2a160a9147f8 Mon Sep 17 00:00:00 2001
From: Leo dev <klesti.selimay@icloud.com>
Date: Sun, 12 Oct 2025 13:16:54 +0200
Subject: [PATCH] Slight re-structure (types)

---
 src/app/chat/[id]/page.tsx    |  2 +-
 src/app/chat/page.tsx         |  2 +-
 src/app/server/[id]/page.tsx  |  3 +--
 src/components/MessageBox.tsx |  2 +-
 src/components/Sidebar.tsx    |  3 +--
 src/lib/auth.ts               |  3 +--
 src/types/Server.ts           |  7 -------
 src/types/channel.ts          |  5 -----
 src/types/message.ts          |  7 -------
 src/types/types.ts            | 19 +++++++++++++++++++
 10 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 src/types/Server.ts
 delete mode 100644 src/types/channel.ts
 delete mode 100644 src/types/message.ts
 create mode 100644 src/types/types.ts

diff --git a/src/app/chat/[id]/page.tsx b/src/app/chat/[id]/page.tsx
index ecdc88c..344334e 100644
--- a/src/app/chat/[id]/page.tsx
+++ b/src/app/chat/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from "react";
 import MessageBox from "@/components/MessageBox";
 import AppSidebar from "@/components/Sidebar";
-import Message from "@/types/message";
+import { Message } from "@/types/types";
 import useUser, { User } from "@/hooks/get-user";
 import { NumberMap } from "@/types/typeUtils";
 import auth, { makeAddress } from "@/lib/auth";
diff --git a/src/app/chat/page.tsx b/src/app/chat/page.tsx
index 92e17a0..7704c0b 100644
--- a/src/app/chat/page.tsx
+++ b/src/app/chat/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from "react";
 import MessageBox from "@/components/MessageBox";
 import AppSidebar from "@/components/Sidebar";
-import Message from "@/types/message";
+import { Message } from "@/types/types";
 import useUser, { User } from "@/hooks/get-user";
 import { NumberMap } from "@/types/typeUtils";
 import auth, { makeAddress } from "@/lib/auth";
diff --git a/src/app/server/[id]/page.tsx b/src/app/server/[id]/page.tsx
index 6cc5bb0..d700cf0 100644
--- a/src/app/server/[id]/page.tsx
+++ b/src/app/server/[id]/page.tsx
@@ -4,10 +4,9 @@ import { useEffect, useRef, useState } from "react";
 import { useParams } from "next/navigation";
 import MessageBox from "@/components/MessageBox";
 import AppSidebar from "@/components/Sidebar";
-import Message from "@/types/message";
+import { Message, Server as ServerType } from "@/types/types";
 import useUser, { User } from "@/hooks/get-user";
 import { NumberMap } from "@/types/typeUtils";
-import ServerType from "@/types/server";
 import auth, { makeAddress } from "@/lib/auth";
 
 export default function Server() {
diff --git a/src/components/MessageBox.tsx b/src/components/MessageBox.tsx
index 9511613..6018ad9 100644
--- a/src/components/MessageBox.tsx
+++ b/src/components/MessageBox.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import Message from "@/types/message";
+import { Message } from "@/types/types";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
 import * as emoji from "emoji-picker-react";
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 373a6e0..7c8c7db 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -8,7 +8,7 @@ import {
   SettingsIcon,
   Volume2Icon,
 } from "lucide-react";
-import Server from "@/types/server";
+import { Server, Channel } from "@/types/types";
 import { useEffect, useState } from "react";
 import Cookies from "js-cookie";
 import {
@@ -28,7 +28,6 @@ import { Card } from "./ui/card";
 import { Avatar, AvatarFallback, AvatarImage } from "./ui/avatar";
 import { ScrollArea } from "./ui/scroll-area";
 import { useRouter } from "next/navigation";
-import Channel from "@/types/channel";
 import Link from "next/link";
 import { NumberMap } from "@/types/typeUtils";
 import { User } from "@/hooks/get-user";
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index e789b2f..f964cd3 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,5 +1,4 @@
-import Message from "@/types/message";
-import Server from "@/types/server";
+import { Message, Server } from "@/types/types";
 import axios from "axios";
 import { Dispatch, RefObject, SetStateAction } from "react";
 
diff --git a/src/types/Server.ts b/src/types/Server.ts
deleted file mode 100644
index bbb817c..0000000
--- a/src/types/Server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Channel from "./channel";
-
-export default interface Server {
-  id: string;
-  name: string;
-  channels: Channel[];
-}
diff --git a/src/types/channel.ts b/src/types/channel.ts
deleted file mode 100644
index c97fd76..0000000
--- a/src/types/channel.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default interface Channel {
-  id: string;
-  name: string;
-  kind: "text" | "voice";
-}
\ No newline at end of file
diff --git a/src/types/message.ts b/src/types/message.ts
deleted file mode 100644
index 68074f3..0000000
--- a/src/types/message.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default interface Message {
-  id: number;
-  channel_id: string | number;
-  from: number;
-  contents: string;
-  timestamp: number;
-}
diff --git a/src/types/types.ts b/src/types/types.ts
new file mode 100644
index 0000000..a3ed9b0
--- /dev/null
+++ b/src/types/types.ts
@@ -0,0 +1,19 @@
+export interface Channel {
+  id: string;
+  name: string;
+  kind: "text" | "voice";
+}
+
+export interface Message {
+  id: number;
+  channel_id: string | number;
+  from: number;
+  contents: string;
+  timestamp: number;
+}
+
+export interface Server {
+  id: string;
+  name: string;
+  channels: Channel[];
+}