Merge pull request #2 from wiseCirno/dev

开发完了，收工

.github/workflows/docker-image.yml

@@ -2,37 +2,49 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "dev" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "dev" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    -
-      name: Checkout
-      uses: actions/checkout@v3
-    -
-      name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - 
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-    -
-      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    -
-      name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: |
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push for master
+        if: github.ref == 'refs/heads/master'
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: darinirvana/neko-chan:latest
+
+      - name: Build and push for dev
+        if: github.ref == 'refs/heads/dev'
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
             linux/amd64
             linux/arm64
-        push: true
-        tags: darinirvana/neko-chan:latest
+          push: true
+          tags: darinirvana/neko-chan:dev

Dockerfile

@@ -13,6 +13,6 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev libffi-dev \
     && pip install --no-cache-dir -r requirements.txt \
     && apk del --purge .build-deps
 
-VOLUME ["/neko", "/logs"]
+VOLUME /neko
 
-CMD ["python3", "/app/bot/Main.py"]
+CMD ["python3", "/app/bot/main.py"]

README.md

@@ -8,12 +8,11 @@ Neko is a self-hosted Telegram bot designed with many useful functions c:, espec
 
 - [x] Download stickers
 - [x] Upload manga as EPUB from Telegraph
-- [x] Image search using Ascii2d and Iqdb
+- [x] Image search using ASCII2D and Iqdb
 - [x] Sync manga from Telegraph to server
 - [x] ChatGPT assistant support
 - [x] Anime timeline search by using stickers(GIF)
-- [ ] Dmzj manga update notifications
-- [ ] Convert manga from Dmzj links to Telegraph
+- [x] Generate "Long Sticker"
 - [ ] Convert manga from EX, EH, NH links to Telegraph
 
 ### Back-end
@@ -25,8 +24,8 @@ Neko is a self-hosted Telegram bot designed with many useful functions c:, espec
 - [x] Integrate [trace.moe](https://soruly.github.io/trace.moe-api/#/) API
 - [x] Integrate [ChatAnywhere](https://chatanywhere.apifox.cn/) v1 API
 - [x] HTTP(S) and socks5 proxies support
-- [x] CloudFlare Workers proxy support based on [Cloudflare-Workers-Proxy](https://github.com/ymyuuu/Cloudflare-Workers-Proxy)
-- [ ] Fully integrate Dmzj v3 and v4 APIs
+- [x] CloudFlare Workers proxy support based
+  on [Cloudflare-Workers-Proxy](https://github.com/ymyuuu/Cloudflare-Workers-Proxy)
 - [ ] Fetch manga from EX, EH, NH sources
 
 ## 🔧 Docker Deployment