Compare commits

..

No commits in common. "main" and "0.1.1" have entirely different histories.
main ... 0.1.1

6 changed files with 7 additions and 89 deletions

View File

@ -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 }}

View File

@ -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

View File

@ -2,7 +2,5 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"commitMessagePrefix": ":arrow_up:"
]
}

View File

@ -1,21 +1,2 @@
pixivpy3==3.7.5
discord.py==2.4.0
# 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
pixivpy3
discord.py

View File

@ -9,14 +9,7 @@ IMAGE_NBR_LIMIT = 10
DEFAULT_UPLOAD_SIZE_LIMIT = 209715200
async def send_message(
message: discord.Message,
files,
tmp_dir: str,
muted: bool,
title: str,
art_author: str,
):
async def send_message(message: discord.Message, files, tmp_dir: str, muted: bool):
to_send_files = []
for file in files:
joined = os.path.join(tmp_dir, file)
@ -39,8 +32,7 @@ async def send_message(
to_send_files = to_send_files[1:]
elif first:
await message.reply(
files=splited_file,
content=f"**{title}** by `{art_author}` {chr(10) + TIPS_MESSAGE if not muted else ''}",
files=splited_file, content=(TIPS_MESSAGE if not muted else None)
)
first = False
else:

View File

@ -147,15 +147,12 @@ async def on_message(message: discord.Message):
)
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(
message, files, tmp_dir, muted, title, author
)
await discord_tools.message.send_message(message, files, tmp_dir, muted)
client.run(DISCORD_TOKEN)