Skip to content

Commit cd3359b

Browse files
committed
v1.7.1
1 parent 32de61f commit cd3359b

25 files changed

+541
-356
lines changed

.gitignore

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
.ruff_cache
2+
# Byte-compiled / optimized / DLL files
3+
__pycache__/
4+
*.py[cod]
5+
*$py.class
6+
.requirements_hash/
7+
8+
# C extensions
9+
*.so
10+
11+
# Distribution / packaging
12+
.Python
13+
build/
14+
develop-eggs/
15+
dist/
16+
downloads/
17+
eggs/
18+
.eggs/
19+
lib/
20+
lib64/
21+
parts/
22+
sdist/
23+
var/
24+
wheels/
25+
pip-wheel-metadata/
26+
share/python-wheels/
27+
*.egg-info/
28+
.installed.cfg
29+
*.egg
30+
MANIFEST
31+
32+
# PyInstaller
33+
# Usually these files are written by a python script from a template
34+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
35+
*.manifest
36+
*.spec
37+
38+
# Installer logs
39+
pip-log.txt
40+
pip-delete-this-directory.txt
41+
42+
# Unit test / coverage reports
43+
htmlcov/
44+
.tox/
45+
.nox/
46+
.coverage
47+
.coverage.*
48+
.cache
49+
nosetests.xml
50+
coverage.xml
51+
*.cover
52+
*.py,cover
53+
.hypothesis/
54+
.pytest_cache/
55+
56+
# Translations
57+
*.mo
58+
*.pot
59+
60+
# Django stuff:
61+
*.log
62+
local_settings.py
63+
db.sqlite3
64+
db.sqlite3-journal
65+
66+
# Flask stuff:
67+
instance/
68+
.webassets-cache
69+
70+
# Scrapy stuff:
71+
.scrapy
72+
73+
# Sphinx documentation
74+
docs/_build/
75+
76+
# PyBuilder
77+
target/
78+
79+
# Jupyter Notebook
80+
.ipynb_checkpoints
81+
82+
# IPython
83+
profile_default/
84+
ipython_config.py
85+
86+
# pyenv
87+
.python-version
88+
89+
# pipenv
90+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
91+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
92+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
93+
# install all needed dependencies.
94+
#Pipfile.lock
95+
96+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
97+
__pypackages__/
98+
99+
# Celery stuff
100+
celerybeat-schedule
101+
celerybeat.pid
102+
103+
# SageMath parsed files
104+
*.sage.py
105+
106+
# Environments
107+
.env
108+
.venv
109+
env/
110+
venv/
111+
ENV/
112+
env.bak/
113+
venv.bak/
114+
115+
# Spyder project settings
116+
.spyderproject
117+
.spyproject
118+
119+
# Rope project settings
120+
.ropeproject
121+
122+
# mkdocs documentation
123+
/site
124+
125+
# mypy
126+
.mypy_cache/
127+
.dmypy.json
128+
dmypy.json
129+
130+
# Pyre type checker
131+
.pyre/
132+
133+
134+
*__pycache__
135+
*.pyc
136+
heroku/api_token.py
137+
heroku/loaded_modules
138+
loaded_modules
139+
heroku/debug_modules
140+
heroku*.session*
141+
database-*.json
142+
*.swp
143+
.setup_complete
144+
.tox
145+
.idea/
146+
venv/
147+
api_token.txt
148+
.coverage
149+
.vscode/
150+
ftg-install.log
151+
config.ini
152+
.cache
153+
config-*.json
154+
config.json
155+
*cache*.json
156+
*.webp
157+
*.webm
158+
*.tgs
159+
*.mp4
160+
*.mp3
161+
*.ogg
162+
*.m4a
163+
*.mp3
164+
*.avi
165+
166+
# Heroku-specific rules
167+
.heroku/
168+
.apt/
169+
.profile.d/
170+
vendor/
171+
Pipfile.lock
172+
173+
heroku.log.*
174+
unknown_errors.txt

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
# Heroku Changelog
2+
## 🪐 Heroku 1.7.1
3+
- fixed bug with web
4+
- fixed bug with executor
5+
- fixed bug with presets command
6+
- added structure for windows and MacOS
7+
- added blockquote for all lists
8+
- added new banner for update
9+
- added ubguard.codrago.life
10+
211
## 🪐 Heroku 1.7.0
312

