Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
rm Timex.diff/3 (#4695)
ruslandoga40f28ed15132
diff --git a/lib/plausible/auth/grace_period.ex b/lib/plausible/auth/grace_period.exindex 2267361440..f1ab6fc37b 100644--- a/lib/plausible/auth/grace_period.ex+++ b/lib/plausible/auth/grace_period.ex@@ -82,7 +82,7 @@ defmodule Plausible.Auth.GracePeriod dodef active?(user_or_team)def active?(%{grace_period: %__MODULE__{end_date: %Date{} = end_date}}) do- Timex.diff(end_date, Date.utc_today(), :days) >= 0+ Date.diff(end_date, Date.utc_today()) >= 0enddef active?(%{grace_period: %__MODULE__{manual_lock: true}}) dodiff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex 72df24b487..a93ddd84bc 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -106,7 +106,7 @@ defmodule Plausible.Auth.UserAdmin do"ended"%{end_date: %Date{} = end_date} ->- days_left = Timex.diff(end_date, DateTime.utc_now(), :days)+ days_left = Date.diff(end_date, Date.utc_today())"#{days_left} days left"endenddiff --git a/lib/plausible/plugins/api/token.ex b/lib/plausible/plugins/api/token.exindex 7fe3c2f2d2..2b8cc2284c 100644--- a/lib/plausible/plugins/api/token.ex+++ b/lib/plausible/plugins/api/token.ex@@ -81,7 +81,7 @@ defmodule Plausible.Plugins.API.Token dodiff =if token.last_used_at donow = NaiveDateTime.utc_now()- Timex.diff(now, token.last_used_at, :minutes)+ NaiveDateTime.diff(now, token.last_used_at, :minute)endcond dodiff --git a/lib/plausible/plugins/api/tokens.ex b/lib/plausible/plugins/api/tokens.exindex d325599667..8eb6d78a48 100644--- a/lib/plausible/plugins/api/tokens.ex+++ b/lib/plausible/plugins/api/tokens.ex@@ -63,7 +63,7 @@ defmodule Plausible.Plugins.API.Tokens donow = NaiveDateTime.truncate(now, :second)last_used = token.last_used_at- if is_nil(last_used) or Timex.diff(now, last_used, :minutes) > 5 do+ if is_nil(last_used) or NaiveDateTime.diff(now, last_used, :minute) > 5 dotoken|> Ecto.Changeset.change(%{last_used_at: now})|> Repo.update()diff --git a/lib/plausible/session/cache_store.ex b/lib/plausible/session/cache_store.exindex 724e9a5d6d..c306d97300 100644--- a/lib/plausible/session/cache_store.ex+++ b/lib/plausible/session/cache_store.ex@@ -62,7 +62,7 @@ defmodule Plausible.Session.CacheStore donilsession ->- if Timex.diff(event.timestamp, session.timestamp, :minutes) <= 30 do+ if NaiveDateTime.diff(event.timestamp, session.timestamp, :minute) <= 30 dosessionendend@@ -93,7 +93,7 @@ defmodule Plausible.Session.CacheStore doexit_page_hostname:if(event.name == "pageview", do: event.hostname, else: session.exit_page_hostname),is_bounce: false,- duration: Timex.diff(event.timestamp, session.start, :second) |> abs,+ duration: NaiveDateTime.diff(event.timestamp, session.start) |> abs,pageviews:if(event.name == "pageview", do: session.pageviews + 1, else: session.pageviews),events: session.events + 1diff --git a/lib/plausible/stats/interval.ex b/lib/plausible/stats/interval.exindex 8f053f1e1c..fe125619cd 100644--- a/lib/plausible/stats/interval.ex+++ b/lib/plausible/stats/interval.ex@@ -45,7 +45,7 @@ defmodule Plausible.Stats.Interval doTimex.diff(last, first, :months) > 0 ->"month"- Timex.diff(last, first, :days) > 0 ->+ DateTime.diff(last, first, :day) > 0 ->"day"true ->diff --git a/lib/plausible/stats/query_optimizer.ex b/lib/plausible/stats/query_optimizer.exindex ed4c5e0b8b..827dfebb16 100644--- a/lib/plausible/stats/query_optimizer.ex+++ b/lib/plausible/stats/query_optimizer.ex@@ -85,8 +85,8 @@ defmodule Plausible.Stats.QueryOptimizer dodefp resolve_time_dimension(first, last) docond do- Timex.diff(last, first, :hours) <= 48 -> "time:hour"- Timex.diff(last, first, :days) <= 40 -> "time:day"+ DateTime.diff(last, first, :hour) <= 48 -> "time:hour"+ DateTime.diff(last, first, :day) <= 40 -> "time:day"Timex.diff(last, first, :weeks) <= 52 -> "time:week"true -> "time:month"enddiff --git a/lib/plausible/users.ex b/lib/plausible/users.exindex 33020ff85b..ec9d99be57 100644--- a/lib/plausible/users.ex+++ b/lib/plausible/users.ex@@ -26,7 +26,7 @@ defmodule Plausible.Users do@spec trial_days_left(Auth.User.t()) :: integer()def trial_days_left(user) do- Timex.diff(user.trial_expiry_date, Date.utc_today(), :days)+ Date.diff(user.trial_expiry_date, Date.utc_today())end@spec update_accept_traffic_until(Auth.User.t()) :: Auth.User.t()diff --git a/lib/plausible_web/components/billing/plan_box.ex b/lib/plausible_web/components/billing/plan_box.exindex d853e1e65a..e1a90414ac 100644--- a/lib/plausible_web/components/billing/plan_box.ex+++ b/lib/plausible_web/components/billing/plan_box.ex@@ -274,7 +274,7 @@ defmodule PlausibleWeb.Components.Billing.PlanBox dotrial_active_or_ended_recently? =not invited_user? &&- Timex.diff(Date.utc_today(), current_user.trial_expiry_date, :days) <= 10+ Date.diff(Date.utc_today(), current_user.trial_expiry_date) <= 10limit_checking_opts =cond dodiff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex 188feeca39..1842117342 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -107,7 +107,7 @@ defmodule PlausibleWeb.LayoutView doenddef grace_period_end(%{grace_period: %{end_date: %Date{} = date}}) do- case Timex.diff(date, Date.utc_today(), :days) do+ case Date.diff(date, Date.utc_today()) do0 -> "today"1 -> "tomorrow"n -> "within #{n} days"diff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.exindex 0180fbc27e..b6c8804bec 100644--- a/lib/workers/send_site_setup_emails.ex+++ b/lib/workers/send_site_setup_emails.ex@@ -44,7 +44,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dofor site <- Repo.all(q) doowner = Plausible.Users.with_subscription(site.owner)setup_completed = Plausible.Sites.has_stats?(site)- hours_passed = Timex.diff(DateTime.utc_now(), site.inserted_at, :hours)+ hours_passed = NaiveDateTime.diff(DateTime.utc_now(), site.inserted_at, :hour)if !setup_completed && hours_passed > 47 dosend_setup_help_email(owner, site)diff --git a/lib/workers/send_trial_notifications.ex b/lib/workers/send_trial_notifications.exindex 7386697663..a702c42313 100644--- a/lib/workers/send_trial_notifications.ex+++ b/lib/workers/send_trial_notifications.ex@@ -20,7 +20,7 @@ defmodule Plausible.Workers.SendTrialNotifications do)for user <- users do- case Timex.diff(user.trial_expiry_date, Date.utc_today(), :days) do+ case Date.diff(user.trial_expiry_date, Date.utc_today()) do7 ->if Plausible.Auth.has_active_sites?(user, [:owner]) dosend_one_week_reminder(user)