From 35ec1c1f9270130d684a053edce38c4a97736386 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 18:58:46 +0900 Subject: [PATCH 01/10] new --- .github/workflows/black.yml | 32 ++++++++++++++++++++++++++++++++ .github/workflows/main.yml | 2 +- cogs/bot_info.py | 26 ++++++++++++++++++++++++++ cogs/bot_process.py | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/black.yml create mode 100644 cogs/bot_info.py create mode 100644 cogs/bot_process.py diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml new file mode 100644 index 0000000..b21f8bb --- /dev/null +++ b/.github/workflows/black.yml @@ -0,0 +1,32 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions + +name: black Code Format + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: "3.8" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install black + - name: black + run: | + black . diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 789452f..21cc655 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install flake8 pipenv + pip install flake8 - name: Lint with flake8 run: | flake8 . --count --ignore=E501,E722,C901 --select=E9,F63,F7,F82 --show-source --statistics diff --git a/cogs/bot_info.py b/cogs/bot_info.py new file mode 100644 index 0000000..faa6b78 --- /dev/null +++ b/cogs/bot_info.py @@ -0,0 +1,26 @@ +import discord +from discord.ext import commands +from discord import app_commands +from replit import db + +def bot_command_count_get(data): + return db[f"bot_command_{data}_count_db"] + +def bot_command_all_count_db_get(): + return db[f"bot_command_all_count_db"] + + +class bot_info(commands.Cog): + def __init__(self, bot: commands.Bot) -> None: + self.bot: commands.Bot = bot + + @app_commands.command( + name="bot_info", + description="Botの情報を表示します。" + ) + async def botinfo( + self, i: discord.Interaction + ): + await i.response.send_message(embed=discord.Embed(title='Botの情報').add_field(name='全コマンドの合計実行数', value=str(bot_command_all_count_db_get())), ephemeral=True) +async def setup(bot: commands.Bot) -> None: + await bot.add_cog(bot_info(bot)) diff --git a/cogs/bot_process.py b/cogs/bot_process.py new file mode 100644 index 0000000..e2fb2bd --- /dev/null +++ b/cogs/bot_process.py @@ -0,0 +1,33 @@ +import discord +from discord.ext import commands +from discord import app_commands +from replit import db + +def bot_command_count_get(data): + return db[f"bot_command_{data}_count_db"] + +def bot_command_count(data): + db[f"bot_command_{data}_count_db"] = int(bot_command_count_get()) + 1 + +def bot_command_all_count_db_get(): + return db[f"bot_command_all_count_db"] + +def bot_command_count_p1(): + db[f"bot_command_all_count_db"] = int(bot_command_all_count_db_get()) + 1 + + +class bot_process(commands.Cog): + def __init__(self, bot: commands.Bot) -> None: + self.bot: commands.Bot = bot + + @commands.Cog.listener(name='on_interaction') + async def interaction(self, i: discord.Interaction): + if i.type == discord.InteractionType.application_command: + bot_command_count_p1() + if self.bot.tree.get_command(i.command.name): + bot_command_count(i.command.name) + else: + return + +async def setup(bot: commands.Bot) -> None: + await bot.add_cog(bot_process(bot)) From f4c3e74f9ff9884c6d4f3d6b17591bd632649426 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:05:21 +0900 Subject: [PATCH 02/10] fix --- .github/workflows/black.yml | 56 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index b21f8bb..f65a909 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,32 +1,34 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: black Code Format +name: black on: push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -permissions: - contents: read jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v4 - with: - python-version: "3.8" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install black - - name: black - run: | - black . + formatter: + name: formatter + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.8.15] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install Poetry + run: | + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python + - name: Add path for Poetry + run: echo "$HOME/.poetry/bin" >> $GITHUB_PATH + - name: Install Dependencies + run: poetry install --no-interaction + - name: black + run: poetry run black . + - name: autoflake + run: poetry run autoflake -r . + - uses: stefanzweifel/git-auto-commit-action@v3.0.0 + with: + commit_message: Apply Code Formatter Change + ref: ${{ github.head_ref }} \ No newline at end of file From f00365dd2e4b7654054151217b11d1431f9ce227 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:07:09 +0900 Subject: [PATCH 03/10] fix --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index f65a909..7955058 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8.15] + python-version: 3.8 steps: - name: Checkout uses: actions/checkout@v3 From 594307d48e997fd8d990350165b71060ea172476 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:08:20 +0900 Subject: [PATCH 04/10] fix --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 7955058..27c515f 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: 3.8 + python-version: "3.8" steps: - name: Checkout uses: actions/checkout@v3 From 58d62526dd129a2c6a1b38f64759fbad485dc16d Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:10:26 +0900 Subject: [PATCH 05/10] fix: python-version --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 27c515f..9cc708b 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: "3.8" + python-version: [3.8.14] steps: - name: Checkout uses: actions/checkout@v3 From 99c6faff68d2c189b5fd0c832bebe32cad6de577 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:12:01 +0900 Subject: [PATCH 06/10] fix --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 9cc708b..3470336 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -19,7 +19,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install Poetry run: | - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python + curl -sSL https://install.python-poetry.org/ | python - name: Add path for Poetry run: echo "$HOME/.poetry/bin" >> $GITHUB_PATH - name: Install Dependencies From 2d027cb961a7aa8a473244ac29c88df27068ff8a Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:13:16 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=E3=81=93=E3=81=86=E3=81=A7=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=81=AF=E3=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 3470336..3b6bc70 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -23,7 +23,7 @@ jobs: - name: Add path for Poetry run: echo "$HOME/.poetry/bin" >> $GITHUB_PATH - name: Install Dependencies - run: poetry install --no-interaction + run: poetry install black - name: black run: poetry run black . - name: autoflake From a85b3a1e32243b2dcae2c532be5af1704d162208 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:16:24 +0900 Subject: [PATCH 08/10] new --- pyproject.toml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..561fda8 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,13 @@ +[tool.poetry] +name = "EightBot" +version = "2.0.0" +description = "" +authors = ["EightBotDev "] + +[tool.poetry.dependencies] +python = ">=3.8.0,<3.9" +numpy = "^1.22.2" +Flask = "^2.2.0" +urllib3 = "^1.26.12" +discord = "^2.0.0" +requests = "^2.28.1" From df17d15f51de7a48737b58cda57a0b6b331d07c3 Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:22:24 +0900 Subject: [PATCH 09/10] --- .github/workflows/black.yml | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 3b6bc70..3470336 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -23,7 +23,7 @@ jobs: - name: Add path for Poetry run: echo "$HOME/.poetry/bin" >> $GITHUB_PATH - name: Install Dependencies - run: poetry install black + run: poetry install --no-interaction - name: black run: poetry run black . - name: autoflake diff --git a/pyproject.toml b/pyproject.toml index 561fda8..348af2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,3 +11,4 @@ Flask = "^2.2.0" urllib3 = "^1.26.12" discord = "^2.0.0" requests = "^2.28.1" +black = "^22.10.0" From 90397041fa2fe45305ebda32ea6a7c8c7ae5b00a Mon Sep 17 00:00:00 2001 From: gx1285 <78240988+gx1285@users.noreply.github.com> Date: Wed, 2 Nov 2022 19:25:16 +0900 Subject: [PATCH 10/10] add: autoflake --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 348af2f..c35ce06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,3 +12,4 @@ urllib3 = "^1.26.12" discord = "^2.0.0" requests = "^2.28.1" black = "^22.10.0" +autoflake = "^1.7.7"