413
- added banner to ping

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
<b>Manual installation (no script):</b><br>
22-
<code>apt update && apt install git python3 -y && git clone https://github.com/coddrago/Heroku && cd Heroku && pip install -r requirements.txt && python3 -m hikka</code><br.>
22+
<code>apt update && apt install git python3 -y && git clone https://github.com/coddrago/Heroku && cd Heroku && pip install -r requirements.txt && python3 -m heroku</code><br.>
2323
<i>If you are on VPS\VDS, type <code>--proxy-pass</code> in the end of command to open SSH tunnel to your Heroku web interface, or use <code>--no-web</code> to complete setup in console</i><br>
2424
<br>
2525
<b>Some further details:</b>
@@ -49,7 +49,7 @@
4949
<hr>
5050
<h2 border="none"><img src="https://github.com/hikariatama/assets/raw/master/1312-micro-sd-card-flat.webp" height="54" align="middle"> Requirements</h2>
5151
<ul>
52-
<li>Python 3.8-3.11</li>
52+
<li>Python 3.9-3.12</li>
5353
<li>API_ID and HASH from <a href="https://my.telegram.org/apps" color="#2594cb">Telegram</a></li>
5454
</ul>
5555
<hr>
@@ -125,8 +125,6 @@ Check out <a href="https://heroku.codrago.top/">heroku.codrago.top</a> for users
125125
<b>Special thanks to:</b>
126126

127127
<ul>
128-
<li><a href="https://gitlab.com/hackintosh5">Hackintosh5</a> for FTG, which is the base of project</li>
129-
<li><a href="https://t.me/GunyaKshin">Codwiz</a> for Ukrainian translation pack</li>
130-
<li><a href="https://t.me/thisLyomi">Lyomi</a> for German translation pack</li>
128+
<li><a href="https://github.com/hikariatama">Hikari</a> for Hikka, which is the base of project</li>
131129
<li><a href="https://t.me/lonami">Lonami</a> for Telethon, which is the base of Heroku-TL</li>
132130
</ul>

assets/heroku-update.png

385 KB
Loading

heroku/__main__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ def deps():
8686
except ImportError:
8787
print("\U0001F504 Installing dependencies...")
8888
deps()
89-
print(traceback.format_exc())
9089
restart()
9190

9291
try:
@@ -96,7 +95,6 @@ def deps():
9695
except ImportError as e:
9796
print(f"{str(e)}\n\U0001F504 Attempting dependencies installation... Just wait ⏱")
9897
deps()
99-
print(traceback.format_exc())
10098
restart()
10199

102100
if "HEROKU_DO_NOT_RESTART" in os.environ:

heroku/dispatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ async def _external_bl_reload_loop(self):
720720
self._external_bl = (
721721
await utils.run_sync(
722722
requests.get,
723-
"https://ubguard.dan.tatar/blacklist.json",
723+
"https://ubguard.codrago.life/blacklist.json",
724724
)
725725
).json()["blacklist"]
726726

heroku/langpacks/de.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ heroku_security:
1515
group_admin: "🧑‍⚖️ Admin (beliebig)"
1616
group_member: "👥 In der Gruppe"
1717
pm: "🤙 Privatnachricht"
18-
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Gruppenbenutzer</b> <code>owner</code><b>:</b>\n\n{}"
18+
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Gruppenbenutzer</b> <code>owner</code><b>:</b>\n\n<blockquote expandable>{}</blockquote>"
1919
no_owner: "<emoji document_id=5386399931378440814>😎</emoji> <b>Keine Benutzer in der Gruppe</b> <code>owner</code>"
2020
no_user: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Geben Sie an, wem Rechte zugewiesen werden sollen</b>"
2121
not_a_user: "<emoji document_id=5447644880824181073>⚠️</emoji> <b>Das angegebene Ziel ist kein Benutzer</b>"
@@ -90,7 +90,7 @@ heroku_security:
9090
_cmd_doc_sgroupdel: "<Name> [Benutzer oder Antwort] - Benutzer aus der Sicherheitsgruppe entfernen"
9191

