123

.gitattributes

@@ -57,6 +57,3 @@ resources/fonts/HiraginoMin-W5-90-RKSJ-H-2.ttc filter=lfs diff=lfs merge=lfs -te
 resources/fonts/NotoSansSC-Regular.otf filter=lfs diff=lfs merge=lfs -text
 resources/fonts/NotoSerifSC-Regular.otf filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
-*.gif filter=lfs diff=lfs merge=lfs -text
-*.otf filter=lfs diff=lfs merge=lfs -text
-*.ttf filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -4,8 +4,6 @@ dist/
 .idea/
 venv/
 .venv/
-node_modules/
-pdm.lock
 
 result.png
 result.jpg

.pre-commit-config.yaml

@@ -1,26 +1,26 @@
+default_install_hook_types: [pre-commit, prepare-commit-msg]
 ci:
-  autofix_commit_msg: "style: auto fix by pre-commit hooks"
+  autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks"
   autofix_prs: true
-  autoupdate_branch: main
-  autoupdate_schedule: quarterly
-  autoupdate_commit_msg: "chore: auto update by pre-commit hooks"
+  autoupdate_branch: master
+  autoupdate_schedule: monthly
+  autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+  - repo: https://github.com/hadialqattan/pycln
+    rev: v2.1.3
     hooks:
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+      - id: pycln
+        args: [--config, pyproject.toml]
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
         stages: [commit]
-      - id: ruff-format
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
     hooks:
-      - id: prettier
-        types_or: [javascript, jsx, ts, tsx, markdown, yaml, json]
+      - id: black
         stages: [commit]
-        exclude: |
-          (?x)^(
-              resources/resource_list.json|
-              docs/memes.md
-          )$
+

Dockerfile

@@ -2,24 +2,35 @@ FROM python:3.10 as tmp
 
 WORKDIR /tmp
 
-RUN curl -sSL https://install.python-poetry.org | python -
-
 ENV PATH="${PATH}:/root/.local/bin"
 
 COPY ./pyproject.toml ./poetry.lock* /tmp/
-
-RUN poetry export -f requirements.txt --output requirements.txt --without-hashes
+RUN pip install poetry \
+  && poetry config virtualenvs.in-project true \
+  && poetry install --only main --no-interaction --no-ansi
 
 FROM python:3.10-slim as app
 
 WORKDIR /app
 
-EXPOSE 2233
+EXPOSE 7860
 
 VOLUME /data
 
