18 files changed, 259 insertions, 82 deletions

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
new file mode 100644
index 000000000..e433b0016
--- /dev/null
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -0,0 +1,39 @@
+<div i18n class="about-instance-title">
+  About {{ instanceName }} instance
+</div>
+
+<div class="short-description">
+  <div>{{ shortDescription }}</div>
+</div>
+
+<div class="description">
+  <div i18n class="section-title">Description</div>
+
+  <div [innerHTML]="descriptionHTML"></div>
+</div>
+
+<div class="terms">
+  <div i18n class="section-title">Terms</div>
+
+  <div [innerHTML]="termsHTML"></div>
+</div>
+
+<div class="signup">
+  <div i18n class="section-title">Signup</div>
+
+  <div *ngIf="isSignupAllowed">
+    <ng-container i18n>User registration is allowed and</ng-container>
+
+    <ng-container i18n *ngIf="userVideoQuota !== -1">
+      this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
+    </ng-container>
+
+    <ng-container i18n *ngIf="userVideoQuota === -1">
+      this instance provides unlimited space for the videos of its users.
+    </ng-container>
+  </div>
+
+  <div i18n *ngIf="isSignupAllowed === false">
+    User registration is currently not allowed.
+  </div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/about/about.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss
index a63cd229c..b451e85aa 100644
--- a/client/src/app/about/about.component.scss
+++ b/client/src/app/+about/about-instance/about-instance.component.scss
@@ -1,6 +1,12 @@
 @import '_variables';
 @import '_mixins';
 
+.about-instance-title {
+  font-size: 20px;
+  font-weight: bold;
+  margin-bottom: 15px;
+}
+
 .section-title {
   font-weight: $font-semibold;
   font-size: 20px;
diff --git a/client/src/app/about/about.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index c37b9318b..354f52ce7 100644
--- a/client/src/app/about/about.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -5,12 +5,12 @@ import { NotificationsService } from 'angular2-notifications'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
-  selector: 'my-about',
-  templateUrl: './about.component.html',
-  styleUrls: [ './about.component.scss' ]
+  selector: 'my-about-instance',
+  templateUrl: './about-instance.component.html',
+  styleUrls: [ './about-instance.component.scss' ]
 })
 