9292
heroku_settings:
93-
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Wächter:</b>\n\n<b>{}</b>"
93+
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Wächter:</b>\n\n<blockquote expandable><b>{}</b></blockquote>"
9494
mod404: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Wächter {} nicht gefunden</b>"
9595
disabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Wächter {} ist jetzt <u>deaktiviert</u></b>"
9696
enabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Wächter {} ist jetzt <u>aktiviert</u></b>"
@@ -127,9 +127,9 @@ heroku_settings:
127127
deauth_confirm_btn: "😢 Entfernen"
128128
uninstall: "😢 <b>Heroku wird entfernt...</b>"
129129
uninstalled: "😢 <b>Heroku wurde entfernt. Die Web-Oberfläche ist weiterhin aktiv, und andere Konten können hinzugefügt werden!</b>"
130-
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Befehle aktiviert:</b>\n\n{}"
131-
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Benutzer aktiviert:</b>\n\n{}"
132-
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Chats aktiviert:</b>\n\n{}"
130+
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Befehle aktiviert:</b>\n\n<blockquote expandable>{}</blockquote>"
131+
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Benutzer aktiviert:</b>\n\n<blockquote expandable>{}</blockquote>"
132+
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ist für folgende Chats aktiviert:</b>\n\n<blockquote expandable>{}</blockquote>"
133133
nothing: "<emoji document_id=5427052514094619126>🤷‍♀️</emoji> <b>Nichts zu zeigen...</b>"
134134
btn_yes: "🚸 Trotzdem öffnen"
135135
btn_no: "🔻 Schließen"

heroku/langpacks/en.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ heroku_security:
1717
group_member: "👥 In group"
1818
pm: "🤙 In PM"
1919
everyone: "🌍 Everyone (Inline)"
20-
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Users in group</b> <code>owner</code><b>:</b>\n\n{}"
20+
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Users in group</b> <code>owner</code><b>:</b>\n\n<blockquote expandable>{}</blockquote>"
2121
no_owner: "<emoji document_id=5386399931378440814>😎</emoji> <b>There is no users in group</b> <code>owner</code>"
2222
owner_added: '<emoji document_id="5386399931378440814">😎</emoji> <b><a href="tg://user?id={}">{}</a> added to group</b> <code>owner</code>'
2323
owner_removed: '<emoji document_id="5386399931378440814">😎</emoji> <b><a href="tg://user?id={}">{}</a> removed from group</b> <code>owner</code>'
@@ -96,7 +96,7 @@ heroku_security:
9696

9797
heroku_settings:
9898
name: "HerokuSettings"
99-
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Watchers:</b>\n\n<b>{}</b>"
99+
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Watchers:</b>\n\n<blockquote expandable><b>{}</b></blockquote>"
100100
no_args: "<emoji document_id=5210952531676504517>🚫</emoji> <b>No arguments specified</b>"
101101
invoke404: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Internal debug method</b> <code>{}</code> <b>not found, ergo can't be invoked</b>"
102102
module404: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Module</b> <code>{}</code> <b>not found</b>"
@@ -137,9 +137,9 @@ heroku_settings:
137137
deauth_confirm_btn: "😢 Delete"
138138
uninstall: "😢 <b>Uninstalling Heroku...</b>"
139139
uninstalled: "😢 <b>Heroku uninstalled. Web interface is still active, you can add another account</b>"
140-
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these commands:</b>\n\n{}"
141-
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these users:</b>\n\n{}"
142-
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these chats:</b>\n\n{}"
140+
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these commands:</b>\n\n<blockquote expandable>{}</blockquote>"
141+
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these users:</b>\n\n<blockquote expandable>{}</blockquote>"
142+
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick is enabled for these chats:</b>\n\n<blockquote expandable>{}</blockquote>"
143143
nothing: "<emoji document_id=5427052514094619126>🤷‍♀️</emoji> <b>Nothing to show...</b>"
144144
btn_yes: "🚸 Open anyway"
145145
btn_no: "🔻 Cancel"

heroku/langpacks/ru.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ heroku_security:
1515
group_admin: "🧑‍⚖️ Админ (любой)"
1616
group_member: "👥 В группе"
1717
pm: "🤙 В лс"
18-
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Пользователи группы</b> <code>owner</code><b>:</b>\n\n{}"
18+
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Пользователи группы</b> <code>owner</code><b>:</b>\n\n<blockquote expandable>{}</blockquote>"
1919
no_owner: "<emoji document_id=5386399931378440814>😎</emoji> <b>Нет пользователей в группе</b> <code>owner</code>"
2020
no_user: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Укажи, кому выдавать права</b>"
2121
not_a_user: "<emoji document_id=5447644880824181073>⚠️</emoji> <b>Указанная цель - не пользователь</b>"
@@ -90,7 +90,7 @@ heroku_security:
9090
_cmd_doc_sgroupdel: "<имя> [пользователь или ответ] - Удалить пользователя из группы безопасности"
9191

