Rewrite the web client to look sleeker

.gitignore

@@ -2,8 +2,7 @@
 .swp
 server/build
 server/.gradle
+server/uploads
 server/userDatabase
 server/chatHistory
-client-cli/build
-client-cli/.gradle
-client-cli/.chookpen.profile
+server/roomChats

README.md

@@ -1,8 +1,8 @@
-# Chookpen - A simple messaging service
+# Chookchat - A simple messaging service
 
-## What is Chookpen?
+## What is Chookchat?
 
-Chookpen is a lightweight, secure-ish chat server implementation focused on simplicity and real-time communication. It features user authentication, persistent message history, real-time updates via WebSockets, and supports both traditional HTTP endpoints and WebSocket connections for flexible integration. It uses very little resources on a system, often using a maximum of 20mb. Chookpen is BETA SOFTWARE, and MAY BE BUGGY! Don't expect too much.
+Chookchat is a lightweight, secure-ish chat server implementation focused on simplicity and real-time communication. It features user authentication, persistent message history and real-time updates via WebSockets. It uses very little resources on a system, often using a maximum of 20mb. Chookpen is BETA SOFTWARE, and MAY BE BUGGY! Don't expect too much.
 
 ## A guide to this repository
 
@@ -25,3 +25,7 @@ The build tool for compiling Chookpen. It just works!
 The language Chookpen is coded in. How else does it work?
 
 ### [OpenJDK](https://openjdk.org)
+
+The best way to run Chookpen. Free and open source!
+
+There's also all the other various libraries I use (and these other libraries use) so check the code for those!

client-cli/README.md

@@ -1,26 +0,0 @@
-# Chookpen Client (CLI)
-
-This is the reference client for Chookpen. It is quite a basic client. This is a good starting point if you need an example, or are building a GUI Kotlin client.
-
-## Features
-
-* Profile file
-* Create account (buggy)
-* Log into existing account
-* Sync messages
-* Send message
-* Auto hash password
-* Configure whether HTTPS is used
-
-## Documentation
-
-To run this client, do the following:
-
-1. Install Java 17+ and Gradle.
-2. `git clone https://git.maxwellj.xyz/max/chookpen`
-3. In the client-cli directory of the git repo, run `gradle installDist`.
-5. Inside build/install/bin, create a .chookpen.profile file that looks like this: ```name:password:server:port:0```
-6. Run the script in build/install/bin, or the bat file if you're a crazy weird guy who uses Windows (Make sure to use the command line otherwise it'll close instantly)
-7. If you'd like to send a message, add that as your argument after specifying the script.
-
-Note: The password in .chookpen.profile is hashed by the client. If you're just testing the server, set your password to `dingus`. The hash recognised by the server for that password is `750c63441033127dccaa91c16b21614e`. Create an account with the method specified in the root README using that password.

client-cli/build.gradle.kts

@@ -1,35 +0,0 @@
-plugins {
-    kotlin("jvm") version "2.0.0"
-    application
-    distribution
-}
-
-application {
-    mainClass.set("xyz.maxwellj.chookpen.client.MainKt")
-    layout.buildDirectory.dir("distributions/")
-}
-
-group = "xyz.maxwellj.chookpen.client"
-version = "0.0.2"
-
-repositories {
-    mavenCentral()
-}
-
-tasks.withType<Jar> {
-    manifest {
-        attributes["Main-Class"] = "xyz.maxwellj.chookpen.client.MainKt"
-    }
-}
-
-dependencies {
-    testImplementation(kotlin("test"))
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-kotlin {
-    jvmToolchain(17)
-}

client-cli/settings.gradle.kts

@@ -1,5 +0,0 @@
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
-rootProject.name = "chookpen.client"
-

client-cli/src/main/kotlin/Main.kt

@@ -1,114 +0,0 @@
-package xyz.maxwellj.chookpen.client
-
-import okhttp3.*
-import java.util.Scanner
-import java.util.concurrent.TimeUnit
-
-import kotlin.system.exitProcess
-
-import java.io.File
-
-import kotlin.system.exitProcess
-
-import java.math.BigInteger
-import java.security.MessageDigest
-
-fun md5(input:String): String {
-    val md = MessageDigest.getInstance("MD5")
-    return BigInteger(1, md.digest(input.toByteArray())).toString(16).padStart(32, '0')
-}
-
-fun main() {
-	// Variables 
-    var name = ""
-    var server = ""
-    var port = ""
-    var hasHTTPS = "" 
-    var password = ""
-    var configFile = File("${System.getProperty("user.home")}/chookpen.profile")
-    
-    var configStage = 0
-    for (char in configFile.readText()) {
-        if (char == ':') {configStage ++}
-        if (configStage == 0) {
-            name += char
-        } else if (configStage == 1) {
-            password += char
-        } else if (configStage == 2) {
-            server += char
-        } else if (configStage == 3) {
-            port += char
-        } else if (configStage == 4) {
-            hasHTTPS += char
-        }
-    }
-
-    server = server.replace(":", "")
-    port = port.replace(":", "")
-    hasHTTPS = hasHTTPS.replace(":", "")
-    password = password.replace(":", "")
-
-    if (password == "x") {
-        println("Enter your password:")
-        password = readln()
-    }
-
-    val client = OkHttpClient.Builder()
-        .pingInterval(30, TimeUnit.SECONDS)
-        .build()
-
-    val request = Request.Builder()
-        .url("ws://localhost:7070/api/websocket")
-        .build()
-
-    var webSocket: WebSocket? = null
-
-    val listener = object : WebSocketListener() {
-        override fun onOpen(webSocket: WebSocket, response: Response) {
-            println(password)
-            println(md5(password))
-            println("Connection opened")
-            webSocket.send("username:{$name}token:{${md5(password)}}message:{Joined the room}")
-        }
-
-        override fun onMessage(webSocket: WebSocket, text: String) {
-            println("$text")
-        }
-
-        override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-            println("Connection closing: $reason")
-            webSocket.close(1000, null)
-        }
-
-        override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-            println("Connection failed: ${t.message}")
-        }
-    }
-
-    // Set up shutdown hook for Ctrl+C handling
-    Runtime.getRuntime().addShutdownHook(Thread {
-        println("\nShutting down gracefully...")
-        webSocket?.close(1000, "Client shutting down")
-        client.dispatcher.executorService.shutdown()
-    })
-
-    // Initialize WebSocket connection
-    webSocket = client.newWebSocket(request, listener)
-
-    // Set up input handling
-    val scanner = Scanner(System.`in`)
-    println("Type your messages (press Enter to send, Ctrl+C to quit):")
-    
-    while (true) {
-        try {
-            val input = scanner.nextLine()
-            if (input.isNotEmpty()) {
-                webSocket?.send("username:{$name}token:{${md5(password)}}message:{$input}")
-            }
-        } catch (e: Exception) {
-            // Handle any input-related exceptions
-            println("Error reading input: ${e.message}")
-            break
-        }
-    }
-}

