From 99ffde1c7fc13d7b4877177c53a2809c1eed33f7 Mon Sep 17 00:00:00 2001
From: an <an@dnix.de>
Date: Sun, 2 Jul 2017 00:50:47 +0200
Subject: [PATCH] Dont handle messages from self

---
 Dockerfile | 16 ++++++++--------
 Makefile   |  6 +++---
 main.go    | 11 +++++++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae10e78..7c173cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:15.10 
+FROM ubuntu:16.04 
 MAINTAINER Andreas Neue <an@dnix.de>
 
 RUN apt-get -y --force-yes update 
@@ -7,14 +7,14 @@ RUN apt-get install -y ca-certificates
 RUN apt-get install -y fortune vim
 RUN apt-get clean
 
-RUN mkdir /flokatirc
+RUN mkdir /mmflokati
 
-COPY flokatirc /flokatirc/flokatirc
-COPY newsfeeds.conf /flokatirc/newsfeeds.conf
-COPY fortunes /flokatirc/fortunes
+COPY mmflokati /mmflokati/mmflokati
+#COPY newsfeeds.conf /mmflokati/newsfeeds.conf
+#COPY fortunes /mmflokati/fortunes
 
-ENV PATH $PATH:/flokatirc
+ENV PATH $PATH:/mmflokati
 
-WORKDIR /flokatirc
+WORKDIR /mmflokati
 
-CMD [ "/flokatirc/flokatirc", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#test", "-nsname=N", "-nspass=t0ps3cr37" ]
+#CMD [ "/mmflokati/mmflokati", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#test", "-nsname=N", "-nspass=t0ps3cr37" ]
diff --git a/Makefile b/Makefile
index 47ff5c0..4279d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,15 @@ build: genversion genbuilddate test
 build-win: test genversion
 	GOOS=windows GOARCH=amd64 go build -v -o mmflokati.exe mmflokati
 
-docker: build
-	./dockerbuild.sh
-
 genversion:
 	./genversion.sh
 
 genbuilddate:
 	./genbuilddate.sh
 
+docker: build
+	./dockerbuild.sh
+
 fmt:
 	go fmt ./...
 
diff --git a/main.go b/main.go
index af083f5..b6f5683 100644
--- a/main.go
+++ b/main.go
@@ -1,8 +1,8 @@
 // vi:ts=4:sts=4:sw=4:noet:tw=72
 //
-// flokatirc
+// mmflokati
 //
-// Copyright (c) 2015,2016 Andreas Neue <an@dnix.de>
+// Copyright (c) 2015,2016,2017 Andreas Neue <an@dnix.de>
 
 package main
 
@@ -47,7 +47,7 @@ func main() {
 	xlog.Info("Connecting ...")
 
 	bot := matterclient.New(*name, *pass, *team, *server)
-	bot.SetLogLevel("debug")
+	//bot.SetLogLevel("debug")
 	err := bot.Login()
 	if err != nil {
 		xlog.Error(err.Error())
@@ -84,7 +84,10 @@ func main() {
 	go func() {
 		for {
 			mm := <-bot.MessageChan
-			xlog.Debug("got msg: %v %v :: %v", mm.Username, mm.Channel, mm.Text)
+			if mm.Username == *name {
+				continue
+			}
+			xlog.Debug("Got msg: User: %v, Channel: %v, Text: \"%v\"", mm.Username, mm.Channel, mm.Text)
 			modules.HandleMessage(&modules.Message{From: mm.Username, Channel: mm.Channel, Text: mm.Text})
 		}
 	}()