Sourcery refactored master branch #1

sourcery-ai · 2023-11-21T09:45:08Z

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 · 2023-11-21T09:45:10Z

dicergirl/__init__.py

-        if args[0] == "on":
-            debugon()
-            logging.getLogger().setLevel(logging.DEBUG)
-            logger.remove()
-            logger.add(sys.stdout, level="INFO")
-            logger.info("输出等级设置为 DEBUG.")
-            return await matcher.send(
-                manager.process_generic_event("DebugOn", event=event)
-            )
-        else:
+        if args[0] != "on":
            return await matcher.send("错误, 我无法解析你的指令.")
+        debugon()
+        logging.getLogger().setLevel(logging.DEBUG)
+        logger.remove()
+        logger.add(sys.stdout, level="INFO")
+        logger.info("输出等级设置为 DEBUG.")
+        return await matcher.send(
+            manager.process_generic_event("DebugOn", event=event)
+        )


Function debughandler refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-11-21T09:45:11Z

dicergirl/__init__.py

-        arg = list(filter(None, args.split(" ")))
-
-        if len(arg) >= 1:
+        if arg := list(filter(None, args.split(" "))):


Function superuser_handler refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Simplify sequence length comparison (simplify-len-comparison)

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

Swap if/else branches (swap-if-else-branches)

Simplify logical expression using De Morgan identities (de-morgan)

sourcery-ai · 2023-11-21T09:45:11Z

dicergirl/__init__.py

-            reply = "从商店搜索到以下插件:\n"
-            reply += "Noctisynth 官方插件:\n"
-
+            reply = "从商店搜索到以下插件:\n" + "Noctisynth 官方插件:\n"


Function bothandler refactored with the following changes:

Replace assignment and augmented assignment with single assignment (merge-assign-and-aug-assign)

sourcery-ai · 2023-11-21T09:45:11Z

dicergirl/common/messages.py

-    got = messages.get(args)
-    if got:
+    if got := messages.get(args):
        return got

    for key, alias in messages.keys.items():
-        relation = []
-        for alia in alias:
-            if alia:
-                relation.append(similar(alia, args))
-
+        relation = [similar(alia, args) for alia in alias if alia]


Function help_message refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

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

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

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

Use str.join() instead of for loop (use-join)

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2023-11-21T09:45:11Z

dicergirl/handlers/default.py

-        if len(args) == 0:
+        if not args:


Function DefaultRA.__call__ refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

Remove redundant conditional (remove-redundant-if)

Merge append into list declaration (merge-list-append)

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

sourcery-ai · 2023-11-21T09:45:12Z

dicergirl/plugins/parse.py

-        if "official" in result.keys():
-            official = result["official"]
-        else:
-            official = {}
-
-        return official
+        return result["official"] if "official" in result.keys() else {}


Function get_official_plugins refactored with the following changes:

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

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

sourcery-ai · 2023-11-21T09:45:12Z

dicergirl/plugins/parse.py

-        if "community" in result.keys():
-            community = result["community"]
-        else:
-            community = {}
-
-        return community
+        return result["community"] if "community" in result.keys() else {}


Function get_community_plugins refactored with the following changes:

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

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

sourcery-ai · 2023-11-21T09:45:13Z

dicergirl/reply/init.py

-    for name, method in vars(templates).items():
+    for method in vars(templates).values():


Function _load_template_methods refactored with the following changes:

Replace calls to dict.items with dict.values when the keys are not used (replace-dict-items-with-values)

sourcery-ai · 2023-11-21T09:45:13Z

dicergirl/reply/init.py

-        logger.error(f"请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")
+        logger.error("请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")


Function _load_reply_file refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:13Z

dicergirl/reply/init.py

-        logger.error(f"初始化回复配置时出现异常。")
+        logger.error("初始化回复配置时出现异常。")


Function init_yaml_file refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:15Z

dicergirl/reply/manager.py

-                if response and is_enable:
-                    result = self._handle_generic_event(response, **kwargs)
-                    if result:
-                        return result
-                    else:
-                        break
+            if response and is_enable:
+                result = self._handle_generic_event(response, **kwargs)
+                if result:
+                    return result
+                else:
+                    break


Function ReplyRegistryManager.process_generic_event refactored with the following changes:

