Merge pull request #58 from tribalwarshelp/renovate/golang-1.x

chore(deps): update dependency golang to v1.17.8

.circleci/config.yml

@@ -1,51 +0,0 @@
-version: 2
-jobs:
-  build_latest:
-    docker:
-      - image: circleci/golang:1.16
-    working_directory: ~/twhelpdcbot
-    steps:
-      - checkout
-      - setup_remote_docker
-      # start proprietary DB using private Docker image
-      # with credentials stored in the UI
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/twhelp-dcbot:latest .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/twhelp-dcbot:latest
-  build_version:
-    docker:
-      - image: circleci/golang:1.16
-    working_directory: ~/twhelpdcbot
-    steps:
-      - checkout
-      - setup_remote_docker
-      # start proprietary DB using private Docker image
-      # with credentials stored in the UI
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/twhelp-dcbot:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//') .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/twhelp-dcbot:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//')
-workflows:
-  version: 2
-  deploy_latest:
-    jobs:
-      - build_latest:
-          context: TWHelp
-          filters:
-            branches:
-              only:
-                - master
-  deploy_version:
-    jobs:
-      - build_version:
-          context: TWHelp
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/

.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: Build and push to registry
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.REGISTRY_LOGIN }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          build-args: |
+            VERSION=${{ steps.get_version.outputs.VERSION }}
+          tags: |
+            ${{ secrets.REGISTRY_NAME }}/twhelp-dcbot:latest
+            ${{ secrets.REGISTRY_NAME }}/twhelp-dcbot:${{ steps.get_version.outputs.VERSION }}
+          file: ./Dockerfile
+          push: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.17.8-alpine as builder
 
 # Set the Current Working Directory inside the container
 WORKDIR /app
@@ -29,7 +29,4 @@ ENV APP_MODE=production
 ENV GIN_MODE=release
 EXPOSE 8080
 
-ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait ./wait
-RUN chmod +x ./wait
-
-CMD ./wait && ./twhelpdcbot
+CMD ./twhelpdcbot

discord/observations.go

