[pull] master from tgbot-collection:master

.dockerignore

@@ -1,4 +1,5 @@
 env
+venv
 db_data
 .ash_history
-.DS_Store
+.DS_Store

.env.example

@@ -0,0 +1,66 @@
+# Example .env file for ytdlbot configuration
+
+# Number of workers (default is 100)
+WORKERS=100
+
+# Telegram app ID
+APP_ID=
+
+# Telegram app hash
+APP_HASH=
+
+# Telegram bot token
+BOT_TOKEN=
+
+# Owner ID, comma-separated
+OWNER=
+
+# List of authorized users, comma-separated
+AUTHORIZED_USER=
+
+# Database connection address, i.e. mysql+pymysql://user:pass@mysql/dbname
+DB_DSN=mysql+pymysql://ytdlbot:your_password@mysql/ytdlbot
+
+# Redis host, leave it empty to use fakeredis
+REDIS_HOST=redis
+
+# Enable FFMPEG for video processing (True/False)
+ENABLE_FFMPEG=False
+
+# Desired audio format (e.g., mp3, wav), leave it empty to use m4a
+AUDIO_FORMAT=
+
+# Enable m3u8 link support (True/False)
+M3U8_SUPPORT=False
+
+# Enable Aria2 for downloads (True/False)
+ENABLE_ARIA2=False
+
+# Path to Rclone executable
+RCLONE_PATH=
+
+# Enable VIP features (True/False)
+ENABLE_VIP=False
+
+# Payment provider token from Bot Father
+PROVIDER_TOKEN=
+
+# Free downloads allowed per user
+FREE_DOWNLOAD=5
+
+# Rate limit for requests
+RATE_LIMIT=120
+
+# Path for temporary files (ensure the directory exists and is writable)
+TMPFILE_PATH=
+
+# Maximum size for Telegram uploads in MB
+TG_NORMAL_MAX_SIZE=2000
+
+# Maximum URL length in captions
+CAPTION_URL_LENGTH_LIMIT=150
+
+# potoken 'https://github.com/yt-dlp/yt-dlp/wiki/PO-Token-Guide'
+POTOKEN=11
+
+BROWSERS=firefox

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: BennyThink
+custom: https://buy.stripe.com/bIYbMa9JletbevCaEE

.github/workflows/builder.yaml

@@ -1,6 +1,8 @@
 name: docker image builder
 on:
   push:
+    paths-ignore:
+      - '**.md'
     branches:
       - 'master'
 
@@ -9,63 +11,65 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Lower case for Docker Hub
         id: dh_string
-        uses: ASzc/change-string-case-action@v1
+        uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}
 
       - name: Lower case for ghcr
         id: ghcr_string
-        uses: ASzc/change-string-case-action@v1
+        uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ github.event.repository.full_name }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/arm,linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ${{ steps.dh_string.outputs.lowercase }}
+            ${{ steps.dh_string.outputs.lowercase }}:${{ github.sha }} 
             ghcr.io/${{ steps.ghcr_string.outputs.lowercase }}
+            ghcr.io/${{ steps.ghcr_string.outputs.lowercase }}:${{ github.sha }}
 
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
       - name: Move cache
         run: |
           rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.gitignore

@@ -159,4 +159,23 @@ ytdlbot/ytdl.session
 data/*
 upgrade_worker.sh
 ytdl.session
-reinforcement/*
+reinforcement/*
+/ytdlbot/session/celery.session
+/.idea/prettier.xml
+/.idea/watcherTasks.xml
+/ytdlbot/session/ytdl.session-journal
+/ytdlbot/unknown_errors.txt
+/ytdlbot/ytdl.session-journal
+/ytdlbot/ytdl-main.session-journal
+/ytdlbot/ytdl-main.session
+/ytdlbot/ytdl-celery.session-journal
+/ytdlbot/ytdl-celery.session
+/ytdlbot/main.session
+/ytdlbot/tasks.session
+/ytdlbot/tasks.session-journal
+/ytdlbot/premium.session
+/dump.rdb
+/ytdlbot/premium.session-journal
+/ytdlbot/main.session-journal
+/src/main.session
+/src/main.session-journal

Dockerfile

@@ -1,19 +1,16 @@
-FROM python:3.9-alpine as builder
+FROM python:3.12-alpine AS pybuilder
+ADD pyproject.toml pdm.lock /build/
+WORKDIR /build
+RUN apk add alpine-sdk python3-dev musl-dev linux-headers
+RUN pip install pdm
+RUN pdm install
 
-RUN apk update && apk add  --no-cache tzdata alpine-sdk libffi-dev ca-certificates
-ADD requirements.txt /tmp/
-RUN pip3 install --user -r /tmp/requirements.txt && rm /tmp/requirements.txt
+FROM python:3.12-alpine AS runner
+WORKDIR /app
 
+RUN apk update && apk add --no-cache ffmpeg aria2 deno
+COPY --from=pybuilder /build/.venv/lib/ /usr/local/lib/
+COPY src /app
+WORKDIR /app
 
-FROM python:3.9-alpine
-WORKDIR /ytdlbot/ytdlbot
-ENV TZ=Asia/Shanghai
-
-COPY apk.txt /tmp/
-RUN apk update && xargs apk add  < /tmp/apk.txt
-COPY --from=builder /root/.local /usr/local
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
-COPY . /ytdlbot
-
-CMD ["/usr/local/bin/supervisord", "-c" ,"/ytdlbot/conf/supervisor_main.conf"]
+CMD ["python" ,"main.py"]