finish code cleanup and prettify app responses

app/responses/app.rb

@@ -0,0 +1,56 @@
+def new_app_embed(event)
+  name = event.author.nickname || event.author.name
+
+  chat_embed = Embed.new(
+    title: "New Application!",
+    description: "Hi, #{name},\nI see you'd like to start a new character application!\nI'll send you instructions in a dm!",
+    color: event.author.color.combined
+  )
+
+  embed = Embed.new(
+    title: "Hi, #{name}",
+    description: "If you have any questions, please feel free to ask a Guildmaster!",
+    color: event.author.color.combined,
+    fields: [
+      { name: "Please start your application here:", value: APP_FORM },
+      { name: "Your key is:", value: event.author.id }
+    ]
+  )
+
+  event.send_embed("", chat_embed)
+  embed
+end
+
+def edit_app_embed(event, edit_url, char_name)
+  name = event.author.nickname || event.author.name
+
+  chat_embed = Embed.new(
+    title: "You want to edit #{char_name}?",
+    description: "Good news, #{name}! I'll dm you a link",
+    color: event.author.color.combined
+  )
+
+  embed = Embed.new(
+    title: "You may edit #{char_name} here:",
+    description: edit_url,
+    color: event.author.color.combined
+  )
+
+  event.send_embed("", chat_embed)
+  embed
+end
+
+def app_not_found_embed(event, char_name)
+  name = event.author.nickname || event.author.name
+
+  embed = Embed.new(
+    title: "I'm sorry, #{name}",
+    description: "I can't seem to find your character named, #{char_name}",
+    color: "#a41e1f",
+    fields: [
+      { name: "Want to start a new application?", value: "You can start one with this command:\n```pkmn-app```"}
+    ]
+  )
+
+  event.send_embed("", embed)
+end

app/responses/application_responses.rb

@@ -17,3 +17,17 @@ def unknown_member(event)
   event.message.delete
   event.respond(content)
 end
+
+def reject_app(event, embed)
+  content = event.message.content
+  event.message.delete
+  reject = event.send_embed(content, embed)
+
+  Emoji::APP_SECTIONS.each do |reaction|
+    reject.react(reaction)
+  end
+
+  reject.react(Emoji::CHECK)
+  reject.react(Emoji::CROSS)
+  reject.react(Emoji::CRAYON)
+end

app/responses/reject.rb

@@ -19,3 +19,39 @@ def reject_char_embed(app)
     fields: fields
   )
 end
+
+def message_user_embed(event)
+  reactions = event.message.reactions
+  content = event.message.content
+
+  edit_url = EDIT_URL.match(content)
+  description = ""
+
+  Emoji::APP_SECTIONS.each do |reaction|
+    if reactions[reaction].count > 1
+      m = CharAppResponses::REJECT_MESSAGES[reaction].gsub("\n", " ")
+      description += "\n#{m}"
+    end
+  end
+
+  embed = Embed.new(
+    title: "**Your application has been rejected!!**",
+    color: "#a41e1f",
+    fields: [
+      { name: "Listed reasons for rejection:", value: description },
+      { name: "You can edit your application and resubmit here:", value: "#{APP_FORM}#{edit_url[1]}" }
+    ]
+  )
+
+  embed
+end
+
+def self_edit_embed(content)
+  edit_url = EDIT_URL.match(content)
+
+  Embed.new(
+    title: "Please edit the user's application and resubmit!",
+    color: "#a41e1f",
+    description: "#{APP_FORM}#{edit_url[1]}"
+  )
+end

bot.rb

@@ -27,6 +27,8 @@ HAP_ROTOM = "https://static.pokemonpets.com/images/monsters-images-800-800/479-R
 APP_FORM = "https://docs.google.com/forms/d/e/1FAIpQLSfryXixX3aKBNQxZT8xOfWzuF02emkJbqJ1mbMGxZkwCvsjyA/viewform"
 
 # Regexes
+UID = /<@([0-9]+)>/
+EDIT_URL = /Edit\sKey\s\(ignore\):\s([\s\S]*)/
 
 # ---
 
@@ -91,18 +93,20 @@ end
 
 app = Command.new(:app) do |event, name|
   user = event.author
+  user_channel = event.author.dm
 
   if name
     if character = Character.where(user_id: user.id).find_by(name: name)
       edit_url = APP_FORM + character.edit_url
-      event.respond("OK, #{user.name}! I'll send you what you need to edit #{name}")
-      user.dm("You may edit #{name} here:\n#{edit_url}")
+      embed = edit_app_embed(event, edit_url, name)
+
+      bot.send_message(user_channel.id, "", false, embed)
     else
