Revert "mix format"

This reverts commit 76b5e1c.

Author: andybak

lib/ret/discord_client.ex

@@ -76,23 +76,21 @@ defmodule Ret.DiscordClient do
         {status, result} when status in [:commit, :ok] -> "#{result["nick"]}"
       end
 
-    nickname =
-      if !nickname or nickname == "" do
-        case Cachex.fetch(:discord_api, "/users/#{provider_account_id}") do
-          {status, result} when status in [:commit, :ok] -> "#{result["global_name"]}"
-        end
+    nickname = if !nickname or nickname == "" do
+       case Cachex.fetch(:discord_api, "/users/#{provider_account_id}") do
+        {status, result} when status in [:commit, :ok] -> "#{result["global_name"]}"
+      end
       else
         nickname
-      end
+    end
 
-    nickname =
-      if !nickname or nickname == "" do
-        case Cachex.fetch(:discord_api, "/users/#{provider_account_id}") do
-          {status, result} when status in [:commit, :ok] -> "#{result["username"]}"
-        end
+    nickname = if !nickname or nickname == "" do
+      case Cachex.fetch(:discord_api, "/users/#{provider_account_id}") do
+        {status, result} when status in [:commit, :ok] -> "#{result["username"]}"
+      end
       else
         nickname
-      end
+    end
   end
 
   def fetch_community_identifier(%Ret.OAuthProvider{
@@ -171,21 +169,18 @@ defmodule Ret.DiscordClient do
         case Cachex.fetch(:discord_api, "/guilds/#{community_id}/roles") do
           {status, result} when status in [:commit, :ok] -> result |> Map.new(&{&1["id"], &1})
         end
-
-      # Note: Whether the bitfield values in guild_roles are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
+        # Note: Whether the bitfield values in guild_roles are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
 
       role_everyone = guild_roles[community_id]
       permissions = role_everyone["permissions"]
 
       user_permissions = user_roles |> Enum.map(&guild_roles[&1]["permissions"])
 
-      permissions =
-        user_permissions
-        |> Enum.reduce(
-          permissions,
-          &(if(is_binary(&1), do: String.to_integer(&1), else: &1) |||
-              if(is_binary(&2), do: String.to_integer(&2), else: &2))
-        )
+      permissions = user_permissions |>
+      Enum.reduce(permissions, &(
+      (if is_binary(&1), do: String.to_integer(&1), else: &1) |||
+      (if is_binary(&2), do: String.to_integer(&2), else: &2)
+      ))
 
       if (permissions &&& @administrator) == @administrator do
         @all
@@ -208,21 +203,15 @@ defmodule Ret.DiscordClient do
             |> Map.get("permission_overwrites")
             |> Map.new(&{&1["id"], &1})
         end
-
-      # Note: Whether the bitfield values in channel_overwrites are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
+        # Note: Whether the bitfield values in channel_overwrites are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
 
       overwrite_everyone = channel_overwrites[community_id]
 
       permissions =
         if overwrite_everyone do
           (permissions &&&
-             ~~~if(is_binary(overwrite_everyone["deny"]),
-               do: String.to_integer(overwrite_everyone["deny"]),
-               else: overwrite_everyone["deny"]
-             )) |||
-            if is_binary(overwrite_everyone["allow"]),
-              do: String.to_integer(overwrite_everyone["allow"]),
-              else: overwrite_everyone["allow"]
+          ~~~(if is_binary(overwrite_everyone["deny"]), do: String.to_integer(overwrite_everyone["deny"]), else: overwrite_everyone["deny"])) |||
+          (if is_binary(overwrite_everyone["allow"]), do: String.to_integer(overwrite_everyone["allow"]), else: overwrite_everyone["allow"])
         else
           permissions
         end
@@ -231,21 +220,14 @@ defmodule Ret.DiscordClient do
       user_permissions =
         user_roles |> Enum.map(&channel_overwrites[&1]) |> Enum.filter(&(&1 != nil))
 
-      allow =
-        user_permissions
-        |> Enum.reduce(
-          @none,
-          &(if(is_binary(&1["allow"]), do: String.to_integer(&1["allow"]), else: &1["allow"]) |||
-              &2)
-        )
-
-      deny =
-        user_permissions
-        |> Enum.reduce(
-          @none,
-          &(if(is_binary(&1["deny"]), do: String.to_integer(&1["deny"]), else: &1["deny"]) |||
-              &2)
-        )
+      allow = user_permissions |> Enum.reduce(@none, &(
+      (if is_binary(&1["allow"]), do: String.to_integer(&1["allow"]), else: &1["allow"]) |||
+      &2
+      ))
+      deny = user_permissions |> Enum.reduce(@none, &(
+      (if is_binary(&1["deny"]), do: String.to_integer(&1["deny"]), else: &1["deny"]) |||
+      &2
+      ))
 
       permissions = (permissions &&& ~~~deny) ||| allow
 
@@ -255,13 +237,8 @@ defmodule Ret.DiscordClient do
       permissions =
         if overwrite_member do
           (permissions &&&
-             ~~~if(is_binary(overwrite_member["deny"]),
-               do: String.to_integer(overwrite_member["deny"]),
-               else: overwrite_member["deny"]
-             )) |||
-            if is_binary(overwrite_member["allow"]),
-              do: String.to_integer(overwrite_member["allow"]),
-              else: overwrite_member["allow"]
+          ~~~(if is_binary(overwrite_member["deny"]), do: String.to_integer(overwrite_member["deny"]), else: overwrite_member["deny"])) |||
+          (if is_binary(overwrite_member["allow"]), do: String.to_integer(overwrite_member["allow"]), else: overwrite_member["allow"])
         else
           permissions
         end