9292
heroku_settings:
93-
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Смотрители:</b>\n\n<b>{}</b>"
93+
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Смотрители:</b>\n\n<blockquote expandable><b>{}</b></blockquote>"
9494
mod404: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Смотритель {} не найден</b>"
9595
disabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Смотритель {} теперь <u>выключен</u></b>"
9696
enabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Смотритель {} теперь <u>включен</u></b>"
@@ -127,9 +127,9 @@ heroku_settings:
127127
deauth_confirm_btn: "😢 Удалить"
128128
uninstall: "😢 <b>Удаляю Heroku...</b>"
129129
uninstalled: "😢 <b>Heroku удалена. Веб-интерфейс все еще активен, можно добавить другие аккаунты!</b>"
130-
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих команд:</b>\n\n{}"
131-
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих пользователей:</b>\n\n{}"
132-
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих чатов:</b>\n\n{}"
130+
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих команд:</b>\n\n<blockquote expandable>{}</blockquote>"
131+
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих пользователей:</b>\n\n<blockquote expandable>{}</blockquote>"
132+
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick включен для этих чатов:</b>\n\n<blockquote expandable>{}</blockquote>"
133133
btn_yes: "🚸 Все равно открыть"
134134
btn_no: "🔻 Закрыть"
135135
nothing: "<emoji document_id=5427052514094619126>🤷‍♀️</emoji> <b>Нечего показывать...</b>"

heroku/langpacks/ua.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ heroku_security:
1515
group_admin: "🧑‍⚖️ Адмін (будь-який)"
1616
group_member: "👥 В групі"
1717
pm: "🤙 В пп"
18-
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Користувачі групи</b> <code>owner</code><b>:</b>\n\n{}"
18+
owner_list: "<emoji document_id=5386399931378440814>😎</emoji> <b>Користувачі групи</b> <code>owner</code><b>:</b>\n\n<blockquote expandable>{}</blockquote>"
1919
no_owner: "<emoji document_id=5386399931378440814>😎</emoji> <b>Немає користувачів в групі</b> <code>owner</code>"
2020
no_user: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Вкажи, кому видати права</b>"
2121
not_a_user: "<emoji document_id=5447644880824181073>⚠️</emoji> <b>Вказана ціль - не користувач</b>"
@@ -90,7 +90,7 @@ heroku_security:
9090
_cmd_doc_sgroupdel: "<ім'я> [користувач або відповідь] - Видалити користувача з групи безпеки"
9191

9292
heroku_settings:
93-
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Наглядачі:</b>\n\n<b>{}</b>"
93+
watchers: "<emoji document_id=5424885441100782420>👀</emoji> <b>Наглядачі:</b>\n\n<blockquote expandable><b>{}</b></blockquote>"
9494
mod404: "<emoji document_id=5210952531676504517>🚫</emoji> <b>Наглядача {} не знайдено</b>"
9595
disabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Наглядача {} тепер <u>вимкнено</u></b>"
9696
enabled: "<emoji document_id=5424885441100782420>👀</emoji> <b>Наглядача {} тепер <u>увімкнено</u></b>"
@@ -127,9 +127,9 @@ heroku_settings:
127127
deauth_confirm_btn: "😢 Видалити"
128128
uninstall: "😢 <b>Видаляю Heroku...</b>"
129129
uninstalled: "😢 <b>Heroku видалено. Веб-інтерфейс усе ще активний, можна додати інші акаунти!</b>"
130-
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих команд:</b>\n\n{}"
131-
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих користувачів:</b>\n\n{}"
132-
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих чатів:</b>\n\n{}"
130+
cmd_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих команд:</b>\n\n<blockquote expandable>{}</blockquote>"
131+
user_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих користувачів:</b>\n\n<blockquote expandable>{}</blockquote>"
132+
chat_nn_list: "<emoji document_id=5469791106591890404>🪄</emoji> <b>NoNick ввімкнено для цих чатів:</b>\n\n<blockquote expandable>{}</blockquote>"
133133
nothing: "<emoji document_id=5427052514094619126>🤷‍♀️</emoji> <b>Нема чого показувати...</b>"
134134
btn_yes: "🚸 Все одно відкрити"
135135
btn_no: "🔻 Закрити"

0 commit comments

Comments
 (0)