Fix bug with screen size

pull/10/head
Uku Taht 7 years ago
parent 05cb042278
commit d2855210de

@ -58,7 +58,7 @@
uid: uid,
user_agent: window.navigator.userAgent,
referrer: window.document.referrer,
screenWidth: window.innerWidth
screen_width: window.innerWidth
}));
request.onreadystatechange = function() {

@ -58,7 +58,7 @@
uid: uid,
user_agent: window.navigator.userAgent,
referrer: window.document.referrer,
screenWidth: window.innerWidth
screen_width: window.innerWidth
}));
request.onreadystatechange = function() {

@ -63,11 +63,11 @@ defmodule PlausibleWeb.Api.ExternalController do
end
end
defp calculate_screen_size(nil) , do: nil
defp calculate_screen_size(width) when width < 576, do: "Mobile"
defp calculate_screen_size(width) when width < 992, do: "Tablet"
defp calculate_screen_size(width) when width < 1440, do: "Laptop"
defp calculate_screen_size(width) when width >= 1440, do: "Desktop"
defp calculate_screen_size(_) , do: nil
defp clean_referrer(referrer) do
uri = if referrer do

@ -285,4 +285,22 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert response(conn, 202) == ""
assert pageview.screen_size == "Mobile"
end
test "screen size is nil if screen_width is missing", %{conn: conn} do
params = %{
url: "http://gigride.live/",
new_visitor: true,
uid: UUID.uuid4()
}
conn = conn
|> put_req_header("content-type", "text/plain")
|> put_req_header("user-agent", @user_agent)
|> post("/api/page", Jason.encode!(params))
pageview = Repo.one(Plausible.Pageview)
assert response(conn, 202) == ""
assert pageview.screen_size == nil
end
end

Loading…
Cancel
Save