No more check_scroll_depth_visible!

plausible · Jan 30, 2025 · 37eae52 · 37eae52
1 parent 76d5dc9
commit 37eae52
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 61 deletions.
diff --git a/lib/plausible/exports.ex b/lib/plausible/exports.ex
@@ -418,8 +418,6 @@ defmodule Plausible.Exports do
     site = Plausible.Repo.get(Plausible.Site, site_id)
     current_user = current_user_id && Plausible.Repo.get(Plausible.Auth.User, current_user_id)
 
-    include_scroll_depth? = Plausible.Stats.ScrollDepth.check_feature_visible!(site, current_user)
-
     base_q =
       from(e in sampled("events_v2"),
         where: ^export_filter(site_id, date_range),
@@ -428,7 +426,7 @@ defmodule Plausible.Exports do
         order_by: selected_as(:date)
       )
 
-    if include_scroll_depth? do
+    if Plausible.Stats.ScrollDepth.feature_visible?(site, current_user) do
       max_scroll_depth_per_visitor_q =
         from(e in "events_v2",
           where: ^export_filter(site_id, date_range),

diff --git a/lib/plausible/stats/scroll_depth.ex b/lib/plausible/stats/scroll_depth.ex
@@ -3,11 +3,6 @@ defmodule Plausible.Stats.ScrollDepth do
   Module to check whether the scroll depth metric is available and visible for a site.
   """
 
-  import Ecto.Query
-  require Logger
-
-  alias Plausible.ClickhouseRepo
-
   def feature_available?(site, user) do
     FunWithFlags.enabled?(:scroll_depth, for: user) ||
       FunWithFlags.enabled?(:scroll_depth, for: site)
@@ -16,48 +11,4 @@ defmodule Plausible.Stats.ScrollDepth do
   def feature_visible?(site, user) do
     feature_available?(site, user) && not is_nil(site.scroll_depth_visible_at)
   end
-
-  @doc """
-  Checks whether the scroll depth feature is visible for a site and updates the site record if it is.
-
-  Note this function queries ClickHouse and may take a while to complete.
-  """
-  def check_feature_visible!(site, user) do
-    cond do
-      not feature_available?(site, user) ->
-        false
-
-      not is_nil(site.scroll_depth_visible_at) ->
-        true
-
-      is_nil(site.scroll_depth_visible_at) ->
-        visible? = has_scroll_data_last_30d?(site)
-
-        # if visible? do
-        #   Plausible.Sites.set_scroll_depth_visible_at(site)
-        # end
-
-        visible?
-    end
-  end
-
-  defp has_scroll_data_last_30d?(site) do
-    try do
-      ClickhouseRepo.exists?(
-        from(e in "events_v2",
-          where:
-            e.site_id == ^site.id and
-              e.name == "pageleave" and
-              e.timestamp >= fragment("toStartOfDay(now() - toIntervalDay(30))") and
-              e.scroll_depth > 0 and e.scroll_depth <= 100
-        )
-      )
-    rescue
-      # Avoid propagating error to the user, bringing down the site.
-      error ->
-        Logger.error("Error checking scroll data for site #{site.id}: #{inspect(error)}")
-
-        false
-    end
-  end
 end
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
@@ -45,7 +45,7 @@ defmodule PlausibleWeb.StatsController do
   use Plausible.Repo
 
   alias Plausible.Sites
-  alias Plausible.Stats.{Filters, Query}
+  alias Plausible.Stats.{Filters, Query, ScrollDepth}
   alias PlausibleWeb.Api
 
   plug(PlausibleWeb.Plugs.AuthorizeSiteAccess when action in [:stats, :csv_export])
@@ -59,9 +59,6 @@ defmodule PlausibleWeb.StatsController do
     dogfood_page_path = if demo, do: "/#{site.domain}", else: "/:dashboard"
     skip_to_dashboard? = conn.params["skip_to_dashboard"] == "true"
 
-    scroll_depth_visible? =
-      Plausible.Stats.ScrollDepth.check_feature_visible!(site, current_user)
-
     cond do
       (stats_start_date && can_see_stats?) || (can_see_stats? && skip_to_dashboard?) ->
         conn
@@ -72,7 +69,7 @@ defmodule PlausibleWeb.StatsController do
           revenue_goals: list_revenue_goals(site),
           funnels: list_funnels(site),
           has_props: Plausible.Props.configured?(site),
-          scroll_depth_visible: scroll_depth_visible?,
+          scroll_depth_visible: ScrollDepth.feature_visible?(site, current_user),
           stats_start_date: stats_start_date,
           native_stats_start_date: NaiveDateTime.to_date(site.native_stats_start_at),
           title: title(conn, site),
@@ -350,9 +347,6 @@ defmodule PlausibleWeb.StatsController do
         shared_link = Plausible.Repo.preload(shared_link, site: :owner)
         stats_start_date = Plausible.Sites.stats_start_date(shared_link.site)
 
-        scroll_depth_visible? =
-          Plausible.Stats.ScrollDepth.check_feature_visible!(shared_link.site, current_user)
-
         conn
         |> put_resp_header("x-robots-tag", "noindex, nofollow")
         |> delete_resp_header("x-frame-options")
@@ -362,7 +356,7 @@ defmodule PlausibleWeb.StatsController do
           revenue_goals: list_revenue_goals(shared_link.site),
           funnels: list_funnels(shared_link.site),
           has_props: Plausible.Props.configured?(shared_link.site),
-          scroll_depth_visible: scroll_depth_visible?,
+          scroll_depth_visible: ScrollDepth.feature_visible?(shared_link.site, current_user),
           stats_start_date: stats_start_date,
           native_stats_start_date: NaiveDateTime.to_date(shared_link.site.native_stats_start_at),
           title: title(conn, shared_link.site),