7han0s
diff --git a/‎.devcontainer/devcontainer.json‎
Lines changed: 6 additions & 0 deletions b/‎.devcontainer/devcontainer.json‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.env.sample‎
Lines changed: 6 additions & 3 deletions b/‎.env.sample‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎.github/FUNDING.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/FUNDING.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 30 additions & 11 deletions b/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 30 additions & 11 deletions
diff --git a/‎.github/workflows/codeql.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/codeql.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/pr-test-docker-build.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/pr-test-docker-build.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/publish-docker-image.yml‎
Lines changed: 11 additions & 11 deletions b/‎.github/workflows/publish-docker-image.yml‎
Lines changed: 11 additions & 11 deletions
diff --git a/‎.github/workflows/publish-to-pypi.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/publish-to-pypi.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/publish-to-test-pypi.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/publish-to-test-pypi.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/rough-test.yml‎
Lines changed: 96 additions & 11 deletions b/‎.github/workflows/rough-test.yml‎
Lines changed: 96 additions & 11 deletions
@@ -0,0 +1,6 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/python:3.12-bookworm",
+  "onCreateCommand": {
+    "install-python-packages": "pip install -r requirements.txt"
+  }
+}
@@ -1,5 +1,5 @@
 TOKEN=1234567890:A1BCd2EF3gH45IJK6lMN7oPqr8ST9UvWX0Yz0  # get it from @BotFather
-MANAGER=1234567890  # get it from @userinfobot
+MANAGER=1234567890  # get it from @userinfobot, can be a list (e.g., 1234567890;987654321)
 
 # ↓------ To disable sending via Telegraph, comment out this area ------↓ #
 # Get Telegraph API access tokens: https://api.telegra.ph/createAccount?short_name=RSStT&author_name=Generated%20by%20RSStT&author_url=https%3A%2F%2Fgithub.com%2FRongronggg9%2FRSS-to-Telegram-Bot
@@ -17,15 +17,17 @@ TELEGRAPH_TOKEN="
 
 # Please read https://github.com/Rongronggg9/RSS-to-Telegram-Bot/blob/master/docs/advanced-settings.md for more details.
 # ↓------ Advanced settings ------↓ #
+#ERROR_LOGGING_CHAT=-1001234567890  # default: the first MANAGER
 #MULTIUSER=0  # default: 1
 #CRON_SECOND=30  # 0-59, default: 0
-#DATABASE_URL=postgres://username:password@host:port/db_name  # default: sqlite://path/to/config/db.sqlite3
+#DATABASE_URL=postgres://username:password@host:port/db_name  # default: sqlite:/path/to/config/db.sqlite3
 #API_ID=1025907  # get it from https://core.telegram.org/api/obtaining_api_id
 #API_HASH=452b0359b988148995f22ff0f4229750  # get it from https://core.telegram.org/api/obtaining_api_id
 #IMG_RELAY_SERVER=https://wsrv.nl/?url=  # default: https://rsstt-img-relay.rongrong.workers.dev/
 #IMAGES_WESERV_NL=https://t0.nl/  # default: https://wsrv.nl/
-#USER_AGENT=Mozilla/5.0 (Android 12; Mobile; rv:68.0) Gecko/68.0 Firefox/96.0  # default: RSStT/2.2 RSS Reader
+#USER_AGENT=Mozilla/5.0  # default: RSStT/* RSS Reader (+https://git.io/RSStT)
 #IPV6_PRIOR=1  # default: 0
+#VERIFY_TLS=0  # default: 1
 #T_PROXY=socks5://172.17.0.1:1080  # Proxy used to connect to the Telegram API
 #R_PROXY=socks5://172.17.0.1:1080  # Proxy used to fetch feeds
 #PROXY_BYPASS_PRIVATE=1  # default: 0
@@ -39,5 +41,6 @@ TELEGRAPH_TOKEN="
 #MANAGER_PRIVILEGED=1  # default: 0
 #NO_UVLOOP=1  # default: 0
 #MULTIPROCESSING=1  # default: 0
