From c23214b186ca933d8f0a4e0cbb14fc437957ddc6 Mon Sep 17 00:00:00 2001
From: "Tristan B. Kildaire" <deavmi@disroot.org>
Date: Mon, 27 Jul 2020 14:12:56 +0200
Subject: [PATCH] Order of construction details (WIP)

---
 source/app.d             | 6 +++---
 source/server/listener.d | 6 ++++++
 source/server/server.d   | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/app.d b/source/app.d
index 16585a0..562ef88 100644
--- a/source/app.d
+++ b/source/app.d
@@ -27,8 +27,8 @@ void main()
 	ButterflyListener[] listeners = constructListeners(config["listeners"]);
 
 	/* Start the server */
-	Address address = parseAddress(config["address"].str(), to!(ushort)(config["port"].str()));
-	ButterflyServer server = new ButterflyServer(listeners, config["domain"].str());
+	//Address address = parseAddress(config["address"].str(), to!(ushort)(config["port"].str()));
+	ButterflyServer server = new ButterflyServer(listeners);
 }
 
 private ButterflyListener[] constructListeners(JSONValue listenersBlock)
@@ -45,7 +45,7 @@ private ButterflyListener[] constructListeners(JSONValue listenersBlock)
 	{
 		writeln("Constructing listener \"" ~ listener ~ "\" ...");
 
-		
+
 
 		writeln("Listener \"" ~ listener ~ "\"constructed");
 	}
diff --git a/source/server/listener.d b/source/server/listener.d
index da1789e..5855309 100644
--- a/source/server/listener.d
+++ b/source/server/listener.d
@@ -9,6 +9,7 @@ public abstract class ButterflyListener : Thread
     private ButterflyServer server;
     private string listenerName;
     private JSONValue config;
+    private string domain;
 
     this(string listenerName, JSONValue config)
     {
@@ -32,6 +33,11 @@ public abstract class ButterflyListener : Thread
         return listenerName;
     }
 
+    public string getDomain()
+    {
+        return domain;
+    }
+
     public JSONValue getConfig()
     {
         return config;
diff --git a/source/server/server.d b/source/server/server.d
index 572da1a..3f463b9 100644
--- a/source/server/server.d
+++ b/source/server/server.d
@@ -27,7 +27,7 @@ public final class ButterflyServer
     /* TODO: Server domain */
     public string domain;
 
-    this(ButterflyListener[] listeners, string domain)
+    this(ButterflyListener[] listeners)
     {
         /**
         * Create the needed directories (if not already present)