iterate

Author: Betree

apps/cf/lib/comments/comments.ex

@@ -93,8 +93,10 @@ defmodule CF.Comments do
         full_comment = comment
 
         # If new source, fetch metadata
-        if source && is_nil(Map.get(source, :id)),
-          do: fetch_source_metadata_and_update_comment(comment, source_fetch_callback)
+        if source && is_nil(Map.get(source, :id)) do
+          callback = source_fetch_callback || fn _comment -> :ok end
+          fetch_source_metadata_and_update_comment(comment, callback)
+        end
 
         # Return comment
         full_comment
@@ -266,11 +268,14 @@ defmodule CF.Comments do
   defp reverse_vote_type(:vote_down), do: :revert_vote_down
   defp reverse_vote_type(:self_vote), do: :revert_self_vote
 
-  defp fetch_source_metadata_and_update_comment(%Comment{source: nil}, _), do: nil
+  defp fetch_source_metadata_and_update_comment(%Comment{source: nil}, _callback), do: nil
 
   defp fetch_source_metadata_and_update_comment(comment = %Comment{source: base_source}, callback) do
     Sources.update_source_metadata(base_source, fn updated_source ->
-      callback.(Map.merge(comment, %{source: updated_source, source_id: updated_source.id}))
+      updated_comment =
+        Map.merge(comment, %{source: updated_source, source_id: updated_source.id})
+
+      callback.(updated_comment)
     end)
   end
 end

apps/cf/lib/sources/fetcher.ex

@@ -16,7 +16,7 @@ defmodule CF.Sources.Fetcher do
       start: {__MODULE__, :start_link, [opts]},
       type: :supervisor,
       restart: :permanent,
-      shutdown: 500
+      shutdown: 2000
     }
   end
 
@@ -60,15 +60,15 @@ defmodule CF.Sources.Fetcher do
 
   def get_queue, do: Fetcher.LinkChecker.get_queue()
 
-  @url_regex ~r/^https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&\/\/=]*)/
-
   defp fetch(url, callback) do
-    without_domain = Regex.replace(@url_regex, url, "\\1")
-    path = Regex.replace(~r/\?.+$/, without_domain, "")
+    uri = URI.parse(url)
+
+    case do_fetch_source_metadata(url, MIME.from_path(uri.path)) do
+      {:error, err} ->
+        :error
 
-    case do_fetch_source_metadata(url, MIME.from_path(path)) do
-      {:error, _} -> :error
-      {:ok, result} -> callback.(result)
+      {:ok, result} ->
+        callback.(result)
     end
   end
 
@@ -77,13 +77,13 @@ defmodule CF.Sources.Fetcher do
   defp do_fetch_source_metadata(url, mime_types) when mime_types in @fetchable_mime_types do
     case HTTPoison.get(
            url,
-           [],
+           [{"User-Agent", "CaptainFact/#{CF.Application.version()}"}],
            follow_redirect: true,
            max_redirect: 5,
            hackney: [pool: pool_name()]
          ) do
       {:ok, %HTTPoison.Response{status_code: 200, body: body}} ->
-        {:ok, source_params_from_tree(Floki.parse_document(body))}
+        {:ok, source_params_from_tree(Floki.parse_document!(body))}
 
       {:ok, %HTTPoison.Response{status_code: 404}} ->
         {:error, :not_found}

apps/cf_graphql/lib/resolvers/comments.ex

@@ -41,17 +41,25 @@ defmodule CF.Graphql.Resolvers.Comments do
 
     source_url = Map.get(args, :source)
 
-    # Comments.add_comment returns the comment directly or {:error, reason}
-    case Comments.add_comment(user, video_id, params, source_url) do
-      {:error, reason} ->
-        {:error, reason}
-
-      comment ->
-        # Preload associations for GraphQL response
-        comment = Repo.preload(comment, [:source, :user, :statement])
+    # Callback to broadcast comment_updated when source metadata is fetched
+    update_callback = fn updated_comment ->
+      updated_comment = Repo.preload(updated_comment, [:source, :user, :statement])
+      Subscriptions.publish_comment_updated(updated_comment, video_id)
+    end
 
-        Subscriptions.publish_comment_added(comment, video_id)
-        {:ok, comment}
+    try do
+      case Comments.add_comment(user, video_id, params, source_url, update_callback) do
+        {:error, reason} ->
+          {:error, reason}
+
+        comment ->
+          comment = Repo.preload(comment, [:source, :user, :statement])
+          Subscriptions.publish_comment_added(comment, video_id)
+          {:ok, comment}
+      end
+    rescue
+      exception ->
+        {:error, exception}
     end
   end
 

mix.exs

@@ -3,7 +3,7 @@ defmodule CF.Umbrella.Mixfile do
 
   def project do
     [
-      version: "1.2.0",
+      version: "2.0.0",
       apps_path: "apps",
       deps_path: "deps",
       build_embedded: Mix.env() == :prod,