client-python/README.md

@@ -0,0 +1,13 @@
+## Chookchat Python Client
+
+This is an example client for Chookchat, written in Python. It is very simplistic. It connects to the Websocket, and prints recieved messages.
+
+This would be a good baseline for a GUI client with tkinter, or a bot for Chookchat linking it to other services.
+
+Not much else to say. 
+
+### Running
+
+First, `pip3 install websocket-client rel`. If you need, create a virtual environment for Python. 
+
+Then, run with `python3 client.py`

client-python/client.py

@@ -0,0 +1,68 @@
+import websocket
+import json
+import _thread
+import time
+import rel
+from google import genai
+
+username = "(insert username here)"
+token = "(insert token here)"
+
+def joinRoom(roomName):
+    ws.send(json.dumps({
+        "type": "joinRoom",
+        "username": username,
+        "token": token,
+        "room": roomName,
+        "content": ""
+    }))
+
+def sendMessage(content):
+    ws.send(json.dumps({
+        "type": "message",
+        "username": username,
+        "token": token,
+        "content": content
+    }))
+
+def sendTyping(content):
+    ws.send(json.dumps({
+        "type": "typing",
+        "username": username,
+        "token": token,
+        "content": content
+    }))
+
+def on_message(ws, message):
+    print("Message received: " + message)
+    if message == "ping":
+        ws.send("pong")
+
+def on_error(ws, error):
+    print("Error:", error)
+
+def on_close(ws, close_status_code, close_msg):
+    print(f"Connection closed: {close_status_code} - {close_msg}")
+
+def on_open(ws):
+    print("Opening connection to Chookchat...")
+    joinRoom("general")
+    ws.send(json.dumps({
+        "type": "connect",
+        "username": username,
+        "token": token,
+        "content": username + " joined the room!"
+    }))
+
+if __name__ == "__main__":
+    websocket.enableTrace(True)
+    ws = websocket.WebSocketApp("wss://bobcompass.online/api/websocket",
+                                on_open=on_open,
+                                on_message=on_message,
+                                on_error=on_error,
+                                on_close=on_close
+                                )
+
+    ws.run_forever(dispatcher=rel, reconnect=5, ping_interval=30, ping_timeout=10)
+    rel.signal(2, rel.abort)
+    rel.dispatch()

client-web/gradient.css

