Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Only show db-ip notice when relevant

Uku Tahteeaefc1ad056
diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js
index 4490c98b71..b5d45aff67 100644
--- a/assets/js/dashboard/mount.js
+++ b/assets/js/dashboard/mount.js
@@ -16,7 +16,7 @@ if (container) {
statsBegin: container.dataset.statsBegin,
embedded: container.dataset.embedded,
background: container.dataset.background,
- selfhosted: container.dataset.selfhosted === 'true',
+ isDbip: container.dataset.isDbip === 'true',
flags: JSON.parse(container.dataset.flags)
}
diff --git a/assets/js/dashboard/stats/locations/map.js b/assets/js/dashboard/stats/locations/map.js
index c9de680b05..ddae985867 100644
--- a/assets/js/dashboard/stats/locations/map.js
+++ b/assets/js/dashboard/stats/locations/map.js
@@ -128,7 +128,7 @@ class Countries extends React.Component {
}
geolocationDbNotice() {
- if (this.props.site.selfhosted) {
+ if (this.props.site.isDbip) {
return (
<span className="text-xs text-gray-500 absolute bottom-4 right-3">IP Geolocation by <a target="_blank" href="https://db-ip.com" rel="noreferrer" className="text-indigo-600">DB-IP</a></span>
)
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index a55901c67d..835568fa41 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -26,7 +26,8 @@ defmodule PlausibleWeb.StatsController do
title: "Plausible · " <> site.domain,
offer_email_report: offer_email_report,
demo: demo,
- flags: get_flags(conn.assigns[:current_user])
+ flags: get_flags(conn.assigns[:current_user]),
+ is_dbip: is_dbip()
)
!stats_start_date && can_see_stats ->
@@ -215,4 +216,16 @@ defmodule PlausibleWeb.StatsController do
custom_dimension_filter: FunWithFlags.enabled?(:custom_dimension_filter, for: user)
}
end
+
+ defp is_dbip() do
+ if Application.get_env(:plausible, :is_selfhost) do
+ case Geolix.metadata([:geolocation]) do
+ %{geolocation: %{database_type: type}} ->
+ String.starts_with?(type, "DBIP")
+
+ _ ->
+ false
+ end
+ end
+ end
end
diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex
index e8b05bb228..7c22aaf02a 100644
--- a/lib/plausible_web/templates/stats/stats.html.eex
+++ b/lib/plausible_web/templates/stats/stats.html.eex
@@ -12,7 +12,7 @@
<% end %>
<div class="pt-6"></div>
- <div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-stats-begin="<%= @stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>" data-flags="<%= Jason.encode!(@flags) %>"></div>
+ <div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-stats-begin="<%= @stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-is-dbip="<%= @is_dbip %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>" data-flags="<%= Jason.encode!(@flags) %>"></div>
<div id="modal_root"></div>
<%= if [email protected][:current_user] && @conn.assigns[:demo] do %>
<div class="bg-gray-50 dark:bg-gray-850">