an/flokati
an
/
flokati
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: an:e494c194681a50f9ea81cbecbe410a737829fc98
Branches Tags
an:master
..
compare: an:ffe325a7f0eb90cc37318dc0d9a00c0572f19f14
Branches Tags
an:master

2 Commits
e494c19468 ... ffe325a7f0

Author SHA1 Message Date
Andreas Neue ffe325a7f0 Merge branch 'master' of git.dnix.de:an/flokati
continuous-integration/drone/push Build is failing Details
2019-08-29 16:36:02 +02:00
Andreas Neue 9746d49530 dont hardcode time offset in fuzzytime.go, set correct timezone in Dockerfile 2019-08-29 16:35:50 +02:00
2 changed files with 4 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
Dockerfile
View File

@ -1,7 +1,8 @@
FROM golang:latest FROM golang:latest
MAINTAINER Andreas Neue <an@dnix.de> MAINTAINER Andreas Neue <an@dnix.de>
RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim ca-certificates && apt-get clean RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim tzdata ca-certificates && apt-get clean
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
WORKDIR /go/src/flokati WORKDIR /go/src/flokati
COPY . . COPY . .

4
modules/fuzzytime.go
View File

@ -29,8 +29,8 @@ func fuzzytimeHandleMessage(m *Message) {
func fuzzytimeShow(channel string) { func fuzzytimeShow(channel string) {
t := time.Now() t := time.Now()
h := t.Hour() h := t.Hour()
tzcorrect := 1 z, o := t.Zone()
h = h + tzcorrect // XXX: This should not be hardcoded h = h + o
m := t.Minute() m := t.Minute()
s := "Es ist " s := "Es ist "
switch { switch {