Add contributors in about peertube page

8 files changed, 195 insertions, 94 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
index 9499bbe4e..25d416740 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -4,7 +4,7 @@
     <div class="about-instance-title">
       <div i18n class="title">About {{ instanceName }} instance</div>
 
-      <div *ngIf="isContactFormEnabled" (click)="openContactModal()" i18n role="button" class="contact-admin">Contact administrator</div>
+      <div i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" role="button" class="contact-admin">Contact administrator</div>
     </div>
 
     <div class="block instance-badges">
@@ -16,10 +16,10 @@
     <div class="short-description">
       <div class="block short-description">{{ shortDescription }}</div>
 
-      <div *ngIf="isNSFW" class="block dedicated-to-nsfw">This instance is dedicated to sensitive/NSFW content.</div>
+      <div i18n *ngIf="isNSFW" class="block dedicated-to-nsfw">This instance is dedicated to sensitive/NSFW content.</div>
     </div>
 
-    <div class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
+    <div i18n class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
       Administrators & sustainability
     </div>
 
@@ -47,7 +47,7 @@
       <p>{{ businessModel }}</p>
     </div>
 
-    <div class="middle-title" *ngIf="html.description">
+    <div i18n class="middle-title" *ngIf="html.description">
       Information
     </div>
 
@@ -57,7 +57,7 @@
       <div [innerHTML]="html.description"></div>
     </div>
 
-    <div class="middle-title" *ngIf="html.moderationInformation || html.codeOfConduct || html.terms">
+    <div i18n class="middle-title" *ngIf="html.moderationInformation || html.codeOfConduct || html.terms">
       Moderation
     </div>
 
@@ -79,7 +79,7 @@
       <div [innerHTML]="html.terms"></div>
     </div>
 
-    <div class="middle-title" *ngIf="html.hardwareInformation">
+    <div i18n class="middle-title" *ngIf="html.hardwareInformation">
       Other information
     </div>
 
@@ -91,7 +91,7 @@
   </div>
 
   <div class="col-md-12 col-xl-6">
-    <label>Features found on this instance</label>
+    <label i18n>Features found on this instance</label>
     <my-instance-features-table></my-instance-features-table>
   </div>
 </div>
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
new file mode 100644
index 000000000..997a6a3e1
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
@@ -0,0 +1,13 @@
+<h3 i18n class="section-title">Who made this software?</h3>
+
+<p align="center">
+  <strong>Developed with &#10084; by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a></strong>
+</p>
+
+<p align="center">
+  <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">
+    <img width="150px" src="/client/assets/images/framasoft.png" alt="Framasoft logo"/>
+  </a>
+</p>
+
+<div [innerHTML]="creditsHtml"></div>
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
new file mode 100644
index 000000000..9c3b0a46b
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss
@@ -0,0 +1,15 @@
+@import '_variables';
+@import '_mixins';
+
+/deep/ h1 {
+  font-size: 1rem;
+}
+
+/deep/ ul {
+  padding: 0;
+
+  li {
+    display: inline-block;
+    margin-right: 10px;
+  }
+}
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts
new file mode 100644
index 000000000..fa2c0daa0
--- /dev/null
+++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core'
+import { MarkdownService } from '@app/shared/renderer'
+
+@Component({
+  selector: 'my-about-peertube-contributors',
+  templateUrl: './about-peertube-contributors.component.html',
+  styleUrls: [ './about-peertube-contributors.component.scss' ]
+})
+export class AboutPeertubeContributorsComponent implements OnInit {
+  creditsHtml: string
+
+  private markdown = require('raw-loader!../../../../../CREDITS.md')
+
+  constructor (private markdownService: MarkdownService) { }
+
+  async ngOnInit () {
+    this.creditsHtml = await this.markdownService.completeMarkdownToHTML(this.markdown)
+  }
+}
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index d3fc9a828..423f7bce7 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -14,84 +14,89 @@
   </p>
 </div>
 
-<div id="p2p-privacy">
-  <h3 i18n class="section-title">P2P & Privacy</h3>
+<div class="privacy-contributors">
+  <my-about-peertube-contributors></my-about-peertube-contributors>
+
+  <div class="p2p-privacy">
+    <h3 i18n class="section-title">P2P & Privacy</h3>
+
+    <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>
+
+    <h6 i18n class="p2p-privacy-title">What are the consequences?</h6>
+
+    <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 publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the WebTorrent library</a>), 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>
+
+    <h6 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h6>
+
+    <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>
+
+    <h6 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h6>
+
+    <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>
+
+    <h6 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h6>
+
+    <p i18n>
+      PeerTube is in its early stages, 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>
 
