From a6fd2b30bf717eec14972a2175354781f5f43e77 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 30 Dec 2016 12:53:41 +0100
Subject: Server: move remote routes in their own directory

---
 server/helpers/utils.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'server/helpers/utils.js')

diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index 9f27671b6..7e0c9823c 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -5,11 +5,16 @@ const crypto = require('crypto')
 const logger = require('./logger')
 
 const utils = {
+  badRequest,
   cleanForExit,
   generateRandomString,
   isTestInstance
 }
 
+function badRequest (req, res, next) {
+  res.type('json').status(400).end()
+}
+
 function generateRandomString (size, callback) {
   crypto.pseudoRandomBytes(size, function (err, raw) {
     if (err) return callback(err)
-- 
cgit v1.2.3


From 55fa55a9be566cca2ba95322f2ae23b434aed62a Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Wed, 4 Jan 2017 20:59:23 +0100
Subject: Server: add video abuse support

---
 server/helpers/utils.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'server/helpers/utils.js')

diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index 7e0c9823c..9f4b14582 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -8,7 +8,8 @@ const utils = {
   badRequest,
   cleanForExit,
   generateRandomString,
-  isTestInstance
+  isTestInstance,
+  getFormatedObjects
 }
 
 function badRequest (req, res, next) {
@@ -32,6 +33,19 @@ function isTestInstance () {
   return (process.env.NODE_ENV === 'test')
 }
 
+function getFormatedObjects (objects, objectsTotal) {
+  const formatedObjects = []
+
+  objects.forEach(function (object) {
+    formatedObjects.push(object.toFormatedJSON())
+  })
+
+  return {
+    total: objectsTotal,
+    data: formatedObjects
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 module.exports = utils
-- 
cgit v1.2.3


From ed04d94f6d7132055f97a2f757b85c03c5f2a0b6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 6 Jan 2017 23:24:47 +0100
Subject: Server: try to have a better video integrity

---
 server/helpers/utils.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'server/helpers/utils.js')

diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index 9f4b14582..a902850cd 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const crypto = require('crypto')
+const retry = require('async/retry')
 
 const logger = require('./logger')
 
@@ -9,7 +10,8 @@ const utils = {
   cleanForExit,
   generateRandomString,
   isTestInstance,
-  getFormatedObjects
+  getFormatedObjects,
+  transactionRetryer
 }
 
 function badRequest (req, res, next) {
@@ -46,6 +48,18 @@ function getFormatedObjects (objects, objectsTotal) {
   }
 }
 
+function transactionRetryer (func, callback) {
+  retry({
+    times: 5,
+
+    errorFilter: function (err) {
+      const willRetry = (err.name === 'SequelizeDatabaseError')
+      logger.debug('Maybe retrying the transaction function.', { willRetry })
+      return willRetry
+    }
+  }, func, callback)
+}
+
 // ---------------------------------------------------------------------------
 
 module.exports = utils
-- 
cgit v1.2.3