16 files changed, 238 insertions, 25 deletions

diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index ea419029c..7b67b5c64 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: PeerTube
-  version: 1.2.1
+  version: 1.3.0-rc.1
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'
@@ -842,7 +842,7 @@ paths:
                   description: Video name
                   type: string
                 tags:
-                  description: Video tags
+                  description: Video tags (maximum 5 tags each between 2 and 30 characters)
                   type: array
                   items:
                     type: string
@@ -1089,6 +1089,83 @@ paths:
               channelId=$CHANNEL_ID \
               name=$NAME \
               "Authorization:Bearer $token"
+  /videos/imports:
+    post:
+      summary: Import a torrent or magnetURI or HTTP ressource (if enabled by the instance administrator)
+      security:
+        - OAuth2: []
+      tags:
+        - Video
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VideoUploadResponse'
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                torrentfile:
+                  description: Torrent File
+                  type: string
+                  format: binary
+                targetUrl:
+                  description: HTTP target URL
+                  type: string
+                magnetUri:
+                  description: Magnet URI
+                  type: string
+                channelId:
+                  description: Channel id that will contain this video
+                  type: number
+                thumbnailfile:
+                  description: Video thumbnail file
+                  type: string
+                previewfile:
+                  description: Video preview file
+                  type: string
+                privacy:
+                  $ref: '#/components/schemas/VideoPrivacy'
+                category:
+                  description: Video category
+                  type: string
+                licence:
+                  description: Video licence
+                  type: string
+                language:
+                  description: Video language
+                  type: string
+                description:
+                  description: Video description
+                  type: string
+                waitTranscoding:
+                  description: Whether or not we wait transcoding before publish the video
+                  type: string
+                support:
+                  description: Text describing how to support the video uploader
+                  type: string
+                nsfw:
+                  description: Whether or not this video contains sensitive content
+                  type: string
+                name:
+                  description: Video name
+                  type: string
+                tags:
+                  description: Video tags
+                  type: array
+                  items:
+                    type: string
+                commentsEnabled:
+                  description: Enable or disable comments for this video
+                  type: string
+                scheduleUpdate: *ref_0
+              required:
+                - channelId
+                - name
   /videos/abuse:
     get:
       summary: Get list of reported video abuses
@@ -1199,13 +1276,13 @@ paths:
           $ref: '#/paths/~1users~1me/put/responses/204'
       requestBody:
         $ref: '#/components/requestBodies/VideoChannelInput'
-  '/video-channels/{id}':
+  '/video-channels/{channelHandle}':
     get:
       summary: Get a video channel by its id
       tags:
         - Video Channel
       parameters:
-        - $ref: '#/components/parameters/id3'
+        - $ref: '#/components/parameters/channelHandle'
       responses:
         '200':
           description: successful operation
@@ -1220,7 +1297,7 @@ paths:
       tags:
         - Video Channel
       parameters:
-        - $ref: '#/components/parameters/id3'
+        - $ref: '#/components/parameters/channelHandle'
       responses:
         '204':
           $ref: '#/paths/~1users~1me/put/responses/204'
@@ -1233,17 +1310,17 @@ paths:
       tags:
         - Video Channel
       parameters:
-        - $ref: '#/components/parameters/id3'
+        - $ref: '#/components/parameters/channelHandle'
       responses:
         '204':
           $ref: '#/paths/~1users~1me/put/responses/204'
-  '/video-channels/{id}/videos':
+  '/video-channels/{channelHandle}/videos':
     get:
       summary: Get videos of a video channel by its id
       tags:
         - Video Channel
       parameters:
-        - $ref: '#/components/parameters/id3'
+        - $ref: '#/components/parameters/channelHandle'
       responses:
         '200':
           description: successful operation
@@ -1267,6 +1344,35 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/VideoChannel'
+  '/accounts/{name}/ratings':
+    get:
+      summary: Get ratings of an account by its name
+      security:
+        - OAuth2: []
+      tags:
+        - User
+      parameters:
+        - $ref: '#/components/parameters/start'
+        - $ref: '#/components/parameters/count'
+        - $ref: '#/components/parameters/sort'
+        - name: rating
+          in: query
+          required: false
+          description: Optionaly filter which ratings to retrieve
+          schema:
+            type: string
+            enum:
+              - like
+              - dislike
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/VideoRating'
   '/videos/{id}/comment-threads':
     get:
       summary: Get the comment threads of a video by its id
@@ -1505,11 +1611,11 @@ components:
       description: The video id or uuid
       schema:
         type: string
