From 7a164944b4021067a3a736d6fc6eb2af8f8a9822 Mon Sep 17 00:00:00 2001
From: Byron Mulvogue <not.2.me.damaged@gmail.com>
Date: Tue, 3 Mar 2020 11:23:53 +0000
Subject: [PATCH] Fixed user.avatar failure. Ran mix format.

---
 lib/philomena_web/award_json.ex               | 31 ++++----
 .../api/json/profile_controller.ex            | 52 ++++++-------
 lib/philomena_web/links_json.ex               | 41 +++++------
 lib/philomena_web/user_json.ex                | 73 ++++++++++---------
 4 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/lib/philomena_web/award_json.ex b/lib/philomena_web/award_json.ex
index 6007486b..375de2a0 100755
--- a/lib/philomena_web/award_json.ex
+++ b/lib/philomena_web/award_json.ex
@@ -1,16 +1,15 @@
-defmodule PhilomenaWeb.AwardsJson do
-
-  def as_json(_conn, award) do
-    %{
-      image_url: badge_url_root() <> "/" <> award.badge.image,
-      title: award.badge.title,
-      id: award.badge_id,
-      label: award.label,
-      awarded_on: award.awarded_on
-    }
-  end
-
-  defp badge_url_root do
-    Application.get_env(:philomena, :badge_url_root)
-  end
-end
+defmodule PhilomenaWeb.AwardsJson do
+  def as_json(_conn, award) do
+    %{
+      image_url: badge_url_root() <> "/" <> award.badge.image,
+      title: award.badge.title,
+      id: award.badge_id,
+      label: award.label,
+      awarded_on: award.awarded_on
+    }
+  end
+
+  defp badge_url_root do
+    Application.get_env(:philomena, :badge_url_root)
+  end
+end
diff --git a/lib/philomena_web/controllers/api/json/profile_controller.ex b/lib/philomena_web/controllers/api/json/profile_controller.ex
index 41f85b5f..1a201589 100755
--- a/lib/philomena_web/controllers/api/json/profile_controller.ex
+++ b/lib/philomena_web/controllers/api/json/profile_controller.ex
@@ -1,26 +1,26 @@
-defmodule PhilomenaWeb.Api.Json.ProfileController do
-  use PhilomenaWeb, :controller
-
-  alias PhilomenaWeb.UserJson
-  alias Philomena.Users.User
-  alias Philomena.Repo
-  import Ecto.Query
-
-  def show(conn, %{"id" => id}) do
-    profile =
-      User
-      |> where(id: ^id)
-      |> preload([public_links: :tag, awards: :badge])
-      |> Repo.one()
-
-    cond do
-      is_nil(profile) or profile.deleted_at ->
-        conn
-        |> put_status(:not_found)
-        |> text("")
-
-      true ->
-        json(conn, %{user: UserJson.as_json(conn, profile)})
-    end
-  end
-end
+defmodule PhilomenaWeb.Api.Json.ProfileController do
+  use PhilomenaWeb, :controller
+
+  alias PhilomenaWeb.UserJson
+  alias Philomena.Users.User
+  alias Philomena.Repo
+  import Ecto.Query
+
+  def show(conn, %{"id" => id}) do
+    profile =
+      User
+      |> where(id: ^id)
+      |> preload(public_links: :tag, awards: :badge)
+      |> Repo.one()
+
+    cond do
+      is_nil(profile) or profile.deleted_at ->
+        conn
+        |> put_status(:not_found)
+        |> text("")
+
+      true ->
+        json(conn, %{user: UserJson.as_json(conn, profile)})
+    end
+  end
+end
diff --git a/lib/philomena_web/links_json.ex b/lib/philomena_web/links_json.ex
index 792cf550..eb9e31ba 100755
--- a/lib/philomena_web/links_json.ex
+++ b/lib/philomena_web/links_json.ex
@@ -1,21 +1,20 @@
-defmodule PhilomenaWeb.LinksJson do
-
-  def as_json(_conn, %{public: false}), do: nil
-
-  def as_json(_conn, link) do
-    %{
-      user_id: link.user_id,
-      created_at: link.created_at,
-      state: link.aasm_state,
-      tag_id: tag_id(link.tag)
-    }
-  end
-
-  defp tag_id(nil) do
-    nil
-  end
-
-  defp tag_id(tag) do
-    tag.id
-  end
-end
+defmodule PhilomenaWeb.LinksJson do
+  def as_json(_conn, %{public: false}), do: nil
+
+  def as_json(_conn, link) do
+    %{
+      user_id: link.user_id,
+      created_at: link.created_at,
+      state: link.aasm_state,
+      tag_id: tag_id(link.tag)
+    }
+  end
+
+  defp tag_id(nil) do
+    nil
+  end
+
+  defp tag_id(tag) do
+    tag.id
+  end
+end
diff --git a/lib/philomena_web/user_json.ex b/lib/philomena_web/user_json.ex
index 9d686afb..ad8a3d51 100755
--- a/lib/philomena_web/user_json.ex
+++ b/lib/philomena_web/user_json.ex
@@ -1,35 +1,38 @@
-defmodule PhilomenaWeb.UserJson do
-
-  alias PhilomenaWeb.LinksJson
-  alias PhilomenaWeb.AwardsJson
-
-  def as_json(conn, user) do
-    %{
-      id: user.id,
-      name: user.name,
-      slug: user.slug,
-      role: role(user),
-      description: user.description,
-      avatar_url: avatar_url_root() <> "/" <> user.avatar,
-      created_at: user.created_at,
-      comments_count: user.comments_posted_count,
-      uploads_count: user.uploads_count,
-      posts_count: user.forum_posts_count,
-      topics_count: user.topic_count,
-      links: Enum.map(user.public_links, &LinksJson.as_json(conn, &1)),
-      awards: Enum.map(user.awards, &AwardsJson.as_json(conn, &1))
-    }
-  end
-
-  defp role(%{hide_default_role: true}) do
-    "user"
-  end
-
-  defp role(user) do
-    user.role
-  end
-
-  defp avatar_url_root do
-    Application.get_env(:philomena, :avatar_url_root)
-  end  
-end
+defmodule PhilomenaWeb.UserJson do
+  alias PhilomenaWeb.LinksJson
+  alias PhilomenaWeb.AwardsJson
+
+  def as_json(conn, user) do
+    %{
+      id: user.id,
+      name: user.name,
+      slug: user.slug,
+      role: role(user),
+      description: user.description,
+      avatar_url: avatar_url(user),
+      created_at: user.created_at,
+      comments_count: user.comments_posted_count,
+      uploads_count: user.uploads_count,
+      posts_count: user.forum_posts_count,
+      topics_count: user.topic_count,
+      links: Enum.map(user.public_links, &LinksJson.as_json(conn, &1)),
+      awards: Enum.map(user.awards, &AwardsJson.as_json(conn, &1))
+    }
+  end
+
+  defp role(%{hide_default_role: true}) do
+    "user"
+  end
+
+  defp role(user) do
+    user.role
+  end
+
+  defp avatar_url(%{avatar: nil}) do
+    nil
+  end
+
+  defp avatar_url(user) do
+    Application.get_env(:philomena, :avatar_url_root) <> "/" <> user.avatar
+  end
+end