Hoist conditional out of nested conditional (hoist-if-from-if)

sourcery-ai · 2023-11-21T09:45:15Z

dicergirl/reply/manager.py

-        if len(result) == 0:
-            return None
-        return result
+        return None if len(result) == 0 else result


Function ReplyRegistryManager.process_message_event refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

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

sourcery-ai · 2023-11-21T09:45:16Z

dicergirl/reply/registry.py

-            logger.error(f"请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")
+            logger.error("请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")


Function ReplyRegistry.disable_event refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:16Z

dicergirl/reply/registry.py

-            logger.error(f"请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")
+            logger.error("请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")


Function ReplyRegistry.enable_event refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:16Z

dicergirl/reply/registry.py

-            logger.error(f"请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")
+            logger.error("请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")


Function ReplyRegistry.toggle refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:17Z

dicergirl/utils/dicer.py

-        if split[0]:
-            self.a = int(split[0])
-        else:
-            self.a = 1
-
+        self.a = int(split[0]) if split[0] else 1


Function PunishDice.parse refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:17Z

dicergirl/utils/dicer.py

-    for roll_string in roll_strings.keys():
+    for roll_string in roll_strings:


Lines 344-344 refactored with the following changes:

Remove unnecessary call to keys() (remove-dict-keys)

sourcery-ai · 2023-11-21T09:45:17Z

dicergirl/utils/docimasy.py

-        if judge:
-            self.judge = self.judge_dict[judge]
-        else:
-            self.judge = None
+        self.judge = self.judge_dict[judge] if judge else None


Function Docimasy.__init__ refactored with the following changes:

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

sourcery-ai · 2023-11-21T09:45:17Z

dicergirl/utils/docimasy.py

-        if self.judge > 0:
-            return True
-        else:
-            return False
+        return self.judge > 0


Function Docimasy.__bool__ refactored with the following changes:

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

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

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-11-21T09:45:17Z

dicergirl/utils/docimasy.py

-            toadd = toadd.lstrip("\n")
-            if toadd:
-                if self.detail:
-                    self.detail = self.detail.strip("\n") + "\n" + toadd
-                else:
-                    self.detail = toadd
+            if toadd := toadd.lstrip("\n"):
+                self.detail = self.detail.strip("\n") + "\n" + toadd if self.detail else toadd


Function Docimasy.__add__ refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

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

sourcery-ai · 2023-11-21T09:45:20Z

dicergirl/utils/formatters.py

-    message = str(message).lower() if lower else str(message)
+    message = message.lower() if lower else message
    msg = translate_punctuation(
        re.sub("\s+", " ", re.sub(regex, "", message)).strip(" ")
    )
    if msg.startswith("/"):
-        msg = "." + msg[1:]
+        msg = f".{msg[1:]}"


Function format_str refactored with the following changes:

Remove unnecessary casts to int, str, float or bool [×2] (remove-unnecessary-cast)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-11-21T09:45:20Z

dicergirl/utils/handlers.py

-    mentions = []
    try:
        message = json.loads(event.json())["message"]
    except KeyError:
        return []

-    for mention in message:
-        if mention["type"] == "at":
-            mentions.append(mention["data"]["qq"])
-
-    return mentions
+    return [
+        mention["data"]["qq"] for mention in message if mention["type"] == "at"
+    ]


Function get_mentions refactored with the following changes:

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

Convert for loop into list comprehension (list-comprehension)

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

sourcery-ai · 2023-11-21T09:45:20Z

dicergirl/utils/handlers.py

-    for _, obj in vars(main).items():
+    for obj in vars(main).values():


Function get_handlers refactored with the following changes:

Replace calls to dict.items with dict.values when the keys are not used (replace-dict-items-with-values)

sourcery-ai · 2023-11-21T09:45:20Z

dicergirl/utils/handlers.py

-            if raw_json["card"]:
-                return raw_json["card"]
-            else:
-                return raw_json["nickname"]
+            return raw_json["card"] if raw_json["card"] else raw_json["nickname"]
        except:
            from .plugins import modes

            cards = modes[get_mode(event)].__cards__
-            got = cards.get(event, qid=get_user_id(event))
-            if got:
+            if got := cards.get(event, qid=get_user_id(event)):


