diff --git a/config/runtime.exs b/config/runtime.exs index ef71eb492..2148fee56 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -6,7 +6,7 @@ if config_env() in [:dev, :test] do Envy.load(["config/.env.#{config_env()}"]) end -if config_env() == :small do +if config_env() == :small_dev do Envy.load(["config/.env.dev"]) end diff --git a/config/small.exs b/config/small.exs index eaa8a34e6..c98cd2d4a 100644 --- a/config/small.exs +++ b/config/small.exs @@ -1,6 +1,6 @@ import Config -import_config "dev.exs" +import_config "prod.exs" config :esbuild, default: [ diff --git a/config/small_dev.exs b/config/small_dev.exs new file mode 100644 index 000000000..eaa8a34e6 --- /dev/null +++ b/config/small_dev.exs @@ -0,0 +1,11 @@ +import Config + +import_config "dev.exs" + +config :esbuild, + default: [ + args: + ~w(js/app.js js/dashboard.js js/embed.host.js js/embed.content.js --bundle --target=es2017 --loader:.js=jsx --outdir=../priv/static/js --define:BUILD_EXTRA=false), + cd: Path.expand("../assets", __DIR__), + env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)} + ] diff --git a/extra/lib/plausible/stats/sampling.ex b/extra/lib/plausible/stats/sampling.ex new file mode 100644 index 000000000..836ef7ce5 --- /dev/null +++ b/extra/lib/plausible/stats/sampling.ex @@ -0,0 +1,41 @@ +defmodule Plausible.Stats.Sampling do + @moduledoc """ + Sampling related functions + """ + @default_sample_threshold 20_000_000 + + import Ecto.Query + + @spec add_query_hint(Ecto.Query.t(), Plausible.Stats.Query.t()) :: Ecto.Query.t() + def add_query_hint(%Ecto.Query{} = db_query, %Plausible.Stats.Query{} = query) do + case query.sample_threshold do + :infinite -> + db_query + + threshold -> + add_query_hint(db_query, threshold) + end + end + + @spec add_query_hint(Ecto.Query.t(), pos_integer()) :: Ecto.Query.t() + def add_query_hint(%Ecto.Query{} = query, threshold) when is_integer(threshold) do + from(x in query, hints: [sample: threshold]) + end + + @spec add_query_hint(Ecto.Query.t()) :: Ecto.Query.t() + def add_query_hint(%Ecto.Query{} = query) do + add_query_hint(query, @default_sample_threshold) + end + + @spec put_threshold(Plausible.Stats.Query.t(), map()) :: Plausible.Stats.Query.t() + def put_threshold(query, params) do + sample_threshold = + case params["sample_threshold"] do + nil -> @default_sample_threshold + "infinite" -> :infinite + value -> String.to_integer(value) + end + + Map.put(query, :sample_threshold, sample_threshold) + end +end diff --git a/lib/plausible.ex b/lib/plausible.ex index c0a2f01c4..a8fe326fa 100644 --- a/lib/plausible.ex +++ b/lib/plausible.ex @@ -3,7 +3,7 @@ defmodule Plausible do Build-related macros """ - @small_builds [:small, :small_test] + @small_builds [:small, :small_test, :small_dev] defmacro __using__(_) do quote do diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.ex index 4248826c5..41cc124f8 100644 --- a/lib/plausible/auth/auth.ex +++ b/lib/plausible/auth/auth.ex @@ -1,4 +1,5 @@ defmodule Plausible.Auth do + use Plausible use Plausible.Repo alias Plausible.Auth @@ -56,11 +57,15 @@ defmodule Plausible.Auth do ) end - def is_super_admin?(nil), do: false - def is_super_admin?(%Plausible.Auth.User{id: id}), do: is_super_admin?(id) + on_full_build do + def is_super_admin?(nil), do: false + def is_super_admin?(%Plausible.Auth.User{id: id}), do: is_super_admin?(id) - def is_super_admin?(user_id) when is_integer(user_id) do - user_id in Application.get_env(:plausible, :super_admin_user_ids) + def is_super_admin?(user_id) when is_integer(user_id) do + user_id in Application.get_env(:plausible, :super_admin_user_ids) + end + else + def is_super_admin?(_), do: false end def enterprise_configured?(nil), do: false diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.ex index 6980da2a0..b62c771e4 100644 --- a/lib/plausible/auth/user.ex +++ b/lib/plausible/auth/user.ex @@ -11,6 +11,7 @@ defimpl FunWithFlags.Actor, for: Plausible.Auth.User do end defmodule Plausible.Auth.User do + use Plausible use Ecto.Schema import Ecto.Changeset @@ -209,10 +210,10 @@ defmodule Plausible.Auth.User do end defp trial_expiry() do - if Application.get_env(:plausible, :is_selfhost) do - Timex.today() |> Timex.shift(years: 100) - else + on_full_build do Timex.today() |> Timex.shift(days: 30) + else + Timex.today() |> Timex.shift(years: 100) end end diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index 0ae80dcf8..ccab13835 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -1,4 +1,5 @@ defmodule Plausible.Billing do + use Plausible use Plausible.Repo require Plausible.Billing.Subscription.Status alias Plausible.Billing.{Subscription, Plans, Quota} @@ -116,11 +117,15 @@ defmodule Plausible.Billing do defp subscription_is_active?(%Subscription{}), do: false defp subscription_is_active?(nil), do: false - def on_trial?(%Plausible.Auth.User{trial_expiry_date: nil}), do: false + on_full_build do + def on_trial?(%Plausible.Auth.User{trial_expiry_date: nil}), do: false - def on_trial?(user) do - user = Plausible.Users.with_subscription(user) - !subscription_is_active?(user.subscription) && trial_days_left(user) >= 0 + def on_trial?(user) do + user = Plausible.Users.with_subscription(user) + !subscription_is_active?(user.subscription) && trial_days_left(user) >= 0 + end + else + def on_trial?(_), do: false end def trial_days_left(user) do diff --git a/lib/plausible/billing/quota.ex b/lib/plausible/billing/quota.ex index e747e7284..24b7406a2 100644 --- a/lib/plausible/billing/quota.ex +++ b/lib/plausible/billing/quota.ex @@ -26,44 +26,51 @@ defmodule Plausible.Billing.Quota do end end - @limit_sites_since ~D[2021-05-05] - @spec site_limit(User.t()) :: non_neg_integer() | :unlimited @doc """ Returns the limit of sites a user can have. For enterprise customers, returns :unlimited. The site limit is checked in a background job so as to avoid service disruption. """ - def site_limit(user) do - cond do - Application.get_env(:plausible, :is_selfhost) -> :unlimited - Timex.before?(user.inserted_at, @limit_sites_since) -> :unlimited - true -> get_site_limit_from_plan(user) + on_full_build do + @limit_sites_since ~D[2021-05-05] + @spec site_limit(User.t()) :: non_neg_integer() | :unlimited + def site_limit(user) do + if Timex.before?(user.inserted_at, @limit_sites_since) do + :unlimited + else + get_site_limit_from_plan(user) + end end - end - @site_limit_for_trials 10 - @site_limit_for_legacy_trials 50 - @site_limit_for_free_10k 50 - defp get_site_limit_from_plan(user) do - user = Plausible.Users.with_subscription(user) + @site_limit_for_trials 10 + @site_limit_for_legacy_trials 50 + @site_limit_for_free_10k 50 + defp get_site_limit_from_plan(user) do + user = Plausible.Users.with_subscription(user) - case Plans.get_subscription_plan(user.subscription) do - %EnterprisePlan{} -> - :unlimited + case Plans.get_subscription_plan(user.subscription) do + %EnterprisePlan{} -> + :unlimited - %Plan{site_limit: site_limit} -> - site_limit + %Plan{site_limit: site_limit} -> + site_limit - :free_10k -> - @site_limit_for_free_10k + :free_10k -> + @site_limit_for_free_10k - nil -> - if Timex.before?(user.inserted_at, Plans.business_tier_launch()) do - @site_limit_for_legacy_trials - else - @site_limit_for_trials - end + nil -> + if Timex.before?(user.inserted_at, Plans.business_tier_launch()) do + @site_limit_for_legacy_trials + else + @site_limit_for_trials + end + end + end + else + @spec site_limit(any()) :: non_neg_integer() | :unlimited + def site_limit(_) do + :unlimited end end @@ -203,13 +210,7 @@ defmodule Plausible.Billing.Quota do stats_api_usage = from a in Plausible.Auth.ApiKey, where: a.user_id == ^user.id queries = - if Plausible.Release.selfhost?() do - [ - {Props, props_usage_query}, - {RevenueGoals, revenue_goals_usage}, - {StatsAPI, stats_api_usage} - ] - else + on_full_build do funnels_usage_query = from f in "funnels", inner_join: os in subquery(owned_sites_query(user)), @@ -221,6 +222,12 @@ defmodule Plausible.Billing.Quota do {RevenueGoals, revenue_goals_usage}, {StatsAPI, stats_api_usage} ] + else + [ + {Props, props_usage_query}, + {RevenueGoals, revenue_goals_usage}, + {StatsAPI, stats_api_usage} + ] end Enum.reduce(queries, [], fn {feature, query}, acc -> diff --git a/lib/plausible/plugins/api/token.ex b/lib/plausible/plugins/api/token.ex index 4330da0d9..4f64ccbe8 100644 --- a/lib/plausible/plugins/api/token.ex +++ b/lib/plausible/plugins/api/token.ex @@ -10,6 +10,7 @@ defmodule Plausible.Plugins.API.Token do It is prefixed with a plain text identifier allowing source scanning for leaked secrets. """ + use Plausible use Ecto.Schema import Ecto.Changeset @@ -63,10 +64,15 @@ defmodule Plausible.Plugins.API.Token do can scan repositories for accidental secret commits. """ def prefix() do - case {Plausible.Release.selfhost?(), Application.get_env(:plausible, :environment)} do - {true, _} -> "plausible-plugin-selfhost" - {false, "prod"} -> "plausible-plugin" - {false, env} -> "plausible-plugin-#{env}" + on_full_build do + env = Application.get_env(:plausible, :environment) + + case env do + "prod" -> "plausible-plugin" + env -> "plausible-plugin-#{env}" + end + else + "plausible-plugin-selfhost" end end diff --git a/lib/plausible/site.ex b/lib/plausible/site.ex index f18fc5b03..35b9dc2e5 100644 --- a/lib/plausible/site.ex +++ b/lib/plausible/site.ex @@ -39,7 +39,6 @@ defmodule Plausible.Site do has_one :google_auth, GoogleAuth has_one :weekly_report, Plausible.Site.WeeklyReport has_one :monthly_report, Plausible.Site.MonthlyReport - has_one :custom_domain, Plausible.Site.CustomDomain has_one :spike_notification, Plausible.Site.SpikeNotification has_one :ownership, Plausible.Site.Membership, where: [role: :owner] has_one :owner, through: [:ownership, :user] @@ -49,7 +48,7 @@ defmodule Plausible.Site do # strictly necessary. field :from_cache?, :boolean, virtual: true, default: false - # Used in the context of paginated sites list to order in relation to + # Used in the context of paginated sites list to order in relation to # user's membership state. Currently it can be either "invitation", # "pinned_site" or "site", where invitations are first. field :entry_type, :string, virtual: true diff --git a/lib/plausible/site/custom_domain.ex b/lib/plausible/site/custom_domain.ex deleted file mode 100644 index 325b72bb0..000000000 --- a/lib/plausible/site/custom_domain.ex +++ /dev/null @@ -1,11 +0,0 @@ -defmodule Plausible.Site.CustomDomain do - use Ecto.Schema - - schema "custom_domains" do - field :domain, :string - field :has_ssl_certificate, :boolean - belongs_to :site, Plausible.Site - - timestamps() - end -end diff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.ex index 4ba1720a1..a96b16c97 100644 --- a/lib/plausible/site/memberships/accept_invitation.ex +++ b/lib/plausible/site/memberships/accept_invitation.ex @@ -50,7 +50,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do @spec accept_invitation(String.t(), Auth.User.t(), Keyword.t()) :: {:ok, Site.Membership.t()} | {:error, :invitation_not_found | Ecto.Changeset.t()} def accept_invitation(invitation_id, user, opts \\ []) do - selfhost? = Keyword.get(opts, :selfhost?, Plausible.Release.selfhost?()) + selfhost? = Keyword.get(opts, :selfhost?, small_build?()) with {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do membership = get_or_create_membership(invitation, user) diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index ecdb922ff..684d2676f 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -4,8 +4,6 @@ defmodule Plausible.Stats.Base do alias Plausible.Stats.{Query, Filters} import Ecto.Query - # Ecto typespec has not been updated for this PR: https://github.com/elixir-ecto/ecto/pull/3592 - @dialyzer {:nowarn_function, add_sample_hint: 2} @no_ref "Direct / None" @not_set "(not set)" @@ -40,7 +38,10 @@ defmodule Plausible.Stats.Base do where: e.site_id == ^site.id, where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime ) - |> add_sample_hint(query) + + on_full_build do + q = Plausible.Stats.Sampling.add_query_hint(q, query) + end q = from(e in q, where: ^dynamic_filter_condition(query, "event:page", :pathname)) @@ -211,8 +212,12 @@ defmodule Plausible.Stats.Base do where: s.site_id == ^site.id, where: s.start >= ^first_datetime and s.start < ^last_datetime ) - |> add_sample_hint(query) - |> filter_by_entry_props(query) + + on_full_build do + sessions_q = Plausible.Stats.Sampling.add_query_hint(sessions_q, query) + end + + sessions_q = filter_by_entry_props(sessions_q, query) Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q -> filter_key = "visit:" <> prop_name @@ -549,16 +554,6 @@ defmodule Plausible.Stats.Base do end) end - defp add_sample_hint(db_q, query) do - case query.sample_threshold do - :infinite -> - db_q - - threshold -> - from(e in db_q, hints: [sample: threshold]) - end - end - defp split_goals(clauses, map_fn \\ &Function.identity/1) do groups = Enum.group_by(clauses, fn {goal_type, _v} -> goal_type end, fn {_k, val} -> map_fn.(val) end) diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index adefd1822..909f71f56 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -1,4 +1,5 @@ defmodule Plausible.Stats.Clickhouse do + use Plausible use Plausible.Repo use Plausible.ClickhouseRepo use Plausible.Stats.Fragments @@ -236,7 +237,6 @@ defmodule Plausible.Stats.Clickhouse do current_q = from( e in "events_v2", - hints: [sample: 20_000_000], join: total_q in subquery(total_q), on: e.site_id == total_q.site_id, where: e.site_id in ^Map.keys(site_id_to_domain_mapping), @@ -252,6 +252,10 @@ defmodule Plausible.Stats.Clickhouse do order_by: [e.site_id, fragment("toStartOfHour(timestamp)")] ) + on_full_build do + current_q = Plausible.Stats.Sampling.add_query_hint(current_q) + end + result = current_q |> ClickhouseRepo.all() @@ -275,17 +279,22 @@ defmodule Plausible.Stats.Clickhouse do end defp visitors_24h_total(now, offset1, offset2, site_id_to_domain_mapping) do - from(e in "events_v2", - hints: [sample: 20_000_000], - where: e.site_id in ^Map.keys(site_id_to_domain_mapping), - where: e.timestamp >= ^NaiveDateTime.add(now, offset1, :hour), - where: e.timestamp <= ^NaiveDateTime.add(now, offset2, :hour), - select: %{ - site_id: e.site_id, - total_visitors: fragment("toUInt64(round(uniq(user_id) * any(_sample_factor)))") - }, - group_by: [e.site_id] - ) + query = + from e in "events_v2", + where: e.site_id in ^Map.keys(site_id_to_domain_mapping), + where: e.timestamp >= ^NaiveDateTime.add(now, offset1, :hour), + where: e.timestamp <= ^NaiveDateTime.add(now, offset2, :hour), + select: %{ + site_id: e.site_id, + total_visitors: fragment("toUInt64(round(uniq(user_id) * any(_sample_factor)))") + }, + group_by: [e.site_id] + + on_full_build do + query = Plausible.Stats.Sampling.add_query_hint(query) + end + + query end defp empty_24h_intervals(now) do @@ -306,11 +315,14 @@ defmodule Plausible.Stats.Clickhouse do q = from(s in "sessions_v2", - hints: ["SAMPLE 10000000"], where: s.site_id == ^site.id, where: s.timestamp >= ^first_datetime and s.start < ^last_datetime ) + on_full_build do + q = Plausible.Stats.Sampling.add_query_hint(q, 10_000_000) + end + q = if query.filters["source"] do source = query.filters["source"] @@ -425,11 +437,14 @@ defmodule Plausible.Stats.Clickhouse do q = from(e in "events_v2", - hints: ["SAMPLE 10000000"], where: e.site_id == ^site.id, where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime ) + on_full_build do + q = Plausible.Stats.Sampling.add_query_hint(q, 10_000_000) + end + q = if query.filters["screen"] do size = query.filters["screen"] diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 6c52f79e9..d00b27eaa 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -1,4 +1,6 @@ defmodule Plausible.Stats.Query do + use Plausible + defstruct date_range: nil, interval: nil, period: nil, @@ -7,19 +9,24 @@ defmodule Plausible.Stats.Query do imported_data_requested: false, include_imported: false - @default_sample_threshold 20_000_000 require OpenTelemetry.Tracer, as: Tracer alias Plausible.Stats.{FilterParser, Interval} @type t :: %__MODULE__{} def from(site, params) do - query_by_period(site, params) - |> put_interval(params) - |> put_parsed_filters(params) - |> put_imported_opts(site, params) - |> put_sample_threshold(params) - |> maybe_drop_prop_filter(site) + query = + query_by_period(site, params) + |> put_interval(params) + |> put_parsed_filters(params) + |> put_imported_opts(site, params) + |> maybe_drop_prop_filter(site) + + on_full_build do + query = Plausible.Stats.Sampling.put_threshold(query, params) + end + + query end defp query_by_period(site, %{"period" => "realtime"}) do @@ -163,17 +170,6 @@ defmodule Plausible.Stats.Query do Map.put(query, :filters, FilterParser.parse_filters(params["filters"])) end - defp put_sample_threshold(query, params) do - sample_threshold = - case params["sample_threshold"] do - nil -> @default_sample_threshold - "infinite" -> :infinite - value -> String.to_integer(value) - end - - Map.put(query, :sample_threshold, sample_threshold) - end - def put_filter(query, key, val) do %__MODULE__{ query diff --git a/lib/plausible_release.ex b/lib/plausible_release.ex index 766873ff2..057e3bc53 100644 --- a/lib/plausible_release.ex +++ b/lib/plausible_release.ex @@ -1,4 +1,5 @@ defmodule Plausible.Release do + use Plausible use Plausible.Repo require Logger @@ -10,13 +11,12 @@ defmodule Plausible.Release do :ecto ] - @spec selfhost? :: boolean - def selfhost? do - Application.fetch_env!(@app, :is_selfhost) - end - def should_be_first_launch? do - selfhost?() and not (_has_users? = Repo.exists?(Plausible.Auth.User)) + on_full_build do + false + else + not (_has_users? = Repo.exists?(Plausible.Auth.User)) + end end def migrate do diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index a54b34851..d30bff50d 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -31,12 +31,6 @@ defmodule PlausibleWeb.AuthController do ] ) - plug(:assign_is_selfhost) - - defp assign_is_selfhost(conn, _opts) do - assign(conn, :is_selfhost, Plausible.Release.selfhost?()) - end - def register(conn, %{"user" => %{"email" => email, "password" => password}}) do with {:ok, user} <- login_user(conn, email, password) do conn = set_user_session(conn, user) diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index c4a493c01..0b9949939 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -61,7 +61,7 @@ defmodule PlausibleWeb.SiteController do def add_snippet(conn, _params) do user = conn.assigns[:current_user] - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] is_first_site = !Repo.exists?( @@ -121,9 +121,7 @@ defmodule PlausibleWeb.SiteController do end def settings_general(conn, _params) do - site = - conn.assigns[:site] - |> Repo.preload([:custom_domain]) + site = conn.assigns[:site] conn |> render("settings_general.html", @@ -137,7 +135,7 @@ defmodule PlausibleWeb.SiteController do def settings_people(conn, _params) do site = conn.assigns[:site] - |> Repo.preload(memberships: :user, invitations: [], custom_domain: []) + |> Repo.preload(memberships: :user, invitations: []) conn |> render("settings_people.html", @@ -148,7 +146,7 @@ defmodule PlausibleWeb.SiteController do end def settings_visibility(conn, _params) do - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) conn @@ -161,7 +159,7 @@ defmodule PlausibleWeb.SiteController do end def settings_goals(conn, _params) do - site = Repo.preload(conn.assigns[:site], [:custom_domain, :owner]) + site = Repo.preload(conn.assigns[:site], [:owner]) owner = Plausible.Users.with_subscription(site.owner) site = Map.put(site, :owner, owner) @@ -175,7 +173,7 @@ defmodule PlausibleWeb.SiteController do end def settings_funnels(conn, _params) do - site = Repo.preload(conn.assigns[:site], [:custom_domain, :owner]) + site = Repo.preload(conn.assigns[:site], [:owner]) owner = Plausible.Users.with_subscription(site.owner) site = Map.put(site, :owner, owner) @@ -189,7 +187,7 @@ defmodule PlausibleWeb.SiteController do end def settings_props(conn, _params) do - site = Repo.preload(conn.assigns[:site], [:custom_domain, :owner]) + site = Repo.preload(conn.assigns[:site], [:owner]) owner = Plausible.Users.with_subscription(site.owner) site = Map.put(site, :owner, owner) @@ -203,7 +201,7 @@ defmodule PlausibleWeb.SiteController do end def settings_email_reports(conn, _params) do - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] conn |> render("settings_email_reports.html", @@ -216,21 +214,8 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_custom_domain(conn, _params) do - site = - conn.assigns[:site] - |> Repo.preload(:custom_domain) - - conn - |> assign(:skip_plausible_tracking, true) - |> render("settings_custom_domain.html", - site: site, - layout: {PlausibleWeb.LayoutView, "site_settings.html"} - ) - end - def settings_danger_zone(conn, _params) do - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] conn |> render("settings_danger_zone.html", @@ -243,7 +228,7 @@ defmodule PlausibleWeb.SiteController do def settings_integrations(conn, _params) do site = conn.assigns.site - |> Repo.preload([:google_auth, :custom_domain]) + |> Repo.preload([:google_auth]) search_console_domains = if site.google_auth do @@ -295,7 +280,7 @@ defmodule PlausibleWeb.SiteController do end def update_settings(conn, %{"site" => site_params}) do - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] changeset = Plausible.Site.update_changeset(site, site_params) case Repo.update(changeset) do @@ -624,27 +609,6 @@ defmodule PlausibleWeb.SiteController do end end - def delete_custom_domain(conn, %{"id" => domain_id}) do - site = conn.assigns[:site] - site_id = site.id - - case Repo.delete_all( - from d in Plausible.Site.CustomDomain, - where: d.site_id == ^site_id, - where: d.id == ^domain_id - ) do - {1, _} -> - conn - |> put_flash(:success, "Custom domain deleted successfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") - - {0, _} -> - conn - |> put_flash(:error, "Failed to delete custom domain") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") - end - end - def import_from_google_user_metric_notice(conn, %{ "view_id" => view_id, "access_token" => access_token, @@ -874,7 +838,7 @@ defmodule PlausibleWeb.SiteController do end def add_snippet_after_domain_change(conn, _params) do - site = conn.assigns[:site] |> Repo.preload(:custom_domain) + site = conn.assigns[:site] conn |> assign(:skip_plausible_tracking, true) diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 149ca599d..ff149aa77 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -363,14 +363,13 @@ defmodule PlausibleWeb.StatsController do end defp is_dbip() do - is_or_nil = - if Application.get_env(:plausible, :is_selfhost) do - if type = Plausible.Geo.database_type() do - String.starts_with?(type, "DBIP") - end - end - - !!is_or_nil + on_full_build do + false + else + Plausible.Geo.database_type() + |> to_string() + |> String.starts_with?("DBIP") + end end defp title(%{path_info: ["plausible.io"]}, _) do diff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.ex index 1a5b28233..4da4681cf 100644 --- a/lib/plausible_web/live/goal_settings/form.ex +++ b/lib/plausible_web/live/goal_settings/form.ex @@ -24,7 +24,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do site = user_id |> Plausible.Sites.get_for_user!(domain, [:owner, :admin, :super_admin]) - |> Repo.preload([:custom_domain, :owner]) + |> Repo.preload([:owner]) owner = Plausible.Users.with_subscription(site.owner) site = Map.put(site, :owner, owner) diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.ex index 143ca30de..258c6b52a 100644 --- a/lib/plausible_web/live/register_form.ex +++ b/lib/plausible_web/live/register_form.ex @@ -5,6 +5,7 @@ defmodule PlausibleWeb.Live.RegisterForm do use Phoenix.LiveView use Phoenix.HTML + use Plausible import PlausibleWeb.Live.Components.Form @@ -37,7 +38,6 @@ defmodule PlausibleWeb.Live.RegisterForm do form: to_form(changeset), captcha_error: nil, password_strength: Auth.User.password_strength(changeset), - is_selfhost: Plausible.Release.selfhost?(), trigger_submit: false )} end @@ -68,7 +68,7 @@ defmodule PlausibleWeb.Live.RegisterForm do ~H"""
- <%= if assigns[:trace_id] && !assigns[:selfhosted?] do %> - If you would like to help, tell us what you were trying to do. Our development team will receive your report. - <% else %> - We have been notified. - <% end %> -
-- <%= link("Home page", to: "/", class: "text-indigo-500 mr-8") %> - <%= link("Status page", to: "https://status.plausible.io", class: "mr-8 text-indigo-500") %> - <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-500") %> -
-+ <%= if assigns[:trace_id] && full_build?() do %> + If you would like to help, tell us what you were trying to do. Our development team will receive your report. + <% else %> + We have been notified. + <% end %> +
++ <%= link("Home page", to: "/", class: "text-indigo-500 mr-8") %> + <%= link("Status page", + to: "https://status.plausible.io", + class: "mr-8 text-indigo-500" + ) %> + <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-500") %> +
+
- <%= if !Application.get_env(:plausible, :is_selfhost) do %>
- Made and hosted in the EU 🇪🇺
- <% end %>
- Solely funded by our subscribers.
-
+ <%= if full_build?() do %>
+ Made and hosted in the EU 🇪🇺
+ <% end %>
+ Solely funded by our subscribers.
+
This dashboard is actually locked. You are viewing it with super-admin access
-
- Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet", class: "text-indigo-600 dark:text-indigo-500 text-underline")%>
- Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#check-for-the-plausible-snippet-in-your-source-code", class: "text-indigo-600 dark:text-indigo-500 text-underline", rel: "noreferrer") %> with our guide
- <%= if Application.get_env(:plausible, :is_selfhost) do %>
- first
Still not working? Ask on our <%= link("community-supported forum", to: "https://github.com/plausible/analytics/discussions", class: "text-indigo-600 dark:text-indigo-500 text-underline" ) %>
- <% else %>
- first
Still not working? <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-600 dark:text-indigo-500 text-underline" ) %> and we will help you with your setup
- <% end %>
-
This dashboard is actually locked. You are viewing it with super-admin access
+
+ Need to see the snippet again?
+ <.styled_link href={"/#{URI.encode_www_form(@site.domain)}/snippet"}>
+ Click here
+
+
+
Not working?
+ <.styled_link
+ new_tab
+ href="https://plausible.io/docs/troubleshoot-integration#check-for-the-plausible-snippet-in-your-source-code"
+ >
+ Troubleshoot the integration
+
+
+
+
+ Still not working?
+ <.styled_link new_tab href="https://plausible.io/contact">Contact us
+ and we will help you with your setup
+
+
+ Still not working? Ask on our
+ <.styled_link new_tab href="https://github.com/plausible/analytics/discussions">
+ community-supported forum
+
+
+