-    id3:
-      name: id
+    channelHandle:
+      name: channelHandle
       in: path
       required: true
-      description: The video channel id or uuid
+      description: "The video channel handle (example: 'my_username@example.com' or 'my_username')"
       schema:
         type: string
     commentId:
@@ -1867,6 +1973,8 @@ components:
             - Administrator
         videoQuota:
           type: number
+        videoQuotaDaily:
+          type: number
         createdAt:
           type: string
         account:
@@ -2002,6 +2110,9 @@ components:
         videoQuota:
           type: string
           description: 'The user videoQuota '
+        videoQuotaDaily:
+          type: string
+          description: 'The user daily video quota '
         role:
           type: integer
           format: int32
@@ -2015,6 +2126,7 @@ components:
         - password
         - email
         - videoQuota
+        - videoQuotaDaily
         - role
     UpdateUser:
       properties:
@@ -2027,6 +2139,9 @@ components:
         videoQuota:
           type: string
           description: 'The updated videoQuota of the user '
+        videoQuotaDaily:
+          type: string
+          description: 'The updated daily video quota of the user '
         role:
           type: string
           description: 'The updated role of the user '
@@ -2034,6 +2149,7 @@ components:
         - id
         - email
         - videoQuota
+        - videoQuotaDaily
         - role
     UpdateMe:
       properties:
@@ -2065,6 +2181,16 @@ components:
       required:
         - id
         - rating
+    VideoRating:
+      properties:
+        video:
+          $ref: '#/components/schemas/Video'
+        rating:
+          type: number
+          description: 'Rating of the video'
+      required:
+        - video
+        - rating
     RegisterUser:
       properties:
         username:
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index d98d71020..77cec3ba3 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -28,13 +28,13 @@
      [https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions)
   4. Install NodeJS 8.x (current LTS):
      [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)
