IMPROVE: error handling wrt message number

Author: merefield

config/locales/server.en.yml

@@ -30,7 +30,8 @@ en:
           found_matching_discourse_topic: "SUCCESS: Found matching Discourse Topic"
           final_outcome: "SUCCESS: Copied over %{count} past messages to Discourse!"
         error:
-          must_specify_message_number: "ERROR: In outside of a Thread you must specify number of messages to be copied!"
+          must_specify_message_number: "ERROR: Outside of a Thread you must specify number of messages to be copied!"
+          must_specify_message_number_as_integer: "ERROR: Number of messages must be an integer!"
           unable_to_find_discourse_category: "ERROR: Unable to find matching Discourse Category, aborting command!  Be sure to substitute _ for spaces in name and match case."
           unable_to_find_discourse_topic: "ERROR: Unable to find matching Discourse Topic in target Category, will create new!"
           unable_to_determine_topic_id: "ERROR: Unable to determine a suitable Topic Id for Discourse!"

lib/bot_commands.rb

@@ -17,9 +17,16 @@ def self.manage_discord_commands(bot)
     bot.command(:disccopy, min_args: 0, max_args: 3, bucket: :admin_tasks, rate_limit_message: I18n.t("discord_bot.commands.rate_limit_breached"), required_roles: [SiteSetting.discord_bot_admin_role_id], description: I18n.t("disccopy.description")) do |event, number_of_past_messages, target_category, target_topic|
       past_messages = []
 
-      if !THREAD_TYPES.include?(event.channel.type) && number_of_past_messages.nil?
-        event.respond I18n.t("discord_bot.commands.disccopy.error.must_specify_message_number")
-        break
+      if !THREAD_TYPES.include?(event.channel.type)
+        if !(number_of_past_messages.to_i > 0)
+          event.respond I18n.t("discord_bot.commands.disccopy.error.must_specify_message_number")
+          break
+        end
+      else
+        if !number_of_past_messages.blank? && !(number_of_past_messages.to_i > 0)
+          event.respond I18n.t("discord_bot.commands.disccopy.error.must_specify_message_number_as_integer")
+          break
+        end
       end
 
       number_of_past_messages = number_of_past_messages || HISTORY_CHUNK_LIMIT

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-discord-bot
 # about: Integrate Discord Bots with Discourse
-# version: 0.3.2
+# version: 0.3.3
 # authors: Robert Barrow
 # url: https://github.com/merefield/discourse-discord-bot