lib/ret/http_utils.ex

@@ -177,19 +177,18 @@ defmodule Ret.HttpUtils do
   end
 
   def join_smart(enum) do
-    Enum.reduce(enum, "", fn x, acc ->
-      x =
-        cond do
-          !x -> nil
-          is_binary(x) -> String.trim(x)
-          true -> "#{x}"
-        end
-
+    Enum.reduce(enum, "", fn(x, acc) ->
+      x = cond do
+        !x -> nil
+        is_binary(x) -> String.trim(x)
+        true -> "#{x}"
+      end
       if x && x != "" do
         if acc && acc != "", do: acc <> " — " <> x, else: x
       else
         acc
       end
     end)
   end
+
 end

lib/ret/media_resolver.ex

@@ -337,45 +337,43 @@ defmodule Ret.MediaResolver do
   end
 
   defp resolve_non_video(
-         %MediaResolverQuery{
-           url: %URI{host: "api.icosa.gallery", path: "/v1/assets/" <> asset_id} = uri
-         },
+         %MediaResolverQuery{url: %URI{host: "api.icosa.gallery", path: "/v1/assets/" <> asset_id} = uri},
          "icosa.gallery"
-       ) do
-    # Increment stat for the request
-    Statix.increment("ret.media_resolver.icosa.requests")
-
-    # Make the API call to get the asset data
-    payload =
-      "https://api.icosa.gallery/v1/assets/#{asset_id}"
-      # Assuming this function sends the request and handles retries
-      |> retry_get_until_success()
-      |> Map.get(:body)
-      |> Poison.decode!()
-
-    # Create the meta information based on the payload
-    meta =
-      %{
-        expected_content_type: "model/gltf",
-        name: payload["displayName"],
-        author: payload["authorName"],
-        license: payload["license"]
-      }
-
-    # Extract the GLTF2 format URL from the payload
-    uri =
-      payload["formats"]
-      |> Enum.find(&(&1["formatType"] == "GLTF2"))
-      |> Kernel.get_in(["root", "url"])
-      |> URI.parse()
-
-    # Increment stat for successful resolution
-    Statix.increment("ret.media_resolver.icosa.ok")
-
-    # Return the URI and meta data for further processing
-    {:commit, resolved(uri, meta)}
+    ) do
+  # Increment stat for the request
+  Statix.increment("ret.media_resolver.icosa.requests")
+
+  # Make the API call to get the asset data
+  payload =
+  "https://api.icosa.gallery/v1/assets/#{asset_id}"
+  |> retry_get_until_success() # Assuming this function sends the request and handles retries
+  |> Map.get(:body)
+  |> Poison.decode!()
+
+  # Create the meta information based on the payload
+  meta =
+  %{
+    expected_content_type: "model/gltf",
+    name: payload["displayName"],
+    author: payload["authorName"],
+    license: payload["license"]
+  }
+
+  # Extract the GLTF2 format URL from the payload
+  uri =
+  payload["formats"]
+  |> Enum.find(&(&1["formatType"] == "GLTF2"))
+  |> Kernel.get_in(["root", "url"])
+  |> URI.parse()
+
+  # Increment stat for successful resolution
+  Statix.increment("ret.media_resolver.icosa.ok")
+
+  # Return the URI and meta data for further processing
+  {:commit, resolved(uri, meta)}
   end
 
