[pull] master from tgbot-collection:master

.dockerignore

@@ -7,4 +7,5 @@ YYeTsFE/node_modules/*
 assets/*
 conf/*
 tests/*
-yyetsweb/yyets.sqlite
+yyetsweb/yyets.sqlite
+yyetsweb/subtitle_data

.github/FUNDING.yml

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

.github/workflows/builder.yaml → .github/workflows/docker.yaml

@@ -1,70 +1,62 @@
-name: build docker image
+name: Build and push docker image
 on:
   push:
     branches:
       - 'master'
+    paths-ignore:
+      - '**.md'
+      - 'LICENSE'
 
 jobs:
   docker:
     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: Run hooks
-        env:
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          REACT_APP_SENTRY_DSN: ${{ secrets.REACT_APP_SENTRY_DSN }}
-          REACT_APP_DOMAIN: ${{ secrets.REACT_APP_DOMAIN }}
-          REACT_APP_GA: ${{ secrets.REACT_APP_GA }}
-          GENERATE_SOURCEMAP: ${{ secrets.GENERATE_SOURCEMAP }}
-        run: bash scripts/pre_build.sh
-
       - 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
+      - name: Build and push docker images
+        uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64, linux/arm64
@@ -85,4 +77,4 @@ jobs:
           TOKEN: ${{ secrets.BOT_TOKEN }}
         run: |
           curl "https://api.telegram.org/bot$TOKEN/sendMessage?chat_id=260260121&text=Normal%20Build%20complete!"
-          echo "Build complete!"
+          echo "YYeTsBot Build complete!"

.gitignore

@@ -124,15 +124,27 @@ certs/*
 data/*
 logs/*
 **/.DS_Store
-/yyetsweb/yyets.sqlite
+/yyetsweb/yyets_sqlite.db
 /yyetsweb/yyetsweb
 /yyetsweb/assets.go
-/yyetsweb/templates/static/*
 /yyetsweb/templates/sponsor/*
 /yyetsweb/templates/svg/*
 /yyetsweb/templates/index.css
 /yyetsweb/templates/logo*
 /yyetsweb/templates/*.json
 
-
+/yyetsweb/templates/*
 /yyetsweb/templates/data/*
+/yyetsweb/builds/
+/builds/checksum-sha256sum.txt
+/yyetsweb/1.html
+!/env/
+!/mongo_data/
+/env/yyets.env
+!/docker-compose.override.yml
+/docker-compose.override.yml
+/yyetsweb/templates/dump/yyets_mongo.gz
+/yyetsweb/templates/dump/yyets_mysql.zip
+/yyetsweb/templates/dump/yyets_sqlite.zip
+/yyetsweb/subtitle_data/attachment/201001/17/758231_1263706947i2nW.rar
+/yyetsweb/subtitle_data/attachment/200912/4/212807_1259889699DJm8.rar