Merge pull request #7 from w1tnessbtwwwww/future

Future

.github/workflows/deploy.yml

@@ -0,0 +1,28 @@
+name: Deployment
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - master
+
+
+jobs:
+  Deploy:
+    runs-on: self-hosted
+    steps:
+      - name: Downloading repository
+        uses: actions/checkout@v4
+
+      - name: Copy .env file
+        run: |
+          echo "${{ secrets.QUOTE_ENV }}" > .env
+
+      - name: Run docker-compose.yml
+        run: |
+          make deploy
+
+

.gitignore

@@ -4,4 +4,7 @@
 
 .DS_Store
 
-temp_quotes/
+
+
+
+*.log

Makefile

@@ -1,3 +1,8 @@
 dev:
 	poetry run python main.py
 
+deploy:
+	docker-compose -f docker/docker-compose.yml --project-directory . up --build -d
+
+deploydebug:
+	docker-compose -f docker/docker-compose.yml --project-directory . up --build

app/cfg/settings.py

@@ -3,5 +3,7 @@
 class Settings(BaseSettings):
     TELEGRAM_TOKEN: str
 
+    class Config:
+        env_file = '.env'
 
 settings = Settings()

app/quote_module/models/quote_model.py

@@ -4,9 +4,10 @@
 
 
 class QuoteModel:
-    def __init__(self, quote: str, author: str):
+    def __init__(self, quote: str, author: str, avatar:str):
         self.quote = quote
         self.author = author
+        self.avatar = avatar
 
     @property
     def wrapped_quote(self, chunk_size=50):

app/quote_module/quote.py

@@ -1,6 +1,5 @@
 from app.quote_module.models.quote_model import QuoteModel
 from app.utils.result.result import Result, err, success
-from app.utils.logger.logger import logger
 from PIL import Image, ImageDraw, ImageFont
 import textwrap
 
@@ -36,7 +35,7 @@ def create_avatar_circle(size, border_color='black', border_width=2):
 def paste_avatar(image, avatar, position):
     image.paste(avatar, position, avatar)
 
-def generate_image(quote_text: str, author_name: str) -> Result[None]:
+def generate_image(quote_text: str, author_name: str, avatar:str) -> Result[None]:
     title_font = ImageFont.truetype("app/quote_module/media/Roboto-Medium.ttf", 24)
     quote_font = ImageFont.truetype("app/quote_module/media/Roboto-Medium.ttf", 20)
     author_font = ImageFont.truetype("app/quote_module/media/Roboto-Medium.ttf", 16)
@@ -73,17 +72,17 @@ def generate_image(quote_text: str, author_name: str) -> Result[None]:
 
     author_position = (padding + avatar_size + padding, height - author_height - padding)
     add_text(image, author_text, author_font, author_position)
-
+    
     avatar = create_avatar_circle(avatar_size)
     avatar_position = (50, height - avatar_size - 50)
-    # paste_avatar(image, f"{author_name}_avatar.png", avatar_position)
+    paste_avatar(image, f"{author_name}_avatar.png", avatar_position)
 
 
     image.save(f'temp_quotes/{author_name.replace("@", "")}.png')
     image.close()
 def generate_quote(quote: QuoteModel) -> Result[None]:
     try:
-        generate_image(quote.wrapped_quote, quote.author)
+        generate_image(quote.wrapped_quote, quote.author, quote.avatar)
         return success(None)
     except Exception as e:
         print(e)

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.7-slim-bullsey
+FROM python:3.12.7-slim-bullseye
 
 RUN apt-get update && apt-get install -y \
     gcc \

docker/docker-compose.yml

@@ -1,8 +1,8 @@
 
 
 services:
-  quoteGen:
-    container_name: quoteGen
+  quote_gen:
+    container_name: quote_gen
     build:
       context: .
       dockerfile: docker/Dockerfile

main.py

@@ -1,10 +1,10 @@
 import asyncio
 import os
 import telebot
+import requests
 from telebot.types import Message
 from telebot.types import UserProfilePhotos
 
-import logging
 
 from app.quote_module.models.quote_model import QuoteModel
 from app.utils.get_user_avatar import get_user_avatar
@@ -19,12 +19,26 @@
 
 @bot.message_handler(func=lambda message: True)
 def handle_all_messages(message: telebot.types.Message):
-
-    logging.info(f"Received message: {message}")
 
     if message.forward_from or message.forward_from_chat:
+        user_id = message.forward_from.id
+        try:
+            photos = bot.get_user_profile_photos(user_id)
+            if photos.total_count > 0:
+                file_id = photos.photos[0][-1].file_id
+                file_info = bot.get_file(file_id)
+                file_path = file_info.file_path
+                file_url = f"https://api.telegram.org/file/bot{settings.TELEGRAM_TOKEN}/{file_path}"
+                response =  requests.get(file_url)
+                if response.status_code == 200:
+                    with open(f"{message.forward_from.full_name}_avatar.png", "wb") as file:
+                        file.write(response.content)
+                else:
+                    bot.send_message(message.chat.id, "Не удалось скачать аватар")
+        except Exception as e:
+            bot.reply_to(message, f"Ошибка!")
         # avatar = get_user_avatar(message.forward_from.username, message.forward_from.id, bot)
-        image = generate_quote(QuoteModel(message.any_text, message.forward_from.username))
+        image = generate_quote(QuoteModel(message.any_text, message.forward_from.username, f"{message.forward_from.full_name}"))
         if image.success:
             with open(f"temp_quotes/{message.forward_from.username}.png", "rb") as photo:
                 bot.send_photo(message.chat.id, photo)

pyproject.toml

@@ -12,6 +12,7 @@ telebot = "^0.0.5"
 pydantic = "^2.10.3"
 pillow = "^11.0.0"
 pytelegrambotapi = "^4.25.0"
+pydantic-settings = "^2.7.0"
 
 
 [build-system]