diff options
| author | TheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com> | 2020-12-07 17:03:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 17:03:57 +0000 |
| commit | 68552b6d6539792f59b901e222fc08999dcfc696 (patch) | |
| tree | c789d30dcd416f94f2b7fb2be8df70ad607e55a2 | |
| parent | 44a4cea3a267fc96792b2f98076887d2fd440c44 (diff) | |
| parent | 77c13e10ecc2bab5e9de7109514b8e0dbf79ef2a (diff) | |
| download | invidious-68552b6d6539792f59b901e222fc08999dcfc696.tar.gz invidious-68552b6d6539792f59b901e222fc08999dcfc696.tar.bz2 invidious-68552b6d6539792f59b901e222fc08999dcfc696.zip | |
Merge pull request #1544 from schwukas/fix-youtube-subscription-import
Fix youtube subscription import
| -rw-r--r-- | src/invidious.cr | 7 | ||||
| -rw-r--r-- | src/invidious/views/data_control.ecr | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 1b59025c..c4ca9c08 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -1492,9 +1492,10 @@ post "/data_control" do |env| end end when "import_youtube" - 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] + subscriptions = JSON.parse(body) + + user.subscriptions += subscriptions.as_a.compact_map do |entry| + entry["snippet"]["resourceId"]["channelId"].as_s end user.subscriptions.uniq! diff --git a/src/invidious/views/data_control.ecr b/src/invidious/views/data_control.ecr index e3edb9ea..74ccc06c 100644 --- a/src/invidious/views/data_control.ecr +++ b/src/invidious/views/data_control.ecr @@ -14,7 +14,7 @@ <div class="pure-control-group"> <label for="import_youtube"> - <a rel="noopener" target="_blank" href="https://support.google.com/youtube/answer/6224202?hl=en"> + <a rel="noopener" target="_blank" href="https://github.com/iv-org/documentation/blob/master/Export-YouTube-subscriptions.md"> <%= translate(locale, "Import YouTube subscriptions") %> </a> </label> |