+COPY --from=tmp /tmp/.venv /app/.venv
+
+COPY ./resources/fonts/* /usr/share/fonts/meme-fonts/
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends locales fontconfig fonts-noto-cjk fonts-noto-color-emoji gettext \
+  && localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 \
+  && fc-cache -fv \
+  && apt-get purge -y --auto-remove \
+  && rm -rf /var/lib/apt/lists/*
+
 ENV TZ=Asia/Shanghai \
   LC_ALL=zh_CN.UTF-8 \
+  PATH="/app/.venv/bin:${PATH}" \
+  VIRTUAL_ENV="/app/.venv" \
   LOAD_BUILTIN_MEMES=true \
   MEME_DIRS="[\"/data/memes\"]" \
   MEME_DISABLED_LIST="[]" \
@@ -29,27 +40,12 @@ ENV TZ=Asia/Shanghai \
   BAIDU_TRANS_APIKEY="" \
   LOG_LEVEL="INFO"
 
-COPY --from=tmp /tmp/requirements.txt /app/requirements.txt
-
-COPY ./resources/fonts/* /usr/share/fonts/meme-fonts/
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends locales fontconfig fonts-noto-color-emoji gettext \
-  && localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 \
-  && fc-cache -fv \
-  && apt-get purge -y --auto-remove \
-  && rm -rf /var/lib/apt/lists/* \
-  && pip install --no-cache-dir --upgrade -r /app/requirements.txt
-
 COPY ./meme_generator /app/meme_generator
 
-
-
 COPY ./docker/config.toml.template /app/config.toml.template
 COPY ./docker/start.sh /app/start.sh
 RUN mkdir -p /.config
 RUN chmod -R 777 /.config
 RUN chmod +x /app/start.sh
-RUN python -m meme_generator.cli
 
 CMD ["/app/start.sh"]

Dockerfile.memebot

@@ -1,58 +0,0 @@
-FROM python:3.10 as tmp
-
-WORKDIR /tmp
-
-RUN curl -sSL https://install.python-poetry.org | python -
-
-ENV PATH="${PATH}:/root/.local/bin"
-
-COPY ./pyproject.toml ./poetry.lock* /tmp/
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends git \
-  && poetry export -f requirements.txt --output requirements.txt --without-hashes \
-  && git clone --depth=1 https://github.com/MeetWq/github-meme-bot
-
-FROM python:3.10-slim as app
-
-WORKDIR /app
-
-EXPOSE 2233
-
-VOLUME /data
-
-ENV TZ=Asia/Shanghai \
-  LC_ALL=zh_CN.UTF-8 \
-  LOAD_BUILTIN_MEMES=true \
-  MEME_DIRS="[\"/data/memes\"]" \
-  MEME_DISABLED_LIST="[]" \
-  GIF_MAX_SIZE=10.0 \
-  GIF_MAX_FRAMES=100 \
-  BAIDU_TRANS_APPID="" \
-  BAIDU_TRANS_APIKEY="" \
-  LOG_LEVEL="INFO"
-
-COPY --from=tmp /tmp/requirements.txt /app/requirements.txt
-COPY --from=tmp /tmp/github-meme-bot/src /app/src
-COPY --from=tmp /tmp/github-meme-bot/bot.py /app/bot.py
-COPY --from=tmp /tmp/github-meme-bot/.env /app/.env
-
-COPY ./resources/fonts/* /usr/share/fonts/meme-fonts/
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends locales fontconfig fonts-noto-color-emoji gettext \
-  && localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 \
-  && fc-cache -fv \
-  && apt-get purge -y --auto-remove \
-  && rm -rf /var/lib/apt/lists/* \
-  && pip install --no-cache-dir --upgrade -r /app/requirements.txt \
-  && pip install --no-cache-dir --upgrade nonebot2 nonebot-adapter-github
-
-COPY ./meme_generator /app/meme_generator
-
-COPY ./docker/config.toml.template /app/config.toml.template
-COPY ./docker/start_memebot.sh /app/start_memebot.sh
-RUN chmod +x /app/start_memebot.sh
-RUN python -m meme_generator.cli
-
-CMD ["/app/start_memebot.sh"]

README.md

@@ -4,7 +4,6 @@ emoji: 🌖
 colorFrom: purple
 colorTo: indigo
 sdk: docker
-app_port: 2233
 pinned: false
 ---
 

docker/config.toml.template

@@ -13,7 +13,7 @@ baidu_trans_apikey = "$BAIDU_TRANS_APIKEY"
 
 [server]
 host = "0.0.0.0"
-port = 2233
+port = 7860
 
 [log]
 log_level = "$LOG_LEVEL"

docker/start_memebot.sh

@@ -1,7 +0,0 @@
-#! /usr/bin/env bash
-
-mkdir -p ~/.config/meme_generator
-
-envsubst < /app/config.toml.template > ~/.config/meme_generator/config.toml
-
-exec python /app/bot.py

docs/develop.md

@@ -72,6 +72,7 @@ add_meme(
 
 也可以一个文件中注册多个表情，如：[gif_subtitle](../meme_generator/memes/gif_subtitle/__init__.py)
 
+
 ## 参数定义
 
 部分表情需要额外的参数。表情参数的类型定义如下：

docs/docker.md

@@ -14,17 +14,19 @@ docker run -d \
 
 运行后可通过 api 方式调用
 
+
 ### 环境变量
 
-| 变量名               | 默认值              | 说明                    |
-| -------------------- | ------------------- | ----------------------- |
-| `MEME_DIRS`          | `'["/data/memes"]'` | 额外表情路径            |
-| `MEME_DISABLED_LIST` | `'[]'`              | 禁用表情列表            |
-| `GIF_MAX_SIZE`       | `10.0`              | 限制生成的 gif 文件大小 |
-| `GIF_MAX_FRAMES`     | `100`               | 限制生成的 gif 文件帧数 |
-| `BAIDU_TRANS_APPID`  | `''`                | 百度翻译 appid          |
-| `BAIDU_TRANS_APIKEY` | `''`                | 百度翻译 apikey         |
-| `LOG_LEVEL`          | `'INFO'`            | 日志等级                |
+| 变量名 | 默认值 | 说明 |
+| --- | --- | --- |
+| `MEME_DIRS` | `'["/data/memes"]'` | 额外表情路径 |
+| `MEME_DISABLED_LIST` | `'[]'` | 禁用表情列表 |
+| `GIF_MAX_SIZE` | `10.0` | 限制生成的 gif 文件大小 |
+| `GIF_MAX_FRAMES` | `100` | 限制生成的 gif 文件帧数 |
+| `BAIDU_TRANS_APPID` | `''` | 百度翻译 appid |
+| `BAIDU_TRANS_APIKEY` | `''` | 百度翻译 apikey |
+| `LOG_LEVEL` | `'INFO'` | 日志等级 |
+
 
 ### 加载额外表情
 
@@ -34,6 +36,7 @@ docker run -d \
 
 将额外表情放置于 `<YOUR_DATA_DIR>/memes` 即可
 
+
 完整的运行示例：
 
 ```shell