@@ -648,7 +648,7 @@ func (hndlr *hndlrDeleteObservation) execute(ctx *commandCtx, m *discordgo.Messa
 	if err != nil {
 		hndlr.SendMessage(m.ChannelID,
 			ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: message.DeleteObservationInvalidTribeID,
+				MessageID: message.DeleteObservationInvalidObservationID,
 				TemplateData: map[string]interface{}{
 					"Mention": m.Author.Mention(),
 				},

go.mod

@@ -3,20 +3,20 @@ module github.com/tribalwarshelp/dcbot
 go 1.17
 
 require (
-	github.com/Kichiyaki/appmode v1.0.0
+	github.com/Kichiyaki/appmode v1.0.1
 	github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c
 	github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210822140115-69ad4084d89f
 	github.com/Kichiyaki/goutil v0.1.0
 	github.com/bwmarrin/discordgo v0.23.2
 	github.com/dustin/go-humanize v1.0.0
-	github.com/go-pg/pg/v10 v10.10.3
-	github.com/joho/godotenv v1.3.0
+	github.com/go-pg/pg/v10 v10.10.6
+	github.com/joho/godotenv v1.4.0
 	github.com/nicksnyder/go-i18n/v2 v2.1.2
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
-	github.com/tribalwarshelp/golang-sdk v0.0.0-20210822141452-7694391fc9c9
-	github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8
+	github.com/tribalwarshelp/golang-sdk v0.0.0-20220218103323-ac5a0c28e845
+	github.com/tribalwarshelp/shared v0.0.0-20220218101729-f4cb4c1f2026
 	golang.org/x/text v0.3.7
 )
 
@@ -30,7 +30,7 @@ require (
 	github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
 	github.com/vmihailenco/tagparser v0.1.2 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
-	golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 // indirect
 	mellium.im/sasl v0.2.1 // indirect
 )

go.sum

@@ -1,14 +1,13 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Kichiyaki/appmode v1.0.0 h1:Kgk+pi45/wqIcrWmnloACUsm8HbOGd6UumSRCsm484g=
-github.com/Kichiyaki/appmode v1.0.0/go.mod h1:FDT0lWIX9MBiyiUt4b/xo6BQQyV7aebsi+x5fcljMjk=
+github.com/Kichiyaki/appmode v1.0.1 h1:DRyrRi6JeIaxK1wTZZxKFJiwD8C/Lmj0sV73il7Z2vE=
+github.com/Kichiyaki/appmode v1.0.1/go.mod h1:EY3cHa98DiSDsUiNjQk7gh3ihLhUTDAbrwBMhFi0nWM=
 github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c h1:ZpL24SEaHeCdqT3V5AZCClN/POvi9iefV2f0izD4sqI=
 github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210822140425-1724064d6e5c/go.mod h1:7oE1ZOK5nqdkItxsLX7F5Bh0voNHniJScxwwFYZWSSA=
 github.com/Kichiyaki/go-php-serialize v0.0.0-20200601110855-47b6982acf83/go.mod h1:+iGkf5HfOVeRVd9K7qQDucIl+/Kt3MyenMa90b/O/c4=
 github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210822140115-69ad4084d89f h1:imH0G9JVvOkfOD/2tYdkyLMcaMqxdP2jGACgLZIZ+sw=
 github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210822140115-69ad4084d89f/go.mod h1:l0230tV4NHOKrz9unST9LC9ymduCZN1kRonIhGPZYJg=
-github.com/Kichiyaki/goutil v0.0.0-20210502095630-318d17091eab/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
 github.com/Kichiyaki/goutil v0.1.0 h1:FxcESWhmwOuhwK2H14oDzo6kZ+J8TDOjdIulgzP/rXs=
 github.com/Kichiyaki/goutil v0.1.0/go.mod h1:c1d+I8M8Hjdb9Brn3S5cYfMQk9Nf/9mYumATyVCF3io=
 github.com/Kichiyaki/gqlgen-client v0.0.0-20200604145848-274796c104f4 h1:QiOarkkKHdFYI+0m6F1H3rRzP6DqJsKJVLirGXEHGSU=
@@ -28,8 +27,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-pg/pg/v10 v10.9.1/go.mod h1:rgmTPgHgl5EN2CNKKoMwC7QT62t8BqsdpEkUQuiZMQs=
-github.com/go-pg/pg/v10 v10.10.3 h1:WobSfk5I+v7XwD1h9x2B7n4slDzjdBIonJ5PID95Aag=
-github.com/go-pg/pg/v10 v10.10.3/go.mod h1:EmoJGYErc+stNN/1Jf+o4csXuprjxcRztBnn6cHe38E=
+github.com/go-pg/pg/v10 v10.10.6 h1:1vNtPZ4Z9dWUw/TjJwOfFUbF5nEq1IkR6yG8Mq/Iwso=
+github.com/go-pg/pg/v10 v10.10.6/go.mod h1:GLmFXufrElQHf5uzM3BQlcfwV3nsgnHue5uzjQ6Nqxg=
 github.com/go-pg/zerochecker v0.2.0 h1:pp7f72c3DobMWOb2ErtZsnrPaSvHd2W4o9//8HtF4mU=
 github.com/go-pg/zerochecker v0.2.0/go.mod h1:NJZ4wKL0NmTtz0GKCoJ8kym6Xn/EQzXRl2OnAe7MmDo=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -56,8 +55,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
+github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
@@ -94,14 +93,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
-github.com/tribalwarshelp/golang-sdk v0.0.0-20210822141452-7694391fc9c9 h1:6zvKlkS70pKWMzEbZ6mRBHC38KmopdmmXXn+Vasuluo=
-github.com/tribalwarshelp/golang-sdk v0.0.0-20210822141452-7694391fc9c9/go.mod h1:9mdH10tX8tNTL6nXAhDrXr2o8c3sBINd0gfojHpmy88=
-github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8 h1:D/aJEuikcllnWnBPb9745412Kv5ihrisVHaHkU+dVTI=
-github.com/tribalwarshelp/shared v0.0.0-20210822141120-6c7e460daed8/go.mod h1:ka8BzXm+IPv/ZemsMu/YmcwlqIDNgV3y3e4MfmIem0U=
+github.com/tribalwarshelp/golang-sdk v0.0.0-20220218103323-ac5a0c28e845 h1:92lfpAvWxo44EK/s+RCNMZIX70USTYwCCQK4L2Z3uNE=
+github.com/tribalwarshelp/golang-sdk v0.0.0-20220218103323-ac5a0c28e845/go.mod h1:bBIs9W0KR4N9bF1t4uDJtm303Kl80YmHopuKowk6L4s=
+github.com/tribalwarshelp/shared v0.0.0-20220218101729-f4cb4c1f2026 h1:ncDx2chRqGr/ZdmnZTe0FWUhrOoZxwvwADh4VF4f58I=
+github.com/tribalwarshelp/shared v0.0.0-20220218101729-f4cb4c1f2026/go.mod h1:e7btUzVL+8ESwxt8sto2uVbIJbHN43wTEg44mJW8YzM=
 github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
 github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
 github.com/vmihailenco/msgpack/v5 v5.3.0/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/msgpack/v5 v5.3.1/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/msgpack/v5 v5.3.4 h1:qMKAwOV+meBw2Y8k9cVwAy7qErtYCwBzZ2ellBfvnqc=
 github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
@@ -117,8 +115,8 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -150,8 +148,9 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 h1:c20P3CcPbopVp2f7099WLOqSNKURf30Z0uq66HpijZY=
+golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

message/ids.go

@@ -80,7 +80,7 @@ const (
 	ObserveSuccess             = "observe.success"
 
 	DeleteObservationInvalidGroupID = "deleteObservation.invalidGroupID"
-	DeleteObservationInvalidTribeID = "deleteObservation.invalidTribeID"
+	DeleteObservationInvalidObservationID = "deleteObservation.invalidObservationID"
 	DeleteObservationGroupNotFound  = "deleteObservation.groupNotFound"
 	DeleteObservationSuccess        = "deleteObservation.success"