aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-12-29 12:13:19 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-12-29 12:13:19 +0100
commit4d32448895ad29ef694bcf790d59253249ad5939 (patch)
treec81643455db459dd90f004a7d2669e22a092fa4f /server/controllers
parent98ac898a03ed7bbb4edec74fe823b3f2d6d4904a (diff)
downloadPeerTube-4d32448895ad29ef694bcf790d59253249ad5939.tar.gz
PeerTube-4d32448895ad29ef694bcf790d59253249ad5939.tar.zst
PeerTube-4d32448895ad29ef694bcf790d59253249ad5939.zip
Server: use binary data instead of base64 to send thumbnails
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/remote.js4
-rw-r--r--server/controllers/api/users.js2
2 files changed, 2 insertions, 4 deletions
diff --git a/server/controllers/api/remote.js b/server/controllers/api/remote.js
index 94d6e740e..ac850c2d2 100644
--- a/server/controllers/api/remote.js
+++ b/server/controllers/api/remote.js
@@ -147,9 +147,9 @@ function addRemoteVideo (videoToCreateData, fromHost, finalCallback) {
147 }, 147 },
148 148
149 function generateThumbnail (t, tagInstances, video, callback) { 149 function generateThumbnail (t, tagInstances, video, callback) {
150 db.Video.generateThumbnailFromBase64(video, videoToCreateData.thumbnailBase64, function (err) { 150 db.Video.generateThumbnailFromData(video, videoToCreateData.thumbnailData, function (err) {
151 if (err) { 151 if (err) {
152 logger.error('Cannot generate thumbnail from base 64 data.', { error: err }) 152 logger.error('Cannot generate thumbnail from data.', { error: err })
153 return callback(err) 153 return callback(err)
154 } 154 }
155 155
diff --git a/server/controllers/api/users.js b/server/controllers/api/users.js
index e4423680c..53bf56790 100644
--- a/server/controllers/api/users.js
+++ b/server/controllers/api/users.js
@@ -1,12 +1,10 @@
1'use strict' 1'use strict'
2 2
3const each = require('async/each')
4const express = require('express') 3const express = require('express')
5const waterfall = require('async/waterfall') 4const waterfall = require('async/waterfall')
6 5
7const constants = require('../../initializers/constants') 6const constants = require('../../initializers/constants')
8const db = require('../../initializers/database') 7const db = require('../../initializers/database')
9const friends = require('../../lib/friends')
10const logger = require('../../helpers/logger') 8const logger = require('../../helpers/logger')
11const middlewares = require('../../middlewares') 9const middlewares = require('../../middlewares')
12const admin = middlewares.admin 10const admin = middlewares.admin