From e6a4627a31500345fdb52b1ce1a00ece697f9bb5 Mon Sep 17 00:00:00 2001 From: artifishvr <59352535+artifishvr@users.noreply.github.com> Date: Mon, 22 Apr 2024 19:44:59 -0700 Subject: [PATCH] Reapply "why is butterroach afraid" This reverts commit 8a200516c7c0bd2f78bff27dd6b2843f449f3d5b. --- .env.example | 1 + .github/workflows/deploy-image.yml | 30 ++++++ .gitignore | 161 ++++++++++++++++++++++++++++- Dockerfile | 10 ++ bot.py | 5 +- 5 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 .env.example create mode 100644 .github/workflows/deploy-image.yml create mode 100644 Dockerfile diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..03652b9 --- /dev/null +++ b/.env.example @@ -0,0 +1 @@ +DISCORD_TOKEN=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \ No newline at end of file diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml new file mode 100644 index 0000000..354ee04 --- /dev/null +++ b/.github/workflows/deploy-image.yml @@ -0,0 +1,30 @@ +name: Deploy Docker Image to GHCR + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + push-image: + runs-on: ubuntu-latest + steps: + - name: 'Make repo lowercase' + run: | + echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV} + + - name: 'Checkout GitHub Action' + uses: actions/checkout@v4 + + - name: 'Login to GitHub Container Registry' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{github.actor}} + password: ${{secrets.GH_TOKEN}} + + - name: 'Build & Publish Docker Image' + run: | + docker build . --tag "ghcr.io/${REPO}:latest" + docker push "ghcr.io/${REPO}:latest" diff --git a/.gitignore b/.gitignore index 77b3ac2..6769e21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,160 @@ -token.txt \ No newline at end of file +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..fc38ef2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.7-alpine + +WORKDIR /app + +COPY ["requirements.txt", "./"] +RUN pip install -r requirements.txt + +COPY . . + +CMD [ "python3", "bot.py" ] \ No newline at end of file diff --git a/bot.py b/bot.py index a40e082..3b8b244 100644 --- a/bot.py +++ b/bot.py @@ -1,6 +1,7 @@ import discord import requests from discord.ext import commands +import os intents = discord.Intents.default() intents.message_content = True @@ -13,8 +14,6 @@ .json() .keys() ) # only use of requests im so good at this stuff -with open("token.txt") as f: - token = f.read() @client.event @@ -89,4 +88,4 @@ async def ping(interaction: discord.Interaction): ) -client.run(token) +client.run(os.getenv("DISCORD_TOKEN"))