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
Remove `Timex.format` (#4402)
ruslandoga5e2a9563f748
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex 8301d18a1f..e7459d96a2 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -142,6 +142,6 @@ defmodule Plausible.Auth.UserAdmin dodefp format_date(nil), do: "--"defp format_date(date) do- Timex.format!(date, "{Mshort} {D}, {YYYY}")+ Calendar.strftime(date, "%b %-d, %Y")endenddiff --git a/lib/plausible/billing/paddle_api.ex b/lib/plausible/billing/paddle_api.exindex e0ac0d7bbb..71796cbe8a 100644--- a/lib/plausible/billing/paddle_api.ex+++ b/lib/plausible/billing/paddle_api.ex@@ -98,8 +98,8 @@ defmodule Plausible.Billing.PaddleApi dovendor_auth_code: config[:vendor_auth_code],subscription_id: subscription.paddle_subscription_id,is_paid: 1,- from: Date.shift(Date.utc_today(), year: -5) |> Timex.format!("{YYYY}-{0M}-{0D}"),- to: Date.shift(Date.utc_today(), day: 1) |> Timex.format!("{YYYY}-{0M}-{0D}")+ from: Date.shift(Date.utc_today(), year: -5) |> Calendar.strftime("%Y-%m-%d"),+ to: Date.shift(Date.utc_today(), day: 1) |> Calendar.strftime("%Y-%m-%d")}with {:ok, %{body: body}} <- HTTPClient.post(invoices_url(), @headers, params),diff --git a/lib/plausible/data_migration/populate_event_session_columns.ex b/lib/plausible/data_migration/populate_event_session_columns.exindex 659ca8c831..818f995007 100644--- a/lib/plausible/data_migration/populate_event_session_columns.ex+++ b/lib/plausible/data_migration/populate_event_session_columns.ex@@ -94,7 +94,7 @@ defmodule Plausible.DataMigration.PopulateEventSessionColumns do{:ok, %{rows: [[merges]]}} = run_sql("get-merges-progress"){:ok, %{rows: disks}} = run_sql("get-disks")- IO.puts("\n\n#{Timex.now() |> Timex.format!("{ISO:Extended}")}")+ IO.puts("\n\n#{Timex.now() |> DateTime.to_iso8601()}")# List partitions that need to runIO.puts(diff --git a/lib/plausible/data_migration/versioned_sessions.ex b/lib/plausible/data_migration/versioned_sessions.exindex f265e47556..7152d2d23b 100644--- a/lib/plausible/data_migration/versioned_sessions.ex+++ b/lib/plausible/data_migration/versioned_sessions.ex@@ -10,7 +10,7 @@ defmodule Plausible.DataMigration.VersionedSessions do"""use Plausible.DataMigration, dir: "VersionedSessions", repo: Plausible.IngestRepo- @suffix_format "{YYYY}{0M}{0D}{h24}{m}{s}"+ @suffix_format "%Y%m%d%H%M%S"@versioned_table_engines ["ReplicatedVersionedCollapsingMergeTree","VersionedCollapsingMergeTree"@@ -19,7 +19,7 @@ defmodule Plausible.DataMigration.VersionedSessions dodef run(opts \\ []) dorun_exchange? = Keyword.get(opts, :run_exchange?, true)- unique_suffix = Timex.now() |> Timex.format!(@suffix_format)+ unique_suffix = Timex.now() |> Calendar.strftime(@suffix_format)cluster? = Plausible.MigrationUtils.clustered_table?("sessions_v2")diff --git a/lib/plausible/exports.ex b/lib/plausible/exports.exindex 04e6a42021..1501944375 100644--- a/lib/plausible/exports.ex+++ b/lib/plausible/exports.ex@@ -220,8 +220,8 @@ defmodule Plausible.Exports dosuffix =if date_range do- first_date = Timex.format!(date_range.first, "{YYYY}{0M}{0D}")- last_date = Timex.format!(date_range.last, "{YYYY}{0M}{0D}")+ first_date = Calendar.strftime(date_range.first, "%Y%m%d")+ last_date = Calendar.strftime(date_range.last, "%Y%m%d")"_#{first_date}_#{last_date}" <> extnameelseextnamediff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex 201b4e1294..a22be106e7 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -158,7 +158,7 @@ defmodule Plausible.SiteAdmin doenddefp format_date(date) do- Timex.format!(date, "{Mshort} {D}, {YYYY}")+ Calendar.strftime(date, "%b %-d, %Y")enddefp get_owner(site) dodiff --git a/lib/plausible/stats/time.ex b/lib/plausible/stats/time.exindex 40e7b24222..a9520c5b61 100644--- a/lib/plausible/stats/time.ex+++ b/lib/plausible/stats/time.ex@@ -58,7 +58,7 @@ defmodule Plausible.Stats.Time dodef format_datetime(%Date{} = date), do: Date.to_string(date)def format_datetime(%DateTime{} = datetime),- do: Timex.format!(datetime, "{YYYY}-{0M}-{0D} {h24}:{m}:{s}")+ do: Calendar.strftime(datetime, "%Y-%m-%d %H:%M:%S")# Realtime graphs return numbersdef format_datetime(other), do: otherdiff --git a/lib/plausible_web/components/billing/notice.ex b/lib/plausible_web/components/billing/notice.exindex 4856b87bea..e794c22ecf 100644--- a/lib/plausible_web/components/billing/notice.ex+++ b/lib/plausible_web/components/billing/notice.ex@@ -264,7 +264,7 @@ defmodule PlausibleWeb.Components.Billing.Notice doelse~H"""<p>- You have access to your stats until <span class="font-semibold inline"><%= Timex.format!(@user.subscription.next_bill_date, "{Mshort} {D}, {YYYY}") %></span>.+ You have access to your stats until <span class="font-semibold inline"><%= Calendar.strftime(@user.subscription.next_bill_date, "%b %-d, %Y") %></span>.<.linkclass="underline inline-block"href={Routes.billing_path(PlausibleWeb.Endpoint, :choose_plan)}diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 9218abaa50..2114a973d1 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -269,7 +269,7 @@ defmodule PlausibleWeb.Api.StatsController do"hour" ->current_date =Timex.now(site.timezone)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:00:00")+ |> Calendar.strftime("%Y-%m-%d %H:00:00")Enum.find_index(dates, &(&1 == current_date))@@ -302,7 +302,7 @@ defmodule PlausibleWeb.Api.StatsController do"minute" ->current_date =Timex.now(site.timezone)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:{0m}:00")+ |> Calendar.strftime("%Y-%m-%d %H:%M:00")Enum.find_index(dates, &(&1 == current_date))enddiff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex b5104c39f9..b2bb5eedc1 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -115,7 +115,7 @@ defmodule PlausibleWeb.StatsController doquery = Query.from(site, params)filename =- ~c"Plausible export #{params["domain"]} #{Timex.format!(query.date_range.first, "{ISOdate} ")} to #{Timex.format!(query.date_range.last, "{ISOdate} ")}.zip"+ ~c"Plausible export #{params["domain"]} #{Date.to_iso8601(query.date_range.first)} to #{Date.to_iso8601(query.date_range.last)} .zip"params = Map.merge(params, %{"limit" => "300", "csv" => "True", "detailed" => "True"})limited_params = Map.merge(params, %{"limit" => "100"})diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.exindex 17d67bcd0d..9094c79e19 100644--- a/lib/plausible_web/email.ex+++ b/lib/plausible_web/email.ex@@ -192,7 +192,7 @@ defmodule PlausibleWeb.Email doenddef yearly_renewal_notification(user) do- date = Timex.format!(user.subscription.next_bill_date, "{Mfull} {D}, {YYYY}")+ date = Calendar.strftime(user.subscription.next_bill_date, "%B %-d, %Y")priority_email()|> to(user)@@ -207,12 +207,12 @@ defmodule PlausibleWeb.Email doenddef yearly_expiration_notification(user) do- next_bill_date = Timex.format!(user.subscription.next_bill_date, "{Mfull} {D}, {YYYY}")+ next_bill_date = Calendar.strftime(user.subscription.next_bill_date, "%B %-d, %Y")accept_traffic_until =user|> Plausible.Users.accept_traffic_until()- |> Timex.format!("{Mfull} {D}, {YYYY}")+ |> Calendar.strftime("%B %-d, %Y")priority_email()|> to(user)diff --git a/lib/plausible_web/live/shields/country_rules.ex b/lib/plausible_web/live/shields/country_rules.exindex 41324ff599..5929fce53c 100644--- a/lib/plausible_web/live/shields/country_rules.ex+++ b/lib/plausible_web/live/shields/country_rules.ex@@ -241,6 +241,6 @@ defmodule PlausibleWeb.Live.Shields.CountryRules dodefp format_added_at(dt, tz) dodt|> Plausible.Timezones.to_datetime_in_timezone(tz)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:{m}:{s}")+ |> Calendar.strftime("%Y-%m-%d %H:%M:%S")endenddiff --git a/lib/plausible_web/live/shields/hostname_rules.ex b/lib/plausible_web/live/shields/hostname_rules.exindex 80065482d9..d0399b5c79 100644--- a/lib/plausible_web/live/shields/hostname_rules.ex+++ b/lib/plausible_web/live/shields/hostname_rules.ex@@ -263,7 +263,7 @@ defmodule PlausibleWeb.Live.Shields.HostnameRules dodefp format_added_at(dt, tz) dodt|> Plausible.Timezones.to_datetime_in_timezone(tz)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:{m}:{s}")+ |> Calendar.strftime("%Y-%m-%d %H:%M:%S")enddef suggest_hostnames(input, _options, site) dodiff --git a/lib/plausible_web/live/shields/ip_rules.ex b/lib/plausible_web/live/shields/ip_rules.exindex e8dc20466f..335ce25617 100644--- a/lib/plausible_web/live/shields/ip_rules.ex+++ b/lib/plausible_web/live/shields/ip_rules.ex@@ -290,6 +290,6 @@ defmodule PlausibleWeb.Live.Shields.IPRules dodefp format_added_at(dt, tz) dodt|> Plausible.Timezones.to_datetime_in_timezone(tz)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:{m}:{s}")+ |> Calendar.strftime("%Y-%m-%d %H:%M:%S")endenddiff --git a/lib/plausible_web/live/shields/page_rules.ex b/lib/plausible_web/live/shields/page_rules.exindex cd11a64847..8f4d07b90a 100644--- a/lib/plausible_web/live/shields/page_rules.ex+++ b/lib/plausible_web/live/shields/page_rules.ex@@ -255,7 +255,7 @@ defmodule PlausibleWeb.Live.Shields.PageRules dodefp format_added_at(dt, tz) dodt|> Plausible.Timezones.to_datetime_in_timezone(tz)- |> Timex.format!("{YYYY}-{0M}-{0D} {h24}:{m}:{s}")+ |> Calendar.strftime("%Y-%m-%d %H:%M:%S")enddef suggest_page_paths(input, _options, site) dodiff --git a/lib/plausible_web/mjml/templates/stats_report.mjml.eex b/lib/plausible_web/mjml/templates/stats_report.mjml.eexindex 93f969590c..2818c93307 100644--- a/lib/plausible_web/mjml/templates/stats_report.mjml.eex+++ b/lib/plausible_web/mjml/templates/stats_report.mjml.eex@@ -22,7 +22,7 @@<%= @site.domain %></mj-text><mj-text mj-class="text-sm" padding="0 25px 0 25px">- <%= @name %> Report (<%= Timex.format!(@query.date_range.last, "{D} {Mshort} {YYYY}") %>)+ <%= @name %> Report (<%= Calendar.strftime(@query.date_range.last, "%-d %b %Y") %>)</mj-text></mj-column></mj-section>diff --git a/lib/plausible_web/templates/auth/user_settings.html.heex b/lib/plausible_web/templates/auth/user_settings.html.heexindex b0f6d475fc..ac7024be92 100644--- a/lib/plausible_web/templates/auth/user_settings.html.heex+++ b/lib/plausible_web/templates/auth/user_settings.html.heex@@ -60,7 +60,7 @@<%= if @subscription && @subscription.next_bill_date && Plausible.Billing.Subscription.Status.in?(@subscription, [Plausible.Billing.Subscription.Status.active(), Plausible.Billing.Subscription.Status.past_due()]) do %><div class="py-2 text-xl font-medium dark:text-gray-100">- <%= Timex.format!(@subscription.next_bill_date, "{Mshort} {D}, {YYYY}") %>+ <%= Calendar.strftime(@subscription.next_bill_date, "%b %-d, %Y") %></div><span class="text-gray-600 dark:text-gray-400">(<%= subscription_interval(@subscription) %> billing)diff --git a/lib/plausible_web/views/auth_view.ex b/lib/plausible_web/views/auth_view.exindex bf3a72e428..1fcba86dbf 100644--- a/lib/plausible_web/views/auth_view.ex+++ b/lib/plausible_web/views/auth_view.ex@@ -32,8 +32,7 @@ defmodule PlausibleWeb.AuthView dodef format_invoices(invoice_list) doEnum.map(invoice_list, fn invoice ->%{- date:- invoice["payout_date"] |> Date.from_iso8601!() |> Timex.format!("{Mshort} {D}, {YYYY}"),+ date: invoice["payout_date"] |> Date.from_iso8601!() |> Calendar.strftime("%b %-d, %Y"),amount: (invoice["amount"] / 1) |> :erlang.float_to_binary(decimals: 2),currency: invoice["currency"] |> PlausibleWeb.BillingView.present_currency(),url: invoice["receipt_url"]diff --git a/lib/plausible_web/views/billing_view.ex b/lib/plausible_web/views/billing_view.exindex 2731dd8f9d..b343999f32 100644--- a/lib/plausible_web/views/billing_view.ex+++ b/lib/plausible_web/views/billing_view.ex@@ -3,7 +3,7 @@ defmodule PlausibleWeb.BillingView dodef present_date(date) doDate.from_iso8601!(date)- |> Timex.format!("{D} {Mshort} {YYYY}")+ |> Calendar.strftime("%-d %b %Y")enddef present_currency("USD"), do: "$"diff --git a/lib/plausible_web/views/email_view.ex b/lib/plausible_web/views/email_view.exindex e74bbe636a..1ac9a5ad4f 100644--- a/lib/plausible_web/views/email_view.ex+++ b/lib/plausible_web/views/email_view.ex@@ -13,7 +13,7 @@ defmodule PlausibleWeb.EmailView dodef greet_recipient(_), do: "Hey,"def date_format(date) do- Timex.format!(date, "{D} {Mshort} {YYYY}")+ Calendar.strftime(date, "%-d %b %Y")enddef sentry_link(trace_id, dsn \\ Sentry.Config.dsn()) dodiff --git a/lib/plausible_web/views/text_helpers.ex b/lib/plausible_web/views/text_helpers.exindex 8e0b54c457..2f8029d417 100644--- a/lib/plausible_web/views/text_helpers.ex+++ b/lib/plausible_web/views/text_helpers.ex@@ -42,6 +42,6 @@ defmodule PlausibleWeb.TextHelpers doenddef format_date(date) do- Timex.format!(date, "{Mshort} {D}, {YYYY}")+ Calendar.strftime(date, "%b %-d, %Y")endenddiff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.exindex 6b7bab38fa..918cca0d4b 100644--- a/lib/workers/send_email_report.ex+++ b/lib/workers/send_email_report.ex@@ -61,7 +61,7 @@ defmodule Plausible.Workers.SendEmailReport doTimex.now(site.timezone)|> DateTime.shift(month: -1)|> Timex.beginning_of_month()- |> Timex.format!("{ISOdate}")+ |> Date.to_iso8601()query = Query.from(site, %{"period" => "month", "date" => last_month})@@ -77,7 +77,7 @@ defmodule Plausible.Workers.SendEmailReport doenddefp put_monthly_report_name(%{query: query} = assigns) do- Map.put(assigns, :name, Timex.format!(query.date_range.first, "{Mfull}"))+ Map.put(assigns, :name, Calendar.strftime(query.date_range.first, "%B"))enddefp put_stats(%{site: site, query: query} = assigns) do