From 4e5d43e484e6252e94f52d84c728c9ddd1d0d3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 23 Mar 2024 14:59:43 +0100 Subject: [PATCH] Remove service_domain leftovers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- lib/pleroma/domain.ex | 13 ++----------- .../web/admin_api/controllers/domain_controller.ex | 6 +++--- .../api_spec/operations/admin/domain_operation.ex | 2 -- lib/pleroma/web/plugs/set_domain_plug.ex | 2 +- .../migrations/20230618190919_create_domains.exs | 2 -- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/lib/pleroma/domain.ex b/lib/pleroma/domain.ex index a07fcc06f..b9b465d54 100644 --- a/lib/pleroma/domain.ex +++ b/lib/pleroma/domain.ex @@ -13,7 +13,6 @@ defmodule Pleroma.Domain do schema "domains" do field(:domain, :string, default: "") - field(:service_domain, :string, default: "") field(:public, :boolean, default: false) field(:resolves, :boolean, default: false) field(:last_checked_at, :naive_datetime) @@ -25,10 +24,8 @@ defmodule Pleroma.Domain do domain |> cast(params, [:domain, :public]) |> validate_required([:domain]) - |> maybe_add_service_domain() |> update_change(:domain, &String.downcase/1) |> unique_constraint(:domain) - |> unique_constraint(:service_domain) end def update_changeset(%__MODULE__{} = domain, params \\ %{}) do @@ -47,12 +44,6 @@ defmodule Pleroma.Domain do ) end - defp maybe_add_service_domain(%{changes: %{service_domain: _}} = changeset), do: changeset - - defp maybe_add_service_domain(%{changes: %{domain: domain}} = changeset) do - change(changeset, service_domain: domain) - end - def list do __MODULE__ |> order_by(asc: :id) @@ -61,9 +52,9 @@ defmodule Pleroma.Domain do def get(id), do: Repo.get(__MODULE__, id) - def get_by_service_domain(domain) do + def get_by_name(domain) do __MODULE__ - |> where(service_domain: ^domain) + |> where(domain: ^domain) |> Repo.one() end diff --git a/lib/pleroma/web/admin_api/controllers/domain_controller.ex b/lib/pleroma/web/admin_api/controllers/domain_controller.ex index 983ce02f5..f2614904e 100644 --- a/lib/pleroma/web/admin_api/controllers/domain_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/domain_controller.ex @@ -40,7 +40,7 @@ defmodule Pleroma.Web.AdminAPI.DomainController do with {:domain_not_used, true} <- {:domain_not_used, params[:domain] !== Pleroma.Web.WebFinger.host()}, {:ok, domain} <- Domain.create(params), - _ <- @cachex.del(:domain, :domains_list) do + _ <- @cachex.del(:domain_cache, :domains_list) do Pleroma.Workers.CheckDomainResolveWorker.enqueue("check_domain_resolve", %{ "id" => domain.id }) @@ -62,14 +62,14 @@ defmodule Pleroma.Web.AdminAPI.DomainController do params |> Domain.update(id) - @cachex.del(:domain, :domains_list) + @cachex.del(:domain_cache, :domains_list) render(conn, "show.json", domain: domain) end def delete(conn, %{id: id}) do with {:ok, _} <- Domain.delete(id), - _ <- @cachex.del(:domain, :domains_list) do + _ <- @cachex.del(:domain_cache, :domains_list) do json(conn, %{}) else _ -> json_response(conn, :bad_request, "") diff --git a/lib/pleroma/web/api_spec/operations/admin/domain_operation.ex b/lib/pleroma/web/api_spec/operations/admin/domain_operation.ex index a91872f97..20f790074 100644 --- a/lib/pleroma/web/api_spec/operations/admin/domain_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/domain_operation.ex @@ -84,7 +84,6 @@ defmodule Pleroma.Web.ApiSpec.Admin.DomainOperation do required: [:domain], properties: %{ domain: %Schema{type: :string}, - service_domain: %Schema{type: :string, nullable: true}, public: %Schema{type: :boolean, nullable: true} } } @@ -105,7 +104,6 @@ defmodule Pleroma.Web.ApiSpec.Admin.DomainOperation do properties: %{ id: %Schema{type: :integer}, domain: %Schema{type: :string}, - service_domain: %Schema{type: :string}, public: %Schema{type: :boolean}, resolves: %Schema{type: :boolean}, last_checked_at: %Schema{type: :string, format: "date-time", nullable: true} diff --git a/lib/pleroma/web/plugs/set_domain_plug.ex b/lib/pleroma/web/plugs/set_domain_plug.ex index fc58987f7..1c0a1182b 100644 --- a/lib/pleroma/web/plugs/set_domain_plug.ex +++ b/lib/pleroma/web/plugs/set_domain_plug.ex @@ -17,7 +17,7 @@ defmodule Pleroma.Web.Plugs.SetDomainPlug do Pleroma.Config.get([__MODULE__, :domain]), Pleroma.Web.Endpoint.host() ], - %Domain{} = domain <- Domain.get_by_service_domain(domain) do + %Domain{} = domain <- Domain.get_by_name(domain) do Map.put(conn, :domain, domain) else _ -> conn diff --git a/priv/repo/migrations/20230618190919_create_domains.exs b/priv/repo/migrations/20230618190919_create_domains.exs index cfb149894..9994a4682 100644 --- a/priv/repo/migrations/20230618190919_create_domains.exs +++ b/priv/repo/migrations/20230618190919_create_domains.exs @@ -4,7 +4,6 @@ defmodule Pleroma.Repo.Migrations.CreateDomains do def change do create_if_not_exists table(:domains) do add(:domain, :citext) - add(:service_domain, :citext) add(:public, :boolean) add(:resolves, :boolean) add(:last_checked_at, :naive_datetime) @@ -13,7 +12,6 @@ defmodule Pleroma.Repo.Migrations.CreateDomains do end create_if_not_exists(unique_index(:domains, [:domain])) - create_if_not_exists(unique_index(:domains, [:service_domain])) alter table(:users) do add(:domain_id, references(:domains))