From 17cf0772fb9ab483391942a33fec6e71aa25128d Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Sun, 3 Mar 2019 11:55:14 -0600
Subject: [PATCH] Set domain to be nil by default

---
 config/config.yml              | 2 +-
 src/invidious.cr               | 4 ++--
 src/invidious/helpers/utils.cr | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index f981a398..c6f8420a 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -10,4 +10,4 @@ db:
   dbname: invidious
 full_refresh: false
 https_only: false
-domain: invidio.us
+domain:
diff --git a/src/invidious.cr b/src/invidious.cr
index d9b88a0c..88f258c6 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -1056,7 +1056,7 @@ post "/login" do |env|
         end
 
         if config.domain
-          env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", domain: ".#{config.domain}", value: sid, expires: Time.now + 2.years,
+          env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", domain: "#{config.domain}", value: sid, expires: Time.now + 2.years,
             secure: secure, http_only: true)
         else
           env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", value: sid, expires: Time.now + 2.years,
@@ -1118,7 +1118,7 @@ post "/login" do |env|
       end
 
       if config.domain
-        env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", domain: ".#{config.domain}", value: sid, expires: Time.now + 2.years,
+        env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", domain: "#{config.domain}", value: sid, expires: Time.now + 2.years,
           secure: secure, http_only: true)
       else
         env.response.cookies["SID"] = HTTP::Cookie.new(name: "SID", value: sid, expires: Time.now + 2.years,
diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index f5838622..5ccc1009 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -200,7 +200,12 @@ def make_host_url(ssl, host)
     scheme = "http://"
   end
 
-  return "#{scheme}#{host}"
+  if host
+    host = host.lchop(".")
+    return "#{scheme}#{host}"
+  else
+    return ""
+  end
 end
 
 def get_referer(env, fallback = "/")