From 871666c7f9ac02b1dc3c314bb531674e0ba63e19 Mon Sep 17 00:00:00 2001 From: EDM115 Date: Tue, 7 May 2024 17:50:18 +0200 Subject: [PATCH] chore: removed bots and useless files, updated funding info, updated workflows, prefilled the .env, simplified the gitignore --- .env | 7 +- .github/FUNDING.yml | 2 +- .github/dependabot.yml | 16 +- .github/workflows/build-docker-image.yml | 4 - .github/workflows/codeql-analysis.yml | 44 +---- .gitignore | 73 +------ .restyled.yml | 19 -- requirements.lock | 31 --- techstack.md | 168 ---------------- techstack.yml | 240 ----------------------- 10 files changed, 21 insertions(+), 583 deletions(-) delete mode 100644 .restyled.yml delete mode 100644 requirements.lock delete mode 100644 techstack.md delete mode 100644 techstack.yml diff --git a/.env b/.env index 8b137891..924d7ab5 100644 --- a/.env +++ b/.env @@ -1 +1,6 @@ - +APP_ID= +API_HASH="" +BOT_OWNER= +BOT_TOKEN="" +MONGODB_URL="" +LOGS_CHANNEL= diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 55cb0354..1a3269ed 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ +custom: ["https://paypal.me/8EDM115", "https://www.buymeacoffee.com/edm115", "https://t.me/EDM115bots/698", "https://walad.link/edm115"] github: EDM115 -custom: ["https://paypal.me/8EDM115", "https://www.buymeacoffee.com/edm115", "https://t.me/EDM115bots/544", "https://edm115.shadd.eu.org/"] diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 72734d6f..7d4d3d5f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,20 +1,20 @@ -version: 2 updates: - package-ecosystem: "pip" - directory: "/" - schedule: - interval: "weekly" - day: "sunday" - time: "20:00" - timezone: "Europe/Paris" assignees: - "EDM115" commit-message: - prefix: "[dependabot/pip] " include: scope + prefix: "[dependabot/pip] " + directory: "/" labels: - "dependabot/pip" pull-request-branch-name: separator: "/" reviewers: - "EDM115" + schedule: + day: "sunday" + interval: "weekly" + time: "20:00" + timezone: "Europe/Paris" +version: 2 diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 6f67b47e..c80aa1f8 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -1,10 +1,6 @@ name: Build Docker Image on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 77e283e0..52f71f04 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,24 +1,8 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: -# push: -# branches: [ master ] -# pull_request: -# # The branches below must be a subset of the branches above -# branches: [ master ] -# schedule: -# - cron: '0 4 * * 6' + schedule: + - cron: "0 4 * * 6" workflow_dispatch: jobs: @@ -39,31 +23,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL 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. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # 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@v3 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release + queries: "security-and-quality" - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/.gitignore b/.gitignore index 0cd65c62..abd28d7c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,82 +3,11 @@ __pycache__/ *.py[cod] *$py.class -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -pip-wheel-metadata/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# 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 - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - # Environments .env .venv env/ venv/ -ENV/ -env.bak/ -venv.bak/ # VS Code .vscode @@ -86,4 +15,4 @@ venv.bak/ .vscode/* # Secrets -*.session \ No newline at end of file +*.session diff --git a/.restyled.yml b/.restyled.yml deleted file mode 100644 index 6ca5bbb3..00000000 --- a/.restyled.yml +++ /dev/null @@ -1,19 +0,0 @@ -enabled: false -exclude: - - "unzipper/modules/ext_script/ext_helper.py" - - "unzipper/modules/ext_script/up_helper.py" -auto: false -pull_requests: false -commit_template: | - Restyled by ${restyler.name} -statuses: - differences: false - no_differences: true - error: true -labels: - - style -restylers: - - name: autopep8 - - name: isort - - name: black - - name: yapf diff --git a/requirements.lock b/requirements.lock deleted file mode 100644 index e03a4149..00000000 --- a/requirements.lock +++ /dev/null @@ -1,31 +0,0 @@ -aiofiles==23.2.1 -aiohttp==3.9.1 -aiosignal==1.3.1 -attrs==23.1.0 -base58check==1.0.2 -certifi==2023.7.22 -charset-normalizer==3.3.2 -dnspython==2.4.2 -frozenlist==1.4.0 -gitdb==4.0.11 -GitPython==3.1.41 -idna==3.4 -motor==3.3.2 -multidict==6.0.4 -mutagen==1.47.0 -Pillow==10.1.0 -psutil==5.9.7 -pyaes==1.6.1 -pykeyboard==0.1.5 -pymongo==4.6.0 -Pyrogram==2.0.106 -pyromod==1.5 -PySocks==1.7.1 -requests==2.31.0 -setuptools==68.2.2 -smmap==5.0.1 -TgCrypto==1.2.5 -unzip-http==0.4 -urllib3==2.1.0 -wheel==0.41.3 -yarl==1.9.2 diff --git a/techstack.md b/techstack.md deleted file mode 100644 index 457aa3c0..00000000 --- a/techstack.md +++ /dev/null @@ -1,168 +0,0 @@ - -
- -# Tech Stack File -![](https://img.stackshare.io/repo.svg "repo") [EDM115/unzip-bot](https://github.com/EDM115/unzip-bot)![](https://img.stackshare.io/public_badge.svg "public") -

