From 1ac00b9816f484c073c0f258f317f80bcf0baa18 Mon Sep 17 00:00:00 2001 From: Les De Ridder Date: Sat, 11 Mar 2017 16:45:05 +0100 Subject: [PATCH] Use gen-package-version --- .gitignore | 2 ++ dub.sdl | 4 +++- dub.selections.json | 4 ++++ source/ircd/app.d | 2 +- source/ircd/connection.d | 13 +++++++++---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5ea5ee9..5bc957a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ __dummy.html *.obj __test__*__ /ircd + +source/ircd/packageVersion.d diff --git a/dub.sdl b/dub.sdl index 17ab569..d13b66b 100644 --- a/dub.sdl +++ b/dub.sdl @@ -3,5 +3,7 @@ description "An Internet Relay Chat server in D" authors "Les De Ridder" copyright "Copyright © 2017, Les De Ridder" license "NCSA" -dependency "vibe-d" version="~>0.7.30" +dependency "vibe-d:core" version="~>0.7.30" +dependency "gen-package-version" version="~>1.0.5" +preGenerateCommands "dub run gen-package-version -- ircd --src=source/" versions "VibeDefaultMain" diff --git a/dub.selections.json b/dub.selections.json index fbdddc4..b25920b 100644 --- a/dub.selections.json +++ b/dub.selections.json @@ -2,10 +2,14 @@ "fileVersion": 1, "versions": { "diet-ng": "1.2.0", + "eventcore": "0.8.8", + "gen-package-version": "1.0.5", "libasync": "0.7.9", "libevent": "2.0.2+2.0.16", "memutils": "0.4.9", "openssl": "1.1.5+1.0.1g", + "scriptlike": "0.9.7", + "taggedalgebraic": "0.10.5", "vibe-d": "0.7.30" } } diff --git a/source/ircd/app.d b/source/ircd/app.d index 890da87..1c2182b 100644 --- a/source/ircd/app.d +++ b/source/ircd/app.d @@ -5,7 +5,7 @@ import std.algorithm; import std.range; import core.time; -import vibe.d; +import vibe.core.core; import ircd.message; import ircd.connection; diff --git a/source/ircd/connection.d b/source/ircd/connection.d index 0cf84d1..067eab5 100644 --- a/source/ircd/connection.d +++ b/source/ircd/connection.d @@ -1,8 +1,12 @@ module ircd.connection; import std.stdio; +import std.string; -import vibe.d; +import vibe.core.core; +import vibe.stream.operations; + +import ircd.packageVersion; import ircd.message; @@ -37,6 +41,7 @@ class Connection auto message = Message.fromString((cast(string)_connection.readLine()).chomp); writeln("C> " ~ message.toString); + //TODO: If RFC-strictness is off, ignore case switch(message.command) { case "NICK": @@ -51,9 +56,9 @@ class Connection writeln("unused: " ~ message.parameters[2]); send(Message("localhost", "001", [nick, "Welcome to the Internet Relay Network " ~ nick ~ "!" ~ user ~ "@hostname"], true)); - send(Message("localhost", "002", [nick, "Your host is ircd, running version 0.01"], true)); - send(Message("localhost", "003", [nick, "This server was created 2017-03-11"], true)); - send(Message("localhost", "004", [nick, "ircd", "0.01", "w", "snt"])); + send(Message("localhost", "002", [nick, "Your host is localhost, running version " ~ packageVersion], true)); + send(Message("localhost", "003", [nick, "This server was created " ~ packageTimestampISO], true)); + send(Message("localhost", "004", [nick, "localhost", packageVersion, "w", "snt"])); break; case "PING": send(Message(null, "PONG", [message.parameters[0]], true));