From 3788480b431222e346ed6aa529e0861636cc58d9 Mon Sep 17 00:00:00 2001
From: night0721 <night@night0721.xyz>
Date: Wed, 25 Sep 2024 22:30:47 +0100
Subject: [PATCH] Fix imports

---
 src/lib/packet.c       | 1 -
 src/zen/db.c           | 6 +++---
 src/zen/notification.c | 2 +-
 src/zen/ui.c           | 7 ++++---
 src/zen/user.c         | 2 +-
 src/zen/zen.c          | 7 +++----
 src/zmr/zmr.c          | 3 +--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/lib/packet.c b/src/lib/packet.c
index 2ed2def..2592eef 100644
--- a/src/lib/packet.c
+++ b/src/lib/packet.c
@@ -1,7 +1,6 @@
 #include "packet.h"
 #include "key.h"
 #include "util.h"
-#include "server/server.h"
 
 /*
  * Print contents of packet
diff --git a/src/zen/db.c b/src/zen/db.c
index 58e10b8..720465e 100644
--- a/src/zen/db.c
+++ b/src/zen/db.c
@@ -1,9 +1,9 @@
 #include "config.h"
 #include "packet.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "client/user.h"
+#include "zen/ui.h"
+#include "zen/db.h"
+#include "zen/user.h"
 
 sqlite3 *db;
 char zen_db_path[PATH_MAX];
diff --git a/src/zen/notification.c b/src/zen/notification.c
index 24ff452..484e517 100644
--- a/src/zen/notification.c
+++ b/src/zen/notification.c
@@ -1,5 +1,5 @@
-#include "notification.h"
 #include "util.h"
+#include "zen/notification.h"
 
 void send_notification(uint8_t *author, uint8_t *content)
 {
diff --git a/src/zen/ui.c b/src/zen/ui.c
index cc46aeb..d5b0558 100644
--- a/src/zen/ui.c
+++ b/src/zen/ui.c
@@ -1,9 +1,9 @@
 #include "config.h"
 #include "packet.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "client/user.h"
+#include "zen/ui.h"
+#include "zen/db.h"
+#include "zen/user.h"
 
 WINDOW *panel;
 WINDOW *users_border;
@@ -18,6 +18,7 @@ message_t messages[100];
 int num_messages = 0;
 long current_user = 0;
 int current_window = 0;
+int current_mode;
 int sockfd;
 
 /* For tracking cursor position in content */
diff --git a/src/zen/user.c b/src/zen/user.c
index 5b50dc0..327a440 100644
--- a/src/zen/user.c
+++ b/src/zen/user.c
@@ -3,7 +3,7 @@
 
 #include "packet.h"
 #include "util.h"
-#include "client/user.h"
+#include "zen/user.h"
 
 ArrayList *arraylist_init(size_t capacity)
 {
diff --git a/src/zen/zen.c b/src/zen/zen.c
index 4762ca2..7c8c017 100644
--- a/src/zen/zen.c
+++ b/src/zen/zen.c
@@ -1,11 +1,10 @@
 #include "config.h"
 #include "packet.h"
 #include "key.h"
-#include "notification.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "server/server.h"
+#include "zen/notification.h"
+#include "zen/ui.h"
+#include "zen/db.h"
 
 /*
  * Authenticate with server by signing a challenge
diff --git a/src/zmr/zmr.c b/src/zmr/zmr.c
index c6941ef..0453672 100644
--- a/src/zmr/zmr.c
+++ b/src/zmr/zmr.c
@@ -1,8 +1,7 @@
 #include "packet.h"
 #include "util.h"
 #include "config.h"
-#include "notification.h"
-#include "server/server.h"
+#include "zmr/zmr.h"
 
 thread_t threads[MAX_THREADS];
 int num_thread = 0;