+#EXECUTOR_NICENESS_INCREMENT=5  # default: 2
 #DEBUG=1  # debug logging, default: 0
 # ↑------ Advanced settings ------↑ #
@@ -3,7 +3,7 @@
 github: Rongronggg9
 patreon: rongbot
 open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
+ko_fi: rongbot
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 
@@ -7,19 +7,38 @@ assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Describe the bug
+> [!TIP]<!--- Remove this blockquote before submitting -->\
+> A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+## To Reproduce
+> [!TIP]<!--- Remove this blockquote before submitting -->\
+> Steps to reproduce the behavior.
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+## Screenshots
+> [!TIP]<!--- Remove this blockquote before submitting -->\
+> If applicable, upload screenshots to help explain your problem.
 
-**Important log**
-You may execute `docker logs [container name]` to get log.
-Choose that is important and paste it here.
+## Feed URL
+> [!TIP]<!--- Remove this blockquote before submitting -->\
+> If applicable, provide the feed URL that causes the bug.
+
+## Expected behavior
+> [!TIP]<!--- Remove this blockquote before submitting -->\
+> A clear and concise description of what you expected to happen.
+
+## Important log
+> [!IMPORTANT]<!--- Remove this blockquote before submitting -->\
+> Rerun RSStT with `DEBUG=1` set in the environment variables, and paste the log below.
+> If you are using Docker, you can get the log by executing:
+> ```sh
+> docker logs <container name>
+> ```
+
+```
+PASTE LOG HERE
+```
@@ -27,15 +27,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"
@@ -24,7 +24,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v3
       - name: Test Docker build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: false
           context: .
 
@@ -42,7 +42,7 @@ jobs:
             type=pep440,pattern={{major}}
             type=raw,value=latest,enable=${{ endsWith(github.ref, 'master') }}
       - name: Push to Docker Hub
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
@@ -52,33 +52,33 @@ jobs:
           cache-from: type=gha,scope=docker-release
           cache-to: type=gha,scope=docker-release,mode=max
       - name: Set Docker meta (exp-deps)
-        if: ${{ endsWith(github.ref, 'dev') }}
-        id: meta-fpe
+        if: ${{ startsWith(github.ref, 'refs/heads') && github.ref_name != 'master' }}
+        id: meta-exp
         uses: docker/metadata-action@v5
         with:
           images: ${{ secrets.DOCKER_USERNAME }}/rss-to-telegram
           flavor: latest=false
-          tags: type=raw,value=exp-deps,enable=true
+          tags: type=raw,value=${{ github.ref_name != 'dev' && format('{0}-', github.ref_name) || '' }}exp-deps,enable=true
       - name: Push to Docker Hub (exp-deps)
-        if: ${{ endsWith(github.ref, 'dev') }}
-        uses: docker/build-push-action@v5
+        if: ${{ startsWith(github.ref, 'refs/heads') && github.ref_name != 'master' }}
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           build-args: EXP_DEPS=1
           platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta-fpe.outputs.tags }}
