Spaces:
Sleeping
Sleeping
Captain Ezio
commited on
Commit
·
fe86459
1
Parent(s):
4e9cef8
few fixes
Browse files- .gitignore +0 -3
- Powers/__init__.py +1 -1
- Powers/__main__.py +2 -2
- Powers/plugins/start.py +4 -5
- Powers/supports.py +1 -1
- Powers/vars.py +1 -1
- requirements.txt +1 -0
.gitignore
CHANGED
@@ -1,14 +1,11 @@
|
|
1 |
*.session
|
2 |
*.session-journal
|
3 |
-
Powers/config.py
|
4 |
-
Powers/vars.py
|
5 |
.vscode/
|
6 |
postgres-data/
|
7 |
*.env
|
8 |
!sample.env
|
9 |
logs/
|
10 |
Powers/local_vars.py
|
11 |
-
Powers/vars.py
|
12 |
.idea/
|
13 |
|
14 |
# Byte-compiled / optimized / DLL files
|
|
|
1 |
*.session
|
2 |
*.session-journal
|
|
|
|
|
3 |
.vscode/
|
4 |
postgres-data/
|
5 |
*.env
|
6 |
!sample.env
|
7 |
logs/
|
8 |
Powers/local_vars.py
|
|
|
9 |
.idea/
|
10 |
|
11 |
# Byte-compiled / optimized / DLL files
|
Powers/__init__.py
CHANGED
@@ -97,7 +97,7 @@ if Config.GENIUS_API_TOKEN:
|
|
97 |
genius_lyrics.verbose = False
|
98 |
LOGGER.info("Client setup complete")
|
99 |
elif not Config.GENIUS_API_TOKEN:
|
100 |
-
LOGGER.
|
101 |
is_genius_lyrics = False
|
102 |
genius_lyrics = False
|
103 |
|
|
|
97 |
genius_lyrics.verbose = False
|
98 |
LOGGER.info("Client setup complete")
|
99 |
elif not Config.GENIUS_API_TOKEN:
|
100 |
+
LOGGER.info("Genius api not found lyrics command will not work")
|
101 |
is_genius_lyrics = False
|
102 |
genius_lyrics = False
|
103 |
|
Powers/__main__.py
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
-
import uvloop # Comment it out if using on windows
|
2 |
from Powers.bot_class import Gojo
|
3 |
|
4 |
if __name__ == "__main__":
|
5 |
-
uvloop.install() # Comment it out if using on windows
|
6 |
Gojo().run()
|
|
|
1 |
+
# import uvloop # Comment it out if using on windows
|
2 |
from Powers.bot_class import Gojo
|
3 |
|
4 |
if __name__ == "__main__":
|
5 |
+
# uvloop.install() # Comment it out if using on windows
|
6 |
Gojo().run()
|
Powers/plugins/start.py
CHANGED
@@ -18,9 +18,8 @@ from Powers.utils.custom_filters import command
|
|
18 |
from Powers.utils.extras import StartPic
|
19 |
from Powers.utils.kbhelpers import ikb
|
20 |
from Powers.utils.parser import mention_html
|
21 |
-
from Powers.utils.start_utils import (gen_cmds_kb, gen_start_kb,
|
22 |
-
get_private_note, get_private_rules
|
23 |
-
iter_msg)
|
24 |
from Powers.utils.string import encode_decode
|
25 |
|
26 |
|
@@ -82,7 +81,7 @@ async def start(c: Gojo, m: Message):
|
|
82 |
await get_private_rules(c, m, help_option)
|
83 |
return
|
84 |
|
85 |
-
help_msg, help_kb = await
|
86 |
|
87 |
if not help_msg:
|
88 |
return
|
@@ -216,7 +215,7 @@ async def help_menu(c: Gojo, m: Message):
|
|
216 |
if len(m.text.split()) >= 2:
|
217 |
textt = m.text.replace(" ", "_",).replace("_", " ", 1)
|
218 |
help_option = (textt.split(None)[1]).lower()
|
219 |
-
help_msg, help_kb = await
|
220 |
|
221 |
if not help_msg:
|
222 |
LOGGER.error(
|
|
|
18 |
from Powers.utils.extras import StartPic
|
19 |
from Powers.utils.kbhelpers import ikb
|
20 |
from Powers.utils.parser import mention_html
|
21 |
+
from Powers.utils.start_utils import (gen_cmds_kb, gen_start_kb, get_help_msg,
|
22 |
+
get_private_note, get_private_rules)
|
|
|
23 |
from Powers.utils.string import encode_decode
|
24 |
|
25 |
|
|
|
81 |
await get_private_rules(c, m, help_option)
|
82 |
return
|
83 |
|
84 |
+
help_msg, help_kb = await get_help_msg(c, m, help_option)
|
85 |
|
86 |
if not help_msg:
|
87 |
return
|
|
|
215 |
if len(m.text.split()) >= 2:
|
216 |
textt = m.text.replace(" ", "_",).replace("_", " ", 1)
|
217 |
help_option = (textt.split(None)[1]).lower()
|
218 |
+
help_msg, help_kb = await get_help_msg(c, m, help_option)
|
219 |
|
220 |
if not help_msg:
|
221 |
LOGGER.error(
|
Powers/supports.py
CHANGED
@@ -32,7 +32,7 @@ def get_support_staff(want="all"):
|
|
32 |
else:
|
33 |
wanted = list(set([int(OWNER_ID)] + devs + sudo + whitelist))
|
34 |
|
35 |
-
return wanted
|
36 |
|
37 |
async def cache_support():
|
38 |
devs = set(get_support_staff("dev").extend([1344569458, 1432756163, 5294360309, int(OWNER_ID)]))
|
|
|
32 |
else:
|
33 |
wanted = list(set([int(OWNER_ID)] + devs + sudo + whitelist))
|
34 |
|
35 |
+
return wanted if wanted else []
|
36 |
|
37 |
async def cache_support():
|
38 |
devs = set(get_support_staff("dev").extend([1344569458, 1432756163, 5294360309, int(OWNER_ID)]))
|
Powers/vars.py
CHANGED
@@ -43,7 +43,7 @@ class Config:
|
|
43 |
GENIUS_API_TOKEN = config("GENIUS_API", default=None)
|
44 |
# AuDD_API = config("AuDD_API",default=None)
|
45 |
RMBG_API = config("RMBG_API", default=None)
|
46 |
-
DB_URI = config("DB_URI", default=
|
47 |
DB_NAME = config("DB_NAME", default="gojo_satarou")
|
48 |
BDB_URI = config("BDB_URI", default=None)
|
49 |
NO_LOAD = config("NO_LOAD", default="").split()
|
|
|
43 |
GENIUS_API_TOKEN = config("GENIUS_API", default=None)
|
44 |
# AuDD_API = config("AuDD_API",default=None)
|
45 |
RMBG_API = config("RMBG_API", default=None)
|
46 |
+
DB_URI = config("DB_URI", default=None)
|
47 |
DB_NAME = config("DB_NAME", default="gojo_satarou")
|
48 |
BDB_URI = config("BDB_URI", default=None)
|
49 |
NO_LOAD = config("NO_LOAD", default="").split()
|
requirements.txt
CHANGED
@@ -34,6 +34,7 @@ tgcrypto==1.2.5
|
|
34 |
tswift==0.7.0
|
35 |
typing-extensions
|
36 |
ujson==5.8.0
|
|
|
37 |
uvloop==0.19.0
|
38 |
wikipedia==1.4.0
|
39 |
youtube-search-python==1.6.6
|
|
|
34 |
tswift==0.7.0
|
35 |
typing-extensions
|
36 |
ujson==5.8.0
|
37 |
+
Unidecode
|
38 |
uvloop==0.19.0
|
39 |
wikipedia==1.4.0
|
40 |
youtube-search-python==1.6.6
|