Sourcery refactored master branch by sourcery-ai[bot] · Pull Request #1 · xbinner18/bot-python

sourcery-ai · 2022-12-15T07:00:11Z

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

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

Help us improve this pull request!

sourcery-ai · 2022-12-15T07:00:20Z

 def create_chat(self, name, about="", rules="", members=[], public=False, join_moderation=False, default_role="member"):
    return self.http_session.get(
-        url="{}/chats/createChat".format(self.api_base_url),
+        url=f"{self.api_base_url}/chats/createChat",


Function create_chat refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:20Z

-        i = 1
        row = []
-        for button in args:
+        for i, button in enumerate(args, start=1):
            row.append(button.to_dic())
            if i % self.buttons_in_row == 0:
                self.keyboard.append(row)
                row = []
-            i += 1


Function InlineKeyboardMarkup.add refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

sourcery-ai · 2022-12-15T07:00:21Z

-        btn_array = []
-        for button in args:
-            btn_array.append(button.to_dic())
+        btn_array = [button.to_dic() for button in args]


Function InlineKeyboardMarkup.row refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-12-15T07:00:21Z

-        result = {}
-        for key in self.styles.keys():
-            result[key] = self.styles[key].to_dic()
+        result = {key: self.styles[key].to_dic() for key in self.styles.keys()}


Function Format.to_json refactored with the following changes:

Convert for loop into dictionary comprehension (dict-comprehension)

sourcery-ai · 2022-12-15T07:00:21Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="User command: {}".format(event.data['text']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"User command: {event.data['text']}",
+    )


Function test_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:21Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Private user command: {}".format(event.data['text']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Private user command: {event.data['text']}",
+    )


Function private_command_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:21Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was pinned".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was pinned",
+    )


Function pinned_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:21Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was unpinned".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was unpinned",
+    )


Function unpinned_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:21Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was edited".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was edited",
+    )


Function edited_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:22Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was deleted".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was deleted",
+    )


Function deleted_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:00:25Z

-        text="Reply to message: {}".format(msg_id),
-        reply_msg_id=msg_id
+        text=f"Reply to message: {msg_id}",
+        reply_msg_id=msg_id,


Function reply_to_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:43Z

-            name=self.name if self.name is not None else requests.get(url="{}/self/get".format(self.api_base_url),
-                                                                      params={"token": self.token}
-                                                                      ).json().get('nick'),
-            # name=self.name,
+            name=self.name
+            if self.name is not None
+            else requests.get(
+                url=f"{self.api_base_url}/self/get", params={"token": self.token}
+            )
+            .json()
+            .get('nick'),
            version=self.version if self.version is not None else 'base',
            uin="" if self.uin is None else self.uin,
-            library_version=version
+            library_version=version,


Function Bot.user_agent refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

This removes the following comments ( why? ):

# name=self.name,

sourcery-ai · 2022-12-15T07:01:43Z

-                if response:
-                    if "description" in response.json() and response.json()["description"] == 'Invalid token':
-                        raise InvalidToken(response.json())
+                if (
+                    response
+                    and "description" in response.json()
+                    and response.json()["description"] == 'Invalid token'
+                ):
+                    raise InvalidToken(response.json())


Function Bot._start_polling refactored with the following changes:

Merge nested if conditions (merge-nested-ifs)

sourcery-ai · 2022-12-15T07:01:43Z

-            url="{}/events/get".format(self.api_base_url),
+            url=f"{self.api_base_url}/events/get",
            params={
                "token": self.token,
                "pollTime": poll_time_s,
-                "lastEventId": last_event_id
+                "lastEventId": last_event_id,
            },
-            timeout=poll_time_s + self.timeout_s
+            timeout=poll_time_s + self.timeout_s,


Function Bot.events_get refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:44Z

