Update in line with latest Kord

Kord-Extensions · Mar 25, 2023 · 9e3f3ce · 9e3f3ce
1 parent f343ef4
commit 9e3f3ce
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt
@@ -188,7 +188,7 @@ class PhishingExtension(private val settings: ExtPhishingBuilder) : Extension()
 
             when (settings.detectionAction) {
                 DetectionAction.Ban -> {
-                    message.getAuthorAsMember()!!.ban {
+                    message.getAuthorAsMemberOrNull()!!.ban {
                         reason = "Message contained a phishing domain"
                     }
 
@@ -198,7 +198,7 @@ class PhishingExtension(private val settings: ExtPhishingBuilder) : Extension()
                 DetectionAction.Delete -> message.delete("Message contained a phishing domain")
 
                 DetectionAction.Kick -> {
-                    message.getAuthorAsMember()!!.kick("Message contained a phishing domain")
+                    message.getAuthorAsMemberOrNull()!!.kick("Message contained a phishing domain")
                     message.delete("Message contained a phishing domain")
                 }
 

diff --git a/.../com/kotlindiscord/kord/extensions/modules/extra/pluralkit/events/PKMessageDeleteEvent.kt b/.../com/kotlindiscord/kord/extensions/modules/extra/pluralkit/events/PKMessageDeleteEvent.kt
@@ -183,7 +183,7 @@ internal suspend fun MessageDeleteEvent.unproxied(): UnProxiedMessageDeleteEvent
         channelId,
         message,
         guildId,
-        message?.getAuthorAsMember(),
+        message?.getAuthorAsMemberOrNull(),
         message?.referencedMessage,
         shard
     )
diff --git a/.../com/kotlindiscord/kord/extensions/modules/extra/pluralkit/events/PKMessageUpdateEvent.kt b/.../com/kotlindiscord/kord/extensions/modules/extra/pluralkit/events/PKMessageUpdateEvent.kt
@@ -193,7 +193,7 @@ internal suspend fun MessageUpdateEvent.unproxied(): UnProxiedMessageUpdateEvent
         messageId,
         old,
         new,
-        message.asMessageOrNull()?.getAuthorAsMember(),
+        message.asMessageOrNull()?.getAuthorAsMemberOrNull(),
         message.asMessageOrNull()?.referencedMessage,
         shard,
     )
diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/commands/converters/impl/MemberConverter.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/commands/converters/impl/MemberConverter.kt
@@ -73,7 +73,7 @@ public class MemberConverter(
             val messageReference = context.message.asMessage().messageReference
 
             if (messageReference != null) {
-                val member = messageReference.message?.asMessage()?.getAuthorAsMember()
+                val member = messageReference.message?.asMessage()?.getAuthorAsMemberOrNull()
 
                 if (member != null) {
                     parsed = member

diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Message.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Message.kt
@@ -147,7 +147,7 @@ public suspend inline fun MessageBehavior.deleteReaction(emoji: GuildEmoji): Uni
 /**
  * Remove a reaction from this message, using the Unicode emoji represented by the given string.
  *
- * @param emoji Emoji to remove from the message.
+ * @param unicode Emoji to remove from the message.
  */
 public suspend inline fun MessageBehavior.deleteReaction(unicode: String): Unit = deleteReaction(unicode.toReaction())
 
@@ -162,7 +162,7 @@ public suspend inline fun MessageBehavior.deleteOwnReaction(emoji: GuildEmoji):
 /**
  * Remove a reaction from this message belonging to the bot, using the Unicode emoji represented by the given string.
  *
- * @param emoji Emoji to remove from the message.
+ * @param unicode Emoji to remove from the message.
  */
 public suspend inline fun MessageBehavior.deleteOwnReaction(unicode: String): Unit =
     deleteOwnReaction(unicode.toReaction())
@@ -277,7 +277,7 @@ public suspend fun Message.requireChannel(
     val topRole = if (getGuildOrNull() == null) {
         null
     } else {
-        getAuthorAsMember()!!.getTopRole()
+        getAuthorAsMemberOrNull()?.getTopRole()
     }
 
     val messageChannel = getChannelOrNull()

diff --git a/...t/src/main/kotlin/com/kotlindiscord/kord/extensions/testbot/extensions/PKTestExtension.kt b/...t/src/main/kotlin/com/kotlindiscord/kord/extensions/testbot/extensions/PKTestExtension.kt
@@ -41,7 +41,7 @@ public class PKTestExtension : Extension() {
         }
 
         event<UnProxiedMessageCreateEvent> {
-            check { failIf(event.message.getAuthorAsMember()?.isBot != false) }
+            check { failIf(event.message.getAuthorAsMemberOrNull()?.isBot != false) }
 
             action {
                 action {
@@ -53,7 +53,7 @@ public class PKTestExtension : Extension() {
         }
 
         event<UnProxiedMessageUpdateEvent> {
-            check { failIf(event.message.asMessageOrNull()?.getAuthorAsMember()?.isBot != false) }
+            check { failIf(event.message.asMessageOrNull()?.getAuthorAsMemberOrNull()?.isBot != false) }
 
             action {
                 event.getMessage().respond(pingInReply = false) {
@@ -63,7 +63,7 @@ public class PKTestExtension : Extension() {
         }
 
         event<UnProxiedMessageDeleteEvent> {
-            check { failIf(event.message?.getAuthorAsMember()?.isBot != false) }
+            check { failIf(event.message?.getAuthorAsMemberOrNull()?.isBot != false) }
 
             action {
                 event.channel.createMessage {