Update formatting and default feed menu

This commit is contained in:
Omar Roth 2019-03-04 10:46:58 -06:00
parent 004fb96b2f
commit aa63c3f70e
2 changed files with 4 additions and 4 deletions

View File

@ -2319,7 +2319,7 @@ get "/feed/playlist/:plid" do |env|
document document
end end
# Add support for subscribing to channels via PubSubHubbub # Support push notifications via PubSubHubbub
get "/feed/webhook/:token" do |env| get "/feed/webhook/:token" do |env|
verify_token = env.params.url["token"] verify_token = env.params.url["token"]
@ -2363,11 +2363,11 @@ post "/feed/webhook/:token" do |env|
rss.xpath_nodes("//feed/entry").each do |entry| rss.xpath_nodes("//feed/entry").each do |entry|
id = entry.xpath_node("videoid").not_nil!.content id = entry.xpath_node("videoid").not_nil!.content
video = get_video(id, PG_DB, proxies) video = get_video(id, PG_DB, proxies, region: nil)
video = ChannelVideo.new(id, video.title, video.published, Time.now, video.ucid, video.author, video.length_seconds) video = ChannelVideo.new(id, video.title, video.published, Time.now, video.ucid, video.author, video.length_seconds)
PG_DB.exec("UPDATE users SET notifications = notifications || $1 \ PG_DB.exec("UPDATE users SET notifications = notifications || $1 \
WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, video.ucid) WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, video.ucid)
video_array = video.to_a video_array = video.to_a
args = arg_array(video_array) args = arg_array(video_array)

View File

@ -17,7 +17,7 @@ user: String,
domain: String?, # Domain to be used for links to resources on the site where an absolute URL is required domain: String?, # Domain to be used for links to resources on the site where an absolute URL is required
use_pubsub_feeds: {type: Bool, default: false}, # Subscribe to channels using PubSubHubbub (requires domain, hmac_key) use_pubsub_feeds: {type: Bool, default: false}, # Subscribe to channels using PubSubHubbub (requires domain, hmac_key)
default_home: {type: String, default: "Top"}, default_home: {type: String, default: "Top"},
feed_menu: {type: Array(String), default: ["Popular", "Top", "Trending"]}, feed_menu: {type: Array(String), default: ["Popular", "Top", "Trending", "Subscriptions"]},
top_enabled: {type: Bool, default: true}, top_enabled: {type: Bool, default: true},
captcha_enabled: {type: Bool, default: true}, captcha_enabled: {type: Bool, default: true},
login_enabled: {type: Bool, default: true}, login_enabled: {type: Bool, default: true},