Merge pull request #1829 from SimonPhoenix96/xml-json-yt-sub-import

integrate legacy yt xml subscription import with new json sub import

1 files changed, 14 insertions, 8 deletions

diff --git a/src/invidious.cr b/src/invidious.cr
index cb2bb5fe..6d0238a1 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -751,10 +751,16 @@ post "/data_control" do |env|
           end
         end
       when "import_youtube"
-        subscriptions = JSON.parse(body)
-
-        user.subscriptions += subscriptions.as_a.compact_map do |entry|
-          entry["snippet"]["resourceId"]["channelId"].as_s
+        if body[0..4] == "<opml"
+          subscriptions = XML.parse(body)
+          user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel|
+            channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0]
+          end
+        else
+          subscriptions = JSON.parse(body)
+          user.subscriptions += subscriptions.as_a.compact_map do |entry|
+            entry["snippet"]["resourceId"]["channelId"].as_s
+          end
         end
         user.subscriptions.uniq!
 
@@ -1548,12 +1554,12 @@ post "/feed/webhook/:token" do |env|
         views:              video.views,
       })
 
-      was_insert = PG_DB.query_one("INSERT INTO channel_videos VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) \
-        ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
-        updated = $4, ucid = $5, author = $6, length_seconds = $7, \
+      was_insert = PG_DB.query_one("INSERT INTO channel_videos VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+        ON CONFLICT (id) DO UPDATE SET title = $2, published = $3,
+        updated = $4, ucid = $5, author = $6, length_seconds = $7,
         live_now = $8, premiere_timestamp = $9, views = $10 returning (xmax=0) as was_insert", *video.to_tuple, as: Bool)
 
-      PG_DB.exec("UPDATE users SET notifications = array_append(notifications, $1), \
+      PG_DB.exec("UPDATE users SET notifications = array_append(notifications, $1),
         feed_needs_update = true WHERE $2 = ANY(subscriptions)", video.id, video.ucid) if was_insert
     end
   end