Invidious is an alternative front-end to YouTube
feat: Add support for POST requests on searches for privacy (#5551)
Fijxu8ef5ea03d45c
diff --git a/assets/css/default.css b/assets/css/default.cssindex ff07bdb4..726a4c37 100644--- a/assets/css/default.css+++ b/assets/css/default.css@@ -902,4 +902,11 @@ h1, h2, h3, h4, h5, p,.error-issue-template {padding: 20px;background: rgba(0, 0, 0, 0.12345);+}++.preference-description {+ width: 250px;+ padding-left: 10px;+ display: inline-block;+ vertical-align: top;}\ No newline at end of filediff --git a/locales/en-US.json b/locales/en-US.jsonindex 5b2ef8d0..d05c0d16 100644--- a/locales/en-US.json+++ b/locales/en-US.json@@ -124,6 +124,8 @@"preferences_sort_label": "Sort videos by: ","preferences_default_playlist": "Default playlist: ","preferences_default_playlist_none": "No default playlist set",+ "preferences_search_privacy_label": "Search privacy: ",+ "preferences_search_privacy_description": "Enabling this preference will prevent your search queries from being saved in your browser history.","published": "published","published - reverse": "published - reverse","alphabetically": "alphabetically",diff --git a/src/invidious/config.cr b/src/invidious/config.crindex 7853d9a3..914d828c 100644--- a/src/invidious/config.cr+++ b/src/invidious/config.cr@@ -54,6 +54,7 @@ struct ConfigPreferencesproperty save_player_pos : Bool = false@[YAML::Field(ignore: true)]property default_playlist : String? = nil+ property search_privacy : Bool = falsedef to_tuple{% begin %}diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.crindex d9fad1b1..a2108b9b 100644--- a/src/invidious/routes/preferences.cr+++ b/src/invidious/routes/preferences.cr@@ -145,6 +145,10 @@ module Invidious::Routes::PreferencesRoutedefault_playlist = env.params.body["default_playlist"]?.try &.as(String)+ search_privacy = env.params.body["search_privacy"]?.try &.as(String)+ search_privacy ||= "off"+ search_privacy = search_privacy == "on"+# Convert to JSON and back again to take advantage of converters used for compatibilitypreferences = Preferences.from_json({annotations: annotations,@@ -182,6 +186,7 @@ module Invidious::Routes::PreferencesRouteshow_nick: show_nick,save_player_pos: save_player_pos,default_playlist: default_playlist,+ search_privacy: search_privacy,}.to_json)if user = env.get? "user"diff --git a/src/invidious/routes/search.cr b/src/invidious/routes/search.crindex 11e6f171..968a5554 100644--- a/src/invidious/routes/search.cr+++ b/src/invidious/routes/search.cr@@ -40,9 +40,16 @@ module Invidious::Routes::Searchpreferences = env.get("preferences").as(Preferences)locale = preferences.locale- region = env.params.query["region"]? || preferences.region+ uri_params = URI::Params.new+ if env.request.method == "GET"+ uri_params = env.params.query+ else+ uri_params = env.params.body+ end++ region = uri_params["region"]? || preferences.region- query = Invidious::Search::Query.new(env.params.query, :regular, region)+ query = Invidious::Search::Query.new(uri_params, :regular, region)if query.empty?# Display the full page search box implemented in #1977diff --git a/src/invidious/routing.cr b/src/invidious/routing.crindex a4ed1f57..12bf5459 100644--- a/src/invidious/routing.cr+++ b/src/invidious/routing.cr@@ -185,6 +185,7 @@ module Invidious::Routingget "/opensearch.xml", Routes::Search, :opensearchget "/results", Routes::Search, :resultsget "/search", Routes::Search, :search+ post "/search", Routes::Search, :searchget "/hashtag/:hashtag", Routes::Search, :hashtagenddiff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.crindex df195dd6..ad4a9bc7 100644--- a/src/invidious/user/preferences.cr+++ b/src/invidious/user/preferences.cr@@ -57,6 +57,7 @@ struct Preferencesproperty volume : Int32 = CONFIG.default_user_preferences.volumeproperty save_player_pos : Bool = CONFIG.default_user_preferences.save_player_posproperty default_playlist : String? = nil+ property search_privacy : Bool = CONFIG.default_user_preferences.search_privacymodule BoolToStringdef self.to_json(value : String, json : JSON::Builder)diff --git a/src/invidious/views/components/search_box.ecr b/src/invidious/views/components/search_box.ecrindex f957c25c..1a14475a 100644--- a/src/invidious/views/components/search_box.ecr+++ b/src/invidious/views/components/search_box.ecr@@ -1,4 +1,12 @@+<%+ search_privacy = preferences.search_privacy+%>++<% if search_privacy %>+<form class="pure-form" action="/search" method="post">+<% else %><form class="pure-form" action="/search" method="get">+<% end %><fieldset><input type="search" id="searchbox" autocorrect="off"autocapitalize="none" spellcheck="false" <% if autofocus %>autofocus<% end %>diff --git a/src/invidious/views/search.ecr b/src/invidious/views/search.ecrindex 2ffe27a1..ff0ced66 100644--- a/src/invidious/views/search.ecr+++ b/src/invidious/views/search.ecr@@ -1,5 +1,10 @@+<%+ search_privacy = preferences.search_privacy+ search_query = query.text.size > 30 ? HTML.escape(query.text[0,30].rstrip(".")) + "…" : HTML.escape(query.text)+%>+<% content_for "header" do %>-<title><%= query.text.size > 30 ? HTML.escape(query.text[0,30].rstrip(".")) + "…" : HTML.escape(query.text) %> - Invidious</title>+<title><%= search_privacy ? "Search" : search_query %> - Invidious</title><link rel="stylesheet" href="/css/search.css?v=<%= ASSET_COMMIT %>"><% end %>diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecrindex 703423c0..aa2e0a7b 100644--- a/src/invidious/views/user/preferences.ecr+++ b/src/invidious/views/user/preferences.ecr@@ -221,6 +221,12 @@<input name="automatic_instance_redirect" id="automatic_instance_redirect" type="checkbox" <% if preferences.automatic_instance_redirect %>checked<% end %>></div>+ <div class="pure-control-group">+ <label for="search_privacy"><%= translate(locale, "preferences_search_privacy_label") %></label>+ <input name="search_privacy" id="search_privacy" type="checkbox" <% if preferences.search_privacy %>checked<% end %>>+ <span class="preference-description"><%= translate(locale, "preferences_search_privacy_description") %></span>+ </div>+<% if env.get? "user" %><legend><%= I18n.translate(locale, "preferences_category_subscription") %></legend>