From de86ebae96bd1a5fdd216f8d263ce8f4f8790bc6 Mon Sep 17 00:00:00 2001
From: Noikoio <noikoio1@gmail.com>
Date: Mon, 9 Sep 2019 22:15:25 -0700
Subject: [PATCH] Add more input options for specifying announce channel

---
 BirthdayBot/BirthdayBot.vbproj               |  2 +-
 BirthdayBot/UserInterface/ManagerCommands.vb | 34 +++++++++++++-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/BirthdayBot/BirthdayBot.vbproj b/BirthdayBot/BirthdayBot.vbproj
index 0d651ae..e47746c 100644
--- a/BirthdayBot/BirthdayBot.vbproj
+++ b/BirthdayBot/BirthdayBot.vbproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BirthdayBot</RootNamespace>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <Authors>Noiiko</Authors>
     <Company />
     <Description>Discord bot for birthday reminders.</Description>
diff --git a/BirthdayBot/UserInterface/ManagerCommands.vb b/BirthdayBot/UserInterface/ManagerCommands.vb
index a9a852f..8861b5b 100644
--- a/BirthdayBot/UserInterface/ManagerCommands.vb
+++ b/BirthdayBot/UserInterface/ManagerCommands.vb
@@ -129,24 +129,36 @@ Friend Class ManagerCommands
             gi.UpdateAnnounceChannel(Nothing)
             Await reqChannel.SendMessageAsync(":white_check_mark: The announcement channel has been unset.")
         Else
-            ' Parameter check: This needs a channel mention to function.
+            ' Determine channel from input
+            Dim chId As ULong = 0
+
+            ' Try channel mention
             Dim m = ChannelMention.Match(param(1))
-            If Not m.Success Then
-                Await reqChannel.SendMessageAsync(":x: The given parameter must be a channel. (The channel name must be clickable.)")
-                Return
+            If m.Success Then
+                chId = ULong.Parse(m.Groups(1).Value)
+            ElseIf ULong.TryParse(param(1), chId) Then
+                ' Continue...
+            Else
+                ' Try text-based search
+                Dim res = reqChannel.Guild.TextChannels _
+                    .FirstOrDefault(Function(ch) String.Equals(ch.Name, param(1), StringComparison.OrdinalIgnoreCase))
+                If res IsNot Nothing Then
+                    chId = res.Id ' Yeah... we are throwing the full result away only to look for it again later.
+                End If
             End If
 
-            Dim chId = ULong.Parse(m.Groups(1).Value)
-            ' Check if the channel isn't in the local guild.
-            Dim chInst = reqChannel.Guild.GetTextChannel(chId)
-            If chInst Is Nothing Then
-                Await reqChannel.SendMessageAsync(":x: Unable to find the specified channel on this server.")
+            ' Attempt to find channel in guild
+            Dim chTt As SocketTextChannel = Nothing
+            If chId <> 0 Then
+                chTt = reqChannel.Guild.GetTextChannel(chId)
+            End If
+            If chTt Is Nothing Then
+                Await reqChannel.SendMessageAsync(":x: Unable to find the specified channel.")
                 Return
             End If
 
             ' Update the value
-            Dim gi = Instance.GuildCache(reqChannel.Guild.Id)
-            gi.UpdateAnnounceChannel(chId)
+            Instance.GuildCache(reqChannel.Guild.Id).UpdateAnnounceChannel(chId)
 
             ' Report the success
             Await reqChannel.SendMessageAsync($":white_check_mark: The announcement channel is now set to <#{chId}>.")