[pull] master from tgbot-collection:master

.dockerignore

@@ -0,0 +1,11 @@
+mongo_data/*
+certs/*
+data/*
+logs/*
+YYeTsFE/node_modules/*
+.github/*
+assets/*
+conf/*
+tests/*
+yyetsweb/yyets.sqlite
+yyetsweb/subtitle_data

.gitattributes

@@ -1 +1,18 @@
-*.html linguist-vendored
+yyets/worker/public/css/** linguist-vendored
+yyets/worker/public/fonts/* linguist-vendored
+yyets/worker/public/img/* linguist-vendored
+yyets/worker/public/js/* linguist-vendored
+yyets/worker/public/js/search.js -linguist-vendored
+yyets/worker/public/404.html linguist-vendored
+yyets/worker/public/resource.html linguist-vendored
+
+yyetsweb/templates/css/** linguist-vendored
+yyetsweb/templates/fonts/* linguist-vendored
+yyetsweb/templates/img/* linguist-vendored
+yyetsweb/templates/js/* linguist-vendored
+yyetsweb/templates/404.html linguist-vendored
+yyetsweb/templates/resource.html linguist-vendored
+
+yyetsweb/templates/js/common.js -linguist-vendored
+
+tests/data/* linguist-vendored

.github/FUNDING.yml

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

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    groups:
+      all-dependencies:
+        patterns: ["*"]

.github/workflows/docker.yaml

@@ -0,0 +1,80 @@
+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@v3
+        with:
+          submodules: true
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Cache Docker layers
+        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@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        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@v5
+        with:
+          string: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}
+
+      - name: Lower case for ghcr
+        id: ghcr_string
+        uses: ASzc/change-string-case-action@v5
+        with:
+          string: ${{ github.event.repository.full_name }}
+
+      - name: Build and push docker images
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: |
+            ${{ steps.dh_string.outputs.lowercase }}
+            ghcr.io/${{ steps.ghcr_string.outputs.lowercase }}
+          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
+
+      - name: Notification to Telegram
+        env:
+          TOKEN: ${{ secrets.BOT_TOKEN }}
+        run: |
+          curl "https://api.telegram.org/bot$TOKEN/sendMessage?chat_id=260260121&text=Normal%20Build%20complete!"
+          echo "YYeTsBot Build complete!"

.gitignore

@@ -29,7 +29,7 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
+#*.spec
 
 # Installer logs
 pip-log.txt
@@ -110,6 +110,41 @@ venv.bak/
 /.idea/modules.xml
 /.idea/vcs.xml
 .idea/
-/data/cookies.dump
+/yyetsbot/data/cookies.dump
 /.idea/inspectionProfiles/profiles_settings.xml
-data/
+yyetsbot/data/
+health_check/client.session
+
+/tools/worker/.idea/
+/tools/worker/workers-site/node_modules/*
+/tools/worker/workers-site/worker/script.js
+/health_check/client-hc.session
+mongo_data/*
+certs/*
+data/*
+logs/*
+**/.DS_Store
+/yyetsweb/yyets_sqlite.db
+/yyetsweb/yyetsweb
+/yyetsweb/assets.go
+/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