Sourcery refactored main branch #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
PasswordUtils.py
Outdated
Comment on lines
-43
to
+45
| password = ''.join(random.choice(letters)+random.choice(symbols) for i in range(8)) | ||
| password = ''.join( | ||
| random.choice(letters) + random.choice(symbols) for _ in range(8) | ||
| ) |
Author
There was a problem hiding this comment.
Function PasswordUtils.passwordgen refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore)
PerevodLimitsX.py
Outdated
Comment on lines
-58
to
+88
| ''' - [Ник перевода] [Сколько переводить] - Перевод лимитов''' | ||
| args = utils.get_args_split_by(message, " ") | ||
| async with self.client.conversation("@mine_evo_bot") as conv: | ||
| await conv.send_message("б") | ||
| res = await conv.get_response() | ||
| pattern = "<b>Баланс:</b> (.*?)\n" | ||
| match = re.search(pattern, res.text,re.DOTALL) | ||
| if match: | ||
| balance = match.group(1) | ||
| balance = match.group(1) | ||
| await conv.send_message(f"Перевести {args[0]} {balance}") | ||
| res = await conv.get_response() | ||
| if "недостаточно денег" in res.text: | ||
| await utils.answer(message,"⚠️ Откройте конверт! Я не смог выяснить лимит игрока из-за бага майнево!") | ||
| return | ||
| pattern = "\n(.*?)$" | ||
| match = re.search(pattern, res.message, re.DOTALL) | ||
| if match: | ||
| sum = match.group(1).replace("$","") | ||
| ''' - [Ник перевода] [Сколько переводить] - Перевод лимитов''' | ||
| args = utils.get_args_split_by(message, " ") | ||
| async with self.client.conversation("@mine_evo_bot") as conv: | ||
| await conv.send_message("б") | ||
| res = await conv.get_response() | ||
| pattern = "<b>Баланс:</b> (.*?)\n" | ||
| match = re.search(pattern, res.text,re.DOTALL) | ||
| if match: | ||
| balance = match.group(1) | ||
| balance = match.group(1) | ||
| await conv.send_message(f"Перевести {args[0]} {balance}") | ||
| res = await conv.get_response() | ||
| if "недостаточно денег" in res.text: | ||
| await utils.answer(message,"⚠️ Откройте конверт! Я не смог выяснить лимит игрока из-за бага майнево!") | ||
| return | ||
| pattern = "\n(.*?)$" | ||
| if match := re.search(pattern, res.message, re.DOTALL): | ||
| sum = match.group(1).replace("$","") | ||
|
|
||
| conv.cancel() | ||
| ost = 0 | ||
| self.set("full",args[1]) | ||
| await utils.answer(message,"💖 Я начал переводить!") | ||
| for i in range(int(args[1])+1): | ||
| self._db.get(__name__,"ost",0) | ||
| await self.client.send_message("@mine_evo_bot",f"Перевести {args[0]} {sum}") | ||
| await asyncio.sleep(self.config["time_perevod"]) | ||
| ost += 1 | ||
| self.set("ost",ost) | ||
| await utils.answer(message,"💸 Я всё перевёл") | ||
| await self.client.send_message(self._backup_channel,f"🎉 <b>Я перевел все лимиты игроку:</b> <code>{args[0]}</code> <b>В количстве:</b> <code>{args[1]}</code>") | ||
| conv.cancel() | ||
| ost = 0 | ||
| self.set("full",args[1]) | ||
| await utils.answer(message,"💖 Я начал переводить!") | ||
| for _ in range(int(args[1])+1): | ||
| self._db.get(__name__,"ost",0) | ||
| await self.client.send_message("@mine_evo_bot",f"Перевести {args[0]} {sum}") | ||
| await asyncio.sleep(self.config["time_perevod"]) | ||
| ost += 1 | ||
| self.set("ost",ost) | ||
| await utils.answer(message,"💸 Я всё перевёл") | ||
| await self.client.send_message(self._backup_channel,f"🎉 <b>Я перевел все лимиты игроку:</b> <code>{args[0]}</code> <b>В количстве:</b> <code>{args[1]}</code>") |
Author
There was a problem hiding this comment.
Function PerevodLimitsX.perevodx refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace unused for index with underscore (
for-index-underscore)
Comment on lines
-50
to
+55
| elif isinstance(peer, PeerChat) or isinstance(peer, PeerChannel): | ||
| elif isinstance(peer, (PeerChat, PeerChannel)): | ||
| added = self.strings("added").format( | ||
| message.chat_id, | ||
| entity.title | ||
| ) | ||
|
|
Author
There was a problem hiding this comment.
Function PinMoreChats.pinchat refactored with the following changes:
- Merge isinstance calls (
merge-isinstance)
Comment on lines
-91
to
+97
| if isinstance(peer, PeerUser): | ||
| name = entity.first_name | ||
| elif isinstance(peer, PeerChat): | ||
| name = entity.title | ||
| elif isinstance(peer, PeerChannel): | ||
| name = entity.title | ||
| else: | ||
| name = entity.title | ||
| name = entity.first_name if isinstance(peer, PeerUser) else entity.title | ||
| except Exception: | ||
| pass | ||
| messages = await self.client.get_messages(chat_id, limit=1) | ||
| max_message_id = messages[0].id | ||
| chats += f"<a href=tg://privatepost?channel={chat}&post={max_message_id}>{name}</a>\n" | ||
|
|
Author
There was a problem hiding this comment.
Function PinMoreChats.listpinchats refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Replace if statement with if expression (
assign-if-exp)
SpyEVO.py
Outdated
Comment on lines
-30
to
+79
| converts = self.get("converts",0) | ||
| r_converts = self.get("r_converts",0) | ||
| case = self.get("case",0) | ||
| r_case = self.get("r_case",0) | ||
| mif = self.get("mif",0) | ||
| crystal = self.get("crystal",0) | ||
| plasma = self.get("plasma",0) | ||
| zv = self.get("zv",0) | ||
| scrap = self.get("scrap",0) | ||
| medals = self.get("medals",0) | ||
|
|
||
| if message.chat_id == 5522271758 and message.text == "✉ Ты нашел(ла) конверт.": | ||
| converts += 1 | ||
| self.set("converts",converts) | ||
| if message.chat_id == 5522271758 and message.text == "🧧 Ты нашел(ла) редкий конверт.": | ||
| r_converts +=1 | ||
| self.set("r_converts",converts) | ||
| if message.chat_id == 5522271758 and message.text == "📦 Ты нашел(ла) Кейс!": | ||
| case += 1 | ||
| self.set("case",case) | ||
| if message.chat_id == 5522271758 and message.text == "🗳 Ты нашел(ла) Редкий Кейс!": | ||
| r_case += 1 | ||
| self.set("r_case",r_case) | ||
| if message.chat_id == 5522271758 and message.raw_text == "🕋 Ты нашел(ла) Мифический Кейс!": | ||
| mif += 1 | ||
| self.set("mif",mif) | ||
| if message.chat_id == 5522271758 and message.raw_text == "💎 Ты нашел(ла) Кристальный Кейс!": | ||
| crystal += 1 | ||
| self.set("crystal",crystal) | ||
| if message.chat_id == 5522271758 and "🎆 Ты нашел(ла) 1 плазму" in message.text: | ||
| plasma += 1 | ||
| self.set("plasma",plasma) | ||
| if message.chat_id == 5522271758 and "💫" in message.text: | ||
| zv += 1 | ||
| self.set("zv",zv) | ||
| if message.chat_id == 5522271758 and "🎆 Ты нашел(ла) 2 плазмы" in message.text: | ||
| plasma += 2 | ||
| self.set("plasma",plasma) | ||
| if message.chat_id == 5522271758 and "Медаль" in message.text: | ||
| pattern = "Медаль +(.*?)</b>" | ||
| match = re.search(pattern, message.text, re.DOTALL) | ||
| if match: | ||
| medali = int(match.group(1)) | ||
| medals += medali | ||
| self.set("medals",medals) | ||
| if message.chat_id == 5522271758 and "Скрап" in message.text: | ||
| pattern = "Скрап +(.*?)</b>" | ||
| match = re.search(pattern, message.text, re.DOTALL) | ||
| if match: | ||
| scrapi = int(match.group(1)) | ||
| scrap += scrapi | ||
| self.set("scrap",scrap) | ||
| converts = self.get("converts",0) | ||
| r_converts = self.get("r_converts",0) | ||
| case = self.get("case",0) | ||
| r_case = self.get("r_case",0) | ||
| mif = self.get("mif",0) | ||
| crystal = self.get("crystal",0) | ||
| plasma = self.get("plasma",0) | ||
| zv = self.get("zv",0) | ||
| scrap = self.get("scrap",0) | ||
| medals = self.get("medals",0) | ||
|
|
||
| if message.chat_id == 5522271758 and message.text == "✉ Ты нашел(ла) конверт.": | ||
| converts += 1 | ||
| self.set("converts",converts) | ||
| if message.chat_id == 5522271758 and message.text == "🧧 Ты нашел(ла) редкий конверт.": | ||
| r_converts +=1 | ||
| self.set("r_converts",converts) | ||
| if message.chat_id == 5522271758 and message.text == "📦 Ты нашел(ла) Кейс!": | ||
| case += 1 | ||
| self.set("case",case) | ||
| if message.chat_id == 5522271758 and message.text == "🗳 Ты нашел(ла) Редкий Кейс!": | ||
| r_case += 1 | ||
| self.set("r_case",r_case) | ||
| if message.chat_id == 5522271758 and message.raw_text == "🕋 Ты нашел(ла) Мифический Кейс!": | ||
| mif += 1 | ||
| self.set("mif",mif) | ||
| if message.chat_id == 5522271758 and message.raw_text == "💎 Ты нашел(ла) Кристальный Кейс!": | ||
| crystal += 1 | ||
| self.set("crystal",crystal) | ||
| if message.chat_id == 5522271758 and "🎆 Ты нашел(ла) 1 плазму" in message.text: | ||
| plasma += 1 | ||
| self.set("plasma",plasma) | ||
| if message.chat_id == 5522271758 and "💫" in message.text: | ||
| zv += 1 | ||
| self.set("zv",zv) | ||
| if message.chat_id == 5522271758 and "🎆 Ты нашел(ла) 2 плазмы" in message.text: | ||
| plasma += 2 | ||
| self.set("plasma",plasma) | ||
| if message.chat_id == 5522271758 and "Медаль" in message.text: | ||
| pattern = "Медаль +(.*?)</b>" | ||
| if match := re.search(pattern, message.text, re.DOTALL): | ||
| medali = int(match.group(1)) | ||
| medals += medali | ||
| self.set("medals",medals) | ||
| if message.chat_id == 5522271758 and "Скрап" in message.text: | ||
| pattern = "Скрап +(.*?)</b>" | ||
| if match := re.search(pattern, message.text, re.DOTALL): | ||
| scrapi = int(match.group(1)) | ||
| scrap += scrapi | ||
| self.set("scrap",scrap) |
Author
There was a problem hiding this comment.
Function SpyEVO.watcher refactored with the following changes:
- Use named expression to simplify assignment and conditional [×2] (
use-named-expression)
| self._chats.append(message.chat_id) | ||
| added = True | ||
| elif message.chat_id in self._chats: | ||
| else: |
Author
There was a problem hiding this comment.
Function Autoreader.autoread refactored with the following changes:
- Remove redundant conditional (
remove-redundant-if)
autoreader.py
Outdated
Comment on lines
-91
to
+98
|
|
||
| if str(args).startswith("-100"): | ||
| value = int(str(args)[4:]) | ||
|
|
||
| elif args > 2**64 - 1 or args < 0: | ||
| await utils.answer(message,"Неверный айди!") | ||
| else: | ||
| await self.client.send_read_acknowledge(int(args),clear_mentions=True) | ||
| await self.client.send_read_acknowledge(args, clear_mentions=True) |
Author
There was a problem hiding this comment.
Function Autoreader.read refactored with the following changes:
- Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
filters.py
Outdated
Comment on lines
-41
to
-49
|
|
||
| elif filter_txt == "capitalize": | ||
| try: | ||
| await message.edit(message.text.capitalize()) | ||
| except Exception: | ||
| pass | ||
| elif filter_txt == "off": | ||
| pass # Ну а чо делать | ||
|
|
Author
There was a problem hiding this comment.
Function TextFilters.watcher refactored with the following changes:
- Remove empty elif clause (
remove-pass-elif)
This removes the following comments ( why? ):
# Ну а чо делать
sendmsg.py
Outdated
| message.message = " ".join(args.split()[1:]) | ||
| try: | ||
| if error == False: | ||
| if not error: |
Author
There was a problem hiding this comment.
Function SendMSGA.SendMSG refactored with the following changes:
- Simplify comparison to boolean [×2] (
simplify-boolean-comparison)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!