Sourcery refactored main branch #4

sourcery-ai · 2022-01-29T03:59:04Z

Branch main refactored 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 main branch, then run:

git fetch origin sourcery/main
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-01-29T03:59:06Z

WebStreamer/vars.py

-class Var(object):
+
+
+class Var((object)):


Lines 9-33 refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

sourcery-ai · 2022-01-29T03:59:06Z

WebStreamer/bot/plugins/admin.py

-        broadcast_id = ''.join([random.choice(string.ascii_letters) for i in range(3)])
+        broadcast_id = ''.join([random.choice(string.ascii_letters) for _ in range(3)])
        if not broadcast_ids.get(broadcast_id):
            break
    out = await m.reply_text(
-        text=f"Broadcast initiated! You will be notified with log file when all the users are notified."
+        text='Broadcast initiated! You will be notified with log file when all the users are notified.'
    )
+


Function broadcast_ refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Replace f-string with no interpolated values with string (remove-redundant-fstring)

sourcery-ai · 2022-01-29T03:59:06Z

WebStreamer/bot/plugins/stream.py

-        print(f"Sleeping for {str(e.x)}s")
+        print(f'Sleeping for {e.x}s')
        await asyncio.sleep(e.x)
-        await c.send_message(chat_id=Var.BIN_CHANNEL, text=f"Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {str(e.x)}s from [{m.from_user.first_name}](tg://user?id={m.from_user.id})\n\n**𝚄𝚜𝚎𝚛 𝙸𝙳 :** `{str(m.from_user.id)}`", disable_web_page_preview=True, parse_mode="Markdown")
+        await c.send_message(
+            chat_id=Var.BIN_CHANNEL,
+            text=f'Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {e.x}s from [{m.from_user.first_name}](tg://user?id={m.from_user.id})\n\n**𝚄𝚜𝚎𝚛 𝙸𝙳 :** `{m.from_user.id}`',
+            disable_web_page_preview=True,
+            parse_mode="Markdown",
+        )


Function private_receive_handler refactored with the following changes:

Simplify unnecessary nesting, casting and constant values in f-strings (simplify-fstring-formatting)

sourcery-ai · 2022-01-29T03:59:06Z

WebStreamer/bot/plugins/stream.py

-            text=f"**Cʜᴀɴɴᴇʟ Nᴀᴍᴇ:** `{broadcast.chat.title}`\n**Cʜᴀɴɴᴇʟ ID:** `{broadcast.chat.id}`\n**Rᴇǫᴜᴇsᴛ ᴜʀʟ:** https://t.me/{(await bot.get_me()).username}?start=AvishkarPatil_{str(log_msg.message_id)}",
-            # text=f"**Cʜᴀɴɴᴇʟ Nᴀᴍᴇ:** `{broadcast.chat.title}`\n**Cʜᴀɴɴᴇʟ ID:** `{broadcast.chat.id}`\n**Rᴇǫᴜᴇsᴛ ᴜʀʟ:** https://t.me/FxStreamBot?start=AvishkarPatil_{str(log_msg.message_id)}",
+            text=f'**Cʜᴀɴɴᴇʟ Nᴀᴍᴇ:** `{broadcast.chat.title}`\n**Cʜᴀɴɴᴇʟ ID:** `{broadcast.chat.id}`\n**Rᴇǫᴜᴇsᴛ ᴜʀʟ:** https://t.me/{(await bot.get_me()).username}?start=AvishkarPatil_{log_msg.message_id}',
            quote=True,
-            parse_mode="Markdown"
+            parse_mode="Markdown",
        )
+
        await bot.edit_message_reply_markup(
            chat_id=broadcast.chat.id,
            message_id=broadcast.message_id,
            reply_markup=InlineKeyboardMarkup(
-                [[InlineKeyboardButton("Dᴏᴡɴʟᴏᴀᴅ ʟɪɴᴋ 📥", url=f"https://t.me/{(await bot.get_me()).username}?start=AvishkarPatil_{str(log_msg.message_id)}")]])
-            # [[InlineKeyboardButton("Dᴏᴡɴʟᴏᴀᴅ ʟɪɴᴋ 📥", url=f"https://t.me/FxStreamBot?start=AvishkarPatil_{str(log_msg.message_id)}")]])
+                [
+                    [
+                        InlineKeyboardButton(
+                            "Dᴏᴡɴʟᴏᴀᴅ ʟɪɴᴋ 📥",
+                            url=f'https://t.me/{(await bot.get_me()).username}?start=AvishkarPatil_{log_msg.message_id}',
+                        )
+                    ]
+                ]
+            ),
        )
+
    except FloodWait as w:
-        print(f"Sleeping for {str(w.x)}s")
+        print(f'Sleeping for {w.x}s')
        await asyncio.sleep(w.x)
-        await bot.send_message(chat_id=Var.BIN_CHANNEL,
-                             text=f"Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {str(w.x)}s from {broadcast.chat.title}\n\n**Cʜᴀɴɴᴇʟ ID:** `{str(broadcast.chat.id)}`",
-                             disable_web_page_preview=True, parse_mode="Markdown")
+        await bot.send_message(
+            chat_id=Var.BIN_CHANNEL,
+            text=f'Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {w.x}s from {broadcast.chat.title}\n\n**Cʜᴀɴɴᴇʟ ID:** `{broadcast.chat.id}`',
+            disable_web_page_preview=True,
+            parse_mode="Markdown",
+        )
+


