Skip to content

Commit a87ce41

Browse files
committed
v7.2.0
- bumped most deps, Python 3.12 and unrar - switched from Kurigram to pyrofork due to connection issues (i hate framework hopping) - changed a bit the versionning scheme, see #296 (comment) - disabled some actions - removed pyromod as pyrofork includes it by default
1 parent 3d09d26 commit a87ce41

File tree

10 files changed

+37
-30
lines changed

10 files changed

+37
-30
lines changed

.github/workflows/authors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Update Authors
22

33
on:
44
# push:
5-
# branches:
6-
# - master
5+
# branches:
6+
# - master
77
workflow_dispatch:
88

99
jobs:

.github/workflows/unfurl-links.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: Unfurl Links
22

33
on:
4-
issues:
5-
types: [opened, edited]
6-
issue_comment:
7-
types: [created, edited]
8-
pull_request:
9-
types: [opened, edited]
4+
# issues:
5+
# types: [opened, edited]
6+
# issue_comment:
7+
# types: [created, edited]
8+
# pull_request:
9+
# types: [opened, edited]
10+
workflow_dispath:
1011

1112
jobs:
1213
run:

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.12.8
1+
3.12.9

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN pip install -U pip setuptools wheel && \
2626

2727
FROM python:3.12-alpine
2828

29-
ARG VERSION="7.1.6a"
29+
ARG VERSION="7.2.0"
3030

3131
LABEL org.opencontainers.image.authors="EDM115 <unzip@edm115.dev>"
3232
LABEL org.opencontainers.image.base.name="python:3.12-alpine"

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111

1212
</div>
1313

14+
> [!IMPORTANT]
15+
> The bot is undergoing an important rewrite.
16+
> Please be patient and wait a few months to get the unzip-bot in its full glory !
17+
> Check [[ROADMAP] The future of unzip-bot (v7) (#296)](https://github.com/EDM115/unzip-bot/issues/296) to know more about the current development.
18+
> Check [the master branch](https://github.com/EDM115/unzip-bot/tree/master) to use the older version.
19+
20+
---
21+
1422
## Working bot :smiling_face_with_three_hearts:
1523
[@unzip_edm115bot](https://t.me/unzip_edm115bot)
1624
More info : [edm115.dev/unzip](https://edm115.dev/unzip)
@@ -60,11 +68,6 @@ help - In case you need 😭
6068
Deploying is easy :smiling_face_with_three_hearts: You can deploy this bot in Heroku or in a VPS :heart:
6169
**Star :star2: Fork :fork_and_knife: and Deploy :outbox_tray:**
6270

63-
> [!NOTE]
64-
> We are using Arch Linux as a base image. But why :thinking:
65-
> Because Arch's p7zip package is the only maintained version of the [original p7zip](http://p7zip.sourceforge.net/) package with some additional features
66-
> **EDIT** : We might switch to Alpine Linux in the future, I still have to compare the commits done on the p7zip package
67-
6871
#### The lazy way
6972
[![Deploy me :pleading_face:](https://www.herokucdn.com/deploy/button.svg)](https://www.heroku.com/deploy?template=https://github.com/EDM115/unzip-bot/tree/v7)
7073
(if you're in a fork, make sure to replace the template URL with your repo's one, also replace the URL in the Dockerfile)
@@ -134,7 +137,7 @@ If you found a bug in this bot please open an [issue](https://github.com/EDM115/
134137
Same if you have any feature request :wink:
135138

136139
## License & Copyright :cop:
137-
Copyright (c) 2022 - 2024 EDM115
140+
Copyright (c) 2022 - 2025 EDM115
138141

139142
This unzip-bot repository is licensed under the [MIT License](https://github.com/EDM115/unzip-bot/blob/master/LICENSE)
140143
Enjoy copying and modifying, but always mention me

config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ class Config:
3535
MONGODB_DBNAME = os.environ.get("MONGODB_DBNAME", "Unzipper_Bot")
3636
TG_MAX_SIZE = 2097152000
3737
THUMB_LOCATION = f"{os.path.dirname(__file__)}/Thumbnails"
38-
VERSION = os.environ.get("UNZIPBOT_VERSION", "7.1.6a")
38+
VERSION = os.environ.get("UNZIPBOT_VERSION", "7.2.0")

install_unrar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# origin : https://github.com/linuxserver/docker-sabnzbd/blob/444da02e31823289c4d4ca6ab407442bf6719e94/Dockerfile#L28-L38
55
# source : https://www.reddit.com/r/AlpineLinux/comments/13p4p5k/comment/jmrdr24/
66
# get unrar version : https://www.rarlab.com/rar_add.htm
7-
UNRAR_VERSION="7.1.2"
7+
UNRAR_VERSION="7.1.5"
88

99
echo "Installing unrar version: ${UNRAR_VERSION}"
1010
mkdir /tmp/unrar

requirements.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
aiocron==1.8
22
aiofiles==24.1.0
3-
aiohttp==3.11.7
3+
aiohttp==3.11.13
44
base58check==1.0.2
55
dnspython==2.7.0
6-
gitdb==4.0.11
7-
GitPython==3.1.43
8-
motor==3.6.0
6+
gitdb==4.0.12
7+
GitPython==3.1.44
8+
motor==3.7.0
99
mutagen==1.47.0
10-
Pillow==11.0.0
11-
psutil==6.1.0
10+
Pillow==11.1.0
11+
psutil==7.0.0
1212
pykeyboard==0.1.5
13-
Kurigram @ https://github.com/KurimuzonAkuma/pyrogram/archive/dev.zip
14-
pyromod==3.1.6
13+
pyrofork==2.3.59
14+
# pyromod==3.1.6
1515
requests==2.32.3
16-
TgCrypto==1.2.5
16+
PyTgCrypto==1.2.9.2
1717
unzip-http==0.6

unzipbot/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import logging
22
import time
33

4-
from pyromod import Client
4+
# from pyromod import Client
5+
from pyrogram import Client
56

67
from config import Config
78

unzipbot/i18n/lang/en.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"stats_btn": "Stats 📊"
1919
},
2020
"callbacks": {
21-
"about_txt": "**About the unzip-bot [v{}]**\n\n• **Language :** [Python 3.12.8](https://www.python.org/)\n• **Framework :** [KurimuzonAkuma/pyrogram@dev](https://docs.kurigram.xyz/)\n• **Source code :** [EDM115/unzip-bot@v7](https://github.com/EDM115/unzip-bot/tree/v7)\n• **Developer :** [EDM115](https://github.com/EDM115)\n\n**[Rate me ⭐](https://t.me/BotsArchive/2705)**\nMade with ❤️ by **@EDM115bots**",
21+
"about_txt": "**About the unzip-bot [v{}]**\n\n• **Language :** [Python 3.12.9](https://www.python.org/)\n• **Framework :** [Mayuri-Chan/pyrofork
22+
2.3.59](https://pyrofork.wulan17.top/)\n• **Source code :** [EDM115/unzip-bot@v7](https://github.com/EDM115/unzip-bot)\n• **Developer :** [EDM115](https://github.com/EDM115)\n\n**[Rate me ⭐](https://t.me/BotsArchive/2705)**\nMade with ❤️ by **@EDM115bots**",
2223
"actual_thumb": "Your actual thumbnail",
2324
"after_ok_dl_txt": "**Successfully downloaded ✅**\n\n**Download time :** `{}`\n**Status :** Testing the archive… Please wait",
2425
"after_ok_merge_dl_txt": "**Successfully downloaded all {} files ✅**\n\n**Download time :** `{}`\n**Status :** Merging the archive… Please wait",
@@ -86,7 +87,8 @@
8687
"user_query": "Processing an user query…\n\nUser ID : {}"
8788
},
8889
"commands": {
89-
"about_txt": "**About the unzip-bot [v{}]**\n\n• **Language :** [Python 3.12.8](https://www.python.org/)\n• **Framework :** [KurimuzonAkuma/pyrogram@dev](https://docs.kurigram.xyz/)\n• **Source code :** [EDM115/unzip-bot@v7](https://github.com/EDM115/unzip-bot/tree/v7)\n• **Developer :** [EDM115](https://github.com/EDM115)\n\n**[Rate me ⭐](https://t.me/BotsArchive/2705)**\nMade with ❤️ by **@EDM115bots**",
90+
"about_txt": "**About the unzip-bot [v{}]**\n\n• **Language :** [Python 3.12.9](https://www.python.org/)\n• **Framework :** [Mayuri-Chan/pyrofork
91+
2.3.59](https://pyrofork.wulan17.top/)\n• **Source code :** [EDM115/unzip-bot@v7](https://github.com/EDM115/unzip-bot)\n• **Developer :** [EDM115](https://github.com/EDM115)\n\n**[Rate me ⭐](https://t.me/BotsArchive/2705)**\nMade with ❤️ by **@EDM115bots**",
9092
"admincmd": "Here's all the commands that only the owner (you) can use :\n\n**/gitpull** : Pulls the latest changes from GitHub\n**/broadcast** : Send something to all the users\n**/sendto user_id** : Same as broadcast but for a single user. Doesn't handle replies for now…\n**/ban user_id** : Ban an user. He can no longer use your bot, except if…\n**/unban user_id** : …you unban him. All his stats and settings stays saved after a ban\n**/user user_id** : Know more about the use of your bot by a single user\n**/user2 user_id** : Get full info about an [User](https://docs.pyrogram.org/api/types/User) (info returned by Pyrogram)\n**/self** : Get full info about me (info returned by Pyrogram)\n**/getthumbs** : Get all the thumbnails on the server\n**/redbutton** : __Does nothing yet__\n**/maintenance** : Put the bot in or out of maintenance mode. No tasks can be processed while on\n**/cleanall** : Same as `/clean`, but for the whole server\n**/cleantasks** : Same as `/cleanall`, plus removes them from the database\n**/logs** : Send you the logs (all of them). Useful for bug tracking. Send them to **@EDM115** if you don't understand them/need help\n**/restart** : Does a basic restart, less intrusive as the `/redbutton` one\n**/dbexport** : ~~Exports the whole database as CSV~~ __Does nothing yet__\n**/eval code** : Evaluate a piece of code. Useful for debugging\n**/exec code** : Execute a piece of code. Useful for debugging\n**/admincmd** : This message\n**/commands** : For all the other commands",
9193
"already_added": "{} is already in the user database\n\n",
9294
"already_banned": "{} have already been banned\n\n",

0 commit comments

Comments
 (0)