-            url="{}/self/get".format(self.api_base_url),
-            params={
-                "token": self.token
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/self/get",
+            params={"token": self.token},
+            timeout=self.timeout_s,


Function Bot.self_get refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:44Z

-            url="{}/messages/sendText".format(self.api_base_url),
+            url=f"{self.api_base_url}/messages/sendText",


Function Bot.send_text refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:45Z

-            url="{}/chats/getPendingUsers".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/getPendingUsers",
+            params={"token": self.token, "chatId": chat_id},
+            timeout=self.timeout_s,


Function Bot.get_chat_pending_users refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:45Z

-            url="{}/chats/blockUser".format(self.api_base_url),
+            url=f"{self.api_base_url}/chats/blockUser",
            params={
                "token": self.token,
                "chatId": chat_id,
                "userId": user_id,
-                "delLastMessages": str(del_last_messages).lower()
+                "delLastMessages": str(del_last_messages).lower(),
            },
-            timeout=self.timeout_s
+            timeout=self.timeout_s,


Function Bot.chat_block_user refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:45Z

-            url="{}/chats/unblockUser".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "userId": user_id
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/unblockUser",
+            params={"token": self.token, "chatId": chat_id, "userId": user_id},
+            timeout=self.timeout_s,


Function Bot.chat_unblock_user refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:45Z

-            url="{}/chats/resolvePending".format(self.api_base_url),
+            url=f"{self.api_base_url}/chats/resolvePending",
            params={
                "token": self.token,
                "chatId": chat_id,
                "approve": str(approve).lower(),
                "userId": user_id,
-                "everyone": str(everyone).lower()
+                "everyone": str(everyone).lower(),
            },
-            timeout=self.timeout_s
+            timeout=self.timeout_s,


Function Bot.chat_resolve_pending refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:45Z

-            url="{}/chats/setTitle".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "title": title
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/setTitle",
+            params={"token": self.token, "chatId": chat_id, "title": title},
+            timeout=self.timeout_s,


Function Bot.set_chat_title refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:49Z

-            url="{}/chats/setAbout".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "about": about
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/setAbout",
+            params={"token": self.token, "chatId": chat_id, "about": about},
+            timeout=self.timeout_s,


Function Bot.set_chat_about refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:49Z

-            url="{}/chats/setRules".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "rules": rules
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/setRules",
+            params={"token": self.token, "chatId": chat_id, "rules": rules},
+            timeout=self.timeout_s,


Function Bot.set_chat_rules refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:50Z

-            url="{}/files/getInfo".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "fileId": file_id
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/files/getInfo",
+            params={"token": self.token, "fileId": file_id},
+            timeout=self.timeout_s,


Function Bot.get_file_info refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:50Z

-            url="{}/chats/pinMessage".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "msgId": msg_id
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/pinMessage",
+            params={"token": self.token, "chatId": chat_id, "msgId": msg_id},
+            timeout=self.timeout_s,


Function Bot.pin_message refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:50Z

-            url="{}/chats/unpinMessage".format(self.api_base_url),
-            params={
-                "token": self.token,
-                "chatId": chat_id,
-                "msgId": msg_id
-            },
-            timeout=self.timeout_s
+            url=f"{self.api_base_url}/chats/unpinMessage",
+            params={"token": self.token, "chatId": chat_id, "msgId": msg_id},
+            timeout=self.timeout_s,


Function Bot.unpin_message refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:52Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Private user command: {}".format(event.data['text']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Private user command: {event.data['text']}",
+    )


Function private_command_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:52Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was pinned".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was pinned",
+    )


Function pinned_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:52Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was unpinned".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was unpinned",
+    )


Function unpinned_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:52Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was edited".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was edited",
+    )


Function edited_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:52Z

-    bot.send_text(chat_id=event.data['chat']['chatId'], text="Message {} was deleted".format(event.data['msgId']))
+    bot.send_text(
+        chat_id=event.data['chat']['chatId'],
+        text=f"Message {event.data['msgId']} was deleted",
+    )


Function deleted_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-12-15T07:01:56Z

-        text="Reply to message: {}".format(msg_id),
-        reply_msg_id=msg_id
+        text=f"Reply to message: {msg_id}",
+        reply_msg_id=msg_id,


Function reply_to_message_cb refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai Bot requested a review from xbinner18 December 15, 2022 07:00

sourcery-ai Bot commented Dec 15, 2022

View reviewed changes

'Refactored by Sourcery'

ffec9d6

sourcery-ai Bot force-pushed the sourcery/master branch from 3fbea40 to ffec9d6 Compare December 15, 2022 07:01

sourcery-ai Bot commented Dec 15, 2022

View reviewed changes

		url="{}/messages/sendText".format(self.api_base_url),
		url=f"{self.api_base_url}/messages/sendText",

Conversation

sourcery-ai Bot commented Dec 15, 2022

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Dec 15, 2022

Choose a reason for hiding this comment