diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-11 14:23:49 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-05-11 14:23:49 +0200 |
commit | a3c997b34cad79fce92c67951a3c8140a9888973 (patch) | |
tree | 97e685638989af094d1aa2b025216656bacb6a85 | |
parent | 428ccb8b7a44ce60cabb7401a5464cf5fcbd4dba (diff) | |
download | PeerTube-a3c997b34cad79fce92c67951a3c8140a9888973.tar.gz PeerTube-a3c997b34cad79fce92c67951a3c8140a9888973.tar.zst PeerTube-a3c997b34cad79fce92c67951a3c8140a9888973.zip |
Update README
-rw-r--r-- | README.md | 23 | ||||
-rw-r--r-- | server/tests/api/server/handle-down.ts | 10 |
2 files changed, 19 insertions, 14 deletions
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | <p align=center> | 7 | <p align=center> |
8 | <strong><a href="https://joinpeertube.org">Website</a></strong> | 8 | <strong><a href="https://joinpeertube.org">Website</a></strong> |
9 | | <strong><a href="https://instances.joinpeertube.org">Join an instance</a></strong> | 9 | | <strong><a href="https://joinpeertube.org/instances">Join an instance</a></strong> |
10 | | <strong><a href="#package-create-your-own-instance">Create an instance</a></strong> | 10 | | <strong><a href="#package-create-your-own-instance">Create an instance</a></strong> |
11 | | <strong><a href="#contact">Chat with us</a></strong> | 11 | | <strong><a href="#contact">Chat with us</a></strong> |
12 | | <strong><a href="https://framasoft.org/en/#soutenir">Donate</a></strong> | 12 | | <strong><a href="https://framasoft.org/en/#soutenir">Donate</a></strong> |
@@ -67,23 +67,24 @@ Introduction | |||
67 | 67 | ||
68 | PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper: | 68 | PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper: |
69 | 69 | ||
70 | But one organization hosting PeerTube alone may not have enough money to pay for bandwidth and video storage of its servers, | 70 | To learn more: |
71 | all servers of PeerTube are interoperable as a federated network, and non-PeerTube servers can be part of the larger Vidiverse | ||
72 | (federated video network) by talking our implementation of ActivityPub. | ||
73 | Video load is reduced thanks to P2P in the web browser using <a href="https://github.com/webtorrent/webtorrent">WebTorrent</a> or <a href="https://github.com/novage/p2p-media-loader">p2p-media-loader</a>. | ||
74 | |||
75 | To learn more, see: | ||
76 | * This [two-minute video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) (hosted on PeerTube) explaining what PeerTube is and how it works | 71 | * This [two-minute video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) (hosted on PeerTube) explaining what PeerTube is and how it works |
77 | * PeerTube's project homepage, [joinpeertube.org](https://joinpeertube.org) | 72 | * PeerTube's project homepage, [joinpeertube.org](https://joinpeertube.org) |
78 | * Demonstration instances: | 73 | * Demonstration instances: |
79 | * [peertube.cpy.re](https://peertube.cpy.re) | 74 | * [peertube.cpy.re](https://peertube.cpy.re) (stable) |
80 | * [peertube2.cpy.re](https://peertube2.cpy.re) | 75 | * [peertube2.cpy.re](https://peertube2.cpy.re) (Nightly) |
81 | * [peertube3.cpy.re](https://peertube3.cpy.re) | 76 | * [peertube3.cpy.re](https://peertube3.cpy.re) (RC) |
82 | * This [video](https://peertube.cpy.re/videos/watch/da2b08d4-a242-4170-b32a-4ec8cbdca701) demonstrating the communication between PeerTube and [Mastodon](https://github.com/tootsuite/mastodon) (a decentralized Twitter alternative) | 77 | * This [video](https://peertube.cpy.re/videos/watch/da2b08d4-a242-4170-b32a-4ec8cbdca701) demonstrating the communication between PeerTube and [Mastodon](https://github.com/tootsuite/mastodon) (a decentralized Twitter alternative) |
83 | 78 | ||
84 | :sparkles: Features | 79 | :sparkles: Features |
85 | ---------------------------------------------------------------- | 80 | ---------------------------------------------------------------- |
86 | 81 | ||
82 | <p align=center> | ||
83 | <strong><a href="https://joinpeertube.org/faq#what-are-the-peertube-features-for-viewers">All features for viewers</a></strong> | ||
84 | | <strong><a href="https://joinpeertube.org/faq#what-are-the-peertube-features-for-content-creators">All features for content creators</a></strong> | ||
85 | | <strong><a href="https://joinpeertube.org/faq#what-are-the-peertube-features-for-administrators">All features for administrators</a></strong> | ||
86 | </p> | ||
87 | |||
87 | <img src="https://lutim.cpy.re/AHbctLjn.png" align="left" height="300px"/> | 88 | <img src="https://lutim.cpy.re/AHbctLjn.png" align="left" height="300px"/> |
88 | <h3 align="left">Video streaming, even in live!</h3> | 89 | <h3 align="left">Video streaming, even in live!</h3> |
89 | <p align="left"> | 90 | <p align="left"> |
@@ -121,6 +122,8 @@ In addition to visitors using WebTorrent to share the load among them, instances | |||
121 | Content creators can get help from their viewers in the simplest way possible: a support button showing a message linking to their donation accounts or really anything else. No more pay-per-view and advertisements that hurt visitors and <strike>incentivize</strike> alter creativity (more about that in our <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md">FAQ</a>). | 122 | Content creators can get help from their viewers in the simplest way possible: a support button showing a message linking to their donation accounts or really anything else. No more pay-per-view and advertisements that hurt visitors and <strike>incentivize</strike> alter creativity (more about that in our <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md">FAQ</a>). |
122 | </p> | 123 | </p> |
123 | 124 | ||
125 | |||
126 | |||
124 | :raised_hands: Contributing | 127 | :raised_hands: Contributing |
125 | ---------------------------------------------------------------- | 128 | ---------------------------------------------------------------- |
126 | 129 | ||
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index fa1a3c444..fe4a0e100 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts | |||
@@ -346,10 +346,12 @@ describe('Test handle downs', function () { | |||
346 | // Wait video expiration | 346 | // Wait video expiration |
347 | await wait(11000) | 347 | await wait(11000) |
348 | 348 | ||
349 | for (let i = 0; i < 3; i++) { | 349 | for (let i = 0; i < 5; i++) { |
350 | await getVideo(servers[1].url, videoIdsServer1[i]) | 350 | try { |
351 | await waitJobs([ servers[1] ]) | 351 | await getVideo(servers[1].url, videoIdsServer1[i]) |
352 | await wait(1500) | 352 | await waitJobs([ servers[1] ]) |
353 | await wait(1500) | ||
354 | } catch {} | ||
353 | } | 355 | } |
354 | 356 | ||
355 | for (const id of videoIdsServer1) { | 357 | for (const id of videoIdsServer1) { |