chore: Merge upstream (#34)

* fix: Role Edit TypeHint (Pycord-Development#2795)

Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com>

* fix: command syncing edge cases (Pycord-Development#2797)

* change default nsfw to false

* cl

* localizations

* :=

* style(pre-commit): auto fixes from pre-commit.com hooks

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Format code

---------

Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com>
Co-authored-by: Lumouille <144063653+Lumabots@users.noreply.github.com>
Co-authored-by: UK <41271523+NeloBlivion@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 4 people

CHANGELOG.md

@@ -128,6 +128,8 @@ These changes are available on the `master` branch, but have not yet been releas
   changes. ([#2671](https://github.com/Pycord-Development/pycord/pull/2671))
 - `Entitlement.ends_at` can now be `None`.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
+- Changed the default value of `ApplicationCommand.nsfw` to `False`.
+  ([#2797](https://github.com/Pycord-Development/pycord/pull/2797))
 
 ### Deprecated
 

discord/bot.py

@@ -307,9 +307,12 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                             ]:
                                 # We have a difference
                                 return True
-                    elif getattr(cmd, check, None) != match.get(check):
-                        # We have a difference
-                        if check == "default_permission" and getattr(cmd, check) is True and match.get(check) is None:
+                    elif (attr := getattr(cmd, check, None)) != (found := match.get(check)):
+                        # We might have a difference
+                        if "localizations" in check and bool(attr) == bool(found):
+                            # unlike other attrs, localizations are MISSING by default
+                            continue
+                        elif check == "default_permission" and attr is True and found is None:
                             # This is a special case
                             # TODO: Remove for perms v2
                             continue

discord/commands/core.py

@@ -226,7 +226,7 @@ def __init__(self, func: Callable, **kwargs) -> None:
             "__default_member_permissions__",
             kwargs.get("default_member_permissions", None),
         )
-        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", None))
+        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", False))
 
         integration_types = getattr(func, "__integration_types__", kwargs.get("integration_types", None))
         contexts = getattr(func, "__contexts__", kwargs.get("contexts", None))
@@ -1182,7 +1182,7 @@ def __init__(
 
         # Permissions
         self.default_member_permissions: Permissions | None = kwargs.get("default_member_permissions", None)
-        self.nsfw: bool | None = kwargs.get("nsfw", None)
+        self.nsfw: bool | None = kwargs.get("nsfw", False)
 
         integration_types = kwargs.get("integration_types", None)
         contexts = kwargs.get("contexts", None)

discord/role.py

@@ -443,7 +443,7 @@ async def edit(
         reason: str | None | utils.Undefined = MISSING,
         icon: bytes | None | utils.Undefined = MISSING,
         unicode_emoji: str | None | utils.Undefined = MISSING,
-    ) -> Role | None:
+    ) -> Role:
         """|coro|
 
         Edits the role.