diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..1935f14 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,59 @@ +# Python +__pycache__/ +*.py[cod] +*$py.class +*.so +.Python +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ +pythonenv/ + +# Package files +*.egg +*.egg-info/ +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg +lib/ +lib64/ +pip-log.txt +pip-delete-this-directory.txt + +# Logs and databases +*.log +*.sqlite3 +*.db + +# Environment variables +.env +.env.local +.env.production + +# IDE +.vscode/ +.idea/ +*.swp +*.swo +*~ + +# OS +.DS_Store +Thumbs.db + +# Docker +Dockerfile +.dockerignore + +# Temp files +tmp/ +temp/ + +backups/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0264038..0a4126d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ venv/ __pycache__/ *.pyc -.env .secrets -db_settings.py src/data/secrets/ -src/backups/ \ No newline at end of file +src/backups/ + +secrets/ +.env \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5426081 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM python:3 + +WORKDIR /usr/src/moderation-bot +COPY requirements.txt ./ +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . +CMD [ "python", "src/test.py" ] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..9e0875f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ + +services: + discord-moderation-bot: + build: . + image: discord-moderation-bot + container_name: discord-moderation-bot + restart: always + networks: + - postgres-network + env_file: + - .env + +networks: + postgres-network: + external: true diff --git a/filter.txt b/filter.txt deleted file mode 100644 index c3cc3d5..0000000 --- a/filter.txt +++ /dev/null @@ -1,8 +0,0 @@ -+ /ModBot/** -- /ModBot/venv/** -- /ModBot/__pycache__/** -- /ModBot/backups/** -- /ModBot/.env -- /ModBot/.secrets -- /ModBot/*.pyc -- * \ No newline at end of file diff --git a/src/CoreMod.py b/src/CoreMod.py index ca8ec76..9ebe0b5 100644 --- a/src/CoreMod.py +++ b/src/CoreMod.py @@ -14,7 +14,7 @@ import json import re from constants.global_constants import * -from data.secrets.TOKENS import TOKENS +from libs.tokens_formatter import TOKENS from database.db_classes import all_data as DataBaseClasses from managers.DataBaseManager import DatabaseManager from database.settings import config diff --git a/src/database/settings/db_settings.py b/src/database/settings/db_settings.py new file mode 100644 index 0000000..9c12238 --- /dev/null +++ b/src/database/settings/db_settings.py @@ -0,0 +1,7 @@ +import os + +DB_HOST=os.getenv("DB_HOST", "localhost") +DB_PORT=os.getenv("DB_PORT", "5432") +DB_USER=os.getenv("DB_USER", "discord_economy_bot") +DB_PASS=os.getenv("DB_PASSWORD", "economy_bot") +DB_NAME=os.getenv("DB_NAME", "discord_economy_bot_db") \ No newline at end of file diff --git a/src/libs/tokens_formatter.py b/src/libs/tokens_formatter.py new file mode 100644 index 0000000..5b8c3aa --- /dev/null +++ b/src/libs/tokens_formatter.py @@ -0,0 +1,14 @@ + +TOKENS: dict[str, str] = {} + +with open("secrets/TOKEN_KrekAdminBot.txt") as file: + TOKENS = {'KrekAdminBot': file.read()} + +with open("secrets/TOKEN_KrekFunBot.txt") as file: + TOKENS = {'KrekFunBot': file.read()} + +with open("secrets/TOKEN_KrekRimagochiBot.txt") as file: + TOKENS = {'KrekRimagochiBot': file.read()} + +with open("secrets/TOKEN_KrekSupBot.txt") as file: + TOKENS = {'KrekSupBot': file.read()} \ No newline at end of file diff --git a/src/test.py b/src/test.py index 2b929d4..2feb6fb 100644 --- a/src/test.py +++ b/src/test.py @@ -33,7 +33,7 @@ import random import json import shutil from constants.global_constants import * -from data.secrets.TOKENS import TOKENS +from libs.tokens_formatter import TOKENS import CoreMod