From fec178e717221e019a14f012deea5f2e8309ef76 Mon Sep 17 00:00:00 2001 From: ruslandoga <67764432+ruslandoga@users.noreply.github.com> Date: Thu, 23 May 2024 13:21:19 +0700 Subject: [PATCH] remove Plausible Analytics metions from CE --- Dockerfile | 2 +- assets/js/app.js | 2 + lib/plausible.ex | 10 +++++ lib/plausible/auth/totp.ex | 6 +-- lib/plausible_web/email.ex | 38 +++++++------------ lib/plausible_web/live/register_form.ex | 4 +- .../mjml/templates/stats_report.mjml.eex | 2 +- ...approaching_accept_traffic_until.html.heex | 2 +- .../templates/email/dashboard_locked.html.eex | 2 +- .../email/existing_user_invitation.html.eex | 2 +- .../templates/email/export_failure.html.eex | 2 +- .../templates/email/export_success.html.eex | 2 +- .../email/new_user_invitation.html.eex | 2 +- .../templates/email/over_limit.html.eex | 2 +- .../email/ownership_transfer_request.html.eex | 2 +- .../yearly_expiration_notification.html.eex | 2 +- .../yearly_renewal_notification.html.eex | 2 +- .../templates/layout/focus.html.heex | 8 ++-- .../templates/page/index.html.eex | 4 +- .../site/settings_search_console.html.heex | 2 +- 20 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Dockerfile b/Dockerfile index 617d10e304e24..26e75aa97d76f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,7 +63,7 @@ ENV LANG=C.UTF-8 ARG MIX_ENV=ce ENV MIX_ENV=$MIX_ENV -RUN adduser -S -H -u 999 -G nogroup plausible -g 'Plausible Analytics' +RUN adduser -S -H -u 999 -G nogroup plausible RUN apk upgrade --no-cache RUN apk add --no-cache openssl ncurses libstdc++ libgcc ca-certificates diff --git a/assets/js/app.js b/assets/js/app.js index eaad0400bf3e0..605d96947a709 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -104,6 +104,8 @@ if (embedButton) { embedLink.searchParams.set('background', background) } + // TODO + embedCode.value = `
Stats powered by Plausible Analytics
` diff --git a/lib/plausible.ex b/lib/plausible.ex index e853b470da0fa..45eef3a99593c 100644 --- a/lib/plausible.ex +++ b/lib/plausible.ex @@ -57,4 +57,14 @@ defmodule Plausible do end end end + + if Mix.env() in @ce_builds do + def product_name do + "Plausible CE" + end + else + def product_name do + "Plausible Analytics" + end + end end diff --git a/lib/plausible/auth/totp.ex b/lib/plausible/auth/totp.ex index 23529faaddf11..e12f6ebc7194d 100644 --- a/lib/plausible/auth/totp.ex +++ b/lib/plausible/auth/totp.ex @@ -88,7 +88,6 @@ defmodule Plausible.Auth.TOTP do alias Plausible.Repo alias PlausibleWeb.Email - @issuer_name "Plausible Analytics" @recovery_codes_count 10 @spec enabled?(Auth.User.t()) :: boolean() @@ -298,9 +297,8 @@ defmodule Plausible.Auth.TOTP do end defp totp_uri(user) do - NimbleTOTP.otpauth_uri("#{@issuer_name}:#{user.email}", user.totp_secret, - issuer: @issuer_name - ) + issuer_name = Plausible.product_name() + NimbleTOTP.otpauth_uri("#{issuer_name}:#{user.email}", user.totp_secret, issuer: issuer_name) end defp readable_secret(user) do diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex index ea1c4c01190c9..b6330ea20e418 100644 --- a/lib/plausible_web/email.ex +++ b/lib/plausible_web/email.ex @@ -224,7 +224,7 @@ defmodule PlausibleWeb.Email do priority_email() |> to(invitation.email) |> tag("new-user-invitation") - |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}") + |> subject("[#{Plausible.product_name()}] You've been invited to #{invitation.site.domain}") |> render("new_user_invitation.html", invitation: invitation ) @@ -234,7 +234,7 @@ defmodule PlausibleWeb.Email do priority_email() |> to(invitation.email) |> tag("existing-user-invitation") - |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}") + |> subject("[#{Plausible.product_name()}] You've been invited to #{invitation.site.domain}") |> render("existing_user_invitation.html", invitation: invitation ) @@ -244,7 +244,9 @@ defmodule PlausibleWeb.Email do priority_email() |> to(invitation.email) |> tag("ownership-transfer-request") - |> subject("[Plausible Analytics] Request to transfer ownership of #{invitation.site.domain}") + |> subject( + "[#{Plausible.product_name()}] Request to transfer ownership of #{invitation.site.domain}" + ) |> render("ownership_transfer_request.html", invitation: invitation, new_owner_account: new_owner_account @@ -256,7 +258,7 @@ defmodule PlausibleWeb.Email do |> to(invitation.inviter.email) |> tag("invitation-accepted") |> subject( - "[Plausible Analytics] #{invitation.email} accepted your invitation to #{invitation.site.domain}" + "[#{Plausible.product_name()}] #{invitation.email} accepted your invitation to #{invitation.site.domain}" ) |> render("invitation_accepted.html", user: invitation.inviter, @@ -269,7 +271,7 @@ defmodule PlausibleWeb.Email do |> to(invitation.inviter.email) |> tag("invitation-rejected") |> subject( - "[Plausible Analytics] #{invitation.email} rejected your invitation to #{invitation.site.domain}" + "[#{Plausible.product_name()}] #{invitation.email} rejected your invitation to #{invitation.site.domain}" ) |> render("invitation_rejected.html", user: invitation.inviter, @@ -282,7 +284,7 @@ defmodule PlausibleWeb.Email do |> to(invitation.inviter.email) |> tag("ownership-transfer-accepted") |> subject( - "[Plausible Analytics] #{invitation.email} accepted the ownership transfer of #{invitation.site.domain}" + "[#{Plausible.product_name()}] #{invitation.email} accepted the ownership transfer of #{invitation.site.domain}" ) |> render("ownership_transfer_accepted.html", user: invitation.inviter, @@ -295,7 +297,7 @@ defmodule PlausibleWeb.Email do |> to(invitation.inviter.email) |> tag("ownership-transfer-rejected") |> subject( - "[Plausible Analytics] #{invitation.email} rejected the ownership transfer of #{invitation.site.domain}" + "[#{Plausible.product_name()}] #{invitation.email} rejected the ownership transfer of #{invitation.site.domain}" ) |> render("ownership_transfer_rejected.html", user: invitation.inviter, @@ -307,7 +309,9 @@ defmodule PlausibleWeb.Email do priority_email() |> to(membership.user.email) |> tag("site-member-removed") - |> subject("[Plausible Analytics] Your access to #{membership.site.domain} has been revoked") + |> subject( + "[#{Plausible.product_name()}] Your access to #{membership.site.domain} has been revoked" + ) |> render("site_member_removed.html", user: membership.user, membership: membership @@ -348,13 +352,6 @@ defmodule PlausibleWeb.Email do end def export_success(user, site, expires_at) do - subject = - on_ee do - "Your Plausible Analytics export is now ready for download" - else - "Your export is now ready for download" - end - expires_in = if expires_at do Timex.Format.DateTime.Formatters.Relative.format!( @@ -373,7 +370,7 @@ defmodule PlausibleWeb.Email do priority_email() |> to(user) |> tag("export-success") - |> subject(subject) + |> subject("[#{Plausible.product_name()}] Your export is now ready for download") |> render("export_success.html", user: user, site: site, @@ -383,16 +380,9 @@ defmodule PlausibleWeb.Email do end def export_failure(user, site) do - subject = - on_ee do - "Your Plausible Analytics export has failed" - else - "Your export has failed" - end - priority_email() |> to(user) - |> subject(subject) + |> subject("[#{Plausible.product_name()}] Your export has failed") |> render("export_failure.html", user: user, site: site) end diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.ex index 422a1c447fb50..e3cae5802f0d9 100644 --- a/lib/plausible_web/live/register_form.ex +++ b/lib/plausible_web/live/register_form.ex @@ -42,7 +42,7 @@ defmodule PlausibleWeb.Live.RegisterForm do def render(%{invitation_expired: true} = assigns) do ~H"""
-

Plausible Analytics

+

<%= Plausible.product_name() %>

Lightweight and privacy-friendly web analytics
@@ -65,7 +65,7 @@ defmodule PlausibleWeb.Live.RegisterForm do

<%= if ce?() or @live_action == :register_from_invitation_form do %> - Register your Plausible Analytics account + Register your <%= Plausible.product_name() %> account <% else %> Register your 30-day free trial <% end %> diff --git a/lib/plausible_web/mjml/templates/stats_report.mjml.eex b/lib/plausible_web/mjml/templates/stats_report.mjml.eex index 5baff5a95a020..93f969590caca 100644 --- a/lib/plausible_web/mjml/templates/stats_report.mjml.eex +++ b/lib/plausible_web/mjml/templates/stats_report.mjml.eex @@ -16,7 +16,7 @@ - Plausible Analytics + <%= Plausible.product_name() %> <%= @site.domain %> diff --git a/lib/plausible_web/templates/email/approaching_accept_traffic_until.html.heex b/lib/plausible_web/templates/email/approaching_accept_traffic_until.html.heex index 88e2f71e6f442..4cb3e664f3df2 100644 --- a/lib/plausible_web/templates/email/approaching_accept_traffic_until.html.heex +++ b/lib/plausible_web/templates/email/approaching_accept_traffic_until.html.heex @@ -1,4 +1,4 @@ -You used to have an active account with Plausible Analytics, a simple, lightweight, open source and privacy-first Google Analytics alternative. +You used to have an active account with <%= Plausible.product_name() %>, a simple, lightweight, open source and privacy-first Google Analytics alternative.

We've noticed that you're still sending us stats so we're writing to inform you that we'll stop accepting stats from your sites <%= @time %>. We're an independent, bootstrapped service and we don't sell your data, so this will reduce our server costs and help keep us sustainable.

If you'd like to continue counting your site stats in a privacy-friendly way, please diff --git a/lib/plausible_web/templates/email/dashboard_locked.html.eex b/lib/plausible_web/templates/email/dashboard_locked.html.eex index 64d2dc944b3a2..342b44f590ef5 100644 --- a/lib/plausible_web/templates/email/dashboard_locked.html.eex +++ b/lib/plausible_web/templates/email/dashboard_locked.html.eex @@ -1,4 +1,4 @@ -Last week we sent a reminder that your site traffic has exceeded the limits of your Plausible Analytics subscription tier for two consecutive months. Since we haven't received a response, we've had to temporarily lock access to your stats. +Last week we sent a reminder that your site traffic has exceeded the limits of your <%= Plausible.product_name() %> subscription tier for two consecutive months. Since we haven't received a response, we've had to temporarily lock access to your stats.

Your subscription is still active, we're still counting your stats and haven't deleted any of your data but as you have outgrown your subscription tier, we kindly ask you to upgrade to match your new traffic levels. Upon upgrading to a suitable tier, your dashboard access will be immediately restored.

diff --git a/lib/plausible_web/templates/email/existing_user_invitation.html.eex b/lib/plausible_web/templates/email/existing_user_invitation.html.eex index 3bdd91a1813f6..32554a2320b9f 100644 --- a/lib/plausible_web/templates/email/existing_user_invitation.html.eex +++ b/lib/plausible_web/templates/email/existing_user_invitation.html.eex @@ -1,3 +1,3 @@ -<%= @invitation.inviter.email %> has invited you to the <%= @invitation.site.domain %> site on Plausible Analytics. +<%= @invitation.inviter.email %> has invited you to the <%= @invitation.site.domain %> site on <%= Plausible.product_name() %>. <%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation. The invitation will expire 48 hours after this email is sent. diff --git a/lib/plausible_web/templates/email/export_failure.html.eex b/lib/plausible_web/templates/email/export_failure.html.eex index f4163bbfe3b6f..fc58418bf1e3a 100644 --- a/lib/plausible_web/templates/email/export_failure.html.eex +++ b/lib/plausible_web/templates/email/export_failure.html.eex @@ -1,4 +1,4 @@ -Your <%= if ee?() do %>Plausible Analytics <% end %>export for <%= @site.domain %> has encountered an error and was unsuccessful. +Your <%= Plausible.product_name() %> export for <%= @site.domain %> has encountered an error and was unsuccessful. Sorry for the trouble this may have caused.

Please attempt to export your data again. diff --git a/lib/plausible_web/templates/email/export_success.html.eex b/lib/plausible_web/templates/email/export_success.html.eex index 541a0e11b5c79..636bed8e6da2d 100644 --- a/lib/plausible_web/templates/email/export_success.html.eex +++ b/lib/plausible_web/templates/email/export_success.html.eex @@ -1,3 +1,3 @@ -Your <%= if ee?() do %>Plausible Analytics <% end %>export for <%= @site.domain %> is now ready for download. +Your <%= Plausible.product_name() %> export for <%= @site.domain %> is now ready for download. Please click here to start the download process. <%= if @expires_in do %>Note that this link will expire <%= @expires_in %>.<% end %> diff --git a/lib/plausible_web/templates/email/new_user_invitation.html.eex b/lib/plausible_web/templates/email/new_user_invitation.html.eex index ffef74616441e..3bb9c59cd3f6f 100644 --- a/lib/plausible_web/templates/email/new_user_invitation.html.eex +++ b/lib/plausible_web/templates/email/new_user_invitation.html.eex @@ -1,4 +1,4 @@ -<%= @invitation.inviter.email %> has invited you to join the <%= @invitation.site.domain %> site on Plausible Analytics. +<%= @invitation.inviter.email %> has invited you to join the <%= @invitation.site.domain %> site on <%= Plausible.product_name() %>. <%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_from_invitation_form, @invitation.invitation_id)) %> to create your account. The link is valid for 48 hours after this email is sent.

Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors. diff --git a/lib/plausible_web/templates/email/over_limit.html.eex b/lib/plausible_web/templates/email/over_limit.html.eex index 3ac2dc440125a..ad0a929c74321 100644 --- a/lib/plausible_web/templates/email/over_limit.html.eex +++ b/lib/plausible_web/templates/email/over_limit.html.eex @@ -1,4 +1,4 @@ -Thanks for being a Plausible Analytics subscriber! +Thanks for being a <%= Plausible.product_name() %> subscriber!

This is a friendly reminder that your traffic has exceeded your subscription tier for two consecutive months. Congrats on all that traffic!

diff --git a/lib/plausible_web/templates/email/ownership_transfer_request.html.eex b/lib/plausible_web/templates/email/ownership_transfer_request.html.eex index 13ce240f52666..4da4185a4aa49 100644 --- a/lib/plausible_web/templates/email/ownership_transfer_request.html.eex +++ b/lib/plausible_web/templates/email/ownership_transfer_request.html.eex @@ -1,4 +1,4 @@ -<%= @invitation.inviter.email %> has requested to transfer the ownership of <%= @invitation.site.domain %> site on Plausible Analytics to you. +<%= @invitation.inviter.email %> has requested to transfer the ownership of <%= @invitation.site.domain %> site on <%= Plausible.product_name() %> to you. <%= if @new_owner_account do %> <%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation. <% else %> diff --git a/lib/plausible_web/templates/email/yearly_expiration_notification.html.eex b/lib/plausible_web/templates/email/yearly_expiration_notification.html.eex index 403663b18dc19..c2aaeafcac7b1 100644 --- a/lib/plausible_web/templates/email/yearly_expiration_notification.html.eex +++ b/lib/plausible_web/templates/email/yearly_expiration_notification.html.eex @@ -1,4 +1,4 @@ -Time flies! This is a reminder that your annual subscription for Plausible Analytics will expire on <%= @next_bill_date %>. +Time flies! This is a reminder that your annual subscription for <%= Plausible.product_name() %> will expire on <%= @next_bill_date %>.

You need to <%= link("renew your subscription", to: PlausibleWeb.Router.Helpers.billing_url(PlausibleWeb.Endpoint, :choose_plan)) %> if you want to continue using Plausible to count your website stats in a privacy-friendly way.

diff --git a/lib/plausible_web/templates/email/yearly_renewal_notification.html.eex b/lib/plausible_web/templates/email/yearly_renewal_notification.html.eex index 220a34313d11b..01fb4be765594 100644 --- a/lib/plausible_web/templates/email/yearly_renewal_notification.html.eex +++ b/lib/plausible_web/templates/email/yearly_renewal_notification.html.eex @@ -1,4 +1,4 @@ -Time flies! This is a reminder that your annual subscription for Plausible Analytics is due to renew on <%= @date %>. We will automatically charge <%= PlausibleWeb.BillingView.present_currency(@currency) %><%= @next_bill_amount %> from your preferred billing method. +Time flies! This is a reminder that your annual subscription for <%= Plausible.product_name() %> is due to renew on <%= @date %>. We will automatically charge <%= PlausibleWeb.BillingView.present_currency(@currency) %><%= @next_bill_amount %> from your preferred billing method.

There's no action required if you're happy to continue using Plausible to count your website stats in a privacy-friendly way.

diff --git a/lib/plausible_web/templates/layout/focus.html.heex b/lib/plausible_web/templates/layout/focus.html.heex index 560ad17f51395..9adcb81e03b6b 100644 --- a/lib/plausible_web/templates/layout/focus.html.heex +++ b/lib/plausible_web/templates/layout/focus.html.heex @@ -47,9 +47,11 @@ <% end %> <%= @inner_content %> -

- © <%= DateTime.utc_now().year() %> Plausible Analytics. All rights reserved. -

+ <%= if ee?() do %> +

+ © <%= DateTime.utc_now().year() %> Plausible Analytics. All rights reserved. +

+ <% end %> diff --git a/lib/plausible_web/templates/page/index.html.eex b/lib/plausible_web/templates/page/index.html.eex index 9d2b0d79813c4..b238a92e0c03f 100644 --- a/lib/plausible_web/templates/page/index.html.eex +++ b/lib/plausible_web/templates/page/index.html.eex @@ -1,9 +1,9 @@

- Welcome to Plausible Analytics! + Welcome to <%= Plausible.product_name() %>!

- Plausible Analytics is a simple, open source, lightweight (< 1 KB) and privacy-friendly alternative to Google Analytics. We're completely independent and solely funded by our 10,000+ paying subscribers. Read more about us. + <%= Plausible.product_name() %> is a simple, open source, lightweight (< 1 KB) and privacy-friendly alternative to Google Analytics. We're completely independent and solely funded by our 10,000+ paying subscribers. Read more about us.

  • diff --git a/lib/plausible_web/templates/site/settings_search_console.html.heex b/lib/plausible_web/templates/site/settings_search_console.html.heex index 480da73282747..3a38219f61209 100644 --- a/lib/plausible_web/templates/site/settings_search_console.html.heex +++ b/lib/plausible_web/templates/site/settings_search_console.html.heex @@ -116,7 +116,7 @@

    - An extra step is needed to set up your Plausible Analytics Self Hosted for the Google Search Console integration. + An extra step is needed to set up your <%= Plausible.product_name() %> for the Google Search Console integration. Find instructions <%= link("here", to: "https://plausible.io/docs/self-hosting-configuration#google-search-integration", class: "text-indigo-500"