-  <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>
-
-  <h6 i18n class="p2p-privacy-title">What are the consequences?</h6>
-
-  <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 publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the WebTorrent library</a>), 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>
-
-  <h6 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h6>
-
-  <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>
-
-  <h6 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h6>
-
-  <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>
-
-  <h6 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h6>
-
-  <p i18n>
-    PeerTube is in its early stages, 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>
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.scss b/client/src/app/+about/about-peertube/about-peertube.component.scss
index 0d2e2bb68..8fca53e90 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.scss
+++ b/client/src/app/+about/about-peertube/about-peertube.component.scss
@@ -2,12 +2,12 @@
 @import '_mixins';
 
 .about-peertube-title {
-  font-size: 25px;
-  font-weight: bold;
+  font-size: 20px;
+  font-weight: $font-semibold;
   margin-bottom: 15px;
 }
 
-.section-title {
+/deep/ .section-title {
   font-weight: $font-semibold;
   font-size: 20px;
   margin-bottom: 5px;
@@ -17,6 +17,41 @@
   margin-bottom: 30px;
 }
 
+.description,
+.p2p-privacy,
+my-about-peertube-contributors {
+  /deep/ {
+    p, li {
+      font-size: 15px;
+    }
+  }
+}
+
 .p2p-privacy-title {
   margin-top: 15px;
-}
\ No newline at end of file
+}
+
+.privacy-contributors {
+  display: flex;
+  flex-direction: row;
+
+  > div,
+  > my-about-peertube-contributors {
+    flex-basis: 100%;
+    display: block;
+  }
+
+  .p2p-privacy {
+    h6 {
+      font-size: 20px;
+    }
+  }
+
+  my-about-peertube-contributors {
+    margin: 0 40px 40px 0;
+  }
+
+  @media screen and (max-width: $small-view) {
+    flex-direction: column;
+  }
+}
diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts
index 49a7a52f8..14bf76e55 100644
--- a/client/src/app/+about/about.module.ts
+++ b/client/src/app/+about/about.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core'
-
 import { AboutRoutingModule } from './about-routing.module'
 import { AboutComponent } from './about.component'
 import { SharedModule } from '../shared'
@@ -7,6 +6,7 @@ import { AboutInstanceComponent } from '@app/+about/about-instance/about-instanc
 import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component'
 import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
 import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.component'
+import { AboutPeertubeContributorsComponent } from '@app/+about/about-peertube/about-peertube-contributors.component'
 
 @NgModule({
   imports: [
@@ -19,6 +19,7 @@ import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.c
     AboutInstanceComponent,
     AboutPeertubeComponent,
     AboutFollowsComponent,
+    AboutPeertubeContributorsComponent,
     ContactAdminModalComponent
   ],
 
diff --git a/client/src/app/shared/renderer/markdown.service.ts b/client/src/app/shared/renderer/markdown.service.ts
index 9a9066351..0e24f3085 100644
--- a/client/src/app/shared/renderer/markdown.service.ts
+++ b/client/src/app/shared/renderer/markdown.service.ts
@@ -13,9 +13,11 @@ export class MarkdownService {
     'list'
   ]
   static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ])
+  static COMPLETE_RULES = MarkdownService.ENHANCED_RULES.concat([ 'block', 'inline', 'heading', 'html_inline', 'html_block', 'paragraph' ])
 
   private textMarkdownIt: MarkdownIt
   private enhancedMarkdownIt: MarkdownIt
+  private completeMarkdownIt: MarkdownIt
 
   async textMarkdownToHTML (markdown: string) {
     if (!markdown) return ''
@@ -39,11 +41,22 @@ export class MarkdownService {
     return this.avoidTruncatedTags(html)
   }
 
-  private async createMarkdownIt (rules: string[]) {
-    // FIXME: import('..') returns a struct module, containing a "default" field corresponding to our sanitizeHtml function
+  async completeMarkdownToHTML (markdown: string) {
+    if (!markdown) return ''
+
+    if (!this.completeMarkdownIt) {
+      this.completeMarkdownIt = await this.createMarkdownIt(MarkdownService.COMPLETE_RULES, true)
+    }
+
+    const html = this.completeMarkdownIt.render(markdown)
+    return this.avoidTruncatedTags(html)
+  }
+
+  private async createMarkdownIt (rules: string[], html = false) {
+    // FIXME: import('...') returns a struct module, containing a "default" field corresponding to our sanitizeHtml function
     const MarkdownItClass: typeof import ('markdown-it') = (await import('markdown-it') as any).default
 
-    const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: true })
+    const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: true, html })
 
     for (const rule of rules) {
       markdownIt.enable(rule)