chore: some containers

Dockerfile

@@ -8,4 +8,4 @@ RUN make install
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 RUN dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install
 RUN rm -rf google-chrome-stable_current_amd64.deb; apt-get update
-ENTRYPOINT ["python", "-m", "bot"]
+ENTRYPOINT ["make", "start"]

Makefile

@@ -1,7 +1,10 @@
 .PHONY: install
 
-run-container:
-	docker-compose up -d
+run-containers:
+	docker-compose up -d --remove-orphans
+
+remove-containers:
+	docker-compose down --volumes
 
 install:
 	pip install --no-deps -U pytgcalls==3.0.0.dev24 tgcalls==3.0.0.dev6
@@ -17,6 +20,6 @@ lint:
 session-string:
 	python ./session/session.py
 
-start: install
+start:
 	python -m bot
 

bot/__init__.py

@@ -16,7 +16,7 @@
 # ------------------------------------------------------------------------------
 
 _API_ID = config.API_ID
-_API_HASH = config.API_ID
+_API_HASH = config.API_HASH
 _BOT_TOKEN = config.BOT_TOKEN
 _SESSION_STRING = config.SESSION_STRING
 _POSTGRES_DB = config.POSTGRES_DB

bot/config.py

@@ -4,11 +4,12 @@
 
 class Config(object):
     def __init__(self):
-        current_dir = os.path.dirname(os.path.abspath(__file__))
-        path = os.path.join(current_dir, "../.env")
+        cwd = os.path.dirname(os.path.abspath(__file__))
+        path = os.path.join(cwd, "../.env")
         load_dotenv(path)
-        self.API_HASH = os.getenv("API_HASH")
+
         self.API_ID = os.getenv("API_ID")
+        self.API_HASH = os.getenv("API_HASH")
         self.BOT_TOKEN = os.getenv("BOT_TOKEN")
         self.BOT_USERNAME = os.getenv("BOT_USERNAME")
         self.CHANNEL = os.getenv("CHANNEL")
@@ -20,6 +21,8 @@ def __init__(self):
         self.POSTGRES_DB = os.getenv("POSTGRES_DB")
         self.POSTGRES_USER = os.getenv("POSTGRES_USER")
         self.POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD")
+        self.POSTGRES_HOST = os.getenv("POSTGRES_HOST")
+        self.POSTGRES_PORT = os.getenv("POSTGRES_PORT")
         self.REDIS_HOST = os.getenv("REDIS_HOST")
         self.REDIS_PASSWORD = os.getenv("REDIS_PASSWORD")
         self.REDIS_PORT = os.getenv("REDIS_PORT")

bot/plugins/commands/play_song.py

@@ -167,8 +167,8 @@ async def _(client: Client, message: Message):
             )
             return await msg.edit(
                 f"__Added to queue at {position} \n\n Title: [{name}]({url})\nDuration: {duration} Minutes\n Requested by:__ [{data['first_name']}]({data['mention']})",
-                    reply_markup=InlineKeyboardMarkup(
-                        [[InlineKeyboardButton("cʟᴏꜱᴇ", callback_data="cls")]]
+                reply_markup=InlineKeyboardMarkup(
+                    [[InlineKeyboardButton("cʟᴏꜱᴇ", callback_data="cls")]]
                 ),
             )
         if message.chat.id not in get_queues():

docker-compose.yml

@@ -9,7 +9,7 @@ services:
     env_file:
       - ./.env
     ports:
-      - "$($POSTGRES_PORT):$($POSTGRES_PORT)"
+      - "$POSTGRES_PORT:$POSTGRES_PORT"
   cache:
     image: redis:7.2.1-alpine3.18
     restart: always
@@ -18,7 +18,7 @@ services:
       - cache:/data
     command: redis-server --save 20 1 --loglevel warning --requirepass $REDIS_PASSWORD
     ports:
-      - "$($REDIS_PORT):$($REDIS_PORT)"
+      - "$REDIS_PORT:$REDIS_PORT"
   pgadmin:
     image: dpage/pgadmin4
     restart: always
@@ -32,7 +32,7 @@ services:
       - "5050:80"
     expose:
      - 5050
-  bot:
+  app:
     build: .
     depends_on:
       - db