Update go and deps; use GH actions to build and release

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+on:
+  push:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: go mod verify
+        run: go mod verify
+
+      - name: Linting
+        run: |
+            go install honnef.co/go/tools/cmd/staticcheck@latest
+            staticcheck ./...
+      - name: govulncheck
+        run: |
+            go install golang.org/x/vuln/cmd/govulncheck@latest
+            govulncheck ./...
+
+      - name: Testing
+        run: go test -cover -v ./...
+
+      - name: Build
+        run: go build .

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+on:
+  create:
+    tags:
+      - 'v*'
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '^1.19'
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: go mod verify
+        run: go mod verify
+
+      - name: Build
+        run: go build .
+
+      - name: GoReleaser Action
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -0,0 +1,28 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+before:
+  hooks:
+builds:
+  -
+    main: ./main.go
+    goos:
+      - linux
+    goarch:
+      - amd64
+archives:
+- replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+    - '^docs:'
+    - '^test:'

Dockerfile

@@ -0,0 +1,10 @@
+FROM golang
+
+ENV SLACK_BOT_TOKEN $SLACK_BOT_TOKEN
+ENV RECYCLE_LIST $RECYCLE_LIST
+
+COPY . /build
+WORKDIR /build
+RUN go build -o /usr/bin/bidonbot
+WORKDIR /
+CMD bidonbot

README.md

@@ -1,2 +1,3 @@
 # bidonbot
+
 Slack bot for rubbish recycling

go.mod

@@ -0,0 +1,20 @@
+module github.com/batt/bidonbot
+
+go 1.19
+
+require (
+	github.com/Sirupsen/logrus v1.0.6
+	github.com/nlopes/slack v0.6.0
+)
+
+require (
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/stretchr/testify v1.8.0 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
+	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
+)

go.sum

@@ -0,0 +1,39 @@
+github.com/Sirupsen/logrus v1.0.6 h1:HCAGQRk48dRVPA5Y+Yh0qdCSTzPOyU1tBJ7Q9YzotII=
+github.com/Sirupsen/logrus v1.0.6/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/nlopes/slack v0.6.0 h1:jt0jxVQGhssx1Ib7naAOZEZcGdtIhTzkP0nopK0AsRA=
+github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -155,19 +155,16 @@ func main() {
 
 	ticker := time.NewTicker(10 * time.Minute)
 	go func() {
-		for {
-			select {
-			case <-ticker.C:
-				now := time.Now()
-
-				elapsedMinutes := (60*(now.Hour()+24) + now.Minute() - wakeUpOffset) % (60 * 24)
-				fmt.Printf("Awake for %d minutes\n", elapsedMinutes)
-				if elapsedMinutes < awakeMinutes {
-					fmt.Println("keepalive ping!")
-					http.Get(httpURL + "/keepalive")
-				} else {
-					fmt.Println("skipping keepalive, going to sleep...")
-				}
+		for range ticker.C {
+			now := time.Now()
+
+			elapsedMinutes := (60*(now.Hour()+24) + now.Minute() - wakeUpOffset) % (60 * 24)
+			fmt.Printf("Awake for %d minutes\n", elapsedMinutes)
+			if elapsedMinutes < awakeMinutes {
+				fmt.Println("keepalive ping!")
+				http.Get(httpURL + "/keepalive")
+			} else {
+				fmt.Println("skipping keepalive, going to sleep...")
 			}
 		}
 	}()

script/build.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+cd "$(dirname "${0}")/../"
+
+go build -o bidonbot .

script/release.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# This script creates a release tag on main/master branch and pushes both the branch and the tag.
+# Tags must have the 'vXYZ' format. The script doesn't work if the repo has uncommitted changes.
+
+set -eu
+
+cd "$(dirname "${0}")/../"
+
+if [ $# -ne 1 ]; then
+    echo "Missing tag version. Usage: $0 <tag version>"
+
+    exit 1
+fi
+
+if git rev-list "$1" > /dev/null 2>&1; then
+    echo "Provided tag already exists. List of existing tags:"
+    git tag
+
+    exit 1
+fi
+
+if ! git diff-index --quiet HEAD --; then
+    echo "There are uncommitted changes; please commit or stash before releasing. Quitting"
+
+    exit 1
+fi
+
+BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+
+if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then
+    echo "Not on main or master branch, quitting."
+
+    exit 1
+fi
+
+git tag "$1"
+git push origin HEAD --tags

script/run.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+cd "$(dirname "${0}")/../"
+
+docker run -e SLACK_BOT_TOKEN="${SLACK_BOT_TOKEN}" -e RECYCLE_LIST="${RECYCLE_LIST}" bidonbot

slackbot/filtering.go

@@ -10,10 +10,6 @@ type filterer interface {
 	filter(msg *slack.Msg) bool
 }
 
-type multiFilter struct {
-	filters []filterer
-}
-
 type directFilter struct {
 	id string
 }
@@ -31,17 +27,21 @@ func (f *directFilter) filter(msg *slack.Msg) bool {
 		(strings.HasPrefix(msg.Text, "<@"+f.id+">") || strings.HasPrefix(msg.Channel, "D"))
 }
 
-func newMultiFilter(filters ...filterer) *multiFilter {
-	return &multiFilter{
-		filters: filters,
-	}
-}
-
-func (f *multiFilter) filter(msg *slack.Msg) bool {
-	for _, filter := range f.filters {
-		if !filter.filter(msg) {
-			return false
-		}
-	}
-	return true
-}
+// type multiFilter struct {
+// 	filters []filterer
+// }
+
+// func newMultiFilter(filters ...filterer) *multiFilter {
+// 	return &multiFilter{
+// 		filters: filters,
+// 	}
+// }
+
+// func (f *multiFilter) filter(msg *slack.Msg) bool {
+// 	for _, filter := range f.filters {
+// 		if !filter.filter(msg) {
+// 			return false
+// 		}
+// 	}
+// 	return true
+// }

slackbot/slackbot.go

@@ -129,7 +129,7 @@ func (bot *Bot) startRTM() error {
 			log.Errorf("Error: %s\n", ev.Error())
 
 		case *slack.InvalidAuthEvent:
-			return errors.New("Invalid credentials")
+			return errors.New("invalid credentials")
 
 		default:
 			// Can be used to handle custom events.