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

chore(deps): update dependency golang to v1.17.8
2022-03-04 06:41:11 +01:00 · 2022-03-04 00:52:37 +00:00 · 2022-02-18 12:57:17 +01:00 · 2022-02-18 11:13:28 +00:00 · 2022-02-18 10:52:36 +00:00 · 2022-02-11 06:51:58 +01:00
8 changed files with 103 additions and 104 deletions
--- a/.circleci/config.yml
+++ b/.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: /.*/
--- a/.github/workflows/publish.yml
+++ b/.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
--- a/7
+++ b/7
@ -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
--- a/discord/observations.go
+++ b/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(),
 				},
--- a/go.mod
+++ b/go.mod
@ -1,21 +1,36 @@
 module github.com/tribalwarshelp/dcbot

-go 1.16
+go 1.17

 require (
-	github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d
-	github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9
-	github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d
-	github.com/Kichiyaki/goutil v0.0.0-20210504132659-3d843a787db7
+	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.2
-	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-20210717112029-bb518cbee33d
-	github.com/tribalwarshelp/shared v0.0.0-20210717094429-6efa1a4f614c
-	golang.org/x/text v0.3.6
+	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
+)
+
+require (
+	github.com/Kichiyaki/gqlgen-client v0.0.0-20200604145848-274796c104f4 // indirect
+	github.com/go-pg/zerochecker v0.2.0 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
+	github.com/vmihailenco/bufpool v0.1.11 // indirect
+	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-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 // indirect
+	mellium.im/sasl v0.2.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,21 +1,17 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d h1:ApX13STtfJc2YPH5D2JnBa6+4AM2vt7a81so/MPr/bA=
-github.com/Kichiyaki/appmode v0.0.0-20210502105643-0a26207c548d/go.mod h1:41p1KTy/fiVocPnJR2h/iXh2NvWWVBdNoZrN8TWVXUI=
-github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9 h1:S/08K0AD4bXYeSPJKei8ZbumDy1JNARZsgYbNZgr9Tk=
-github.com/Kichiyaki/go-pg-logrus-query-logger/v10 v10.0.0-20210428180109-fb97298564d9/go.mod h1:ADHVWnGlWcRn1aGthuh7I1Lrn6zzsjkVJju151dXyDw=
+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-20210521204542-cc672e361b3d h1:7ZJVfFgAR0zNf5fNc6M9v2PZbXvTgGgDjQo4/+NIezQ=
-github.com/Kichiyaki/gopgutil/v10 v10.0.0-20210521204542-cc672e361b3d/go.mod h1:MSAEhr8oeK+Rhjhqyl31/8/AI88thYky80OyD8mheDA=
-github.com/Kichiyaki/goutil v0.0.0-20210502095630-318d17091eab/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
-github.com/Kichiyaki/goutil v0.0.0-20210504132659-3d843a787db7 h1:OU3ZA5H8fHTzaYIw9UBfH3gtWRL0XmnczlhH3E2PjV4=
-github.com/Kichiyaki/goutil v0.0.0-20210504132659-3d843a787db7/go.mod h1:+HhI932Xb0xrCodNcCv5GPiCjLYhDxWhCtlEqMIJhB4=
+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.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=
 github.com/Kichiyaki/gqlgen-client v0.0.0-20200604145848-274796c104f4/go.mod h1:weCVl47ZANyeX60sdsSl0bWHf8HWXyVFmlGHHCR/i5M=
-github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM=
-github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
 github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4=
 github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@ -31,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.2 h1:8G2DdKrB3/0nRIlpur0HySEWBJnHYUByiC0ko4XzE8w=
-github.com/go-pg/pg/v10 v10.10.2/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=
@ -59,14 +55,12 @@ 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=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/nicksnyder/go-i18n/v2 v2.0.3 h1:ks/JkQiOEhhuF6jpNvx+Wih1NIiXzUnZeZVnJuI8R8M=
-github.com/nicksnyder/go-i18n/v2 v2.0.3/go.mod h1:oDab7q8XCYMRlcrBnaY/7B1eOectbvj6B1UPBT+p5jo=
 github.com/nicksnyder/go-i18n/v2 v2.1.2 h1:QHYxcUJnGHBaq7XbvgunmZ2Pn0focXFqTD61CkH146c=
 github.com/nicksnyder/go-i18n/v2 v2.1.2/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
@ -99,15 +93,15 @@ 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-20210717112029-bb518cbee33d h1:Xh5rVjUP55jOZZM3PaI2AvMpCoiRadwIe5gfDBpDC+0=
-github.com/tribalwarshelp/golang-sdk v0.0.0-20210717112029-bb518cbee33d/go.mod h1:COakTplg+GL/4mIPyry00PcZqOcCNCDXkhM36Dci+kA=
-github.com/tribalwarshelp/shared v0.0.0-20210717094429-6efa1a4f614c h1:dgWoORgR3COUbO0Dhho+fB1axhsKGXadaxeCiw9APFA=
-github.com/tribalwarshelp/shared v0.0.0-20210717094429-6efa1a4f614c/go.mod h1:6xooIU27fjagr/KVBPayktW4gn9ylTdBPGgxlQ6+x9s=
+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 h1:0i85a4dsZh8mC//wmyyTEzidDLPQfQAxZIOLtafGbFY=
-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=
 github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
@ -119,11 +113,10 @@ go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bj
 golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 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=
@ -134,7 +127,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
@ -147,7 +139,6 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -157,19 +148,19 @@ 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=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@ -198,7 +189,6 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
--- a/main.go
+++ b/main.go
@ -62,7 +62,7 @@ func main() {
 		}
 	}()
 	if envutil.GetenvBool("LOG_DB_QUERIES") {
-		db.AddQueryHook(gopglogrusquerylogger.QueryLogger{
+		db.AddQueryHook(querylogger.Logger{
 			Log:            logrus.NewEntry(logrus.StandardLogger()),
 			MaxQueryLength: 5000,
 		})
--- a/message/ids.go
+++ b/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"
Author	SHA1	Message	Date
Dawid Wysokiński	31fa2366a1	Merge pull request #58 from tribalwarshelp/renovate/golang-1.x chore(deps): update dependency golang to v1.17.8	2022-03-04 06:41:11 +01:00
Renovate Bot	1a457e58c2	chore(deps): update dependency golang to v1.17.8	2022-03-04 00:52:37 +00:00
Dawid Wysokiński	8036c76648	run go mod tidy	2022-02-18 12:57:17 +01:00
Dawid Wysokiński	af8dced05a	Merge pull request #53 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to ac5a0c2	2022-02-18 11:13:28 +00:00
Renovate Bot	5bc28a9fc4	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to ac5a0c2	2022-02-18 10:52:36 +00:00
Dawid Wysokiński	d291ff5468	Merge pull request #52 from tribalwarshelp/renovate/golang-1.x chore(deps): update golang docker tag to v1.17.7	2022-02-11 06:51:58 +01:00
Renovate Bot	fda5fa1bc8	chore(deps): update golang docker tag to v1.17.7	2022-02-11 01:50:38 +00:00
Dawid Wysokiński	8314e1c1b7	Merge pull request #51 from tribalwarshelp/renovate/golang-1.x chore(deps): update golang docker tag to v1.17.6	2022-01-07 07:39:53 +01:00
Renovate Bot	1bc0613dcf	chore(deps): update golang docker tag to v1.17.6	2022-01-07 00:16:43 +00:00
Dawid Wysokiński	38d24b59be	Merge pull request #50 from tribalwarshelp/renovate/golang-1.x chore(deps): update golang docker tag to v1.17.5	2021-12-09 19:55:13 +01:00
Renovate Bot	95da9a6014	chore(deps): update golang docker tag to v1.17.5	2021-12-09 18:47:16 +00:00
Dawid Wysokiński	39ce98651b	use fix golang version in Dockerfile	2021-11-14 10:26:04 +01:00
Dawid Wysokiński	e1a849c310	replace circleci with github workflows	2021-11-14 09:40:24 +01:00
Dawid Wysokiński	1c6c6da482	qf	2021-10-06 20:05:54 +02:00
Dawid Wysokiński	e254901033	Merge pull request #49 from tribalwarshelp/renovate/github.com-kichiyaki-appmode-1.x fix(deps): update module github.com/kichiyaki/appmode to v1.0.1	2021-09-27 09:01:02 +02:00
Renovate Bot	c30d648f8a	fix(deps): update module github.com/kichiyaki/appmode to v1.0.1	2021-09-27 05:58:39 +00:00
Dawid Wysokiński	db4b013f70	Merge pull request #48 from tribalwarshelp/renovate/github.com-joho-godotenv-1.x fix(deps): update module github.com/joho/godotenv to v1.4.0	2021-09-25 10:01:57 +02:00
Renovate Bot	0fcd4488e8	fix(deps): update module github.com/joho/godotenv to v1.4.0	2021-09-24 11:32:10 +00:00
Dawid Wysokiński	db5427fe68	Merge pull request #47 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 4cb44d4	2021-09-24 13:31:16 +02:00
Renovate Bot	c0495a56d3	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 4cb44d4	2021-09-24 09:57:24 +00:00
Dawid Wysokiński	f77e18e311	Merge pull request #44 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 40b8dcf	2021-09-05 09:41:20 +02:00
Renovate Bot	fd030f05ad	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 40b8dcf	2021-09-05 07:14:25 +00:00
Dawid Wysokiński	b2a8a141c0	Merge pull request #40 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 3a2c337	2021-08-25 19:42:34 +02:00
Renovate Bot	a5013fa482	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 3a2c337	2021-08-25 16:24:53 +00:00
Dawid Wysokiński	93a29f6ec7	Merge pull request #37 from tribalwarshelp/renovate/circleci-golang-1.x chore(deps): update circleci/golang docker tag to v1.17	2021-08-23 06:03:50 +02:00
Renovate Bot	66a3074351	chore(deps): update circleci/golang docker tag to v1.17	2021-08-23 02:04:08 +00:00
Dawid Wysokiński	bb90fc2534	fix: undefined: gopglogrusquerylogger	2021-08-22 16:22:03 +02:00
Dawid Wysokiński	f40ba0921e	bump go version	2021-08-22 16:17:32 +02:00
Dawid Wysokiński	a100b7eda4	Merge pull request #36 from tribalwarshelp/renovate/golang.org-x-text-0.x fix(deps): update module golang.org/x/text to v0.3.7	2021-08-11 07:55:40 +02:00
Renovate Bot	566628ffe2	fix(deps): update module golang.org/x/text to v0.3.7	2021-08-10 19:04:03 +00:00
Dawid Wysokiński	87062cbd58	Merge pull request #35 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to d4c8ccf	2021-07-27 14:58:46 +02:00
Renovate Bot	1cecff6045	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to d4c8ccf	2021-07-27 09:45:53 +00:00
Dawid Wysokiński	642c9f905f	Merge pull request #33 from tribalwarshelp/renovate/github.com-tribalwarshelp-golang-sdk-digest fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 268fb0b	2021-07-23 15:53:48 +02:00
Renovate Bot	71344399bf	fix(deps): update github.com/tribalwarshelp/golang-sdk commit hash to 268fb0b	2021-07-23 13:23:54 +00:00