Merge pull request #1103 from SISheogorath/fix/localImageUpload

SISheogorath · web-flow · commit f492fea41859 · 2018-12-20T22:42:17.000+01:00
Fix usage of new URL API
diff --git a/lib/web/imageRouter/filesystem.js b/lib/web/imageRouter/filesystem.js
@@ -1,5 +1,5 @@
 'use strict'
-const url = require('url')
+const URL = require('url').URL
 const path = require('path')
 
 const config = require('../../config')
@@ -16,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
-  callback(null, url.URL.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))
+  callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`'use strict'`
`2`		`-const url = require('url')`
	`2`	`+const URL = require('url').URL`
`3`	`3`	`const path = require('path')`
`4`	`4`
`5`	`5`	`const config = require('../../config')`
`@@ -16,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {`
`16`	`16`	`return`
`17`	`17`	`}`
`18`	`18`
`19`		`- callback(null, url.URL.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))`
	`19`	`+ callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)`
`20`	`20`	`}`