From 3679a7351feb9eb726d9f102bf5e6a8855a360e1 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 5 Feb 2020 13:51:44 +0200 Subject: [PATCH] Remove www from domain --- .../stats/modals/referrer-drilldown.js | 1 - .../controllers/api/external_controller.ex | 2 +- .../api/external_controller_test.exs | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index e0f91d599..13ad912ef 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -79,7 +79,6 @@ class ReferrerDrilldownModal extends React.Component { { this.renderReferrerName(referrer.name) } appears in {referrer.tweets.length} tweets -
{ referrer.tweets.map(this.renderTweet) } diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 6ae37ec63..1668cc16c 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -50,7 +50,7 @@ defmodule PlausibleWeb.Api.ExternalController do event_attrs = %{ name: params["name"], hostname: strip_www(uri.host), - domain: params["domain"] || strip_www(uri.host), + domain: strip_www(params["domain"]) || strip_www(uri.host), pathname: uri.path, new_visitor: params["new_visitor"], country_code: country_code, diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index c29778d8f..5adddb36d 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -61,6 +61,25 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert event.domain == "some_site.com" end + test "www. is stripped from domain", %{conn: conn} do + params = %{ + name: "custom event", + url: "http://gigride.live/", + domain: "www.some_site.com", + new_visitor: false, + uid: UUID.uuid4() + } + + conn + |> put_req_header("content-type", "text/plain") + |> post("/api/event", Jason.encode!(params)) + + pageview = Repo.one(Plausible.Event) + finalize_session(pageview.user_id) + + assert pageview.domain == "some_site.com" + end + test "www. is stripped from hostname", %{conn: conn} do params = %{ name: "pageview",