lib/HahaCommands/download.ex

@@ -26,29 +26,31 @@ defmodule HahaYes.Commands.Download do
     url = Enum.at(args, 0)
     {:ok, loading} = Api.create_message(msg.channel_id, "Downloading...")
 
-    with {:ok, output} <- HahaYes.Utility.download(url, "#{System.tmp_dir}/#{msg.id}") do
-      {:ok, file} = File.stat(output)
-      file_size =
-        file.size / 1000000.0
-        |> Decimal.from_float()
-        |> Decimal.round(2)
-        |> Decimal.to_float()
 
-      Api.delete_message(loading.channel_id, loading.id)
+    opt = ["-f", "bestvideo[height<=?480]+bestaudio/best", url, "-o", "#{System.tmp_dir}/#{msg.id}.%(ext)si", "--force-overwrites", "--playlist-reverse", "--no-playlist", "--remux-video=mp4/webm/mov", "--no-warnings"];
-      Api.delete_message(msg)
 
-      if file_size >= 25 do
+    System.cmd("yt-dlp", opt)
-        Api.create_message(msg.channel_id, "File size is too big! (#{file_size})")
+
-      else
+    output = Enum.at(Path.wildcard("#{System.tmp_dir}/#{msg.id}.*"), 0)
-        embed =
+    {:ok, file} = File.stat(output)
-          %Nostrum.Struct.Embed{}
+    file_size =
-          |> put_color(431_948)
+      file.size / 1000000.0
-          |> put_author("Downloaded by #{msg.author.username} (#{file_size} MB)", url, "https://cdn.discordapp.com/avatars/#{msg.author.id}/#{msg.author.avatar}.webp")
+      |> Decimal.from_float()
-          |> put_footer("You can get the original video by clicking on the \"Downloaded by #{msg.author.username}\" message!")
+      |> Decimal.round(2)
-        Api.create_message(msg.channel_id, files: [output], embeds: [embed])
+      |> Decimal.to_float()
-      end
+
+    Api.delete_message(loading.channel_id, loading.id)
+    Api.delete_message(msg)
+
+    if file_size >= 25 do
+      Api.create_message(msg.channel_id, "File size is too big! (#{file_size})")
     else
-      {:error, error} -> Api.create_message(msg.channel_id, "`#{error}`")
+      embed =
+        %Nostrum.Struct.Embed{}
+        |> put_color(431_948)
+        |> put_author("Downloaded by #{msg.author.username} (#{file_size} MB)", url, "https://cdn.discordapp.com/avatars/#{msg.author.id}/#{msg.author.avatar}.webp")
+        |> put_footer("You can get the original video by clicking on the \"Downloaded by #{msg.author.username}\" message!")
+      Api.create_message(msg.channel_id, files: [output], embeds: [embed])
     end
   end
 end

lib/events/messages.ex

@@ -21,7 +21,7 @@ defmodule HahaYes.Events.MessagesConsumer do
       |> Enum.at(0)
       |> String.downcase()
       |> String.capitalize()
-      |> then(& Module.safe_concat(HahaYes.Commands, &1).execute(msg, ws_state, String.split(String.replace(String.downcase(msg.content), "#{prefix}#{String.downcase(&1)} ", ""))))
+      |> then(& Module.concat(HahaYes.Commands, &1).execute(msg, ws_state, String.split(String.replace(String.downcase(msg.content), "#{prefix}#{String.downcase(&1)} ", ""))))
     end
   end
 end

lib/haha_yes/utils.ex

@@ -1,12 +0,0 @@
-defmodule HahaYes.Utility do
-  def download(url, output, format \\ "bestvideo[height<=?480]+bestaudio/best") do
-    opt = ["-f", format, url, "-o", "#{output}.%(ext)s", "--force-overwrites", "--playlist-reverse", "--no-playlist", "--remux-video=mp4/webm/mov", "--no-warnings"];
-
-    {error_output, status} = System.cmd("yt-dlp", opt, [stderr_to_stdout: true])
-    if status !== 0 do
-      {:error, error_output}
-    else
-      {:ok, Enum.at(Path.wildcard("#{output}.*"), 0)}
-    end
-  end
-end