From afaf2561a76c7d2665928fc79763d7fb4f55269e Mon Sep 17 00:00:00 2001
From: Zach Daniel <zach@zachdaniel.dev>
Date: Sun, 22 Jan 2023 23:03:12 -0500
Subject: [PATCH] improvement: fix build/format/other small issues

---
 Dockerfile                                    | 1 -
 lib/ash_hq_web/components/forum/attachment.ex | 4 +---
 lib/ash_hq_web/pages/forum.ex                 | 4 +---
 lib/ash_hq_web/pages/media.ex                 | 5 +++--
 lib/ash_hq_web/templates/layout/root.html.eex | 4 +++-
 mix.exs                                       | 6 ++----
 mix.lock                                      | 1 -
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7031df4..4072590 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,6 @@ RUN mix assets.deploy
 RUN mix compile
 COPY ./config/runtime.exs config/runtime.exs
 COPY ./rel ./rel
-RUN mix ua_inspector.download
 RUN mix release --overwrite
 RUN mkdir indexes
 CMD ["_build/prod/rel/ash_hq/bin/ash_hq", "start"]
diff --git a/lib/ash_hq_web/components/forum/attachment.ex b/lib/ash_hq_web/components/forum/attachment.ex
index 68a190d..d36998f 100644
--- a/lib/ash_hq_web/components/forum/attachment.ex
+++ b/lib/ash_hq_web/components/forum/attachment.ex
@@ -12,10 +12,8 @@ defmodule AshHqWeb.Components.Forum.Attachment do
           <video controls width={@attachment.width} height={@attachment.height}>
             <source src={@attachment.url} type={mime}>
           </video>
-
         {#match {:image, _mime}}
-          <img src={@attachment.url} width={@attachment.width} height={@attachment.height} />
-
+          <img src={@attachment.url} width={@attachment.width} height={@attachment.height}>
         {#match _}
           other
       {/case}
diff --git a/lib/ash_hq_web/pages/forum.ex b/lib/ash_hq_web/pages/forum.ex
index 0db6dff..9163be7 100644
--- a/lib/ash_hq_web/pages/forum.ex
+++ b/lib/ash_hq_web/pages/forum.ex
@@ -241,14 +241,12 @@ defmodule AshHqWeb.Pages.Forum do
   defp assign_tags(socket) do
     tags =
       AshHq.Discord.Tag
-      # TODO: use distinct
-      # |> Ash.Query.distinct(:name)
+      |> Ash.Query.distinct(:name)
       |> Ash.Query.filter(channel_id == ^socket.assigns.channel.id)
       |> Ash.Query.select(:name)
       |> Ash.Query.sort(:name)
       |> AshHq.Discord.read!()
       |> Enum.map(&to_string(&1.name))
-      |> Enum.uniq_by(&String.downcase/1)
 
     assign(socket, :tags, tags)
   end
diff --git a/lib/ash_hq_web/pages/media.ex b/lib/ash_hq_web/pages/media.ex
index aa374b8..f3acd6a 100644
--- a/lib/ash_hq_web/pages/media.ex
+++ b/lib/ash_hq_web/pages/media.ex
@@ -41,7 +41,8 @@ defmodule AshHqWeb.Pages.Media do
             class="twitter-timeline"
             data-height="560px"
             href="https://twitter.com/AshFramework/lists/1604385682176327681?ref_src=twsrc%5Etfw"
-          >Twitter Feed...</a>
+          >Loading Twitter Feed...
+          </a>
         </div>
 
         <div class="col-span-2 lg:col-span-1">
@@ -58,7 +59,7 @@ defmodule AshHqWeb.Pages.Media do
         </div>
 
         <div class="col-span-2 lg:col-span-1 text-2xl">
-          <div class="text-xl mb-8">Example Open Source Projects</div>
+          <div class="text-xl mb-8">Example Projects</div>
           <ul class="list-disc">
             <li class="mb-4">
               <a class="hover:text-primary-light-400" href="https://github.com/ash-project/ash_hq">AshHq (this website)</a>
diff --git a/lib/ash_hq_web/templates/layout/root.html.eex b/lib/ash_hq_web/templates/layout/root.html.eex
index fbe4661..696fa07 100644
--- a/lib/ash_hq_web/templates/layout/root.html.eex
+++ b/lib/ash_hq_web/templates/layout/root.html.eex
@@ -58,7 +58,9 @@
       <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
       <script>mermaid.init(".mermaid")</script>
     <% end %>
-    <script async src="https://platform.twitter.com/widgets.js" charset="utf-8" ></script>
+    <%= if @live_action == :media do %>
+      <script src="https://platform.twitter.com/widgets.js" charset="utf-8" ></script>
+    <% end %>
     <script defer phx-track-static type="text/javascript" src="<%= Routes.static_path(@conn, "/assets/app.js") %>"></script>
   </body>
 </html>
diff --git a/mix.exs b/mix.exs
index dd92541..fa199f4 100644
--- a/mix.exs
+++ b/mix.exs
@@ -15,7 +15,7 @@ defmodule AshHq.MixProject do
       deps: deps(),
       dialyzer: [
         ignore_warnings: "dialyzer.ignore_warnings",
-        plt_add_apps: [:mix]
+        plt_add_apps: [:mix, :nostrum]
       ]
     ]
   end
@@ -62,7 +62,6 @@ defmodule AshHq.MixProject do
       {:spark, "~> 0.3", override: true},
       {:surface, "~> 0.9.1"},
       {:surface_heroicons, "~> 0.6.0"},
-      {:ua_inspector, "~> 3.0"},
       # Syntax Highlighting
       {:makeup, "~> 1.1"},
       {:makeup_elixir, "~> 0.16.0"},
@@ -124,8 +123,7 @@ defmodule AshHq.MixProject do
       setup: [
         "ash_postgres.create",
         "ash_postgres.migrate",
-        "seed",
-        "ua_inspector.download --force"
+        "seed"
       ],
       reset: ["drop", "setup"],
       credo: "credo --strict",
diff --git a/mix.lock b/mix.lock
index 760c119..631f285 100644
--- a/mix.lock
+++ b/mix.lock
@@ -117,7 +117,6 @@
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
   "typable": {:hex, :typable, "0.3.0", "0431e121d124cd26f312123e313d2689b9a5322b15add65d424c07779eaa3ca1", [:mix], [], "hexpm", "880a0797752da1a4c508ac48f94711e04c86156f498065a83d160eef945858f8"},
-  "ua_inspector": {:hex, :ua_inspector, "3.0.1", "649e68e31296a7bc39204e84b13a14c245b61df43fde0dd91ef784a98ecb04d4", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:yamerl, "~> 0.7", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "b510ce5a5fd70a37bf5eab8008a25fc57388ea240b95bb4d98fc892648f9b916"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "websock": {:hex, :websock, "0.4.3", "184ac396bdcd3dfceb5b74c17d221af659dd559a95b1b92041ecb51c9b728093", [:mix], [], "hexpm", "5e4dd85f305f43fd3d3e25d70bec4a45228dfed60f0f3b072d8eddff335539cf"},
   "websock_adapter": {:hex, :websock_adapter, "0.4.5", "30038a3715067f51a9580562c05a3a8d501126030336ffc6edb53bf57d6d2d26", [:mix], [{:bandit, "~> 0.6", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.4", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "1d9812dc7e703c205049426fd4fe0852a247a825f91b099e53dc96f68bafe4c8"},