diff options
| author | Matthew McGarvey <matthewmcgarvey14@gmail.com> | 2020-10-16 05:23:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-16 10:23:18 +0000 |
| commit | d571573e5219f453d371de7061dfcdeae31a567a (patch) | |
| tree | 858404609d35948aa947c28764b8e9eb227a82ec /src | |
| parent | 0f643daac60d63b6da74e01e90fb52b4dd27cfe1 (diff) | |
| download | invidious-d571573e5219f453d371de7061dfcdeae31a567a.tar.gz invidious-d571573e5219f453d371de7061dfcdeae31a567a.tar.bz2 invidious-d571573e5219f453d371de7061dfcdeae31a567a.zip | |
Set preferences before conditional breaks in before_all (#1412)
Diffstat (limited to 'src')
| -rw-r--r-- | src/invidious.cr | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 3e03628f..29a412a1 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -246,12 +246,13 @@ spawn do end before_all do |env| - begin - preferences = Preferences.from_json(env.request.cookies["PREFS"]?.try &.value || "{}") + preferences = begin + Preferences.from_json(env.request.cookies["PREFS"]?.try &.value || "{}") rescue - preferences = Preferences.from_json("{}") + Preferences.from_json("{}") end + env.set "preferences", preferences env.response.headers["X-XSS-Protection"] = "1; mode=block" env.response.headers["X-Content-Type-Options"] = "nosniff" extra_media_csp = "" @@ -298,6 +299,7 @@ before_all do |env| }, HMAC_KEY, PG_DB, 1.week) preferences = user.preferences + env.set "preferences", preferences env.set "sid", sid env.set "csrf_token", csrf_token @@ -319,6 +321,7 @@ before_all do |env| }, HMAC_KEY, PG_DB, 1.week) preferences = user.preferences + env.set "preferences", preferences env.set "sid", sid env.set "csrf_token", csrf_token @@ -336,7 +339,6 @@ before_all do |env| preferences.dark_mode = dark_mode preferences.thin_mode = thin_mode preferences.locale = locale - env.set "preferences", preferences current_page = env.request.path if env.request.query |