From 495511373b995fb33d30fb9c1d8c38c0d63290da Mon Sep 17 00:00:00 2001
From: "Nekoka.tt" <3903853-nekokatt@users.noreply.gitlab.com>
Date: Wed, 16 Sep 2020 22:36:35 +0100
Subject: [PATCH 1/2] Fixes edge case where messages in guilds had a None
 'author' attribute if a webhook sent the message.

---
 hikari/events/message_events.py | 56 ++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/hikari/events/message_events.py b/hikari/events/message_events.py
index 6c9ce8a0b1..5f2a154c8b 100644
--- a/hikari/events/message_events.py
+++ b/hikari/events/message_events.py
@@ -214,6 +214,41 @@ def author(self) -> users.User:
             The user that sent the message.
         """
 
+    @property
+    def is_bot(self) -> bool:
+        """Return `builtins.True` if the message is from a bot.
+
+        Returns
+        -------
+        builtins.bool
+            `builtins.True` if from a bot, or `builtins.False` otherwise.
+        """
+        return self.message.author.is_bot
+
+    @property
+    def is_webhook(self) -> bool:
+        """Return `builtins.True` if the message was created by a webhook.
+
+        Returns
+        -------
+        builtins.bool
+            `builtins.True` if from a webhook, or `builtins.False` otherwise.
+        """
+        return self.message.webhook_id is not None
+
+    @property
+    def is_human(self) -> bool:
+        """Return `builtins.True` if the message was created by a human.
+
+        Returns
+        -------
+        builtins.bool
+            `builtins.True` if from a human user, or `builtins.False` otherwise.
+        """
+        # Not second-guessing some weird edge case will occur in the future with this,
+        # so I am being safe rather than sorry.
+        return not self.message.author.is_bot and self.message.webhook_id is None
+
 
 @base_events.requires_intents(intents.Intents.GUILD_MESSAGES, intents.Intents.PRIVATE_MESSAGES)
 @attr.s(kw_only=True, slots=True, weakref_slot=False)
@@ -367,16 +402,29 @@ def guild_id(self) -> snowflakes.Snowflake:
         return guild_id
 
     @property
-    def author(self) -> guilds.Member:
+    def author(self) -> users.User:
         """Member that sent the message.
 
+        !!! note
+            For webhooks, this will be a `hikari.users.User`.
+
+            Any code relying on this being a `hikari.guilds.Member` directly
+            should use an `isinstance` assertion to determine if member info
+            is available or not.
+
         Returns
         -------
-        hikari.guilds.Member
-            The member that sent the message. This is a specialised
+        hikari.users.User
+            The member that sent the message, if known. This is a specialised
             implementation of `hikari.users.User`.
+
+            If the author was a webhook, then a `hikari.users.User` will be
+            returned instead, as webhooks do not have member objects.
         """
-        return typing.cast(guilds.Member, self.message.member)
+        member = self.message.member
+        if member is not None:
+            return member
+        return self.message.author
 
 
 @base_events.requires_intents(intents.Intents.PRIVATE_MESSAGES)

From ccc27fe108993ceb2809b3fb046959e2539fc7ad Mon Sep 17 00:00:00 2001
From: "Nekoka.tt" <3903853-nekokatt@users.noreply.gitlab.com>
Date: Thu, 17 Sep 2020 00:21:37 +0100
Subject: [PATCH 2/2] Fixed bad import ordering in ux.py

---
 hikari/utilities/ux.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hikari/utilities/ux.py b/hikari/utilities/ux.py
index 1c4100600d..60064f69ff 100644
--- a/hikari/utilities/ux.py
+++ b/hikari/utilities/ux.py
@@ -22,10 +22,6 @@
 """User-experience extensions and utilities."""
 from __future__ import annotations
 
-import time
-
-from hikari.utilities import net
-
 __all__: typing.List[str] = ["init_logging", "print_banner", "supports_color", "HikariVersion", "check_for_updates"]
 
 import contextlib
@@ -37,11 +33,13 @@
 import re
 import string
 import sys
+import time
 import typing
 
 import colorlog  # type: ignore[import]
 
 from hikari import _about as about
+from hikari.utilities import net
 
 if typing.TYPE_CHECKING:
     from hikari import config