-  5. Install yarn, and be sure to have a recent version (>= 1.5.1, the latest release):
+  5. Install yarn, and be sure to have [a recent version](https://github.com/yarnpkg/yarn/releases/latest):
      [https://yarnpkg.com/en/docs/install#linux-tab](https://yarnpkg.com/en/docs/install#linux-tab)
   6. Run:
 
 ```
 $ sudo apt update
-$ sudo apt install nginx ffmpeg postgresql postgresql-contrib openssl g++ make redis-server git
+$ sudo apt install nginx ffmpeg postgresql postgresql-contrib openssl g++ make redis-server git python-dev
 $ ffmpeg -version # Should be >= 3.x
 $ g++ -v # Should be >= 5.x
 ```
diff --git a/support/doc/development/localization.md b/support/doc/development/localization.md
index 97e9e2c51..1664532fe 100644
--- a/support/doc/development/localization.md
+++ b/support/doc/development/localization.md
@@ -31,3 +31,10 @@ Then, `iso639` files will be merged in `server` files (so we have only one JSON
 ```
 $ zanata-cli pull
 ```
+
+## Support a new language
+
+ * Add it to [/shared/models/i18n/i18n.ts](/shared/models/i18n/i18n.ts)
+ * Add it to [/scripts/build/client.sh](/scripts/build/client.sh)
+ * Pull using zanata (that will execute hooks to correctly generate files of this new language)
+ * Build the application and check the new language correctly works
diff --git a/support/doc/development/release.md b/support/doc/development/release.md
new file mode 100644
index 000000000..352a1f0d3
--- /dev/null
+++ b/support/doc/development/release.md
@@ -0,0 +1,20 @@
+# Release
+
+ * Fix remaining important bugs
+ * Update [/CHANGELOG.md](/CHANGELOG.md)
+ * Check migrations:
+    * `npm run clean:server:test`
+    * `git checkout master && rm -r ./node_modules && yarn install --pure-lockfile && npm run build:server`
+    * `NODE_APP_INSTANCE=6 NODE_ENV=test npm run start` and quit after initialization
+    * `git checkout develop && rm -r ./node_modules && yarn install --pure-lockfile && npm run build:server`
+    * `NODE_APP_INSTANCE=6 NODE_ENV=test npm run start` and check migrations does not fail
+ * Run `rm -r node_modules && rm -r client/node_modules && yarn install --pure-lockfile && npm run build` to see if all the supported languages compile correctly
+ * Update https://peertube2.cpy.re and check it works correctly
+ * Check Travis tests are green
+ * Run E2E tests: `BROWSERSTACK_USER=my_user BROWSERSTACK_KEY=my_key npm run e2e`
+ * Release: `GITHUB_TOKEN=my_token npm run release -- 1.x.x`
+ * Create a dedicated branch: `git checkout -b release/1.x.x && git push origin release/1.x.x`
+ * Check the release is okay: https://github.com/Chocobozzz/PeerTube/releases
+ * Update https://peertube3.cpy.re and check it works correctly
+ * Update all other instances and check it works correctly
+ * Communicate on Mastodon & peertube-admin mailing list
diff --git a/support/doc/docker.md b/support/doc/docker.md
index c20746486..7b2d867a0 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -59,6 +59,8 @@ See the production guide ["What now" section](/support/doc/production.md#what-no
 
 ### Upgrade
 
+**Important:** Before upgrading, check you have all the `storage` fields in your [production.yaml file](/support/docker/production/config/production.yaml). 
+
 Pull the latest images and rerun PeerTube:
 
 ```shell
@@ -67,7 +69,6 @@ $ docker-compose pull
 $ docker-compose up -d
 ```
 
-
 ## Build your own Docker image
 
 ```shell
diff --git a/support/doc/production.md b/support/doc/production.md
index 16efe17c4..2eba6e6a3 100644
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -210,6 +210,7 @@ Now your instance is up you can:
  
  * Subscribe to the mailing list for PeerTube administrators: https://framalistes.org/sympa/subscribe/peertube-admin
  * Add you instance to the public PeerTube instances index if you want to: https://instances.peertu.be/
+ * Check [available CLI tools](/support/doc/tools.md)
 
 ## Upgrade
 
diff --git a/support/doc/tools.md b/support/doc/tools.md
index 1a9ba7d2b..086cd5cff 100644
--- a/support/doc/tools.md
+++ b/support/doc/tools.md
@@ -18,6 +18,7 @@
   - [prune-storage.js](#prune-storagejs)
   - [optimize-old-videos.js](#optimize-old-videosjs)
   - [update-host.js](#update-hostjs)
+  - [reset-password.js](#reset-passwordjs)
   - [REPL (Read Eval Print Loop)](#repl-read-eval-print-loop)
     - [.help](#help)
     - [Lodash example](#lodash-example)
@@ -119,7 +120,7 @@ $ node dist/server/tools/peertube-import-videos.js \
 
 * `PEERTUBE_URL` : the full URL of your PeerTube server where you want to import, eg: https://peertube.cpy.re
 * `PEERTUBE_USER` : your PeerTube account where videos will be uploaded
-* `PEERTUBE_PASSWORD` : password of your PeerTube account (if `PEERTUBE_PASSWORD` is omitted, you will be prompted for it)
+* `PEERTUBE_PASSWORD` : password of your PeerTube account (if `--password PEERTUBE_PASSWORD` is omitted, you will be prompted for it)
 * `TARGET_URL` : the target url you want to import. Examples:
   * YouTube:
     * Channel: https://www.youtube.com/channel/ChannelId
@@ -227,6 +228,14 @@ to run:
 $ sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run update-host
 ```
 
+### reset-password.js
+
+To reset a user password from CLI, run:
+
+```
+$ sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run reset-password -- -u target_username
+```
+
 ### REPL ([Read Eval Print Loop](https://nodejs.org/docs/latest-v8.x/api/repl.html))
 
 If you want to interact with the application libraries and objects even when PeerTube is not running, there is a REPL for that.
diff --git a/support/doc/translation.md b/support/doc/translation.md
index 5267c3899..58b52f5f8 100644
--- a/support/doc/translation.md
+++ b/support/doc/translation.md
@@ -26,10 +26,25 @@ There are 4 files:
 
 ## Tips
 
+### Special tags
+
 You must not translate special tags like `<x id="INTERPOLATION" ... />`.
 
 For example: 
 ```<x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views```
 
 should be in french 
-```<x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> vues```
\ No newline at end of file
+```<x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> vues```
+
+
+### Singular/plural
+
+For singular/plural translations, you must translate values inside `{` and `}`.
+
+For example:
+
+```{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> videos} }```
+
+should be in french 
+
+```{VAR_PLURAL, plural, =0 {Aucune vidéos} =1 {1 vidéo} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> vidéos} }```
diff --git a/support/docker/gitpod/Dockerfile b/support/docker/gitpod/Dockerfile
new file mode 100644
index 000000000..435370dc4
--- /dev/null
+++ b/support/docker/gitpod/Dockerfile
@@ -0,0 +1,11 @@
+FROM gitpod/workspace-postgres
+
+# Install PeerTube's dependencies.
+RUN sudo apt-get update -q && sudo apt-get install -qy \
+ ffmpeg \
+ openssl \
+ redis-server
+
+# Set up PostgreSQL.
+COPY --chown=gitpod:gitpod setup_postgres.sql /tmp/
+RUN pg_start && psql -h localhost -d postgres --file=/tmp/setup_postgres.sql
diff --git a/support/docker/gitpod/setup_postgres.sql b/support/docker/gitpod/setup_postgres.sql
new file mode 100644
index 000000000..0937f9d19
--- /dev/null
+++ b/support/docker/gitpod/setup_postgres.sql
@@ -0,0 +1,6 @@
+create database peertube_dev;
+create user peertube password 'peertube';
+grant all privileges on database peertube_dev to peertube;
+\c peertube_dev
+CREATE EXTENSION pg_trgm;
+CREATE EXTENSION unaccent;
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 802d6b2ca..7b9092642 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -7,12 +7,12 @@ PEERTUBE_WEBSERVER_HTTPS=true
 # pass them as a comma separated array:
 PEERTUBE_TRUST_PROXY=["127.0.0.1"]
 #PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
-PEERTUBE_SMTP_USERNAME=
-PEERTUBE_SMTP_PASSWORD=
+#PEERTUBE_SMTP_USERNAME=
+#PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_SMTP_HOSTNAME=postfix
 PEERTUBE_SMTP_PORT=25
 PEERTUBE_SMTP_FROM=noreply@domain.tld
-PEERTUBE_SMTP_TLS=true
+PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
 PEERTUBE_ADMIN_EMAIL=admin@domain.tld
 # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 81468bb4f..5025341f1 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,5 +1,10 @@
 FROM node:8-stretch
 
+# Allow to pass extra options to the npm run build
+# eg: --light --light-fr to not build all client languages
+#     (speed up build time if i18n is not required)
+ARG NPM_RUN_BUILD_OPTS
+
 RUN set -ex; \
     if ! command -v gpg > /dev/null; then \
       apt-get update; \
@@ -34,7 +39,7 @@ RUN chown -R peertube:peertube /app
 USER peertube
 
 RUN yarn install --pure-lockfile \
-    && npm run build \
+    && npm run build -- $NPM_RUN_BUILD_OPTS \
     && rm -r ./node_modules ./client/node_modules \
     && yarn install --pure-lockfile --production \
     && yarn cache clean
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 8604939aa..bd4ac1215 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -111,6 +111,3 @@ instance:
   name: "PEERTUBE_INSTANCE_NAME"
   description: "PEERTUBE_INSTANCE_DESCRIPTION"
   terms: "PEERTUBE_INSTANCE_TERMS"
-
-services:
-  csp-logger: "PEERTUBE_SERVICES_CSPLOGGER"
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 846c838e8..ae6bf3982 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -8,6 +8,16 @@ webserver:
   hostname: undefined
   port: 443
 
+rates_limit:
+  login:
+    # 15 attempts in 5 min
+    window: 5 minutes
+    max: 15
+  ask_send_email:
+    # 3 attempts in 5 min
+    window: 5 minutes
+    max: 3
+
 # Proxies to trust to get real client IP
 # If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
 # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
@@ -46,5 +56,9 @@ storage:
 log:
   level: 'info' # debug/info/warning/error
 
+tracker:
+  enabled: true
+  reject_too_many_announces: false # false because we have issues with traefik and ws ip/port forwarding
+
 admin:
   email: null
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 1b0a28ffb..df21a14d4 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -4,6 +4,7 @@ services:
 
   reverse-proxy:
     image: traefik
+    network_mode: "host"
     command: --docker # Tells Træfik to listen to docker
     ports:
       - "80:80"     # The HTTP port
@@ -13,7 +14,7 @@ services:
       - ./docker-volume/traefik/acme.json:/etc/acme.json
       - ./docker-volume/traefik/traefik.toml:/traefik.toml
     restart: "always"
-    # If you want to use the Traefik dashboard, you should expose it on a 
+    # If you want to use the Traefik dashboard, you should expose it on a
     # subdomain with HTTPS and authentification:
     # https://medium.com/@xavier.priour/secure-traefik-dashboard-with-https-and-password-in-docker-5b657e2aa15f
     # https://github.com/containous/traefik/issues/880#issuecomment-310301168
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 54ffdcc32..fee0f5d1c 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -41,7 +41,7 @@ server {
   # It might be nice to compress JSON, but leaving that out to protect against potential
   # compression+encryption information leak attacks like BREACH.
   gzip on;
-  gzip_types text/css text/html application/javascript;
+  gzip_types text/css application/javascript;
   gzip_vary on;
 
   # Enable HSTS