@@ -1,43 +1,21 @@
-/* Reset default margin and ensure full viewport coverage */
+/* Credit to Manuel Pinto on Codepen for the code!
+   https://codepen.io/P1N2O/pen/pyBNzX */
 body {
-  margin: 0;
-  min-height: 100vh;
-  background: linear-gradient(
-    30deg,
-    #50C878,  /* green */
-    #7FFFD4,  /* aqua */
-    #87CEEB,  /* light blue */
-    #00008B,  /* dark blue */
-    #800080,  /* purple */
-    #50C878,  /* green */
-    #7FFFD4,  /* aqua */
-    #87CEEB,  /* light blue */
-    #00008B,  /* dark blue */
-    #800080,  /* purple */
-    #50C878   /* green */
-  );
-  background-size: 1000% 1000%;
-  animation: gradient 120s ease infinite;
+	background: linear-gradient(-33deg, #721c7a, #612bd4, #3aa5c5, #30cf7f);
+	background-size: 400% 400%;
+	animation: gradient 120s ease infinite;
+	height: 100vh;
 }
 
-/* Gradient animation keyframes */
 @keyframes gradient {
-  0% {
-    background-position: 0% 50%;
-  }
-  100% {
-    background-position: 200% 50%;
-  }
+	0% {
+		background-position: 0% 50%;
+	}
+	50% {
+		background-position: 100% 50%;
+	}
+	100% {
+		background-position: 0% 50%;
+	}
 }
 
-/* Optional: styling for centered content */
-.content {
-  height: 100vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: white;
-  font-family: sans-serif;
-  font-size: 2rem;
-  text-shadow: 2px 2px 4px rgba(0,0,0,0.3);
-}

client-web/index.html

@@ -1,44 +1,171 @@
 <!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Chookchat</title>
-        <link type="text/css" rel="stylesheet" href="index.css">
-        <link type="text/css" rel="stylesheet" href="gradient.css">
-        <link rel="shortcut icon" type="image/jpg" href="favicon.ico"/>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
-        <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-    </head>
-    <body class="gradient">
-        <div id="login">
-            <div class="section">
-                <div class="box">
-                    <h3>Chookchat</h3>
-                    <input type="text" id="username" placeholder="Username"><br>
-                    <input type="password" id="password" placeholder="Password"><br>
-                    <button class="bluebutton" onclick="connect()">Log in</button>
-                    <button class="greenbutton" onclick="register()">Register</button>
-                    <button class="redbutton" onclick="showConfig()">Show Server Config</button>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Chookchat</title>
+    <link rel="preconnect" href="https://rsms.me/">
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <link type="text/css" rel="stylesheet" href="index.css">
+    <link rel="shortcut icon" type="image/jpg" href="favicon.ico"/>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>        
+    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>    
+</head>
+<body>
+    <div id="login-container">
+        <div class="login-card">
+            <div class="login-header">
+                <h2>Chookchat</h2>
+            </div>
+            <div class="login-form">
+                <div class="input-group">
+                    <i class="fa-solid fa-user"></i>
+                    <input type="text" id="username" placeholder="Username">
+                </div>
+                <div class="input-group">
+                    <i class="fa-solid fa-lock"></i>
+                    <input type="password" id="password" placeholder="Password">
+                </div>
+                <div class="login-buttons">
+                    <button class="btn btn-primary" onclick="connect()">Log in</button>
+                    <button class="btn btn-success" onclick="register()">Register</button>
+                </div>
+                <div class="server-options">
+                    <button class="btn btn-text" onclick="showConfig()">Server Settings</button>
                     <div id="serverStatus"></div>
                 </div>
-                <div class="box" style="display: none;" id="serverconfig">
-                    <input type="text" id="serverUrl" value="bobcompass.online" placeholder="Server URL"><br>
-                    <input type="text" id="serverPort" value="443" placeholder="Server Port"><br>
-                    <input type="checkbox" id="securityStatus" checked>
-                    <label for="securityStatus">Use HTTPS/WSS</label>
+                <div id="serverconfig" class="server-config">
+                    <div class="input-group">
+                        <i class="fa-solid fa-server"></i>
+                        <input type="text" id="serverUrl" value="localhost" placeholder="Server URL">
+                    </div>
+                    <div class="input-group">
+                        <i class="fa-solid fa-network-wired"></i>
+                        <input type="text" id="serverPort" value="7070" placeholder="Server Port">
+                    </div>
+                    <div class="checkbox-group">
+                        <input type="checkbox" id="securityStatus" checked>
+                        <label for="securityStatus">Use HTTPS/WSS</label>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="hidden" id="messaging">
-                <div class="box">
-                    <div id="messagebox" class="box" style="height: 600px;"><div></div></div>
-                    <div class="input-container">
-                        <input type="text" id="messageInput" placeholder="Send a message...">
-                        <button onclick="sendMessage()" class="bluebutton">Send</button>
+    </div>
+
+    <div id="app" class="hidden">
+        <div class="sidebar">
+            <div class="sidebar-header">
+                <h3>Chookchat</h3>
+            </div>
+            <div id="room-list" class="room-list">
+                <div class="room-category">
+                    <div class="room-category-header">
+                        <span>Rooms</span>
+                        <button class="btn-icon" onclick="promptCreateRoom()">
+                            <i class="fa-solid fa-plus"></i>
+                        </button>
+                    </div>
+                    <!-- Rooms will be dynamically added here -->
+                </div>
+            </div>
+            <div class="user-profile">
+                <div class="user-avatar">
+                    <i class="fa-solid fa-user"></i>
+                </div>
+                <div class="user-info">
+                    <span id="current-username">Username</span>
+                    <span class="user-status">Online</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="chat-container">
+            <div class="chat-header">
+                <div class="current-room">
+                    <i class="fa-solid fa-hashtag"></i>
+                    <span id="current-room-name">general</span>
+                </div>
+                <div class="header-actions">
+                    <button class="btn-icon" onclick="startMeeting()" title="Start Call">
+                        <i class="fa-solid fa-phone"></i>
+                    </button>
+                </div>
+            </div>
+
+            <div class="chat-content">
+                <div id="messagebox" class="messages">
+                    <!-- Messages will be dynamically added here -->
+                </div>
+                
+                <div id="typing" class="typing-indicator"></div>
+
+                <div class="message-input-container">
+                    <div class="message-actions">
+                        <button class="btn-icon" onclick="showFileUpload()" title="Upload File">
+                            <i class="fa-solid fa-paperclip"></i>
+                        </button>
+                        <button class="btn-icon" onclick="showEggs()" title="Eggs">
+                            <i class="fa-solid fa-egg"></i>
+                        </button>
+                    </div>
+                    <div class="message-input-wrapper">
+                        <input type="text" id="messageInput" placeholder="Send a message..." autofocus>
+                        <button class="send-button" onclick="sendMessage()">
+                            <i class="fa-solid fa-paper-plane"></i>
+                        </button>
                     </div>
                 </div>
+            </div>
         </div>
-        <script src="index.js"></script>
-    </body>
+
+        <div class="users-panel">
+            <div class="users-panel-header">
+                <h3>Members</h3>
+            </div>
+            <div id="users" class="users-list">
+                <!-- Users will be dynamically added here -->
+            </div>
+        </div>
+
+        <div id="eggs-panel" class="eggs-panel hidden">
+            <div class="eggs-header">
+                <h3>Eggs</h3>
+                <button class="btn-icon" onclick="closeEggs()">
+                    <i class="fa-solid fa-times"></i>
+                </button>
+            </div>
+            <div id="eggs-list" class="eggs-list">
+                <button class="egg-item" onclick="eggNotepad()">
+                    <i class="fa-solid fa-note-sticky"></i>
+                    <span>Notepad</span>
+                </button>
+                <!-- More eggs can be added here -->
+            </div>
+            <div id="egg-content" class="egg-content">
+                <!-- Egg content will be displayed here -->
+            </div>
+        </div>
+    </div>
+
+    <div id="meet" class="meet-container hidden"></div>
+
+    <div id="upload-modal" class="modal hidden">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3>Upload File</h3>
+                <button class="btn-icon" onclick="hideFileUpload()">
+                    <i class="fa-solid fa-times"></i>
+                </button>
+            </div>
+            <div class="modal-body">
+                <input type="file" id="fileupload" accept="image/*,text/*">
+                <div class="upload-preview" id="upload-preview"></div>
+                <button class="btn btn-primary" onclick="uploadFile()">Upload</button>
+            </div>
+        </div>
+    </div>
+
+    <script src="index.js"></script>
+</body>
 </html>

server/README.md

@@ -1,130 +1,62 @@
-# Chookpen Server
+# Chookchat Server
 
-Key features:
-- Real-time messaging with WebSocket support
-- User authentication and account management
-- Persistent message history
-- Simple HTTP API for basic operations
-- Built-in static file serving for web clients
-- Support for encryption keys
-- Active user tracking and presence notifications
+This is the code for Chookchat's server program. The server program:
 
-## Requirements
+* Starts a server on port 7070
 
-- Java 17 or later
-- Caddy (for HTTPS reverse proxy) - [Download from caddyserver.com](https://caddyserver.com/download)
-- Some kind of OS, any should do
-- 50mb free space, 30mb avaliable ram (yes I know, very bloated and inefficient)
+* Hosts the web client files (index.html at the root)
 
-## Running the Server
+* Adjusts index.html based on your config file (a backup index.html is still avaliable at localhost:7070/index.html)
 
-Prebuilt binaries are available for immediate use. Simply download the latest server release and run:
+* Handles user signups
 
-```bash
-./run
+* Opens a websocket allowing for flexible user input
+
+* Handles file uploads
+
+**Note:** Chookchat does not support HTTPS natively. We recommend the usage of a reverse proxy like Caddy (caddyserver.com) to enable HTTPS on your website, as well as a firewall to block HTTP connections.
+
+## Server Configuration
+
+Chookchat looks for a chookchat.config file in the directory where you start Chookchat. An example is provided in this directory. Your file must look like the following:
+```
+address:localhost;port:7070;security:false;serviceName:Chookchat;
 ```
 
-The server will start on port 7070 by default.
-
-## Building from Source
-
-First, install Gradle. Unless you want to painfully compile everything manually, Gradle is your best friend.
-
-Clone the repository and CD into the server directory. Then run:
-
-```bash
-gradle build
-```
-
-To create a distribution (you don't need to run gradle build, it will do that for you):
-```bash
-./gradlew installDist
-```
-
-To run the server, create the files `chatHistory` and `userDatabase` in the directory you're running it from, then run the script to start Chookpen.
+Address: Where your server is hosted (a domain or IP address usually)
+Port: Your server's port (default 7070, 443 if you route it through Caddy with HTTPS)
+Security: Whether or not to use WSS/HTTPS (either `true` or `false`)
+ServiceName: What your server's name comes up as.
 
 ## API Documentation
 
-### HTTP Endpoints
-
-#### Send Message
-- Endpoint: `/api/send/{content}`
-- Content Format: `username:{name}token:{token}message:{message}`
-- Response: "Success" or error message
-
-#### Create Account
-- Endpoint: `/api/createaccount/{content}`
-- Content Format: `username:{name}token:{password}`
-- Response: "Success" or error message
-
-#### Sync Messages
-- Endpoint: `/api/syncmessages/{content}`
-- Content Format: `username:{name}token:{token}`
-- Response: Chat history or error message
-
-#### Auth Key (being worked on for E2EE)
-- Endpoint: `/api/authkey/{content}`
-- Content Format: `username:{name}token:{token}authkey:{key}`
-- Response: "Success" or error message
-
-## WebSocket Interface
-
-Connect to `/api/websocket` for real-time updates.
-
-### WebSocket Messages
-
-1. Server to Client:
-- Ping messages: "ping"
-- User updates: "!users:{user1,user2,user3}"
-- Chat messages: "username: message"
-
-2. Client to Server:
-- Pong response: "pong"
-- Message format: Same as HTTP send endpoint
-
-## Setting up HTTPS with Caddy
-
-Caddy provides automatic HTTPS and serves as a reverse proxy for your Chookpen server. [Download from caddyserver.com](https://caddyserver.com/download) or from your Linux/BSD/Illumos/Haiku/TempleOS/whatever distribution's package manager.
-
-1. Create a `Caddyfile` in your server directory:
-```
-chat.yourdomain.com {
-    reverse_proxy localhost:7070
+Chookchat uses websockets to send and recieve messages. Each websocket request (except pinging and ponging) contains JSON to show what kind of data we are sending, what user is sending it (and token while being sent to the server), and the actual message content. A chookchat websocket message to the server looks like this:
+```json
+{
+    "type": "message",
+    "username": "max",
+    "token": "(hash of password)",
+    "content": "dongus"
 }
 ```
-
-2. Start Caddy:
-```bash
-caddy run
+And a message from the server would look like this (it's the same without the token):
+```json
+{
+    "type": "message",
+    "username": "max",
+    "content": "dongus"
+}
 ```
+The server will send a `ping` every five seconds (without JSON) to stop the connection from timing out. When you recieve this, send back a `pong`. 
 
-Caddy will automatically obtain and manage SSL certificates for your domain.
+### Message Types
 
-## Client Deployment
+**message**: A message. Not much going on. It's recommended to display it like ${username}: ${content}
 
-Place your client files in the `src/main/resources/public` directory. The server will automatically serve these static files, making the client accessible at your server's root URL.
+**call**: A link to a Jitsi call. Treat this how you'd like.
 
-## Maintenance
+**file**: A file sent by a user. For now, it appears as if the `system` user has sent the file, so in a client send a message describing who's uploaded the file shortly after sending the file.
 
-### Database Files
-- `userDatabase`: Contains user credentials in format `username:token:salt`
-- `chatHistory`: Stores message history
-- Regular backups recommended
+**connect**: A user joining the room. If this is not sent by the `system` user, ignore. 
 
-### Health Checks
-- Server automatically maintains WebSocket connections
-- Dead sessions are cleaned up automatically
-- Active user count is logged
-
-### Security Recommendations
-- Keep database files secure
-- Regular system updates
-- Monitor for unusual login patterns
-- Back up regularly:
-```bash
-#!/bin/bash
-backup_dir="/path/to/backups"
-date_stamp=$(date +%Y%m%d)
-cp userDatabase "${backup_dir}/userDatabase_${date_stamp}"
-cp chatHistory "${backup_dir}/chatHistory_${date_stamp}"
-```
+**users**: A list of users currently in the room, seperated by ", ". In order of who joined first. If this is not sent by the `system` user, ignore.

server/chookchat.config

@@ -0,0 +1 @@
+address:localhost;port:7070;security:false;serviceName:chookchat;

server/chookchat.eggs.config

@@ -0,0 +1 @@
+notepad

server/eggs/notepad/index.html

@@ -0,0 +1,4 @@
+<div class="egg" id="egg-notepad" style="display: none;">
+    <button id="egg-notepad-close" class="redbutton"  onclick="closeEggNotepad()">Close</button><br>
+    <textarea id="egg-notepad-textarea" placeholder="Start typing..." style="height: 500px"></textarea>
+</div>

server/eggs/notepad/index.js

@@ -0,0 +1,21 @@
+function eggNotepad() {
+    const eggsList = document.getElementById("eggs-list");
+    eggsList.style.display = "none";
+    const eggNotepad = document.getElementById("egg-notepad");
+    eggNotepad.style.display = "block";
+    const eggNotepadTextArea = document.getElementById("egg-notepad-textarea");
+    eggNotepadTextArea.addEventListener('input', function(event) {
+        const eggNotepadMessage = {
+            "type": "egg-notepad",
+            "username": username,
+            "token": md5(password),
+            "content": event.target.value
+        };
+        ws.send(JSON.stringify(eggNotepadMessage));
+    }, false);
+}
+
+function closeEggNotepad() {
+    const eggNotepad = document.getElementById("egg-notepad");
+    eggNotepad.style.display = "none";
+}

server/eggs/notepad/message.js

@@ -0,0 +1,4 @@
+else if (message.type == "egg-notepad") {
+    const eggNotepadTextArea = document.getElementById("egg-notepad-textarea");
+    eggNotepadTextArea.value = message.content
+}

server/resources/InterVariable.ttf

@@ -0,0 +1 @@
+../../client-web/InterVariable.ttf

server/resources/gradient.css

@@ -0,0 +1 @@
+../../client-web/gradient.css

server/resources/index.css

@@ -0,0 +1 @@
+../../client-web/index.css

server/resources/index.html

@@ -0,0 +1 @@
+../../client-web/index.html

server/resources/index.js

@@ -0,0 +1 @@
+../../client-web/index.js

server/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
-rootProject.name = "chookpen"
+rootProject.name = "chookchat"
 

server/src/main/kotlin/Main.kt

@@ -2,6 +2,8 @@ package xyz.maxwellj.chookchat
 
 import io.javalin.Javalin
 import io.javalin.websocket.WsContext
+import io.javalin.http.UploadedFile
+
 import java.util.concurrent.ConcurrentHashMap
 import java.util.UUID
 
@@ -24,32 +26,194 @@ fun md5(input:String): String {
     val md = MessageDigest.getInstance("MD5")
     return BigInteger(1, md.digest(input.toByteArray())).toString(16).padStart(32, '0')
 }
-/*
-fun removeLines(fileName: String, lineNumber: String) {
-    require(!fileName.isEmpty() && startLine >= 1 && numLines >= 1)
-    val f = File(fileName)
-    var lines = f.readLines()
-    if (startLine > size) {
-        println("The starting line is beyond the length of the file")
-        return
+
+object config {
+    var address = ""
+    var port = ""
+    var security = "" 
+    var serviceName = ""
+
+    fun getConfig() {
+        address = ""
+        port = ""
+        security = ""
+        serviceName = ""
+        val configFile = File("chookchat.config")
+        try {
+            val config = configFile.readLines()
+            var type = ""
+            var isEditing = 0
+            for (line in config) {
+                for (char in line) {
+                    if (char == ':') {
+                        isEditing = 1
+                    } else if (char == ';') {
+                        isEditing = 0
+                        type = ""
+                    } else {
+                        if (isEditing == 0) {
+                            type += char
+                        } else if (isEditing == 1)
+                            if (type == "address") {
+                                address += char
+                            } else if (type == "port") {
+                                port += char
+                            } else if (type == "security") {
+                                security += char
+                            } else if (type == "serviceName") {
+                                serviceName += char
+                            }
+                        }
+                    }
+                }
+        } catch (e: Exception) {
+            println("Something went wrong :/ Here's the error: $e")
+        }
     }
-    lines = lines.take(startLine - 1) + lines.drop(startLine + n - 1)
-    val text = lines.joinToString(System.lineSeparator())
-    f.writeText(text)
 }
-*/
+
 object WsSessionManager {
-    val peopleOnline = mutableListOf("")
-    val sessionsList = mutableListOf("")
+    val peopleOnline = mutableListOf<String>()
+    val sessionsList = mutableListOf<String>()
     val sessions = ConcurrentHashMap<WsContext, String>()
     val sessionIds = ConcurrentHashMap<String, WsContext>()
     val userSessions = ConcurrentHashMap<String, String>()
     
+    val roomList = mutableListOf<String>()
+    val userRooms = ConcurrentHashMap<String, String>() 
+    val roomUsers = ConcurrentHashMap<String, MutableList<String>>() 
+    
     init {
+        createRoom("general")
+        
         fixedRateTimer("websocket-ping", period = 5000) {
             sendPing()
         }
     }
+    
+    fun createRoom(roomName: String): Boolean {
+        if (roomList.contains(roomName)) {
+            return false
+        }
+        roomList.add(roomName)
+        roomUsers[roomName] = mutableListOf()
+        return true
+    }
+    
+    fun joinRoom(username: String, roomName: String): Boolean {
+        if (!roomList.contains(roomName)) {
+            createRoom(roomName)
+        }
+        
+        val currentRoom = userRooms[username]
+        if (currentRoom != null) {
+            roomUsers[currentRoom]?.remove(username)
+            
+            val leftMessage = JSONObject().apply {
+                put("type", "roomLeave")
+                put("username", "system")
+                put("room", currentRoom)
+                put("content", "$username left the room")
+            }
+            broadcastToRoom(currentRoom, leftMessage.toString())
+            
+            broadcastRoomUsers(currentRoom)
+        }
+        
+        userRooms[username] = roomName
+        roomUsers[roomName]?.add(username)
+        
+        broadcastRoomUsers(roomName)
+        return true
+    }
+    
+    fun getRoomUsers(roomName: String): List<String> {
+        return roomUsers[roomName] ?: listOf()
+    }
+    
+    fun broadcastRoomUsers(roomName: String) {
+        val usersInRoom = roomUsers[roomName] ?: listOf()
+        val processedData = JSONObject().apply {
+            put("type", "roomUsers")
+            put("username", "system")
+            put("room", roomName)
+            put("content", usersInRoom.joinToString(", "))
+        }
+        broadcastToRoom(roomName, processedData.toString(), false)
+    }
+    
+    fun broadcastOnlineUsers() {
+        val processedData = JSONObject().apply {
+            put("type", "users")
+            put("username", "system")
+            put("content", peopleOnline.joinToString(", "))
+        }
+        broadcast(processedData.toString())
+    }
+    
+    fun broadcastToRoom(roomName: String, message: String, cleanupDeadSessions: Boolean = true) {
+        val deadSessions = mutableListOf<WsContext>()
+        
+        sessions.keys.forEach { ctx ->
+            try {
+                if (ctx.session.isOpen) {
+                    val sessionId = sessions[ctx]
+                    if (sessionId != null) {
+                        val username = userSessions.entries.find { it.value == sessionId }?.key
+                        if (username != null && userRooms[username] == roomName) {
+                            ctx.send(message)
+                        }
+                    }
+                } else {
+                    deadSessions.add(ctx)
+                }
+            } catch (e: Exception) {
+                println("Error broadcasting to session: ${e.message}")
+                deadSessions.add(ctx)
+            }
+        }
+        
+        if (cleanupDeadSessions) {
+            deadSessions.forEach { removeSessionWithoutBroadcast(it) }
+        }
+    }
+    
+    private fun removeSessionWithoutBroadcast(ctx: WsContext) {
+        try {
+            val sessionId = sessions[ctx]
+            if (sessionId != null) {
+                userSessions.entries.find { it.value == sessionId }?.let { entry ->
+                    val username = entry.key
+                    val room = userRooms[username]
+                    
+                    if (room != null) {
+                        roomUsers[room]?.remove(username)
+                    }
+                    
+                    peopleOnline.remove(username)
+                    userSessions.remove(username)
+                    userRooms.remove(username)
+                }
+
+                sessionsList.remove(sessionId)
+                sessions.remove(ctx)
+                sessionIds.remove(sessionId)
+            }
+        } catch (e: Exception) {
+            println("Error removing session without broadcast: ${e.message}")
+        }
+    }
+    
+    fun handleUserLogin(username: String) {
+        if (!peopleOnline.contains(username)) {
+            peopleOnline.add(username)
+            if (!userRooms.containsKey(username)) {
+                joinRoom(username, "general")
+            }
+            broadcastOnlineUsers()
+        }
+    }
+    
     private fun sendPing() {
         val deadSessions = mutableListOf<WsContext>()
 
@@ -65,31 +229,13 @@ object WsSessionManager {
                 deadSessions.add(ctx)
             }
         }
-
-        // Clean up any dead sessions
         deadSessions.forEach { removeSession(it) }
     }
     
-    fun broadcastOnlineUsers() {
-        val processedData = JSONObject().apply {
-            put("type", "users")
-            put("username", "system")
-            put("content", peopleOnline.joinToString(", "))
-        }
-        broadcast(processedData.toString())
-    }
-
-    fun handleUserLogin(username: String) {
-        if (!peopleOnline.contains(username)) {
-            peopleOnline.add(username)
-            broadcastOnlineUsers()
-        }
-    }
-
     fun addSession(ctx: WsContext) {
         try {
             val sessionId = UUID.randomUUID().toString()
-            sessionsList.add(sessionId)  // Changed from += to add()
+            sessionsList.add(sessionId)  
             sessions[ctx] = sessionId
             sessionIds[sessionId] = ctx
         } catch (e: Exception) {
@@ -101,10 +247,18 @@ object WsSessionManager {
         try {
             val sessionId = sessions[ctx]
             if (sessionId != null) {
-                // Find and remove the username associated with this session
                 userSessions.entries.find { it.value == sessionId }?.let { entry ->
-                    peopleOnline.remove(entry.key)
-                    userSessions.remove(entry.key)
+                    val username = entry.key
+                    val room = userRooms[username]
+                    
+                    if (room != null) {
+                        roomUsers[room]?.remove(username)
+                        broadcastRoomUsers(room)
+                    }
+                    
+                    peopleOnline.remove(username)
+                    userSessions.remove(username)
+                    userRooms.remove(username)
                 }
 
                 sessionsList.remove(sessionId)
@@ -140,48 +294,202 @@ object WsSessionManager {
             }
         }
         
-        // Clean up any dead sessions
         deadSessions.forEach { removeSession(it) }
     }
 
     fun getSessionCount(): Int = sessions.size
+    
+    fun getUserRoom(username: String): String? {
+        return userRooms[username]
+    }
+    
+    fun getRooms(): List<String> {
+        return roomList
+    }
 }
 
 fun extractMessageContent(inputData: String, ctx: WsContext): String {
     val jsonInputData = JSONObject(inputData)
+    
     if (jsonInputData.getString("type") == "connect") {
         val username = jsonInputData.getString("username")
         WsSessionManager.associateUserWithSession(username, ctx)
         WsSessionManager.handleUserLogin(username)
+        
         val processedData = JSONObject().apply {
             put("type", "connect")
             put("username", "system")
-            put("content", "${jsonInputData.getString("username")} just joined the room!")
+            put("content", "${jsonInputData.getString("username")} just joined the chat!")
         }
-        return(processedData.toString())
+        return processedData.toString()
     }
+    
+    if (jsonInputData.getString("type") == "joinRoom") {
+        val username = jsonInputData.getString("username")
+        val roomName = jsonInputData.getString("room")
+        
+        if (!jsonInputData.has("token")) {
+            val processedData = JSONObject().apply {
+                put("type", "error")
+                put("username", "system")
+                put("content", "Authentication required")
+            }
+            return processedData.toString()
+        }
+        
+        val success = WsSessionManager.joinRoom(username, roomName)
+        if (success) {
+            val processedData = JSONObject().apply {
+                put("type", "roomJoin")
+                put("username", "system")
+                put("room", roomName)
+                put("content", "$username just joined the room!")
+            }
+            return processedData.toString()
+        } else {
+            val processedData = JSONObject().apply {
+                put("type", "error")
+                put("username", "system")
+                put("content", "Failed to join room: $roomName")
+            }
+            return processedData.toString()
+        }
+    }
+    
+    if (jsonInputData.getString("type") == "getUsersInRoom") {
+        val username = jsonInputData.getString("username")
+        val roomName = jsonInputData.getString("room")
+        
+        if (!jsonInputData.has("token")) {
+            val processedData = JSONObject().apply {
+                put("type", "error")
+                put("username", "system")
+                put("content", "Authentication required")
+            }
+            return processedData.toString()
+        }
+        
+        val usersInRoom = WsSessionManager.getRoomUsers(roomName)
+        val processedData = JSONObject().apply {
+            put("type", "roomUsers")
+            put("username", "system")
+            put("room", roomName)
+            put("content", usersInRoom.joinToString(", "))
+        }
+        return processedData.toString()
+    }
+    
+    if (jsonInputData.getString("type") == "createRoom") {
+        val username = jsonInputData.getString("username")
+        val roomName = jsonInputData.getString("room")
+        
+        if (!jsonInputData.has("token")) {
+            val processedData = JSONObject().apply {
+                put("type", "error")
+                put("username", "system")
+                put("content", "Authentication required")
+            }
+            return processedData.toString()
+        }
+        
+        val success = WsSessionManager.createRoom(roomName)
+        if (success) {
+            WsSessionManager.joinRoom(username, roomName)
+            val processedData = JSONObject().apply {
+                put("type", "roomCreated")
+                put("username", "system")
+                put("room", roomName)
+                put("content", "Room '$roomName' created and joined!")
+            }
+            return processedData.toString()
+        } else {
+            val processedData = JSONObject().apply {
+                put("type", "error")
+                put("username", "system") 
+                put("content", "Room '$roomName' already exists!")
+            }
+            return processedData.toString()
+        }
+    }
+    
+    val username = jsonInputData.getString("username")
+    val room = WsSessionManager.getUserRoom(username) ?: "general"
+    
     val processedData = JSONObject().apply {
         put("type", jsonInputData.getString("type"))
-        put("username", jsonInputData.getString("username"))
+        put("username", username)
+        put("room", room)
         put("content", jsonInputData.getString("content"))
     }
-    return(processedData.toString())
+    
+    return processedData.toString()
 }
 
 fun handleSentMessage(inputData: String): String {
-    println("API request recieved: $inputData")
+    println("API request received: $inputData")
     var jsonInputData: JSONObject
-    try {jsonInputData = JSONObject(inputData)} catch (error: JSONException){return(error.toString())}
+    try {
+        jsonInputData = JSONObject(inputData)
+    } catch (error: JSONException) {
+        return error.toString()
+    }
     
     val username = jsonInputData.getString("username")
     val token = jsonInputData.getString("token")
     val content = jsonInputData.getString("content")
+    val type = jsonInputData.getString("type")
+    
+    if (jsonInputData.has("type")) {
+        val type = jsonInputData.getString("type")
+        if (type == "joinRoom" || type == "createRoom") {
+            val userDatabaseParser = BufferedReader(File("userDatabase").reader())
+            var userLine = ""
+            
+            userDatabaseParser.forEachLine { line ->
+                if (line.contains(username)) {
+                    userLine = line
+                }
+            }
+            userDatabaseParser.close()
+            
+            if (userLine == "") {
+                val processedData = JSONObject().apply {
+                    put("type", "error")
+                    put("username", "system")
+                    put("content", "unknown-account")
+                }    
+                return processedData.toString()
+            }
+            
+            var tokenInDatabase = ""
+            var currentStage = 0
+            for (char in userLine) {
+                if (char == ':') {
+                    currentStage++
+                }
+                if (currentStage == 1) {
+                    tokenInDatabase += char
+                }
+            }
+            tokenInDatabase = tokenInDatabase.replace(":", "")
+            
+            if (token != tokenInDatabase) {
+                val processedData = JSONObject().apply {
+                    put("type", "error")
+                    put("username", "system")
+                    put("content", "invalid-token")
+                }
+                return processedData.toString()
+            }
+            
+            return "Success" 
+        }
+    }
     
     val userDatabaseParser = BufferedReader(File("userDatabase").reader())
     var lineNumber = 1
     var userLine = ""
     
-    // Search the user database to find required information about the user
     userDatabaseParser.forEachLine { line ->
         if (line.contains(username)) {
             userLine = line
@@ -196,7 +504,7 @@ fun handleSentMessage(inputData: String): String {
             put("username", "system")
             put("content", "unknown-account")
         }    
-        return(processedData.toString())
+        return processedData.toString()
     }
  
     var usernameInDatabase = ""
@@ -221,44 +529,147 @@ fun handleSentMessage(inputData: String): String {
     tokenInDatabase = tokenInDatabase.replace(":", "")
     saltInDatabase = saltInDatabase.replace(":", "")
     banStatus = banStatus.replace(":", "")
+    
     if (banStatus == "1") {
         val processedData = JSONObject().apply {
             put("type", "error")
             put("username", "system")
             put("content", "banned")
         }    
-        return(processedData.toString())
+        return processedData.toString()
     }
-    val tokenWithSalt = (md5(token + saltInDatabase))
-    /*println(saltInDatabase)
-    println(tokenWithSalt)
-    if (tokenWithSalt != tokenInDatabase)  {*/
+    
     if (token != tokenInDatabase) {
         val processedData = JSONObject().apply {
             put("type", "error")
             put("username", "system")
             put("content", "invalid-token")
         }
-        return(processedData.toString())
+        return processedData.toString()
     }
-    // Make the message to respond to the client
-    val chatHistoryView = File("chatHistory")
-    var fullMessage = ""
+    
     if (content != "") {
-        fullMessage = "${chatHistoryView.readText()}$username: $content"
-        // Add the client's message to the chat history
+        if (type != "message") {
+            return "Success"
+        }
+        val room = WsSessionManager.getUserRoom(username) ?: "general"
+        
+        val roomDirectory = File("roomChats")
+        if (!roomDirectory.exists()) {
+            roomDirectory.mkdir()
+        }
+        
+        val roomChatHistory = File("roomChats/$room.txt")
+        roomChatHistory.appendText("$username: $content ${System.lineSeparator()}")
+        
         val chatHistory = File("chatHistory")
-        chatHistory.appendText("$username: $content ${System.lineSeparator()}")
-        return("Success")
+        chatHistory.appendText("$username: $content [Room: $room] ${System.lineSeparator()}")
+        
+        return "Success"
     } else {
-        return("No data provided")
+        return "No data provided"
     }
-    return("Chookchat")
+}
+
+fun getRoomChatHistory(roomName: String): String {
+    val roomChatFile = File("roomChats/$roomName.txt")
+    if (roomChatFile.exists()) {
+        return roomChatFile.readText()
+    }
+    return ""
+}
+
+fun buildHTML(): String {
+    try {
+        config.getConfig()
+        val htmlFile = File("resources/index.html")
+        val html = htmlFile.readLines()
+        var editedhtml = ""
+        for (line in html) {
+            if (line == """                    <input type="text" id="serverUrl" value="bobcompass.online" placeholder="Server URL"><br>""") { 
+                editedhtml += """                    <input type="text" id="serverUrl" value="${config.address}" placeholder="Server URL"><br>""" 
+            } else if (line == """                    <input type="text" id="serverPort" value="443" placeholder="Server Port"><br>""") {
+                editedhtml += """                    <input type="text" id="serverPort" value="${config.port}" placeholder="Server Port"><br>"""
+            } else if (line == """                    <input type="checkbox" id="securityStatus" checked>""" && config.security == "false") {
+                editedhtml += """                    <input type="checkbox" id="securityStatus">"""
+            } else if (line == """                    <h3>Chookchat</h3>""") {
+                editedhtml += """                    <h3>${config.serviceName}</h3>""" 
+            } else if (line == """                    <!-- Eggs Start Here -->""") {
+                val eggsFile = File("chookchat.eggs.config")
+                val eggs = eggsFile.readLines()
+                for (line in eggs) {
+                    val eggHTMLFile = File("eggs/$line/index.html")
+                    if (eggHTMLFile.exists()) {
+                        val eggHTML = eggHTMLFile.readText()
+                        editedhtml += eggHTML
+                    }
+                }
+            } else {
+                editedhtml += line
+            }
+        }
+        
+        return(editedhtml)
+    } catch (e: Exception) {
+        println(e)
+        return("There was an error! If you're the server's admin, here are the details: $e")
+    }
+    return("dingus")
+}
+
+fun buildJS(): String {
+    try {
+        val eggsFile = File("chookchat.eggs.config")
+        val eggs = eggsFile.readLines()
+        val jsFile = File("resources/index.js")
+        val js = jsFile.readLines()
+        var editedJS = ""
+        for (line in js) {
+            if (line == "            // Egg message logic") {
+                for (line in eggs) {
+                    val eggJSMessageFile = File("eggs/$line/message.js")
+                    if (eggJSMessageFile.exists()) {
+                        val eggJSMessage = eggJSMessageFile.readText()
+                        editedJS += eggJSMessage
+                    }
+                }
+            } else {
+                editedJS += "$line\n"
+            }
+        }
+        for (line in eggs) {
+            val eggJSFile = File("eggs/$line/index.js")
+            if (eggJSFile.exists()) {
+                val eggJS = eggJSFile.readText()
+                editedJS += eggJS
+            }
+        }
+        return(editedJS)
+    } catch (e: Exception) {
+        println(e)
+        return("console.log(`There was an error! If you're the server's admin, here are the details: $e`)")
+    }
+    return("dingus")
+}
+
+fun handleServerCommand(command: String): String {
+    val commandArgs = mutableListOf("")
+    commandArgs.drop(1)
+    var currentStage = 0
+
+    for (char in command) {
+        if (char == ' ') {
+            currentStage ++
+            commandArgs += ""
+        } else {
+            commandArgs[currentStage] += char
+        }
+    }
+    return("I'm not sure how to ${commandArgs.toString()}")
 }
 
 fun createAccount(inputData: String): String {
     println("Account creation request recieved: $inputData")
-    // Parse data sent to the server by client
     var username = ""
     var token = ""
     var message = ""
@@ -289,7 +700,6 @@ fun createAccount(inputData: String): String {
     var lineNumber = 1
     var userExists = 0
 
-    // Search the user database to find required information about the user
     var response = ""
     userDatabaseParser.forEachLine { line ->
         if (line.contains(username)) {
@@ -334,31 +744,81 @@ fun createAccount(inputData: String): String {
     return(processedData.toString())
 }
 
-fun handleServerCommand(command: String): String {
-    val commandArgs = mutableListOf("")
-    commandArgs.drop(1)
-    var currentStage = 0
-
-    for (char in command) {
-        if (char == ' ') {
-            currentStage ++
-            commandArgs += ""
-        } else {
-            commandArgs[currentStage] += char
-        }
-    }
-    return("I'm not sure how to ${commandArgs.toString()}")
-}
-
 fun main(args: Array<String>) {
-    WsSessionManager.peopleOnline.removeAt(0)
-    WsSessionManager.sessionsList.removeAt(0)
+    WsSessionManager.peopleOnline.clear()
+    WsSessionManager.sessionsList.clear()
+    WsSessionManager.roomList.clear()
+    
+    WsSessionManager.createRoom("general")
+    
+    val roomDirectory = File("roomChats")
+    if (!roomDirectory.exists()) {
+        roomDirectory.mkdir()
+    }
+    
     val app = Javalin.create { config ->
             config.staticFiles.add("/public")
-        }.get("/") { ctx -> 
-            ctx.redirect("/index.html") 
         }
-        .get("/api/createaccount/{content}") { ctx -> ctx.result(createAccount(ctx.pathParam("content")))}
+        .get("/") { ctx ->  
+            ctx.html(buildHTML())
+        }
+        .get("/index.js") { ctx ->
+            ctx.result(buildJS())
+        }
+        .get("/api/createaccount/{content}") { ctx -> 
+            ctx.result(createAccount(ctx.pathParam("content")))
+        }
+        .get("/api/rooms") { ctx ->
+            val rooms = WsSessionManager.getRooms()
+            val roomsJson = JSONArray(rooms)
+            val processedData = JSONObject().apply {
+                put("type", "roomsList")
+                put("username", "system")
+                put("content", roomsJson.toString())
+            }
+            ctx.result(processedData.toString())
+        }
+        .get("/api/room/{roomName}/history") { ctx ->
+            val roomName = ctx.pathParam("roomName")
+            ctx.result(getRoomChatHistory(roomName))
+        }
+        .post("/api/upload") { ctx ->
+            val uploadedFiles = ctx.uploadedFiles()
+            if (uploadedFiles.isEmpty()) {
+                ctx.status(400).result("No files uploaded")
+                return@post
+            }
+            val uploadedFile = uploadedFiles[0]
+            val originalFilename = uploadedFile.filename()
+            val uuid = UUID.randomUUID().toString()
+            val fileExtension = originalFilename.substringAfterLast(".", "")
+            val baseFilename = originalFilename.substringBeforeLast(".")
+            val newFilename = "${baseFilename}_${uuid}${if (fileExtension.isNotEmpty()) ".$fileExtension" else ""}"
+            val filePath = Paths.get("uploads", newFilename)
+            Files.copy(uploadedFile.content(), filePath)
+            
+            val room = if (ctx.formParam("room") != null) ctx.formParam("room") else "general"
+            
+            val processedData = JSONObject().apply {
+                put("type", "fileStatus")
+                put("username", "system")
+                put("content", "success")
+            }
+            ctx.result(processedData.toString())
+            
+            val processedData2 = JSONObject().apply {
+                put("type", "file")
+                put("username", "system")
+                put("room", room)
+                put("content", "https://maxwellj.xyz/chookchat/uploads/$newFilename")
+            }
+            
+            if (room != null && room != "general") {
+                WsSessionManager.broadcastToRoom(room, processedData2.toString())
+            } else {
+                WsSessionManager.broadcast(processedData2.toString())
+            }
+        }
         .ws("/api/websocket") { ws -> 
             ws.onConnect { ctx -> 
                 WsSessionManager.addSession(ctx)
@@ -369,27 +829,52 @@ fun main(args: Array<String>) {
             ws.onMessage { ctx ->
                 when (ctx.message()) {
                     "pong" -> {}
-                else -> {
-                    println(ctx.message()) 
-                    val successState = handleSentMessage(ctx.message())
-                    if (successState != "Success") {
-                        try {
-                            ctx.send(successState)
-                        } catch (e: Exception) {
-                            println("Error sending error message: ${e.message}")
+                    else -> {
+                        println(ctx.message()) 
+                        val successState = handleSentMessage(ctx.message())
+                        if (successState != "Success") {
+                            try {
+                                ctx.send(successState)
+                            } catch (e: Exception) {
+                                println("Error sending error message: ${e.message}")
+                            }
+                        } else {
+                            val messageContent = extractMessageContent(ctx.message(), ctx)
+                            
+                            try {
+                                val jsonMessage = JSONObject(messageContent)
+                                if (jsonMessage.has("room")) {
+                                    val room = jsonMessage.getString("room")
+                                    if (WsSessionManager.roomList.contains(room)) {
+                                        WsSessionManager.broadcastToRoom(room, messageContent)
+                                    } else {
+                                        WsSessionManager.createRoom(room)
+                                        WsSessionManager.broadcastToRoom(room, messageContent)
+                                    }
+                                } else {
+                                    WsSessionManager.broadcastToRoom("general", messageContent)
+                                }
+                            } catch (e: Exception) {
+                                println("Error in broadcasting message: ${e.message}")
+                                WsSessionManager.broadcastToRoom("general", messageContent)
+                            }
                         }
-                    } else {
-                        val messageContent = extractMessageContent(ctx.message(), ctx)
-                        WsSessionManager.broadcast(messageContent)
                     }
                 }
             }
-            }
         }
-    .start(7070)
-    println("Type a command for the server")
-    while (1 == 1) {
-        println(handleServerCommand(readln()))
+        .start(7070)
+    
+    try {
+        if (args[0] == "-i") {
+            println("Type a command for the server")
+            while (1 == 1) {
+                println(handleServerCommand(readln()))
+            }
+        } else {
+            println("Interactive mode disabled, add -i to enable")
+        }
+    } catch (error: Exception) {
+        println("Interactive mode disabled, add -i to enable")
     }
 }
-