-export class AboutComponent implements OnInit {
+export class AboutInstanceComponent implements OnInit {
   shortDescription = ''
   descriptionHTML = ''
   termsHTML = ''
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
new file mode 100644
index 000000000..b0551f8b1
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -0,0 +1,97 @@
+<div i18n class="about-peertube-title">
+  About PeerTube
+</div>
+
+<div class="description">
+  <p i18n>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</p>
+
+  <p i18n>
+    It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3 licence</a>.
+  </p>
+
+  <p i18n>
+    For more information, please visit <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">joinpeertube.org</a>.
+  </p>
+</div>
+
+<div id="p2p-privacy">
+  <div i18n class="section-title">P2P & Privacy</div>
+
+  <p i18n>
+    PeerTube uses the BitTorrent protocol to share bandwidth between users.
+    This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+  </p>
+
+  <h4 i18n class="p2p-privacy-title">What are the consequences?</h4>
+
+  <p i18n>
+    In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
+    In practice, this is much more difficult because:
+  </p>
+
+  <ul>
+    <li i18n>
+      An HTTP request has to be sent on each tracker for each video to spy.
+      If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
+    </li>
+
+    <li i18n>
+      For each request sent, the tracker returns random peers at a limited number.
+      For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm
+    </li>
+
+    <li i18n>
+      Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
+    </li>
+
+    <li i18n>
+      If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
+    </li>
+
+    <li i18n>
+      The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
+    </li>
+
+    <li i18n>
+      Web peers are not directly sent by the tracker: because we use WebRTC inside the web browser, the protocol is different from classic BitTorrent.
+      When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to.
+      See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information
+    </li>
+  </ul>
+
+  <p i18n>
+    The worst-case scenario of an average person spying on their friends is quite unlikely.
+    There are much more effective ways to get that kind of information.
+  </p>
+
+  <h4 i18n class="p2p-privacy-title">How does PeerTube compares to YouTube?</h4>
+
+  <p i18n>
+    The threats to privacy in YouTube are different from PeerTube's.
+    In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
+    Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+  </p>
+
+  <h4 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h4>
+
+  <p i18n>
+    Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more.
+    PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
+    Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+  </p>
+
+  <h4 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h4>
+
+  <p i18n>
+    PeerTube is only in beta, and want to deliver the best countermeasures possible by the time the stable is released.
+    In the meantime, we want to test different ideas related to this issue:
+  </p>
+
+  <ul>
+    <li i18n>Set a limit to the number of peers sent by the tracker</li>
+    <li i18n>Set a limit on the request frequency received by the tracker (being tested)</li>
+    <li i18n>Ring a bell if there are unusual requests (being tested)</li>
+    <li i18n>Disable P2P from the administration interface</li>
+    <li i18n>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.scss b/client/src/app/+about/about-peertube/about-peertube.component.scss
new file mode 100644
index 000000000..1d8579ec1
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube.component.scss
@@ -0,0 +1,22 @@
+@import '_variables';
+@import '_mixins';
+
+.about-peertube-title {
+  font-size: 20px;
+  font-weight: bold;
+  margin-bottom: 15px;
+}
+
+.section-title {
+  font-weight: $font-semibold;
+  font-size: 20px;
+  margin-bottom: 5px;
+}
+
+.description {
+  margin-bottom: 30px;
+}
+
+.p2p-privacy-title {
+  margin-top: 15px;
+}
\ No newline at end of file
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.ts b/client/src/app/+about/about-peertube/about-peertube.component.ts
new file mode 100644
index 000000000..64fd30837
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'my-about-peertube',
+  templateUrl: './about-peertube.component.html',
+  styleUrls: [ './about-peertube.component.scss' ]
+})
+
+export class AboutPeertubeComponent {
+}
diff --git a/client/src/app/+about/about-routing.module.ts b/client/src/app/+about/about-routing.module.ts
new file mode 100644
index 000000000..c83c62c7f
--- /dev/null
+++ b/client/src/app/+about/about-routing.module.ts
@@ -0,0 +1,45 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { MetaGuard } from '@ngx-meta/core'
+import { AboutComponent } from './about.component'
+import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component'
+import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
+
+const aboutRoutes: Routes = [
+  {
+    path: '',
+    component: AboutComponent,
+    canActivateChild: [ MetaGuard ],
+    children: [
+      {
+        path: '',
+        redirectTo: 'instance',
+        pathMatch: 'full'
+      },
+      {
+        path: 'instance',
+        component: AboutInstanceComponent,
+        data: {
+          meta: {
+            title: 'About this instance'
+          }
+        }
+      },
+      {
+        path: 'peertube',
+        component: AboutPeertubeComponent,
+        data: {
+          meta: {
+            title: 'About PeerTube'
+          }
+        }
+      }
+    ]
+  }
+]
+
+@NgModule({
+  imports: [ RouterModule.forChild(aboutRoutes) ],
+  exports: [ RouterModule ]
+})
+export class AboutRoutingModule {}
diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html
new file mode 100644
index 000000000..8c50835c1
--- /dev/null
+++ b/client/src/app/+about/about.component.html
@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="sub-menu">
+
+    <div class="links">
+      <a i18n routerLink="instance" routerLinkActive="active" class="title-page">Instance</a>
+
+      <a i18n routerLink="peertube" routerLinkActive="active" class="title-page">PeerTube</a>
+    </div>
+  </div>
+
+  <div class="margin-content">
+    <router-outlet></router-outlet>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/+about/about.component.scss b/client/src/app/+about/about.component.scss
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/client/src/app/+about/about.component.scss
diff --git a/client/src/app/+about/about.component.ts b/client/src/app/+about/about.component.ts
new file mode 100644
index 000000000..7b65d920f
--- /dev/null
+++ b/client/src/app/+about/about.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'my-about',
+  templateUrl: './about.component.html',
+  styleUrls: [ './about.component.scss' ]
+})
+
+export class AboutComponent {
+
+}
diff --git a/client/src/app/about/about.module.ts b/client/src/app/+about/about.module.ts
index da3163f43..ff6e8ef41 100644
--- a/client/src/app/about/about.module.ts
+++ b/client/src/app/+about/about.module.ts
@@ -3,6 +3,8 @@ import { NgModule } from '@angular/core'
 import { AboutRoutingModule } from './about-routing.module'
 import { AboutComponent } from './about.component'
 import { SharedModule } from '../shared'