Function get_user_card refactored with the following changes:

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

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-21T09:45:20Z

dicergirl/utils/handlers.py

-            got = cards.get(event, qid=get_user_id(event))
-            if got:
+            if got := cards.get(event, qid=get_user_id(event)):


Function get_user_nickname refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-21T09:45:21Z

dicergirl/utils/operator.py

-    if not path.exists():
-        return "欧若可"
-
-    return path.open(mode="r").read()
+    return "欧若可" if not path.exists() else path.open(mode="r").read()


Function get_name refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

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

sourcery-ai · 2023-11-21T09:45:21Z

dicergirl/utils/operator.py

-    status_text = BOT_STATUS_FILE.read_text(encoding="utf-8")
-    if status_text:
+    if status_text := BOT_STATUS_FILE.read_text(encoding="utf-8"):


Function load_status refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-21T09:45:21Z

dicergirl/utils/parser.py

-        iter_args = [arg for arg in args]
+        iter_args = list(args)


Function CommandParser.shlex refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

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

Lift code into else after jump in control flow (reintroduce-else)

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-21T09:45:21Z

dicergirl/utils/plugins.py

-            else:
-                if module.__type__ == "plugin":
-                    module_type = "插件"
-                elif module.__type__ == "library":
-                    module_type = "库"
-
-            if hasattr(module, "__nbcommands__"):
-                commands: dict = module.__nbcommands__
-            else:
-                commands = {}
+            if module.__type__ == "library":
+                module_type = "库"

+            elif module.__type__ == "plugin":
+                module_type = "插件"
+            commands = module.__nbcommands__ if hasattr(module, "__nbcommands__") else {}
            if commands and not hasattr(module, "__nbhandler__"):
                logger.error(f"{module_type} {folder.name} 配置异常, 导入失败.")
                continue

-            if hasattr(module, "__nbhandler__"):
-                handlers = module.__nbhandler__
-            else:
-                handlers = {}
-
+            handlers = module.__nbhandler__ if hasattr(module, "__nbhandler__") else {}


Function modules refactored with the following changes:

Swap if/else branches [×2] (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Simplify conditional into switch-like form [×9] (switch)

Replace if statement with if expression [×2] (assign-if-exp)

sourcery-ai · 2023-11-21T09:45:21Z

dicergirl/utils/update.py

-    if old_length == 5:
-        old_pre_release = old_tuple.group(4)[0]
-        old_pre_version = int(old_tuple.group(5))
-    elif old_length == 3:
+    if old_length == 3:
        old_pre_release = "s"
        old_pre_version = 1
+    elif old_length == 5:
+        old_pre_release = old_tuple.group(4)[0]
+        old_pre_version = int(old_tuple.group(5))
    else:
        return False

-    if new_length == 5:
-        new_pre_release = new_tuple.group(4)[0]
-        new_pre_version = int(new_tuple.group(5))
-    elif new_length == 3:
+    if new_length == 3:
        new_pre_release = "s"
        new_pre_version = 1


Function require_update refactored with the following changes:

Simplify conditional into switch-like form [×7] (switch)

Merge duplicate blocks in conditional [×2] (merge-duplicate-blocks)

Remove redundant conditional [×2] (remove-redundant-if)

'Refactored by Sourcery'

7b02e22

sourcery-ai bot requested a review from HsiangNianian November 21, 2023 09:45

sourcery-ai bot commented Nov 21, 2023

View reviewed changes

HsiangNianian force-pushed the master branch 2 times, most recently from e4f4ef0 to 007c882 Compare December 14, 2023 04:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #1

Sourcery refactored master branch #1

sourcery-ai bot commented Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

sourcery-ai bot Nov 21, 2023

		for name, method in vars(templates).items():
		for method in vars(templates).values():

		logger.error(f"请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")
		logger.error("请确保您的回复配置文件包含了正确的键和相应的值。如果您不确定如何正确配置文件，请参考文档或向管理员寻求帮助。")

		logger.error(f"初始化回复配置时出现异常。")
		logger.error("初始化回复配置时出现异常。")

		for roll_string in roll_strings.keys():
		for roll_string in roll_strings:

		for _, obj in vars(main).items():
		for obj in vars(main).values():

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Nov 21, 2023

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 21, 2023

Choose a reason for hiding this comment