-|17
Tools used|02/29/24
Report generated| -|------|------| -
- -## Languages (1) - - - - -
- Python -
- Python -
- -
- -## Data (1) - - - - -
- MongoDB -
- MongoDB -
- -
- -## DevOps (4) - - - - - - - - - - -
- Docker -
- Docker -
- -		 - Git -
- Git -
- -		 - GitHub Actions -
- GitHub Actions -
- -		 - PyPI -
- PyPI -
- -
- -## Hosting (1) - - - - -
- Heroku -
- Heroku -
- -
- -## Software as a Service (SaaS) (1) - - - - -
- Pillow -
- Pillow -
- -
- -## Other (1) - - - - -
- Shell -
- Shell -
- -
- - -## Open source packages (8) - -## PyPI (8) - -|NAME|VERSION|LAST UPDATED|LAST UPDATED BY|LICENSE|VULNERABILITIES| -|:------|:------|:------|:------|:------|:------| -|[GitPython](https://pypi.org/project/GitPython)|v3.1.41|01/10/24|renovate[bot] |BSD-3-Clause|N/A| -|[aiofiles](https://pypi.org/project/aiofiles)|v23.2.1|08/29/23|EDM115 |Apache-2.0|N/A| -|[aiohttp](https://pypi.org/project/aiohttp)|v3.9.1|11/26/23|renovate[bot] |Apache-2.0|[CVE-2024-23334](https://github.com/advisories/GHSA-5h86-8mv2-jq9f) (Moderate)
[CVE-2024-23829](https://github.com/advisories/GHSA-8qpw-xqxj-h4r2) (Moderate)| -|[dnspython](https://pypi.org/project/dnspython)|v2.4.2|01/10/24|renovate[bot] |Other|N/A| -|[gitdb](https://pypi.org/project/gitdb)|v4.0.11|10/20/23|renovate[bot] |BSD-3-Clause|N/A| -|[motor](https://pypi.org/project/motor)|v3.3.2|11/15/23|renovate[bot] |Apache-2.0|N/A| -|[psutil](https://pypi.org/project/psutil)|v5.9.7|12/17/23|renovate[bot] |BSD-3-Clause|N/A| -|[requests](https://pypi.org/project/requests)|v2.31.0|05/22/23|renovate[bot] |Apache-2.0|N/A| - -
-
- -Generated via [Stack File](https://github.com/marketplace/stack-file) diff --git a/techstack.yml b/techstack.yml deleted file mode 100644 index 19da671b..00000000 --- a/techstack.yml +++ /dev/null @@ -1,240 +0,0 @@ -repo_name: EDM115/unzip-bot -report_id: a22151c2a9a30641224fb622a23031a5 -version: 0.1 -repo_type: Public -timestamp: '2024-02-29T18:13:11+00:00' -requested_by: EDM115 -provider: github -branch: master -detected_tools_count: 17 -tools: -- name: Python - description: A clear and powerful object-oriented programming language, comparable - to Perl, Ruby, Scheme, or Java. - website_url: https://www.python.org - open_source: true - hosted_saas: false - category: Languages & Frameworks - sub_category: Languages - image_url: https://img.stackshare.io/service/993/pUBY5pVj.png - detection_source_url: https://github.com/EDM115/unzip-bot - detection_source: Repo Metadata -- name: MongoDB - description: The database for giant ideas - website_url: http://www.mongodb.com/ - open_source: true - hosted_saas: false - category: Data Stores - sub_category: Databases - image_url: https://img.stackshare.io/service/1030/leaf-360x360.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/unzipper/helpers/database.py - detection_source: unzipper/helpers/database.py - last_updated_by: EDM115 - last_updated_on: 2023-08-28 15:49:59.000000000 Z -- name: Docker - description: Enterprise Container Platform for High-Velocity Innovation. - website_url: https://www.docker.com/ - license: Apache-2.0 - open_source: true - hosted_saas: false - category: Build, Test, Deploy - sub_category: Virtual Machine Platforms & Containers - image_url: https://img.stackshare.io/service/586/n4u37v9t_400x400.png - detection_source_url: https://github.com/EDM115/unzip-bot - detection_source: Repo Metadata -- name: Git - description: Fast, scalable, distributed revision control system - website_url: http://git-scm.com/ - open_source: true - hosted_saas: false - category: Build, Test, Deploy - sub_category: Version Control System - image_url: https://img.stackshare.io/service/1046/git.png - detection_source_url: https://github.com/EDM115/unzip-bot - detection_source: Repo Metadata -- name: GitHub Actions - description: Automate your workflow from idea to production - website_url: https://github.com/features/actions - open_source: false - hosted_saas: true - category: Build, Test, Deploy - sub_category: Continuous Integration - image_url: https://img.stackshare.io/service/11563/actions.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/.github/workflows/black-code-style.yml - detection_source: ".github/workflows/black-code-style.yml" - last_updated_by: renovate[bot] - last_updated_on: 2023-10-10 07:17:45.000000000 Z -- name: PyPI - description: A repository of software for the Python programming language - website_url: https://pypi.org/ - open_source: false - hosted_saas: false - category: Build, Test, Deploy - sub_category: Hosted Package Repository - image_url: https://img.stackshare.io/service/12572/-RIWgodF_400x400.jpg - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: EDM 1.15 - last_updated_on: 2022-05-02 04:19:37.000000000 Z -- name: Heroku - description: Build, deliver, monitor and scale web apps and APIs with a trail blazing - developer experience. - website_url: https://www.heroku.com - open_source: false - hosted_saas: true - category: Application Hosting - sub_category: Platform as a Service - image_url: https://img.stackshare.io/service/133/3wgIDj3j.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/app.json - detection_source: app.json - last_updated_by: EDM 1.15 - last_updated_on: 2023-01-09 14:02:29.000000000 Z -- name: Pillow - description: Python Imaging Library - website_url: https://python-pillow.github.io/ - open_source: true - hosted_saas: false - category: Assets and Media - sub_category: Image Processing and Management - image_url: https://img.stackshare.io/service/2375/default_1f67b0ca7416a9f52beb655f90b5602d5ef74b75.jpg - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-10-15 16:24:32.000000000 Z -- name: Shell - description: A shell is a text-based terminal, used for manipulating programs and - files. Shell scripts typically manage program execution. - website_url: https://en.wikipedia.org/wiki/Shell_script - open_source: false - hosted_saas: false - category: Languages & Frameworks - sub_category: Languages - image_url: https://img.stackshare.io/service/4631/default_c2062d40130562bdc836c13dbca02d318205a962.png - detection_source_url: https://github.com/EDM115/unzip-bot - detection_source: Repo Metadata -- name: GitPython - description: Python Git Library - package_url: https://pypi.org/project/GitPython - version: 3.1.41 - license: BSD-3-Clause - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/19867/default_bd86f80ade48cfe191d5781a2efa0e66fa22163a.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2024-01-10 17:26:25.000000000 Z -- name: aiofiles - description: File support for asyncio - package_url: https://pypi.org/project/aiofiles - version: 23.2.1 - license: Apache-2.0 - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/20183/default_3d320a0aa731f16ceb0e7b6999ca7f7cd784aee2.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: EDM115 - last_updated_on: 2023-08-29 10:25:57.000000000 Z -- name: aiohttp - description: Async http client/server framework - package_url: https://pypi.org/project/aiohttp - version: 3.9.1 - license: Apache-2.0 - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/19852/default_d748224707283d9d8a73c2323730c87bda6b313a.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-11-26 18:24:43.000000000 Z - vulnerabilities: - - name: aiohttp is vulnerable to directory traversal - cve_id: CVE-2024-23334 - cve_url: https://github.com/advisories/GHSA-5h86-8mv2-jq9f - detected_date: Jan 30 - severity: moderate - first_patched: 3.9.2 - - name: aiohttp's HTTP parser (the python one, not llhttp) still overly lenient - about separators - cve_id: CVE-2024-23829 - cve_url: https://github.com/advisories/GHSA-8qpw-xqxj-h4r2 - detected_date: Jan 30 - severity: moderate - first_patched: 3.9.2 -- name: dnspython - description: DNS toolkit - package_url: https://pypi.org/project/dnspython - version: 2.4.2 - license: Other - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/20249/default_47b8ee8db82e43d9eef35923435bd8cc855f3a1b.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2024-01-10 17:26:25.000000000 Z -- name: gitdb - description: Git Object Database - package_url: https://pypi.org/project/gitdb - version: 4.0.11 - license: BSD-3-Clause - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/pypi/image.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-10-20 10:08:53.000000000 Z -- name: motor - description: Non-blocking MongoDB driver for Tornado or asyncio - package_url: https://pypi.org/project/motor - version: 3.3.2 - license: Apache-2.0 - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/20275/default_267c21fe20acb6a3a56ea60f8b271e1ab445049d.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-11-15 00:52:07.000000000 Z -- name: psutil - description: Cross-platform lib for process and system monitoring in Python - package_url: https://pypi.org/project/psutil - version: 5.9.7 - license: BSD-3-Clause - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/19851/default_ac77a75c05474acf9389d56b1f5cc8241af4c384.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-12-17 12:38:31.000000000 Z -- name: requests - description: Python HTTP for Humans - package_url: https://pypi.org/project/requests - version: 2.31.0 - license: Apache-2.0 - open_source: true - hosted_saas: false - category: Libraries - sub_category: PyPI Packages - image_url: https://img.stackshare.io/package/19826/default_d7c684bf2673f008a9f02ac93901229297a22d7e.png - detection_source_url: https://github.com/EDM115/unzip-bot/blob/master/requirements.txt - detection_source: requirements.txt - last_updated_by: renovate[bot] - last_updated_on: 2023-05-22 17:44:46.000000000 Z