.gitea/workflows/docker.yml

@@ -1,48 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches:
-      - "*"
-    tags:
-      - "*"
-  pull_request:
-    branches:
-      - "main"
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            git.sebclem.fr/${{ gitea.repository }}            
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}            
-
-      - name: Login to registry
-        if: github.ref_type == 'tag'
-        uses: docker/login-action@v3
-        with:
-          registry: git.sebclem.fr
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: ${{ github.ref_type == 'tag' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,5 +1,5 @@
 # For more information, please refer to https://aka.ms/vscode-docker-python
-FROM python:3.12-alpine
+FROM python:3.10-slim
 
 # Keeps Python from generating .pyc files in the container
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -7,8 +7,6 @@ ENV PYTHONDONTWRITEBYTECODE=1
 # Turns off buffering for easier container logging
 ENV PYTHONUNBUFFERED=1
 
-RUN apk add build-base
-
 # Install pip requirements
 COPY requirements.txt .
 RUN python -m pip install -r requirements.txt

renovate.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "commitMessagePrefix": ":arrow_up:"
-
-}

requirements.txt

@@ -1,21 +1,2 @@
-pixivpy3==3.7.5
+pixivpy3
-discord.py==2.4.0
+discord.py
-
-# Freeze
-aiohttp==3.10.6
-aiosignal==1.3.1
-async-timeout==4.0.3
-attrs==24.2.0
-certifi==2024.8.30
-charset-normalizer==3.3.2
-cloudscraper==1.2.71
-frozenlist==1.4.1
-idna==3.10
-isort==5.13.2
-multidict==6.1.0
-pyparsing==3.1.4
-requests==2.32.3
-requests-toolbelt==1.0.0
-typing_extensions==4.12.2
-urllib3==2.2.3
-yarl==1.12.1

src/discord_tools/message.py

@@ -1,4 +1,7 @@
+import math
 import os
+from tkinter.tix import IMAGE
+from turtle import Turtle
 from typing import List
 
 import discord
@@ -9,14 +12,7 @@ IMAGE_NBR_LIMIT = 10
 DEFAULT_UPLOAD_SIZE_LIMIT = 209715200
 
 
-async def send_message(
+async def send_message(message: discord.Message, files, tmp_dir: str, muted: bool):
-    message: discord.Message,
-    files,
-    tmp_dir: str,
-    muted: bool,
-    title: str,
-    art_author: str,
-):
     to_send_files = []
     for file in files:
         joined = os.path.join(tmp_dir, file)
@@ -39,8 +35,7 @@ async def send_message(
             to_send_files = to_send_files[1:]
         elif first:
             await message.reply(
-                files=splited_file,
+                files=splited_file, content=(TIPS_MESSAGE if not muted else None)
-                content=f"**{title}** by `{art_author}` {chr(10) + TIPS_MESSAGE if not muted else ''}",
             )
             first = False
         else:
@@ -83,7 +78,7 @@ async def send_command_reply(
         elif first:
             await interaction.followup.send(
                 files=splited_file,
-                content=f"**{title}** by `{art_author}` - <{url}> - Submited by {author.mention} {chr(10) + TIPS_MESSAGE if not muted else ''}",
+                content=f"{title} by {art_author} - <{url}> - Submited by {author.mention} {chr(10) + TIPS_MESSAGE if not muted else ''}",
             )
             first = False
         else:

src/main.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 import os
 from shlex import join
@@ -56,13 +55,8 @@ async def pixivprev(interaction: discord.Interaction, url: str):
     if result and match is not None:
         await interaction.response.defer()
         with TemporaryDirectory() as tmp_dir:
-            loop = asyncio.get_running_loop()
+            data = pixiv_api.dowload_pixiv_images(
-            data = await loop.run_in_executor(
+                int(match.group("id")), tmp_dir, REFRESH_TOKEN
-                None,
-                pixiv_api.download_pixiv_images,
-                int(match.group("id")),
-                tmp_dir,
-                REFRESH_TOKEN,
             )
             if data is None:
                 await interaction.response.send_message(
@@ -92,13 +86,8 @@ async def pixiv_preview(interaction: discord.Interaction, message: discord.Messa
     if result and match is not None:
         await interaction.response.defer()
         with TemporaryDirectory() as tmp_dir:
-            loop = asyncio.get_running_loop()
+            data = pixiv_api.dowload_pixiv_images(
-            data = await loop.run_in_executor(
+                int(match.group("id")), tmp_dir, REFRESH_TOKEN
-                None,
-                pixiv_api.download_pixiv_images,
-                int(match.group("id")),
-                tmp_dir,
-                REFRESH_TOKEN,
             )
             if data is None:
                 await interaction.response.send_message(
@@ -116,7 +105,7 @@ async def pixiv_preview(interaction: discord.Interaction, message: discord.Messa
                 title=title,
                 art_author=author,
                 url=match.group("url"),
-                author=message.author,
+                author=interaction.user,
             )
     else:
         await interaction.response.send_message(
@@ -137,25 +126,17 @@ async def on_message(message: discord.Message):
     if result and match is not None:
         with TemporaryDirectory() as tmp_dir:
             async with message.channel.typing():
-                loop = asyncio.get_running_loop()
+                data = pixiv_api.dowload_pixiv_images(
-                data = await loop.run_in_executor(
+                    int(match.group("id")), tmp_dir, REFRESH_TOKEN
-                    None,
-                    pixiv_api.download_pixiv_images,
-                    int(match.group("id")),
-                    tmp_dir,
-                    REFRESH_TOKEN,
                 )
                 if data is None:
                     return
-                (title, author) = data
                 files = os.listdir(tmp_dir)
                 files.sort()
                 # await send_message.send_message_with_embed(
                 #     message, files, title, tmp_dir, match.group("url")
                 # )
-                await discord_tools.message.send_message(
+                await discord_tools.message.send_message(message, files, tmp_dir, muted)
-                    message, files, tmp_dir, muted, title, author
-                )
 
 
 client.run(DISCORD_TOKEN)

src/pixiv/pixiv_api.py

@@ -9,11 +9,9 @@ import pixivpy3
 
 cpu_count = os.cpu_count()
 max_thread_num = cpu_count * 2 if cpu_count is not None else 4
-if max_thread_num > 10:
-    max_thread_num = 10
 
 
-def download_pixiv_images(
+def dowload_pixiv_images(
     illust_id: int,
     dest_folder: str,
     refresh_token: str,
@@ -24,7 +22,6 @@ def download_pixiv_images(
     json_result = api.illust_detail(illust_id)
     illust = json_result.illust
     if not illust["visible"]:
-        logging.info("Can't be viewed, return None")
         return None
     pages = illust["meta_pages"]
     if len(pages) > 0:
@@ -62,7 +59,7 @@ def download_pixiv_images(
             url=illust["meta_single_page"]["original_image_url"], path=dest_folder
         )
     logging.info("Download finished !")
-    return (illust["title"], f"{illust['user']['name']} ({illust['user']['account']})")
+    return (illust["title"], f"{illust['user']['name']}({illust['user']['account']})")
 
 
 def download_thread(q: Queue[Union[Tuple[str, str, pixivpy3.AppPixivAPI], None]]):