From 29f717b651f13a8c941edb548a5e9e7c51071398 Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 18 Nov 2021 06:15:39 +0000 Subject: [PATCH] Convert video recommendation from legacy (#274) Co-authored-by: Daniel Nathan Gray --- _data/nav/2_providers.yml | 4 +-- _data/nav/3_software.yml | 4 +++ _data/software/video-streaming/1_freetube.yml | 21 ++++++++++++++ _data/software/video-streaming/2_lbry.yml | 26 ++++++++++++++++++ _data/software/video-streaming/3_newpipe.yml | 16 +++++++++++ .../legacy/sections/decentralized-video.html | 14 ---------- .../legacy/sections/video-frontends.html | 15 ---------- assets/img/legacy_svg/3rd-party/invidious.svg | 1 - assets/img/legacy_svg/3rd-party/peertube.svg | 1 - assets/img/video-streaming/freetube.png | Bin 0 -> 5342 bytes assets/img/video-streaming/lbry.svg | 2 ++ assets/img/video-streaming/newpipe.svg | 2 ++ collections/_evergreen/video-streaming.html | 14 ++++++++++ legacy_pages/providers/video.html | 10 ------- legacy_pages/software.html | 2 +- 15 files changed, 88 insertions(+), 44 deletions(-) create mode 100644 _data/software/video-streaming/1_freetube.yml create mode 100644 _data/software/video-streaming/2_lbry.yml create mode 100644 _data/software/video-streaming/3_newpipe.yml delete mode 100644 _includes/legacy/sections/decentralized-video.html delete mode 100644 _includes/legacy/sections/video-frontends.html delete mode 100644 assets/img/legacy_svg/3rd-party/invidious.svg delete mode 100644 assets/img/legacy_svg/3rd-party/peertube.svg create mode 100644 assets/img/video-streaming/freetube.png create mode 100644 assets/img/video-streaming/lbry.svg create mode 100644 assets/img/video-streaming/newpipe.svg create mode 100644 collections/_evergreen/video-streaming.html delete mode 100644 legacy_pages/providers/video.html diff --git a/_data/nav/2_providers.yml b/_data/nav/2_providers.yml index b52f7df7..11cdfe9b 100644 --- a/_data/nav/2_providers.yml +++ b/_data/nav/2_providers.yml @@ -28,8 +28,8 @@ items: - type: link title: Video Platforms icon: fad fa-file-video - file: legacy_pages/providers/video.html + file: _evergreen/video-streaming.html - type: link title: VPN Services icon: fad fa-network-wired - file: legacy_pages/providers/vpn.html \ No newline at end of file + file: legacy_pages/providers/vpn.html diff --git a/_data/nav/3_software.yml b/_data/nav/3_software.yml index 1a8d704b..4d56634b 100644 --- a/_data/nav/3_software.yml +++ b/_data/nav/3_software.yml @@ -52,3 +52,7 @@ items: title: Self-Contained Networks icon: fad fa-chart-network file: legacy_pages/software/networks.html + - type: link + title: Video Streaming + icon: fab fa-youtube + file: _evergreen/video-streaming.html diff --git a/_data/software/video-streaming/1_freetube.yml b/_data/software/video-streaming/1_freetube.yml new file mode 100644 index 00000000..28446a88 --- /dev/null +++ b/_data/software/video-streaming/1_freetube.yml @@ -0,0 +1,21 @@ +title: FreeTube +type: Recommendation +logo: /assets/img/video-streaming/freetube.png +description: | + FreeTube is a free and open source desktop application for YouTube. Your subscription list and playlists are saved locally on your device. + + FreeTube features SponsorBlock to help you skip sponsored advertisement, and all Youtube advertisements are blocked by default as well. + +

Notes

+ Your IP address is visible to YouTube, Invidious and SponsorBlock instances that you use. Consider using a VPN if this is in your threat model. +website: 'https://freetubeapp.io/' +privacy_policy: 'https://freetubeapp.io/privacy.php' +downloads: + - icon: fab fa-windows + url: 'https://freetubeapp.io/#download' + - icon: fab fa-apple + url: 'https://freetubeapp.io/#download' + - icon: fab fa-linux + url: 'https://freetubeapp.io/#download' + - icon: fab fa-github + url: 'https://github.com/FreeTubeApp/FreeTube/issues' diff --git a/_data/software/video-streaming/2_lbry.yml b/_data/software/video-streaming/2_lbry.yml new file mode 100644 index 00000000..6bd9bf52 --- /dev/null +++ b/_data/software/video-streaming/2_lbry.yml @@ -0,0 +1,26 @@ +title: LBRY +type: Recommendation +logo: /assets/img/video-streaming/lbry.svg +description: | + The LBRY network is a decentralized video sharing network. It uses a Torrent like network to store the video content, and a blockchain to store the indexes for those videos. The main advantage of such design is it's censorship resistance. + + The LBRY desktop client helps you stream videos from the LBRY network, and stores your subscription list in your own LBRY wallet. + +

Notes

+ We recommend against synchronizing your wallet with LBRY Inc. at the moment, as synchronizing encrypted wallets is not supported yet. If you synchronize your wallet with LBRY Inc., you have to trust them to not look at your subscription list, LBC funds, or take control of your channel. + + Only the LBRY desktop client is recommended. Odysee and the F-Droid, Play Store, IOS clients have mandatory synchronization and telemetry. + + While watching and hosting videos, your IP address is visible to the LBRY network. Consider using a VPN if this is in your threat model. You could also disable Save hosting data to help the LBRY network option (⚙️ Settings → Advanced Settings) to avoid exposing your IP and watched videos for a prolonged period of time. + +website: 'https://lbry.com/' +privacy_policy: 'https://lbry.com/privacypolicy' +downloads: + - icon: fab fa-windows + url: 'https://lbry.com/get' + - icon: fab fa-apple + url: 'https://lbry.com/osx' + - icon: fab fa-linux + url: 'https://lbry.com/linux' + - icon: fab fa-github + url: 'https://github.com/lbryio' diff --git a/_data/software/video-streaming/3_newpipe.yml b/_data/software/video-streaming/3_newpipe.yml new file mode 100644 index 00000000..3452ba00 --- /dev/null +++ b/_data/software/video-streaming/3_newpipe.yml @@ -0,0 +1,16 @@ +title: NewPipe +type: Recommendation +logo: /assets/img/video-streaming/newpipe.svg +description: | + NewPipe is a free and open source Android application for YouTube, SoundCloud, media.ccc.de, FramaTube, Bandcamp. + All of your subscription list and playlists are saved locally on your Android device. + +

Notes

+ While NewPipe is available on F-Droid's main repository, we recommend that you use the NewPipe project's own F-Droid repository instead to get faster updates and avoid breakages due to changes in Youtube's API. +website: 'https://newpipe.net/' +privacy_policy: 'https://newpipe.net/legal/privacy/' +downloads: + - icon: fab fa-android + url: 'https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/' + - icon: fab fa-github + url: 'https://github.com/TeamNewPipe/NewPipe/' diff --git a/_includes/legacy/sections/decentralized-video.html b/_includes/legacy/sections/decentralized-video.html deleted file mode 100644 index 5f4b8b40..00000000 --- a/_includes/legacy/sections/decentralized-video.html +++ /dev/null @@ -1,14 +0,0 @@ -

Decentralized Video Platforms

- - - -{% include legacy/cardv2.html - title="PeerTube" - image="/assets/img/legacy_svg/3rd-party/peertube.svg" - description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times.' - website="https://joinpeertube.org" - github="https://github.com/Chocobozzz/PeerTube" - web="https://joinpeertube.org/#what-is-peertube" -%} diff --git a/_includes/legacy/sections/video-frontends.html b/_includes/legacy/sections/video-frontends.html deleted file mode 100644 index 09bd5962..00000000 --- a/_includes/legacy/sections/video-frontends.html +++ /dev/null @@ -1,15 +0,0 @@ -

Frontends and Proxies

- - - -{% include legacy/cardv2.html - title="Invidious" - image="/assets/img/legacy_svg/3rd-party/invidious.svg" - description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.' - labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/iv-org/documentation/blob/master/Always-use-%22local%22-to-proxy-video-through-the-server-without-creating-an-account.md::text==Warning::tooltip==By default, Invidious will not proxy videos through the instance's proxy." - website="https://invidious.io" - github="https://github.com/iv-org/invidious" - web="https://instances.invidious.io" -%} diff --git a/assets/img/legacy_svg/3rd-party/invidious.svg b/assets/img/legacy_svg/3rd-party/invidious.svg deleted file mode 100644 index 1e1c6d2d..00000000 --- a/assets/img/legacy_svg/3rd-party/invidious.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/img/legacy_svg/3rd-party/peertube.svg b/assets/img/legacy_svg/3rd-party/peertube.svg deleted file mode 100644 index b749f75f..00000000 --- a/assets/img/legacy_svg/3rd-party/peertube.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/img/video-streaming/freetube.png b/assets/img/video-streaming/freetube.png new file mode 100644 index 0000000000000000000000000000000000000000..5b40c707e8a2d6e49aa654f0e5bd18ac6f61a774 GIT binary patch literal 5342 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 &rIdf}n&$Kfz3~0M zf#s+KX1nNWRmv3)@BIg4bT?4ojxxIyu4~fN%&6)q=@}WTo@ywv2!T~(v~+670g9W_ z=2@7753B;L4ofnt%Wc`^W=r&KD)h~H&VTRb{+9;t{{do0CV*uS{$1NgDl`7f4@VP< z;9J5oSRlZ=6M*ctf65;YQMyjxz&4vMoGUO5yU1R?CPJc!DH*~M`4)JAU4#h%t_2HU zNJrH#GHqo6Ueb+=`G77F2jK`&Y|B;)EGT;X)YaJsd~|lrN1+kVN+r|@r8%%=0;rY^ zgc$s`07$YL9H`q)JY8PI1unodG37xG$f+0Q0VsX$&NAalE+9+JDkVKPUVU^g93C?_ zBXY4FVL_r$;5+)$q9S9mTbTb5n1}D*){_?D_Y~+kcx*K6NXp&leg5q&oC=-e8ahn) zmc8W$&Aej((lb)_O>xnf2-s%pIw9h)tXk|M2h=Uk@vzO3Rwut)3>6s}aDxsB6~d_4 z)HNDmwq~{^F$=u=b+`vbt`VT{r+GY|dsEe<_m&^t z`d|zhxk;qyl*4Xfj6#&3Mt?Yb1~(-+k!|LgXr3;{-KZoK-11R*8%LdzO|fxG{B=9C zc~}II;s<$XFD%Fn3Iqxdz4z|st|p_~`Os6D-u(0udF1x5-$$j`re@13NBM0!$}s|n zBWH#bX1JjX#E?%CW`g9Ll?eg7T^}z_O6kp3^C7^^>Xu^ADmSk}o*LuH-uorzqd zYSbE!?IQ161hm8q8FxJ$Re}0(3pK3Pb~4j_-;@w>#O>YKrYPNCu11)pgnF>T8l!86 z+&aw#%O*G!a^h^rC1Qvt&LhYZ-hd`n6RUm{tByTpe^eKD6pPcss$sD>EcR>CDE!v= z-x&M?E?x1u{(m#1_j)ft2646qy8y3{aAJ@r2oDd}xZ>{<>_H6l)CdUj&RWnv0EvLv M2`fUm@r9fJ0l+7}MgRZ+ literal 0 HcmV?d00001 diff --git a/assets/img/video-streaming/lbry.svg b/assets/img/video-streaming/lbry.svg new file mode 100644 index 00000000..07e35380 --- /dev/null +++ b/assets/img/video-streaming/lbry.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/video-streaming/newpipe.svg b/assets/img/video-streaming/newpipe.svg new file mode 100644 index 00000000..3b0a01f5 --- /dev/null +++ b/assets/img/video-streaming/newpipe.svg @@ -0,0 +1,2 @@ + + diff --git a/collections/_evergreen/video-streaming.html b/collections/_evergreen/video-streaming.html new file mode 100644 index 00000000..651b9acd --- /dev/null +++ b/collections/_evergreen/video-streaming.html @@ -0,0 +1,14 @@ +--- +layout: evergreen +title: Video Streaming +description: "The primary threat when using a video streaming platform is that your streaming habits and subscription lists could be used to profile you. You should combine these tools with a VPN to make it much harder to profile you." +--- + +{% for item_hash in site.data.software.video-streaming %} +{% assign item = item_hash[1] %} + +{% if item.type == "Recommendation" %} +{% include recommendation-card.html %} +{% endif %} + +{% endfor %} diff --git a/legacy_pages/providers/video.html b/legacy_pages/providers/video.html deleted file mode 100644 index e2fb7c84..00000000 --- a/legacy_pages/providers/video.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -permalink: /providers/video/ -title: "Video Platforms" -description: "Find a platform to watch and host videos that doesn't pry into your data or monetize your profile." ---- - -{% include legacy/sections/decentralized-video.html %} - -{% include legacy/sections/video-frontends.html %} diff --git a/legacy_pages/software.html b/legacy_pages/software.html index 0799c893..50d46400 100644 --- a/legacy_pages/software.html +++ b/legacy_pages/software.html @@ -18,6 +18,6 @@ description: "Discover a variety of open-source software built to protect your p
  • Productivity Tools
  • Real-Time Communication
  • Self-contained Networks
    • -
  • Self-Hosted Cloud Server
    • +
  • Video Streaming