From ef76cf01f668e2ab3d11012bbc2d3a3a42331b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20Olausson=20Holten=C3=A4s?= Date: Mon, 31 Oct 2022 14:51:48 +0100 Subject: [PATCH 1/3] add helper to upsert a guild member --- src/helpers/upsertGuildMember/index.ts | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/helpers/upsertGuildMember/index.ts diff --git a/src/helpers/upsertGuildMember/index.ts b/src/helpers/upsertGuildMember/index.ts new file mode 100644 index 0000000..22a90a2 --- /dev/null +++ b/src/helpers/upsertGuildMember/index.ts @@ -0,0 +1,38 @@ +import { GuildMember } from "discord.js"; +import db from "../../handlers/database"; + +export default async (guildMember: GuildMember) => { + const { guild, user } = guildMember; + + return await db.guildMember.upsert({ + where: { + userId_guildId: { + userId: user.id, + guildId: guild.id, + }, + }, + update: {}, + create: { + user: { + connectOrCreate: { + create: { + id: user.id, + }, + where: { + id: user.id, + }, + }, + }, + guild: { + connectOrCreate: { + create: { + id: guild.id, + }, + where: { + id: guild.id, + }, + }, + }, + }, + }); +}; From 8e2a0cca3a36272bdf926a07acf3dc83cc75ea6f Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Tue, 1 Nov 2022 18:15:50 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=B7=20Change=20"on"=20in=20Docker?= =?UTF-8?q?=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 36aadf5..53a45c2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,16 +1,11 @@ name: Docker Image CI on: - schedule: - - cron: "0 10 * * *" push: - branches: - - "**" - tags: - - "v*.*.*" - pull_request: branches: - "main" + tags: + - "*.*.*" jobs: docker: From 2980c376b72c202ecda5b16667f34364bc6ebe1c Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Tue, 1 Nov 2022 18:20:25 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=B8=20improve=20dev=20experience?= =?UTF-8?q?=20in=20vs=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 62 ++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 65197a8..070efb6 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,50 +3,30 @@ // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp // List of extensions which should be recommended for users of this workspace. "recommendations": [ - "abrahamwilliam007.es7-javascript-class-snippets", + "nicoespeon.abracadabra", + "mgmcdermott.vscode-language-babel", + "aaron-bond.better-comments", + "streetsidesoftware.code-spell-checker", + "adpyke.codesnap", + "mikestead.dotenv", + "mateuszdrewniak.theme-dracula-dark-plus", + "irongeek.vscode-env", + "dbaeumer.vscode-eslint", + "dracula-theme.theme-dracula", + "mhutchie.git-graph", + "donjayamanne.githistory", + "github.github-vscode-theme", + "eamodio.gitlens", + "vtrois.gitmoji-vscode", + "xabikos.javascriptsnippets", "christian-kohler.npm-intellisense", "christian-kohler.path-intellisense", - "dbaeumer.vscode-eslint", - "donjayamanne.githistory", - "eamodio.gitlens", - "esbenp.prettier-vscode", - "github.github-vscode-theme", - "irongeek.vscode-env", - "xabikos.javascriptsnippets", - "wix.vscode-import-cost", - "vscode-icons-team.vscode-icons", - "visualstudioexptteam.vscodeintellicode", - "teledemic.branch-warnings", - "tabnine.tabnine-vscode", - "streetsidesoftware.code-spell-checker", - "seatonjiang.gitmoji-vscode", - "sburg.vscode-javascript-booster", - "kisstkondoros.vscode-codemetrics", - "mgmcdermott.vscode-language-babel", - "mhutchie.git-graph", - "mikestead.dotenv", - "mongodb.mongodb-vscode", - "ms-vscode-remote.remote-wsl-recommender", - "ms-vscode.js-debug", - "ms-vscode.js-debug-companion", - "ms-vscode.references-view", - "ms-vscode.vscode-js-profile-table", - "pflannery.vscode-versionlens", - "adpyke.codesnap", - "anan.devdocstab", - "axosoft.gitkraken-glo", - "gruntfuggly.todo-tree", - "kiteco.kite", - "lkytal.pomodoro", - "wayou.vscode-todo-highlight", "johnpapa.vscode-peacock", - "stepsize.stepsize", - "nicoespeon.abracadabra", - "sonarsource.sonarlint-vscode", - "nicoespeon.hocus-pocus", - "aaron-bond.better-comments", - "oouo-diogo-perdigao.docthis", - "Vtrois.gitmoji-vscode" + "esbenp.prettier-vscode", + "wayou.vscode-todo-highlight", + "gruntfuggly.todo-tree", + "pflannery.vscode-versionlens", + "vscode-icons-team.vscode-icons" ], // List of extensions recommended by VS Code that should not be recommended for users of this workspace. "unwantedRecommendations": []