Default to empty pathname

pull/68/head
Uku Taht 7 years ago
parent 0524ac92c2
commit a228c6162f

@ -51,7 +51,7 @@ defmodule PlausibleWeb.Api.ExternalController do
name: params["name"],
hostname: strip_www(uri && uri.host),
domain: strip_www(params["domain"]) || strip_www(uri && uri.host),
pathname: uri && escape_quote(uri.path),
pathname: uri && (uri.path || "/"),
country_code: country_code,
fingerprint: calculate_fingerprint(conn, params),
operating_system: ua && os_name(ua),
@ -160,8 +160,6 @@ defmodule PlausibleWeb.Api.ExternalController do
end
end
defp escape_quote(s), do: String.replace(s, "'", "''")
defp clean_uri(uri) do
uri = URI.parse(String.trim(uri))
if uri.scheme in ["http", "https"] do

@ -1,16 +1,10 @@
defmodule PlausibleWeb.ErrorView do
use PlausibleWeb, :view
def render("500.json", assigns) do
message = if assigns[:reason] do
assigns[:reason].message
else
"Something went wrong"
end
def render("500.json", _assigns) do
%{
status: 500,
message: message
message: "Server error"
}
end

@ -80,9 +80,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
test "www. is stripped from hostname", %{conn: conn} do
params = %{
name: "pageview",
url: "http://www.example.com/",
uid: UUID.uuid4(),
new_visitor: true
url: "http://www.example.com/"
}
conn
@ -95,6 +93,22 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.hostname == "example.com"
end
test "empty path defaults to /", %{conn: conn} do
params = %{
name: "pageview",
url: "http://www.example.com"
}
conn
|> put_req_header("content-type", "text/plain")
|> post("/api/event", Jason.encode!(params))
pageview = Repo.one(Plausible.Event)
finalize_session(pageview.fingerprint)
assert pageview.pathname == "/"
end
test "bots and crawlers are ignored", %{conn: conn} do
params = %{
name: "pageview",

Loading…
Cancel
Save