From d548d67b434982495a52347db7e55fe9f1d92dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Mare=C5=A1?= Date: Sun, 19 Jun 2022 10:57:28 +0000 Subject: [PATCH 01/10] refactor: rename chart to charts [ci skip] it is common practice to name the folder charts even though there is only one helm chart --- .gitlab-ci.yml | 2 +- deploy/{chart => charts}/wsj-standup/.helmignore | 0 deploy/{chart => charts}/wsj-standup/Chart.yaml | 0 deploy/{chart => charts}/wsj-standup/templates/_helpers.tpl | 0 deploy/{chart => charts}/wsj-standup/templates/configmap.yml | 0 deploy/{chart => charts}/wsj-standup/templates/job.yaml | 0 .../wsj-standup/templates/registry-secret.yaml | 0 .../{chart => charts}/wsj-standup/templates/serviceaccount.yaml | 0 deploy/{chart => charts}/wsj-standup/values.yaml | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename deploy/{chart => charts}/wsj-standup/.helmignore (100%) rename deploy/{chart => charts}/wsj-standup/Chart.yaml (100%) rename deploy/{chart => charts}/wsj-standup/templates/_helpers.tpl (100%) rename deploy/{chart => charts}/wsj-standup/templates/configmap.yml (100%) rename deploy/{chart => charts}/wsj-standup/templates/job.yaml (100%) rename deploy/{chart => charts}/wsj-standup/templates/registry-secret.yaml (100%) rename deploy/{chart => charts}/wsj-standup/templates/serviceaccount.yaml (100%) rename deploy/{chart => charts}/wsj-standup/values.yaml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93641b8..4642940 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,6 @@ deploy:prod: environment: name: prod script: - - helm upgrade --install wsj-standup ./deploy/chart/wsj-standup --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 + - helm upgrade --install wsj-standup ./deploy/charts/wsj-standup --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 rules: - if: '$CI_COMMIT_BRANCH == "main"' diff --git a/deploy/chart/wsj-standup/.helmignore b/deploy/charts/wsj-standup/.helmignore similarity index 100% rename from deploy/chart/wsj-standup/.helmignore rename to deploy/charts/wsj-standup/.helmignore diff --git a/deploy/chart/wsj-standup/Chart.yaml b/deploy/charts/wsj-standup/Chart.yaml similarity index 100% rename from deploy/chart/wsj-standup/Chart.yaml rename to deploy/charts/wsj-standup/Chart.yaml diff --git a/deploy/chart/wsj-standup/templates/_helpers.tpl b/deploy/charts/wsj-standup/templates/_helpers.tpl similarity index 100% rename from deploy/chart/wsj-standup/templates/_helpers.tpl rename to deploy/charts/wsj-standup/templates/_helpers.tpl diff --git a/deploy/chart/wsj-standup/templates/configmap.yml b/deploy/charts/wsj-standup/templates/configmap.yml similarity index 100% rename from deploy/chart/wsj-standup/templates/configmap.yml rename to deploy/charts/wsj-standup/templates/configmap.yml diff --git a/deploy/chart/wsj-standup/templates/job.yaml b/deploy/charts/wsj-standup/templates/job.yaml similarity index 100% rename from deploy/chart/wsj-standup/templates/job.yaml rename to deploy/charts/wsj-standup/templates/job.yaml diff --git a/deploy/chart/wsj-standup/templates/registry-secret.yaml b/deploy/charts/wsj-standup/templates/registry-secret.yaml similarity index 100% rename from deploy/chart/wsj-standup/templates/registry-secret.yaml rename to deploy/charts/wsj-standup/templates/registry-secret.yaml diff --git a/deploy/chart/wsj-standup/templates/serviceaccount.yaml b/deploy/charts/wsj-standup/templates/serviceaccount.yaml similarity index 100% rename from deploy/chart/wsj-standup/templates/serviceaccount.yaml rename to deploy/charts/wsj-standup/templates/serviceaccount.yaml diff --git a/deploy/chart/wsj-standup/values.yaml b/deploy/charts/wsj-standup/values.yaml similarity index 100% rename from deploy/chart/wsj-standup/values.yaml rename to deploy/charts/wsj-standup/values.yaml From 11d3191f049ad3f45025148332ff14de2281a43f Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Sat, 20 Aug 2022 11:31:29 +0200 Subject: [PATCH 02/10] refactor(helm): change default ImagePullPolicy to Always --- deploy/charts/wsj-standup/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/wsj-standup/values.yaml b/deploy/charts/wsj-standup/values.yaml index af4fcfd..8add9a2 100644 --- a/deploy/charts/wsj-standup/values.yaml +++ b/deploy/charts/wsj-standup/values.yaml @@ -1,6 +1,6 @@ image: repository: registry.mareshq.com/skaut/wsj/standup-discord-notification - pullPolicy: IfNotPresent + pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "" pullSecretBase64: null From bc197a9fd0537e6a6288c22834ab3307031e985e Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Sat, 20 Aug 2022 11:32:05 +0200 Subject: [PATCH 03/10] refactor(app): remove time from embed --- app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app.js b/app.js index a253e80..ea6895b 100644 --- a/app.js +++ b/app.js @@ -28,8 +28,7 @@ const message = { { "title": "HELP: WTF is Standup?", "description": "Krátké sepsání na čem pracujete, třeba v bodech. Co máte hotové z aktuálního sprintu, na čem pracujete, co vás ještě čeká, případné překážky nebo zda s něčím potřebujete pomoc.", - "color": 5814783, - "timestamp": (new Date()).toISOString() // "2022-05-24T22:00:00.000Z" + "color": 5814783 } ], "attachments": [] From a39cc7ff89cef1b46269fe7f841650d479726662 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:06:25 +0900 Subject: [PATCH 04/10] refactor: rename wsj-standup to wsj-drink (safe to do, this is a fork) - forked - renamed the helm chart --- .gitlab-ci.yml | 2 +- .../{wsj-standup => wsj-drink}/.helmignore | 0 .../{wsj-standup => wsj-drink}/Chart.yaml | 2 +- .../templates/_helpers.tpl | 20 +++++++++---------- .../templates/configmap.yml | 2 +- .../templates/job.yaml | 10 +++++----- .../templates/registry-secret.yaml | 2 +- .../templates/serviceaccount.yaml | 4 ++-- .../{wsj-standup => wsj-drink}/values.yaml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename deploy/charts/{wsj-standup => wsj-drink}/.helmignore (100%) rename deploy/charts/{wsj-standup => wsj-drink}/Chart.yaml (86%) rename deploy/charts/{wsj-standup => wsj-drink}/templates/_helpers.tpl (74%) rename deploy/charts/{wsj-standup => wsj-drink}/templates/configmap.yml (76%) rename deploy/charts/{wsj-standup => wsj-drink}/templates/job.yaml (68%) rename deploy/charts/{wsj-standup => wsj-drink}/templates/registry-secret.yaml (67%) rename deploy/charts/{wsj-standup => wsj-drink}/templates/serviceaccount.yaml (66%) rename deploy/charts/{wsj-standup => wsj-drink}/values.yaml (86%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4642940..11d4fc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,6 @@ deploy:prod: environment: name: prod script: - - helm upgrade --install wsj-standup ./deploy/charts/wsj-standup --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 + - helm upgrade --install wsj-drink ./deploy/charts/wsj-drink --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 rules: - if: '$CI_COMMIT_BRANCH == "main"' diff --git a/deploy/charts/wsj-standup/.helmignore b/deploy/charts/wsj-drink/.helmignore similarity index 100% rename from deploy/charts/wsj-standup/.helmignore rename to deploy/charts/wsj-drink/.helmignore diff --git a/deploy/charts/wsj-standup/Chart.yaml b/deploy/charts/wsj-drink/Chart.yaml similarity index 86% rename from deploy/charts/wsj-standup/Chart.yaml rename to deploy/charts/wsj-drink/Chart.yaml index d674e28..c6936e3 100644 --- a/deploy/charts/wsj-standup/Chart.yaml +++ b/deploy/charts/wsj-drink/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: wsj-standup +name: wsj-drink description: A Helm chart for Kubernetes type: application # SemVer diff --git a/deploy/charts/wsj-standup/templates/_helpers.tpl b/deploy/charts/wsj-drink/templates/_helpers.tpl similarity index 74% rename from deploy/charts/wsj-standup/templates/_helpers.tpl rename to deploy/charts/wsj-drink/templates/_helpers.tpl index 01dc9ca..87aec98 100644 --- a/deploy/charts/wsj-standup/templates/_helpers.tpl +++ b/deploy/charts/wsj-drink/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "wsj-standup.name" -}} +{{- define "wsj-drink.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "wsj-standup.fullname" -}} +{{- define "wsj-drink.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "wsj-standup.chart" -}} +{{- define "wsj-drink.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "wsj-standup.labels" -}} -helm.sh/chart: {{ include "wsj-standup.chart" . }} -{{ include "wsj-standup.selectorLabels" . }} +{{- define "wsj-drink.labels" -}} +helm.sh/chart: {{ include "wsj-drink.chart" . }} +{{ include "wsj-drink.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "wsj-standup.selectorLabels" -}} -app.kubernetes.io/name: {{ include "wsj-standup.name" . }} +{{- define "wsj-drink.selectorLabels" -}} +app.kubernetes.io/name: {{ include "wsj-drink.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "wsj-standup.serviceAccountName" -}} +{{- define "wsj-drink.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "wsj-standup.fullname" .) .Values.serviceAccount.name }} +{{- default (include "wsj-drink.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/deploy/charts/wsj-standup/templates/configmap.yml b/deploy/charts/wsj-drink/templates/configmap.yml similarity index 76% rename from deploy/charts/wsj-standup/templates/configmap.yml rename to deploy/charts/wsj-drink/templates/configmap.yml index 13d1353..4cadfed 100644 --- a/deploy/charts/wsj-standup/templates/configmap.yml +++ b/deploy/charts/wsj-drink/templates/configmap.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "wsj-standup.fullname" . }}-config + name: {{ include "wsj-drink.fullname" . }}-config data: WEBHOOK_URL: {{ .Values.app.WEBHOOK_URL }} SENTRY_DSN: {{ .Values.app.SENTRY_DSN }} diff --git a/deploy/charts/wsj-standup/templates/job.yaml b/deploy/charts/wsj-drink/templates/job.yaml similarity index 68% rename from deploy/charts/wsj-standup/templates/job.yaml rename to deploy/charts/wsj-drink/templates/job.yaml index 5e95f2c..cc2909b 100644 --- a/deploy/charts/wsj-standup/templates/job.yaml +++ b/deploy/charts/wsj-drink/templates/job.yaml @@ -1,9 +1,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "wsj-standup.fullname" . }}-job + name: {{ include "wsj-drink.fullname" . }}-job spec: - schedule: "0 8 * * 1" + schedule: "0 7-21 * * *" jobTemplate: spec: backoffLimit: 4 @@ -13,9 +13,9 @@ spec: spec: {{- if .Values.image.pullSecretBase64 }} imagePullSecrets: - - name: {{ include "wsj-standup.fullname" . }}-registry-credentials + - name: {{ include "wsj-drink.fullname" . }}-registry-credentials {{- end }} - serviceAccountName: {{ include "wsj-standup.serviceAccountName" . }} + serviceAccountName: {{ include "wsj-drink.serviceAccountName" . }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -24,5 +24,5 @@ spec: {{- toYaml .Values.resources | nindent 14 }} envFrom: - configMapRef: - name: {{ include "wsj-standup.fullname" . }}-config + name: {{ include "wsj-drink.fullname" . }}-config restartPolicy: OnFailure diff --git a/deploy/charts/wsj-standup/templates/registry-secret.yaml b/deploy/charts/wsj-drink/templates/registry-secret.yaml similarity index 67% rename from deploy/charts/wsj-standup/templates/registry-secret.yaml rename to deploy/charts/wsj-drink/templates/registry-secret.yaml index 722f864..f4e3dec 100644 --- a/deploy/charts/wsj-standup/templates/registry-secret.yaml +++ b/deploy/charts/wsj-drink/templates/registry-secret.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "wsj-standup.fullname" . }}-registry-credentials + name: {{ include "wsj-drink.fullname" . }}-registry-credentials type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: {{ .Values.image.pullSecretBase64 }} diff --git a/deploy/charts/wsj-standup/templates/serviceaccount.yaml b/deploy/charts/wsj-drink/templates/serviceaccount.yaml similarity index 66% rename from deploy/charts/wsj-standup/templates/serviceaccount.yaml rename to deploy/charts/wsj-drink/templates/serviceaccount.yaml index a0971ca..39ddc73 100644 --- a/deploy/charts/wsj-standup/templates/serviceaccount.yaml +++ b/deploy/charts/wsj-drink/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "wsj-standup.serviceAccountName" . }} + name: {{ include "wsj-drink.serviceAccountName" . }} labels: - {{- include "wsj-standup.labels" . | nindent 4 }} + {{- include "wsj-drink.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/deploy/charts/wsj-standup/values.yaml b/deploy/charts/wsj-drink/values.yaml similarity index 86% rename from deploy/charts/wsj-standup/values.yaml rename to deploy/charts/wsj-drink/values.yaml index 8add9a2..d0d4adf 100644 --- a/deploy/charts/wsj-standup/values.yaml +++ b/deploy/charts/wsj-drink/values.yaml @@ -1,5 +1,5 @@ image: - repository: registry.mareshq.com/skaut/wsj/standup-discord-notification + repository: registry.mareshq.com/skaut/wsj/drink-notification pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: "" From 9755b4554f6715b7423ace9b5159a94ec9dbc3dc Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:32:27 +0900 Subject: [PATCH 05/10] refactor: send drink reminder message, drop @sentry/node --- app.js | 14 +- package-lock.json | 385 +++------------------------------------------- package.json | 5 +- 3 files changed, 24 insertions(+), 380 deletions(-) diff --git a/app.js b/app.js index ea6895b..10e39f5 100644 --- a/app.js +++ b/app.js @@ -1,12 +1,6 @@ 'use strict' const axios = require('axios'); -const sentry = require("@sentry/node"); - -sentry.init({ - dsn: process.env.SENTRY_DSN, - environment: process.env.NODE_ENV, -}) const WEBHOOK_URL = process.env.WEBHOOK_URL || '' @@ -23,13 +17,14 @@ const config = { } const message = { - "content": "**Čas na další standup!**\nAhoj všichni, je pondělí a je tedy čas na další standup!\n\ncc @everyone", + "content": "Ahoj všichni (everyone), je tu vedro, tak se prosím teď všichni napijte.", "embeds": [ { - "title": "HELP: WTF is Standup?", - "description": "Krátké sepsání na čem pracujete, třeba v bodech. Co máte hotové z aktuálního sprintu, na čem pracujete, co vás ještě čeká, případné překážky nebo zda s něčím potřebujete pomoc.", + "title": "PITNÝ REŽIM", + "description": "Nezapomínejte, že podnebí v Koreji je velmi náročná pro nás a nejsme na něj zvyklí. Krom toho tady vykonáváme značnou fyzickou námahu. Proto je velmi důležité, aby jste dost pili a nezkolabovali jste. Tohle je ta nejlepší prevence, kterou můžeme udělat.", "color": 5814783 } + ], "attachments": [] } @@ -37,7 +32,6 @@ const message = { try { axios.post(WEBHOOK_URL, message, config) } catch (e) { - sentry.captureException(e) console.error(`[ERROR] ${e}`) process.exit(1) } diff --git a/package-lock.json b/package-lock.json index a96bbac..5e48326 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,131 +1,15 @@ { - "name": "discord-notifications", + "name": "wsj-drink", "version": "0.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "discord-notifications", + "name": "wsj-drink", "version": "0.0.0", "license": "UNLICENSED", "dependencies": { - "@sentry/node": "^6.19.7", - "axios": "^0.27.2" - } - }, - "node_modules/@sentry/core": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz", - "integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==", - "dependencies": { - "@sentry/hub": "6.19.7", - "@sentry/minimal": "6.19.7", - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@sentry/hub": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz", - "integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==", - "dependencies": { - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/hub/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@sentry/minimal": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz", - "integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==", - "dependencies": { - "@sentry/hub": "6.19.7", - "@sentry/types": "6.19.7", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/minimal/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@sentry/node": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz", - "integrity": "sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==", - "dependencies": { - "@sentry/core": "6.19.7", - "@sentry/hub": "6.19.7", - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "cookie": "^0.4.1", - "https-proxy-agent": "^5.0.0", - "lru_map": "^0.3.3", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/node/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@sentry/types": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz", - "integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/utils": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz", - "integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==", - "dependencies": { - "@sentry/types": "6.19.7", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/utils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" + "axios": "^1.4.0" } }, "node_modules/asynckit": { @@ -134,12 +18,13 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/combined-stream": { @@ -153,42 +38,18 @@ "node": ">= 0.8" } }, - "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "engines": { "node": ">=0.4.0" } }, "node_modules/follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "funding": [ { "type": "individual", @@ -217,23 +78,6 @@ "node": ">= 6" } }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/lru_map": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", - "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=" - }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -253,203 +97,10 @@ "node": ">= 0.6" } }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } - }, - "dependencies": { - "@sentry/core": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz", - "integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==", - "requires": { - "@sentry/hub": "6.19.7", - "@sentry/minimal": "6.19.7", - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@sentry/hub": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz", - "integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==", - "requires": { - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@sentry/minimal": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz", - "integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==", - "requires": { - "@sentry/hub": "6.19.7", - "@sentry/types": "6.19.7", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@sentry/node": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz", - "integrity": "sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==", - "requires": { - "@sentry/core": "6.19.7", - "@sentry/hub": "6.19.7", - "@sentry/types": "6.19.7", - "@sentry/utils": "6.19.7", - "cookie": "^0.4.1", - "https-proxy-agent": "^5.0.0", - "lru_map": "^0.3.3", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@sentry/types": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz", - "integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==" - }, - "@sentry/utils": { - "version": "6.19.7", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz", - "integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==", - "requires": { - "@sentry/types": "6.19.7", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "requires": { - "debug": "4" - } - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - } - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==" - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "lru_map": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", - "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" } } } diff --git a/package.json b/package.json index cc6d19e..57af5e9 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "discord-notifications", + "name": "wsj-drink", "version": "0.0.0", "description": "", "main": "app.js", @@ -9,7 +9,6 @@ "author": "Vojtech Mares ", "license": "UNLICENSED", "dependencies": { - "@sentry/node": "^6.19.7", - "axios": "^0.27.2" + "axios": "^1.4.0" } } From ea6677f918e66d46bba272f116fb0748288b1db7 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:36:50 +0900 Subject: [PATCH 06/10] fix(app.js): add missing @ for @everyone --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 10e39f5..1fe0867 100644 --- a/app.js +++ b/app.js @@ -17,7 +17,7 @@ const config = { } const message = { - "content": "Ahoj všichni (everyone), je tu vedro, tak se prosím teď všichni napijte.", + "content": "Ahoj všichni (@everyone), je tu vedro, tak se prosím teď všichni napijte.", "embeds": [ { "title": "PITNÝ REŽIM", From b2581368b04a866025cd4cc0a1761c8e554e7062 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:46:45 +0900 Subject: [PATCH 07/10] fix(helm): remove SENTRY_DSN --- .gitlab-ci.yml | 4 ++-- deploy/charts/wsj-drink/templates/configmap.yml | 1 - deploy/charts/wsj-drink/values.yaml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11d4fc7..c3e2fc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: sikalabs/ci + image: ghcr.io/vojtechmares/toolkit:latest stages: - build @@ -22,6 +22,6 @@ deploy:prod: environment: name: prod script: - - helm upgrade --install wsj-drink ./deploy/charts/wsj-drink --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set app.SENTRY_DSN=$SENTRY_DSN --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 + - helm upgrade --install wsj-drink ./deploy/charts/wsj-drink --namespace wsj --set image.tag=$IMAGE_TAG --set=app.WEBHOOK_URL=$DISCORD_WEBHOOK_URL --set image.pullSecretBase64=$REGISTRY_PULL_SECRET_BASE64 rules: - if: '$CI_COMMIT_BRANCH == "main"' diff --git a/deploy/charts/wsj-drink/templates/configmap.yml b/deploy/charts/wsj-drink/templates/configmap.yml index 4cadfed..354773b 100644 --- a/deploy/charts/wsj-drink/templates/configmap.yml +++ b/deploy/charts/wsj-drink/templates/configmap.yml @@ -4,5 +4,4 @@ metadata: name: {{ include "wsj-drink.fullname" . }}-config data: WEBHOOK_URL: {{ .Values.app.WEBHOOK_URL }} - SENTRY_DSN: {{ .Values.app.SENTRY_DSN }} NODE_ENV: {{ .Values.app.NODE_ENV }} diff --git a/deploy/charts/wsj-drink/values.yaml b/deploy/charts/wsj-drink/values.yaml index d0d4adf..7d3b04e 100644 --- a/deploy/charts/wsj-drink/values.yaml +++ b/deploy/charts/wsj-drink/values.yaml @@ -24,5 +24,4 @@ resources: app: WEBHOOK_URL: null - SENTRY_DSN: null NODE_ENV: prod From 1b356de98818a13d7752136b2cb531f4a7675508 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:47:24 +0900 Subject: [PATCH 08/10] fix(helm): translate UTC time to KST (GMT+9) --- deploy/charts/wsj-drink/templates/job.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/charts/wsj-drink/templates/job.yaml b/deploy/charts/wsj-drink/templates/job.yaml index cc2909b..8e03497 100644 --- a/deploy/charts/wsj-drink/templates/job.yaml +++ b/deploy/charts/wsj-drink/templates/job.yaml @@ -3,7 +3,9 @@ kind: CronJob metadata: name: {{ include "wsj-drink.fullname" . }}-job spec: - schedule: "0 7-21 * * *" + # Schedule does not support time zones, so we use UTC + # 7-21 UTC => 22-12 KRT (GMT+9) + schedule: "0 22-12 * * *" jobTemplate: spec: backoffLimit: 4 From 5be866b3e419c0056686b65f55a4b8651f9f6e9d Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 15:59:10 +0900 Subject: [PATCH 09/10] fix(helm): k8s 1.27+ can set timezone on CronJobs --- deploy/charts/wsj-drink/templates/job.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deploy/charts/wsj-drink/templates/job.yaml b/deploy/charts/wsj-drink/templates/job.yaml index 8e03497..a24a523 100644 --- a/deploy/charts/wsj-drink/templates/job.yaml +++ b/deploy/charts/wsj-drink/templates/job.yaml @@ -3,9 +3,8 @@ kind: CronJob metadata: name: {{ include "wsj-drink.fullname" . }}-job spec: - # Schedule does not support time zones, so we use UTC - # 7-21 UTC => 22-12 KRT (GMT+9) - schedule: "0 22-12 * * *" + timeZone: "Asia/Seoul" + schedule: "0 7-21 * * *" jobTemplate: spec: backoffLimit: 4 From d3844c74ca785654a6b9416304ef12274f8f4976 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Mon, 31 Jul 2023 16:41:18 +0900 Subject: [PATCH 10/10] chore(app): typos in message and embed - improve Czech message --- app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 1fe0867..af33c32 100644 --- a/app.js +++ b/app.js @@ -17,11 +17,11 @@ const config = { } const message = { - "content": "Ahoj všichni (@everyone), je tu vedro, tak se prosím teď všichni napijte.", + "content": "Ahoj všichni (@everyone), je tu vedro, tak se teď prosím všichni napijte.", "embeds": [ { "title": "PITNÝ REŽIM", - "description": "Nezapomínejte, že podnebí v Koreji je velmi náročná pro nás a nejsme na něj zvyklí. Krom toho tady vykonáváme značnou fyzickou námahu. Proto je velmi důležité, aby jste dost pili a nezkolabovali jste. Tohle je ta nejlepší prevence, kterou můžeme udělat.", + "description": "Nezapomínejte, že podnebí v Koreji je velmi náročné pro nás a nejsme na něj zvyklí. Krom toho tady vykonáváme značnou fyzickou námahu. Proto je velmi důležité, abychom všichni dost pili a nezkolabovali. Tohle je ta nejlepší prevence, kterou můžeme udělat.", "color": 5814783 }