Function channel_receive_handler refactored with the following changes:

Simplify unnecessary nesting, casting and constant values in f-strings (simplify-fstring-formatting)

This removes the following comments ( why? ):

# [[InlineKeyboardButton("Dᴏᴡɴʟᴏᴀᴅ ʟɪɴᴋ 📥", url=f"https://t.me/FxStreamBot?start=AvishkarPatil_{str(log_msg.message_id)}")]]) # text=f"**Cʜᴀɴɴᴇʟ Nᴀᴍᴇ:** `{broadcast.chat.title}`\n**Cʜᴀɴɴᴇʟ ID:** `{broadcast.chat.id}`\n**Rᴇǫᴜᴇsᴛ ᴜʀʟ:** https://t.me/FxStreamBot?start=AvishkarPatil_{str(log_msg.message_id)}",

sourcery-ai · 2022-01-29T03:59:06Z

WebStreamer/server/stream_routes.py

-    file_name = file_properties.file_name if file_properties.file_name \
-        else f"{secrets.token_hex(2)}.jpeg"
-    mime_type = file_properties.mime_type if file_properties.mime_type \
-        else f"{mimetypes.guess_type(file_name)}"
+    file_name = file_properties.file_name or f"{secrets.token_hex(2)}.jpeg"
+    mime_type = file_properties.mime_type or f"{mimetypes.guess_type(file_name)}"


Function media_streamer refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

sourcery-ai · 2022-01-29T03:59:07Z

WebStreamer/utils/custom_dl.py

-        error_message = "This message doesn't contain any downloadable media"
        available_media = ("audio", "document", "photo", "sticker", "animation", "video", "voice", "video_note")

        if isinstance(msg, Message):
+            error_message = "This message doesn't contain any downloadable media"


Function TGCustomYield.generate_file_properties refactored with the following changes:

Move assignments closer to their usage (move-assign)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-01-29T03:59:07Z

WebStreamer/utils/custom_dl.py

+            elif file_id.chat_access_hash == 0:
+                peer = raw.types.InputPeerChat(
+                    chat_id=-file_id.chat_id
+                )
            else:
-                if file_id.chat_access_hash == 0:
-                    peer = raw.types.InputPeerChat(
-                        chat_id=-file_id.chat_id
-                    )
-                else:
-                    peer = raw.types.InputPeerChannel(
-                        channel_id=utils.get_channel_id(file_id.chat_id),
-                        access_hash=file_id.chat_access_hash
-                    )
+                peer = raw.types.InputPeerChannel(
+                    channel_id=utils.get_channel_id(file_id.chat_id),
+                    access_hash=file_id.chat_access_hash
+                )

-            location = raw.types.InputPeerPhotoFileLocation(
+            return raw.types.InputPeerPhotoFileLocation(
                peer=peer,
                volume_id=file_id.volume_id,
                local_id=file_id.local_id,
                big=file_id.thumbnail_source == ThumbnailSource.CHAT_PHOTO_BIG
            )
        elif file_type == FileType.PHOTO:
-            location = raw.types.InputPhotoFileLocation(
+            return raw.types.InputPhotoFileLocation(
                id=file_id.media_id,
                access_hash=file_id.access_hash,
                file_reference=file_id.file_reference,
                thumb_size=file_id.thumbnail_size
            )
        else:
-            location = raw.types.InputDocumentFileLocation(
+            return raw.types.InputDocumentFileLocation(
                id=file_id.media_id,
                access_hash=file_id.access_hash,
                file_reference=file_id.file_reference,
                thumb_size=file_id.thumbnail_size
            )

-        return location


Function TGCustomYield.get_location refactored with the following changes:

Lift return into if (lift-return-into-if)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

sourcery-ai · 2022-01-29T03:59:07Z

WebStreamer/utils/custom_dl.py


-        current_part = 1


Function TGCustomYield.yield_file refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2022-01-29T03:59:07Z

WebStreamer/utils/database.py

    async def is_user_exist(self, id):
        user = await self.col.find_one({'id': int(id)})
-        return True if user else False
+        return bool(user)


Function Database.is_user_exist refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

sourcery-ai · 2022-01-29T03:59:07Z

WebStreamer/utils/database.py

    async def get_all_users(self):
-        all_users = self.col.find({})
-        return all_users
+        return self.col.find({})


Function Database.get_all_users refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

'Refactored by Sourcery'

c70e235

sourcery-ai bot requested a review from AmirulAndalib January 29, 2022 03:59

sourcery-ai bot commented Jan 29, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sourcery refactored main branch #4

Sourcery refactored main branch #4

Uh oh!

sourcery-ai bot commented Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		class Var(object):


		class Var((object)):

Sourcery refactored main branch #4

Are you sure you want to change the base?

Sourcery refactored main branch #4

Uh oh!

Conversation

sourcery-ai bot commented Jan 29, 2022

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jan 29, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant