From 3ac046e2a478a88e24d5ce82d4c43cdd64dea1a2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 26 Jul 2018 16:45:47 +0200
Subject: [PATCH] Fix peertube on chrome

---
 server.ts                        | 31 -------------------------------
 server/lib/activitypub/videos.ts |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/server.ts b/server.ts
index 1bfec724b..efbfd3c97 100644
--- a/server.ts
+++ b/server.ts
@@ -53,39 +53,8 @@ app.set('trust proxy', CONFIG.TRUST_PROXY)
 app.use(helmet({
   frameguard: {
     action: 'deny' // we only allow it for /videos/embed, see server/controllers/client.ts
-  },
-  dnsPrefetchControl: {
-    allow: true
-  },
-  contentSecurityPolicy: {
-    directives: {
-      defaultSrc: ['*', 'data:', REMOTE_SCHEME.WS + ':', REMOTE_SCHEME.HTTP + ':'],
-      fontSrc: ["'self'", 'data:'],
-      frameSrc: ["'none'"],
-      mediaSrc: ['*', REMOTE_SCHEME.HTTP + ':'],
-      objectSrc: ["'none'"],
-      scriptSrc: ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
-      styleSrc: ["'self'", "'unsafe-inline'"],
-      upgradeInsecureRequests: false
-    },
-    browserSniff: false // assumes a modern browser, but allows CDN in front
-  },
-  referrerPolicy: {
-    policy: 'strict-origin-when-cross-origin'
   }
 }))
-app.use((_, res, next) => {
-  [
-    "vibrate 'none'",
-    "geolocation 'none'",
-    "camera 'none'",
-    "microphone 'none'",
-    "magnetometer 'none'",
-    "payment 'none'",
-    "accelerometer 'none'"
-  ].forEach(e => res.append('Feature-Policy', e + ';'))
-  next()
-})
 
 // ----------- Database -----------
 
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index b6f57e0ab..b3fbf88d0 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -287,7 +287,7 @@ async function createRates (actorUrls: string[], video: VideoModel, rate: VideoR
   logger.info('Adding %d %s to video %s.', rateCounts, rate, video.uuid)
 
   // This is "likes" and "dislikes"
-  await video.increment(rate + 's', { by: rateCounts })
+  if (rateCounts !== 0) await video.increment(rate + 's', { by: rateCounts })
 
   return
 }
-- 
2.41.0