diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index f77d5e257..c9ec3eb6f 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -3,21 +3,18 @@ defmodule PlausibleWeb.SiteController do use Plausible.Repo alias Plausible.{Sites, Goals} - plug(PlausibleWeb.RequireAccountPlug) + plug PlausibleWeb.RequireAccountPlug - plug( - PlausibleWeb.AuthorizeSiteAccess, - [:owner, :admin, :super_admin] when action not in [:index, :new, :create_site] - ) + plug PlausibleWeb.AuthorizeSiteAccess, + [:owner, :admin, :super_admin] when action not in [:index, :new, :create_site] def index(conn, params) do user = conn.assigns[:current_user] invitations = Repo.all( - from(i in Plausible.Auth.Invitation, + from i in Plausible.Auth.Invitation, where: i.email == ^user.email - ) ) |> Repo.preload(:site) @@ -109,11 +106,10 @@ defmodule PlausibleWeb.SiteController do is_first_site = !Repo.exists?( - from(sm in Plausible.Site.Membership, + from sm in Plausible.Site.Membership, where: sm.user_id == ^user.id and sm.site_id != ^site.id - ) ) conn @@ -207,7 +203,7 @@ defmodule PlausibleWeb.SiteController do def settings_visibility(conn, _params) do site = conn.assigns[:site] |> Repo.preload(:custom_domain) - shared_links = Repo.all(from(l in Plausible.Site.SharedLink, where: l.site_id == ^site.id)) + shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) conn |> assign(:skip_plausible_tracking, true) @@ -430,7 +426,7 @@ defmodule PlausibleWeb.SiteController do def disable_weekly_report(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from(wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id)) + Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id) conn |> put_flash(:success, "You will not receive weekly email reports going forward") @@ -484,7 +480,7 @@ defmodule PlausibleWeb.SiteController do def disable_monthly_report(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from(mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id)) + Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id) conn |> put_flash(:success, "You will not receive monthly email reports going forward") @@ -544,7 +540,7 @@ defmodule PlausibleWeb.SiteController do def disable_spike_notification(conn, _params) do site = conn.assigns[:site] - Repo.delete_all(from(mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id)) + Repo.delete_all(from mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id) conn |> put_flash(:success, "Spike notification disabled") @@ -660,10 +656,9 @@ defmodule PlausibleWeb.SiteController do site_id = site.id case Repo.delete_all( - from(l in Plausible.Site.SharedLink, + from l in Plausible.Site.SharedLink, where: l.slug == ^slug, where: l.site_id == ^site_id - ) ) do {1, _} -> conn @@ -682,10 +677,9 @@ defmodule PlausibleWeb.SiteController do site_id = site.id case Repo.delete_all( - from(d in Plausible.Site.CustomDomain, + from d in Plausible.Site.CustomDomain, where: d.site_id == ^site_id, where: d.id == ^domain_id - ) ) do {1, _} -> conn @@ -876,11 +870,10 @@ defmodule PlausibleWeb.SiteController do cond do site.imported_data -> Oban.cancel_all_jobs( - from(j in Oban.Job, + from j in Oban.Job, where: j.queue == "google_analytics_imports" and fragment("(? ->> 'site_id')::int", j.args) == ^site.id - ) ) Plausible.Imported.forget(site)