-          labels: ${{ steps.meta-fpe.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/rss-to-telegram:exp-deps
-          cache-to: type=inline,ref=${{ secrets.DOCKER_USERNAME }}/rss-to-telegram:exp-deps
+          tags: ${{ steps.meta-exp.outputs.tags }}
+          labels: ${{ steps.meta-exp.outputs.labels }}
+          cache-from: type=registry,ref=${{ steps.meta-exp.outputs.tags }}  # only one tag, safe to use
+          cache-to: type=inline
 
   description:
     name: Update repository description on Docker Hub
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Update Docker Hub description
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: Install pypa/build
         run: |
           python -m pip install build --user
 
@@ -16,10 +16,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: Install pypa/build
         run: |
           python -m pip install build --user
 
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ '3.9', '3.10', '3.11' ]
+        version: [ '3.9', '3.10', '3.11', '3.12' ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
     name: Python ${{ matrix.version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -21,20 +21,105 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.version }}
           cache: 'pip'
       - name: Install dependencies
+        shell: bash
         run: |
-          pip install --upgrade pip wheel setuptools
+          set -eux
+          python -m pip install --upgrade pip wheel setuptools
           pip install -r requirements.txt
-      - name: Test
-        run: |
-          echo 'TOKEN=test' > .env
-          echo 'MANAGER=-1' >> .env
-          echo 'DEBUG=1' >> .env
-          echo 'PORT=60088' >> .env
-          echo 'TABLE_TO_IMAGE=1' >> .env
-          echo 'MULTIPROCESSING=1' >> .env
+      - name: Setup PostgreSQL
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          sudo apt-get -yq update
+          sudo apt-get -yq install postgresql
+          sudo systemctl start postgresql
+          sudo -u postgres psql -c "CREATE USER test WITH PASSWORD 'test';"
+          sudo -u postgres psql -c "CREATE DATABASE test OWNER test;"
+      - name: Prepare environment
+        shell: bash
+        run: |
+          set -eux
+          echo 'TOKEN=test' > .env_sqlite
+          echo 'MANAGER=-1' >> .env_sqlite
+          echo 'DEBUG=1' >> .env_sqlite
+          echo "PORT=$((RANDOM + 16384))" >> .env_sqlite
+          echo 'TABLE_TO_IMAGE=1' >> .env_sqlite
+          echo 'MULTIPROCESSING=1' >> .env_sqlite
+          cp .env_sqlite .env_postgresql
+          echo 'DATABASE_URL=postgres://test:test@localhost:5432/test' >> .env_postgresql
+          ln -s src rsstt
+      - name: Test RSS-to-Telegram-Bot (SQLite)
+        shell: bash
+        run: |
+          set -eux
+          cp .env_sqlite .env
+          python3 -u telegramRSSbot.py
+      - name: Test RSS-to-Telegram-Bot as a Python package (SQLite)
+        shell: bash
+        run: |
+          set -eux
+          python3 -m rsstt
+      - name: Test RSS-to-Telegram-Bot (PostgreSQL)
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          cp .env_postgresql .env
+          python3 -u telegramRSSbot.py
+      - name: Test RSS-to-Telegram-Bot as a Python package (PostgreSQL)
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          python3 -m rsstt
+      - name: Test scripts/aerich_helper.py (SQLite)
+        shell: bash
+        run: |
+          set -eux
+          ./scripts/aerich_helper.py -h
+          ./scripts/aerich_helper.py -v history
+          ./scripts/aerich_helper.py -v heads
+          ./scripts/aerich_helper.py -v upgrade True
+      - name: Test scripts/aerich_helper.py (PostgreSQL)
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          . .env_postgresql
+          ./scripts/aerich_helper.py -v -u "$DATABASE_URL" history
+          ./scripts/aerich_helper.py -v -u "$DATABASE_URL" heads
+          ./scripts/aerich_helper.py -v -u "$DATABASE_URL" upgrade True
+      - name: Test aerich migration upgrade (SQLite)
+        shell: bash
+        run: |
+          set -eux
+          rm -rf config
+          cp .env_sqlite .env
+          CURR_REF="$(git rev-parse HEAD)"
+          git checkout stale/aerich-0.6
+          pip install -qr requirements.txt
+          python3 -u telegramRSSbot.py
+          git checkout "$CURR_REF"
+          pip install -qr requirements.txt
+          python3 -u telegramRSSbot.py
+      - name: Test aerich migration upgrade (PostgreSQL)
+        if: matrix.os == 'ubuntu-latest'
+        shell: bash
+        run: |
+          set -eux
+          sudo -u postgres psql -c "DROP DATABASE test;"
+          sudo -u postgres psql -c "CREATE DATABASE test OWNER test;"
+          cp .env_postgresql .env
+          CURR_REF="$(git rev-parse HEAD)"
+          git checkout stale/aerich-0.6
+          pip install -qr requirements.txt
+          python3 -u telegramRSSbot.py
+          git checkout "$CURR_REF"
+          pip install -qr requirements.txt
           python3 -u telegramRSSbot.py