From 19684271858c29cddbaf99bfa99de97d57954381 Mon Sep 17 00:00:00 2001 From: an Date: Wed, 28 Jun 2017 13:07:36 +0200 Subject: [PATCH] Module loading implemented --- main.go | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/main.go b/main.go index 7d9c829..f1db452 100644 --- a/main.go +++ b/main.go @@ -8,14 +8,15 @@ package main import ( "flag" + "fmt" + "runtime" "strings" "time" + "code.dnix.de/an/flokatilib/modules" "code.dnix.de/an/xlog" - //"flokatirc/version" - - //"code.dnix.de/an/flokatilib/modules" + "flokatirc/version" "github.com/42wim/matterbridge/matterclient" ) @@ -41,8 +42,7 @@ func main() { xlog.Init(xlog.DEBUG) - //xlog.Info("%s started", SoftwareInfo()) - xlog.Info("Started") + xlog.Info("%s started", SoftwareInfo()) xlog.Info("Connecting ...") bot := matterclient.New(*name, *pass, *team, *server) @@ -53,11 +53,8 @@ func main() { xlog.Info("Connected") - //mods := strings.Split(*modules, ",") - //TODO: implement more robust list parsing - - //modules.Init(sayCh, *mods, *params) - //modules.ModParams["_nick"] = *name + modules.Init(sayCh, *mods) + modules.BotNick = *name for { var targets string @@ -75,7 +72,7 @@ func main() { } } -//func SoftwareInfo() string { -// return fmt.Sprintf("flokatirc %s-%s (built %s [%s])", version.FlokatiVersion, -// version.FlokatiBuild, version.FlokatiBuilddate, runtime.Version()) -//} +func SoftwareInfo() string { + return fmt.Sprintf("flokatirc %s-%s (built %s [%s])", version.FlokatiVersion, + version.FlokatiBuild, version.FlokatiBuilddate, runtime.Version()) +}