From aede39a00c89cfb7b7d47d06e89d06227d14c7e4 Mon Sep 17 00:00:00 2001
From: Les De Ridder <les@lesderid.net>
Date: Tue, 11 Feb 2020 15:25:14 +0100
Subject: [PATCH] Update dependencies and remove 002/003/004

---
 dub.sdl                       |  8 ++++----
 dub.selections.json           | 22 +++++++++-------------
 generate-package-version.fish |  5 +++++
 source/ircd/connection.d      |  8 ++++----
 source/ircd/server.d          |  2 +-
 5 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100755 generate-package-version.fish

diff --git a/dub.sdl b/dub.sdl
index 23f9177..e1c0778 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -4,8 +4,8 @@ authors "Les De Ridder"
 copyright "Copyright © 2017, Les De Ridder"
 license "NCSA"
 targetType "executable"
-dependency "vibe-d:core" version="~>0.7.30"
-dependency "gen-package-version" version="~>1.0.5"
-dependency "sdlang-d" version="~>0.10.1"
-preGenerateCommands "dub run gen-package-version -- ircd --src=source/"
+dependency "vibe-core" version="~>1.8.1"
+dependency "vibe-d:stream" version="~>0.9.0-alpha.1"
+dependency "sdlang-d" version="~>0.10.5"
+preGenerateCommands "./generate-package-version.fish"
 versions "VibeDefaultMain"
diff --git a/dub.selections.json b/dub.selections.json
index 4ef43a2..67d4a39 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -1,18 +1,14 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"diet-ng": "1.2.0",
-		"eventcore": "0.8.8",
-		"gen-package-version": "1.0.5",
-		"libasync": "0.8.3",
-		"libevent": "2.0.2+2.0.16",
-		"libinputvisitor": "1.2.2",
-		"memutils": "0.4.9",
-		"openssl": "1.1.5+1.0.1g",
-		"scriptlike": "0.9.7",
-		"sdlang-d": "0.10.1",
-		"taggedalgebraic": "0.10.5",
-		"unit-threaded": "0.6.36",
-		"vibe-d": "0.7.31"
+		"eventcore": "0.8.48",
+		"libasync": "0.8.5",
+		"memutils": "1.0.4",
+		"sdlang-d": "0.10.5",
+		"stdx-allocator": "2.77.5",
+		"taggedalgebraic": "0.11.8",
+		"unit-threaded": "0.7.55",
+		"vibe-core": "1.8.1",
+		"vibe-d": "0.9.0-alpha.1"
 	}
 }
diff --git a/generate-package-version.fish b/generate-package-version.fish
new file mode 100755
index 0000000..2d14613
--- /dev/null
+++ b/generate-package-version.fish
@@ -0,0 +1,5 @@
+#!/usr/bin/fish
+
+set packageVersion (git describe)
+
+echo "module ircd.packageVersion; enum packageVersion = \"$packageVersion\";" > source/ircd/packageVersion.d
diff --git a/source/ircd/connection.d b/source/ircd/connection.d
index 1d4f98a..dfbb442 100644
--- a/source/ircd/connection.d
+++ b/source/ircd/connection.d
@@ -10,7 +10,8 @@ import std.utf;
 import std.datetime;
 
 import vibe.core.core;
-import vibe.stream.operations;
+import vibe.core.net;
+import vibe.stream.operations : readLine;
 
 import ircd.message;
 import ircd.server;
@@ -1278,9 +1279,8 @@ Lforeach:
     void sendWelcome()
     {
         send(Message(_server.name, "001", [nick, "Welcome to the Internet Relay Network " ~ prefix], true));
-        send(Message(_server.name, "002", [nick, "Your host is " ~ _server.name ~ ", running version " ~ _server.versionString], true));
-        send(Message(_server.name, "003", [nick, "This server was created " ~ _server.creationDate], true));
-        send(Message(_server.name, "004", [nick, _server.name, _server.versionString, "w", "snt"]));
+
+        //TODO: If RFC-strictness is off, also send 002, 003, and 004
     }
 
     string getHost()
diff --git a/source/ircd/server.d b/source/ircd/server.d
index 6eb93ed..39fc46b 100644
--- a/source/ircd/server.d
+++ b/source/ircd/server.d
@@ -10,6 +10,7 @@ import std.datetime;
 import std.string;
 
 import vibe.core.core;
+import vibe.core.net;
 
 import ircd.packageVersion;
 
@@ -22,7 +23,6 @@ class Server
 {
     Connection[] connections;
 
-    enum creationDate = packageTimestampISO.until('T').text; //TODO: Also show time when RFC-strictness is off
     enum versionString = "salty-ircd-" ~ packageVersion;
 
     string name;