diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index c9c663add..a77acb636 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -1,5 +1,6 @@ defmodule Plausible.Sites do use Plausible.Repo + alias Plausible.ClickhouseRepo alias Plausible.Site alias Plausible.Site.SharedLink import Ecto.Query @@ -9,27 +10,38 @@ defmodule Plausible.Sites do end def create(user, params) do - limit = Plausible.Billing.sites_limit(user) - - if owned_sites_count(user) >= limit do - {:error, :limit, limit} - else - site_changeset = Site.changeset(%Site{}, params) - - Ecto.Multi.new() - |> Ecto.Multi.insert(:site, site_changeset) - |> Ecto.Multi.run(:site_membership, fn repo, %{site: site} -> - membership_changeset = - Site.Membership.changeset(%Site.Membership{}, %{ - site_id: site.id, - user_id: user.id - }) - - repo.insert(membership_changeset) + site_changeset = Site.changeset(%Site{}, params) + + Ecto.Multi.new() + |> Ecto.Multi.run(:limit, fn _, _ -> + limit = Plausible.Billing.sites_limit(user) + count = owned_sites_count(user) + + if count >= limit do + {:error, limit} + else + {:ok, count} + end + end) + |> Ecto.Multi.insert(:site, site_changeset) + |> Ecto.Multi.run(:existing_events, fn _, _ -> + site_changeset + |> Ecto.Changeset.validate_change(:domain, fn :domain, domain -> + check_for_existing_events(domain, params) end) - |> maybe_start_trial(user) - |> Repo.transaction() - end + |> Ecto.Changeset.apply_action(:insert) + end) + |> Ecto.Multi.run(:site_membership, fn repo, %{site: site} -> + membership_changeset = + Site.Membership.changeset(%Site.Membership{}, %{ + site_id: site.id, + user_id: user.id + }) + + repo.insert(membership_changeset) + end) + |> maybe_start_trial(user) + |> Repo.transaction() end defp maybe_start_trial(multi, user) do @@ -72,6 +84,11 @@ defmodule Plausible.Sites do !!stats_start_date(site) end + def has_events?(domain) do + q = from e in "events", where: e.domain == ^domain, select: true, limit: 1 + ClickhouseRepo.one(q) == true + end + def create_shared_link(site, name, password \\ nil) do changes = SharedLink.changeset( @@ -166,4 +183,19 @@ defmodule Plausible.Sites do where: sm.role == :owner ) end + + defp check_for_existing_events(domain, params) do + if has_events?(domain) do + Sentry.capture_message("Refused to create a site with existing events", + extra: %{params: params} + ) + + [ + domain: + "This domain has already been taken. Perhaps one of your team members registered it? If that's not the case, please contact support@plausible.io" + ] + else + [] + end + end end diff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.ex index 3144074aa..a754d98fa 100644 --- a/lib/plausible_web/controllers/api/external_sites_controller.ex +++ b/lib/plausible_web/controllers/api/external_sites_controller.ex @@ -18,7 +18,7 @@ defmodule PlausibleWeb.Api.ExternalSitesController do |> put_status(400) |> json(serialize_errors(changeset)) - {:error, :limit, limit} -> + {:error, :limit, limit, _} -> conn |> put_status(403) |> json(%{ diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 04d527528..b43b7c8c6 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -84,16 +84,22 @@ defmodule PlausibleWeb.SiteController do |> put_session(site.domain <> "_offer_email_report", true) |> redirect(to: Routes.site_path(conn, :add_snippet, site.domain)) - {:error, :site, changeset, _} -> + {:error, :limit, limit, _} -> + render(conn, "new.html", + changeset: Plausible.Site.changeset(%Plausible.Site{}), + is_first_site: is_first_site, + is_at_limit: true, + site_limit: limit, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + + {:error, _, changeset, _} -> render(conn, "new.html", changeset: changeset, is_first_site: is_first_site, is_at_limit: false, layout: {PlausibleWeb.LayoutView, "focus.html"} ) - - {:error, :limit, _limit} -> - send_resp(conn, 400, "Site limit reached") end end diff --git a/lib/plausible_web/templates/site/new.html.eex b/lib/plausible_web/templates/site/new.html.eex index 7c981c6f1..14cf241f9 100644 --- a/lib/plausible_web/templates/site/new.html.eex +++ b/lib/plausible_web/templates/site/new.html.eex @@ -16,7 +16,7 @@
- Your account is limited to <%= @site_limit %> sites. Please contact hello@plausible.io to add more sites. + Your account is limited to <%= @site_limit %> sites. Please contact support@plausible.io to add more sites.