+import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component'
+import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
 
 @NgModule({
   imports: [
@@ -11,7 +13,9 @@ import { SharedModule } from '../shared'
   ],
 
   declarations: [
-    AboutComponent
+    AboutComponent,
+    AboutInstanceComponent,
+    AboutPeertubeComponent
   ],
 
   exports: [
diff --git a/client/src/app/about/index.ts b/client/src/app/+about/index.ts
index 218d09801..218d09801 100644
--- a/client/src/app/about/index.ts
+++ b/client/src/app/+about/index.ts
diff --git a/client/src/app/about/about-routing.module.ts b/client/src/app/about/about-routing.module.ts
deleted file mode 100644
index 11a650c80..000000000
--- a/client/src/app/about/about-routing.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { MetaGuard } from '@ngx-meta/core'
-import { AboutComponent } from './about.component'
-
-const aboutRoutes: Routes = [
-  {
-    path: 'about',
-    component: AboutComponent,
-    canActivate: [ MetaGuard ],
-    data: {
-      meta: {
-        title: 'About'
-      }
-    }
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(aboutRoutes) ],
-  exports: [ RouterModule ]
-})
-export class AboutRoutingModule {}
diff --git a/client/src/app/about/about.component.html b/client/src/app/about/about.component.html
deleted file mode 100644
index dc13f785d..000000000
--- a/client/src/app/about/about.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="margin-content">
-  <div i18n class="title-page title-page-single">
-    Welcome to the {{ instanceName }} instance
-  </div>
-
-  <div class="short-description">
-    <div>{{ shortDescription }}</div>
-  </div>
-
-  <div class="description">
-    <div i18n class="section-title">Description</div>
-
-    <div [innerHTML]="descriptionHTML"></div>
-  </div>
-
-  <div class="terms">
-    <div i18n class="section-title">Terms</div>
-
-    <div [innerHTML]="termsHTML"></div>
-  </div>
-
-  <div class="signup">
-    <div i18n class="section-title">Signup</div>
-
-    <div *ngIf="isSignupAllowed">
-      <ng-container i18n>User registration is allowed and</ng-container>
-
-      <ng-container i18n *ngIf="userVideoQuota !== -1">
-        this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
-      </ng-container>
-
-      <ng-container i18n *ngIf="userVideoQuota === -1">
-        this instance provides unlimited space for the videos of its users.
-      </ng-container>
-    </div>
-
-    <div i18n *ngIf="isSignupAllowed === false">
-      User registration is currently not allowed.
-    </div>
-  </div>
-
-  <div id="p2p-privacy">
-    <div i18n class="section-title">P2P & Privacy</div>
-
-    <p i18n>
-      PeerTube uses the BitTorrent protocol to share bandwidth between users. It implies that your public IP address is stored in the public BitTorrent tracker of the video PeerTube instance as long as you're watching the video.
-      If you want to keep your public IP address private, please use a VPN or the Tor Browser.
-    </p>
-  </div>
-</div>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 04c53548e..0b31bf453 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -21,6 +21,10 @@ const routes: Routes = [
     loadChildren: './+video-channels/video-channels.module#VideoChannelsModule'
   },
   {
+    path: 'about',
+    loadChildren: './+about/about.module#AboutModule'
+  },
+  {
     path: '**',
     loadChildren: './+page-not-found/page-not-found.module#PageNotFoundModule'
   }
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 003c91009..9cffdd31e 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,6 +1,5 @@
 import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
-import { AboutModule } from '@app/about'
 import { ServerService } from '@app/core'
 import { ResetPasswordModule } from '@app/reset-password'
 
@@ -53,7 +52,6 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     SignupModule,
     SharedModule,
     VideosModule,
-    AboutModule,
 
     MetaModule.forRoot({
       provide: MetaLoader,
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 208375e33..492568d3c 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -195,7 +195,7 @@
       <ng-container i18n>
         The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be accessed publicly.
       </ng-container>
-      <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about#p2p-privacy">More information</a>
+      <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
     </div>
 
     <div i18n class="privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index bf0eb484e..d8db2a119 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -107,7 +107,7 @@ loadLocale(window.location.origin, videojs, navigator.language)
 
       player.dock({
         title: videoInfo.name,
-        description: player.localize('Uses P2P, others may know you are watching this video.')
+        description: player.localize('Uses P2P, others may know your IP is downloading this video.')
       })
 
       addContextMenu(player, window.location.origin + videoInfo.embedPath)