+
   defp resolve_non_video(
          %MediaResolverQuery{url: %URI{path: "/models/" <> model_id}} = query,
          "sketchfab.com" = root_host

lib/ret/media_search.ex

@@ -418,8 +418,7 @@ defmodule Ret.MediaSearch do
     end
   end
 
-  # Icosa does not currently require an API key
-  def available?(:icosa), do: true
+  def available?(:icosa), do: true  # Icosa does not currently require an API key
   def available?(:bing_images), do: has_resolver_config?(:bing_search_api_key)
   def available?(:bing_videos), do: has_resolver_config?(:bing_search_api_key)
   def available?(:youtube_videos), do: has_resolver_config?(:youtube_api_key)
@@ -602,7 +601,6 @@ defmodule Ret.MediaSearch do
 
   defp created_rooms_search(cursor, account_id, _query) do
     page_number = (cursor || "1") |> Integer.parse() |> elem(0)
-
     ecto_query =
       from h in Hub,
         where: h.created_by_account_id == ^account_id,

lib/ret/scene.ex

@@ -226,38 +226,37 @@ defmodule Ret.Scene do
             model_owned_file: old_model_owned_file,
             account: account
           } = scene
-
+  
           new_scene_owned_file =
             Storage.create_new_owned_file_with_replaced_string(
               old_scene_owned_file,
               account,
               old_domain_url,
               new_domain_url
             )
-
+  
           {:ok, new_model_owned_file} =
             Storage.duplicate_and_transform(old_model_owned_file, account, fn glb_stream,
                                                                               _total_bytes ->
               GLTFUtils.replace_in_glb(glb_stream, old_domain_url, new_domain_url)
             end)
-
+  
           scene
           |> change()
           |> put_change(:scene_owned_file_id, new_scene_owned_file.owned_file_id)
           |> put_change(:model_owned_file_id, new_model_owned_file.owned_file_id)
           |> Repo.update!()
-
+  
           for old_owned_file <- [old_scene_owned_file, old_model_owned_file] do
             OwnedFile.set_inactive(old_owned_file)
             Storage.rm_files_for_owned_file(old_owned_file)
             Repo.delete(old_owned_file)
           end
         rescue
-          e ->
+          e -> 
             IO.warn("Failed to process scene due to an error: #{inspect(e)}")
         end
       end)
-
       :ok
     end)
   end

lib/ret/storage.ex

@@ -288,7 +288,7 @@ defmodule Ret.Storage do
          _account,
          _require_token
        ) do
-    {:ok, owned_file}
+        {:ok, owned_file}
   end
 
   # Promoting a stored file to being owned has two side effects: the file is moved
@@ -310,11 +310,7 @@ defmodule Ret.Storage do
         "promotion_token" => actual_promotion_token
       } <-
         File.read!(meta_file_path) |> Poison.decode!(),
-      {:ok} <-
-        if(require_token,
-          do: check_promotion_token(actual_promotion_token, promotion_token),
-          else: {:ok}
-        ),
+      {:ok} <- (if require_token, do: check_promotion_token(actual_promotion_token, promotion_token), else: {:ok}),
       {:ok} <- check_blob_file_key(blob_file_path, key)
     ) do
       owned_file_params = %{

lib/ret/storage_used.ex

@@ -29,7 +29,7 @@ defmodule Ret.StorageUsed do
           line = lines |> String.split("\n") |> Enum.at(1)
 
           {:ok, [_FS, _kb, used, _Avail], _RestStr} =
-            :io_lib.fread(~c"~s~d~d~d", line |> to_charlist)
+            :io_lib.fread('~s~d~d~d', line |> to_charlist)
 
           {:ok, [{:storage_used, used}]}
 

lib/ret_web/controllers/api/v1/media_search_controller.ex

@@ -3,25 +3,25 @@ defmodule RetWeb.Api.V1.MediaSearchController do
   use Retry
 
   def index(conn, %{"source" => source, "filter" => "created", "user" => user} = params)
-      when source in ["rooms"] do
-    account = conn |> Guardian.Plug.current_resource()
-
-    if account && account.account_id == String.to_integer(user) do
-      {:commit, results} =
-        %Ret.MediaSearchQuery{
-          source: "rooms",
-          cursor: params["cursor"] || "1",
-          user: account.account_id,
-          filter: "created",
-          q: params["q"]
-        }
-        |> Ret.MediaSearch.search()
+    when source in ["rooms"] do
+      account = conn |> Guardian.Plug.current_resource()
+
+      if account && account.account_id == String.to_integer(user) do
+        {:commit, results} =
+          %Ret.MediaSearchQuery{
+            source: "rooms",
+            cursor: params["cursor"] || "1",
+            user: account.account_id,
+            filter: "created",
+            q: params["q"]
+          }
+          |> Ret.MediaSearch.search()
 
-      conn |> render("index.json", results: results)
-    else
-      conn |> send_resp(401, "You can only search created rooms for your own account.")
+        conn |> render("index.json", results: results)
+      else
+        conn |> send_resp(401, "You can only search created rooms for your own account.")
+      end
     end
-  end
 
   def index(conn, %{"source" => "rooms"} = params) do
     {:commit, results} =