-      event.respond("I didn't find your character, #{name}\nIf you want to start a new app, please use `pkmn-app`")
+      app_not_found_embed(event, name)
     end
   else
-    event.respond("You want to start a new character application?\nGreat! I'll dm you instructions")
-    user.dm("Hi, #{user.name}\nYou can start your application here:\n#{APP_FORM}\n\nYour key is: #{user.id}\nOnce complete, your application will submitted to the admins for approval!")
+    embed = new_app_embed(event)
+    bot.send_message(user_channel.id, "", false, embed)
   end
 end
 
@@ -140,7 +144,11 @@ bot.message do |event|
 
 end
 
-# This will trigger on every reaction is added in discord
+# This will trigger when a dm is sent to the bot from a user
+bot.pm do |event|
+end
+
+# This will trigger when any reaction is added in discord
 bot.reaction_add do |event|
   content = event.message.content
 
@@ -150,7 +158,7 @@ bot.reaction_add do |event|
 
     if event.message.reacted_with(Emoji::Y).count > maj
       params = content.split("\n")
-      uid = /<@([0-9]+)>/.match(content)
+      uid = UID.match(content)
       member = event.server.member(uid[1])
 
       character = CharacterController.edit_character(params)
@@ -170,68 +178,38 @@ bot.reaction_add do |event|
       else
         event.respond("Something went wrong")
       end
-    elsif event.message.reacted_with(Emoji::N).count > maj
-      edit_url = /Edit\sKey\s\(ignore\):\s([\s\S]*)/.match(content)
-      user_id = /<@([0-9]+)>/.match(content)
 
-      new_message = "#{user_id[1]}:#{edit_url[1]}"
+    elsif event.message.reacted_with(Emoji::N).count > maj
       embed = reject_char_embed(content)
-
-      #event.message.delete
-      rejected = event.send_embed(content, embed)
-
-      rejected.react(Emoji::SPEECH_BUBBLE)
-      rejected.react(Emoji::SCALE)
-      rejected.react(Emoji::PICTURE)
-      rejected.react(Emoji::BOOKS)
-      rejected.react(Emoji::BABY)
-      rejected.react(Emoji::SKULL)
-      rejected.react(Emoji::VULGAR)
-      rejected.react(Emoji::NOTE)
-      rejected.react(Emoji::CHECK)
-      rejected.react(Emoji::CROSS)
-      rejected.react(Emoji::CRAYON)
-
+      reject_app(event, embed)
     end
   end
 
   if event.message.from_bot? && content.match(/\_New\sCharacter\sApplication\_/)
     if event.message.reacted_with(Emoji::CHECK).count > 1
-      reactions = event.message.reactions
-
-      edit_url = /Edit\sKey\s\(ignore\):\s([\s\S]*)/.match(content)
-      user_id = /<@([0-9]+)>/.match(content)
+      user_id = UID.match(content)
       member = event.server.member(user_id[1])
 
-      message = "Your application has been rejected!"
-
-      Emoji::APP_SECTIONS.each do |reaction|
-        if reactions[reaction].count > 1
-          m = CharAppResponses::REJECT_MESSAGES[reaction].gsub("\n", " ")
-          message += "\n#{m}"
-        end
-      end
+      embed = message_user_embed(event)
 
-      #event.message.delete
-      event.send_temporary_message(message, 25)
+      event.message.delete
+      bot.send_temporary_message(event.channel.id, "", 5, false, embed)
 
-      message += "\n\nYou may edit your application and resubmit here:\n#{APP_FORM}#{edit_url[1]}"
-      member.dm(message)
+      user_channel = member.dm
+      bot.send_message(user_channel.id, "", false, embed)
 
     elsif event.message.reacted_with(Emoji::CROSS).count > 1
       event.message.delete
     elsif event.message.reacted_with(Emoji::CRAYON).count > 1
-      edit_url = /Edit\sKey\s\(ignore\):\s([\s\S]*)/.match(content)
-
-      message = "Please edit the users application and resubmit!\n#{APP_FORM}#{edit_url[1]}"
+      embed = self_edit_embed(content)
 
-      #event.message.delete
-      event.send_temporary_message(message, 25)
+      event.message.delete
+      bot.send_temporary_message(event.channel.id, "", 35, false, embed)
     end
   end
 end
 
-# This will trigger on every reaction is removed in discord
+# This will trigger when any reaction is removed in discord
 bot.reaction_remove do |event|
 end