Added argument support for /jokes, /challenges, /ranking

Author: v0idpwn

config/config.exs

@@ -1,9 +1,9 @@
 use Mix.Config
 
 config :app,
-  bot_name: "lambdinha_bot"
+  bot_name: ""
 
 config :nadia,
-  token: "eh segredo"
+  token: ""
 
 import_config "#{Mix.env}.exs"

lib/app/commands.ex

@@ -17,13 +17,16 @@ defmodule App.Commands do
 
   command ["desafios", "desafio", "challenges", "challenge"] do
     Logger.log :info, "Command /desafios | /desafio | /challenges | /challenge"
-    App.Tools.get_challenges
+    Logger.log :info, update.message.text
+    App.Tools.get_args(update.message.text)
+    |> App.Tools.get_challenges
     |> send_message
   end
 
   command "ranking" do 
     Logger.log :info, "Command /ranking"
-    App.Tools.get_ranking
+    App.Tools.get_args(update.message.text)
+    |> App.Tools.get_ranking
     |> send_message
   end
 
@@ -34,7 +37,8 @@ defmodule App.Commands do
 
   command "joke" do
     Logger.log :info, "Command /joke"
-    App.Tools.get_joke
+    App.Tools.get_args(update.message.text)
+    |> App.Tools.get_joke
     |> send_message
   end
 end

lib/app/tools.ex

@@ -7,6 +7,19 @@ defmodule App.Tools do
     end
   end
 
+  # returns array of args as
+  # "/command 1 2 3" -> "1 2 3"
+  def get_args(text) do
+    [_c | args] = String.split(text, " ")
+    Enum.join(args, " ")
+  end
+
+  # returns only the first digit as an integer
+  def digit_to_int(digit) do
+    {number, _rest} = Integer.parse(digit)
+    number
+  end
+
   def handle_response({:ok, %{status_code: 200, body: body}}) do
     {:ok, Poison.Parser.parse!(body)}
   end
@@ -15,41 +28,70 @@ defmodule App.Tools do
     {:ok, "Error"}
   end
 
-  def extract_challenges(map) do
+
+  # Challenge extraction
+
+  def extract_challenges(map, _number = "") do
     {:ok, body} = map
     Enum.reduce body, [], fn (item, res) -> 
       res ++ ['#{item["name"]} - soluções: #{item["solutions"]} - #{item["link"]} \n']
     end
   end
 
-  def extract_ranking(map) do
+  def extract_challenges(map, number) do
+    {:ok, body} = map
+    item = Enum.at body, digit_to_int number
+    '#{item["name"]} - soluções: #{item["solutions"]} - #{item["link"]} \n'
+  end
+
+  # Ranking extraction 
+
+  def extract_ranking(map, _top = "") do
     {:ok, body} = map
     Enum.reduce body, [], fn (item, res) -> 
       res ++ ['#{item["ranking"]} - #{item["user"]} - #{item["pontuation"]} \n']
     end
   end
 
-  def extract_joke(map) do
+  def extract_ranking(map, top) do
+    {:ok, body} = map
+      Enum.reduce Enum.slice(body, 0, digit_to_int top), [], fn (item, res) -> 
+      res ++ ['#{item["ranking"]} - #{item["user"]} - #{item["pontuation"]} \n']
+    end
+  end
+
+  # Joke extraction 
+
+  def extract_joke(map, _number="") do
     {:ok, body} = map
     item = Enum.random body
     '#{item["joke"]}'
   end
 
-  def get_ranking do
+  def extract_joke(map, number) do
+    {:ok, body} = map
+    item = Enum.at(body, digit_to_int number)
+    '#{item["joke"]}'
+  end
+  
+
+  # Command functions
+
+  def get_ranking(top \\ "") do
     HTTPoison.get("https://raw.githubusercontent.com/lambda-study-group/desafios/master/ranking.json")
     |> handle_response
-    |> extract_ranking
+    |> extract_ranking(top)
   end
 
-  def get_challenges do
+  def get_challenges(number \\ "") do
     HTTPoison.get("https://raw.githubusercontent.com/lambda-study-group/desafios/master/challenges.json")
     |> handle_response
-    |> extract_challenges
+    |> extract_challenges(number)
   end
 
-  def get_joke do
+  def get_joke(number \\ "") do
     HTTPoison.get("https://raw.githubusercontent.com/lambda-study-group/lambdinha-bot/master/jokes.json")
     |> handle_response
-    |> extract_joke
+    |> extract_joke(number)
   end
 end