mirror of
https://github.com/iv-org/invidious.git
synced 2024-09-12 01:28:13 +02:00
HTML-escape strings to '/api/v1/auth/preferences'
This commit is contained in:
parent
da48bbf312
commit
4cf3c6a616
@ -40,10 +40,10 @@ struct Preferences
|
|||||||
begin
|
begin
|
||||||
result = [] of String
|
result = [] of String
|
||||||
value.read_array do
|
value.read_array do
|
||||||
result << value.read_string
|
result << HTML.escape(value.read_string)
|
||||||
end
|
end
|
||||||
rescue ex
|
rescue ex
|
||||||
result = [value.read_string, ""]
|
result = [HTML.escape(value.read_string), ""]
|
||||||
end
|
end
|
||||||
|
|
||||||
result
|
result
|
||||||
@ -69,11 +69,11 @@ struct Preferences
|
|||||||
node.raise "Expected scalar, not #{item.class}"
|
node.raise "Expected scalar, not #{item.class}"
|
||||||
end
|
end
|
||||||
|
|
||||||
result << item.value
|
result << HTML.escape(item.value)
|
||||||
end
|
end
|
||||||
rescue ex
|
rescue ex
|
||||||
if node.is_a?(YAML::Nodes::Scalar)
|
if node.is_a?(YAML::Nodes::Scalar)
|
||||||
result = [node.value, ""]
|
result = [HTML.escape(node.value), ""]
|
||||||
else
|
else
|
||||||
result = ["", ""]
|
result = ["", ""]
|
||||||
end
|
end
|
||||||
@ -83,6 +83,24 @@ struct Preferences
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
module EscapeString
|
||||||
|
def self.to_json(value : String, json : JSON::Builder)
|
||||||
|
json.string value
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.from_json(value : JSON::PullParser) : String
|
||||||
|
HTML.escape(value.read_string)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.to_yaml(value : String, yaml : YAML::Nodes::Builder)
|
||||||
|
yaml.scalar value
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : String
|
||||||
|
HTML.escape(node.value)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
json_mapping({
|
json_mapping({
|
||||||
annotations: {type: Bool, default: CONFIG.default_user_preferences.annotations},
|
annotations: {type: Bool, default: CONFIG.default_user_preferences.annotations},
|
||||||
annotations_subscribed: {type: Bool, default: CONFIG.default_user_preferences.annotations_subscribed},
|
annotations_subscribed: {type: Bool, default: CONFIG.default_user_preferences.annotations_subscribed},
|
||||||
@ -95,13 +113,13 @@ struct Preferences
|
|||||||
latest_only: {type: Bool, default: CONFIG.default_user_preferences.latest_only},
|
latest_only: {type: Bool, default: CONFIG.default_user_preferences.latest_only},
|
||||||
listen: {type: Bool, default: CONFIG.default_user_preferences.listen},
|
listen: {type: Bool, default: CONFIG.default_user_preferences.listen},
|
||||||
local: {type: Bool, default: CONFIG.default_user_preferences.local},
|
local: {type: Bool, default: CONFIG.default_user_preferences.local},
|
||||||
locale: {type: String, default: CONFIG.default_user_preferences.locale},
|
locale: {type: String, default: CONFIG.default_user_preferences.locale, converter: EscapeString},
|
||||||
max_results: {type: Int32, default: CONFIG.default_user_preferences.max_results},
|
max_results: {type: Int32, default: CONFIG.default_user_preferences.max_results},
|
||||||
notifications_only: {type: Bool, default: CONFIG.default_user_preferences.notifications_only},
|
notifications_only: {type: Bool, default: CONFIG.default_user_preferences.notifications_only},
|
||||||
quality: {type: String, default: CONFIG.default_user_preferences.quality},
|
quality: {type: String, default: CONFIG.default_user_preferences.quality, converter: EscapeString},
|
||||||
redirect_feed: {type: Bool, default: CONFIG.default_user_preferences.redirect_feed},
|
redirect_feed: {type: Bool, default: CONFIG.default_user_preferences.redirect_feed},
|
||||||
related_videos: {type: Bool, default: CONFIG.default_user_preferences.related_videos},
|
related_videos: {type: Bool, default: CONFIG.default_user_preferences.related_videos},
|
||||||
sort: {type: String, default: CONFIG.default_user_preferences.sort},
|
sort: {type: String, default: CONFIG.default_user_preferences.sort, converter: EscapeString},
|
||||||
speed: {type: Float32, default: CONFIG.default_user_preferences.speed},
|
speed: {type: Float32, default: CONFIG.default_user_preferences.speed},
|
||||||
thin_mode: {type: Bool, default: CONFIG.default_user_preferences.thin_mode},
|
thin_mode: {type: Bool, default: CONFIG.default_user_preferences.thin_mode},
|
||||||
unseen_only: {type: Bool, default: CONFIG.default_user_preferences.unseen_only},
|
unseen_only: {type: Bool, default: CONFIG.default_user_preferences.unseen_only},
|
||||||
|
Loading…
Reference in New Issue
Block a user