diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 5b7d710151..7496c5c257 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -115,7 +115,7 @@ define(['taskbar'], function(taskbar) {
var postContainer = $(composerTemplate[0]);
- if(config.allowFileUploads || config.imgurClientIDSet) {
+ if(config.allowFileUploads || config.hasPostUploadPlugin) {
initializeFileReader(post_uuid);
}
@@ -369,7 +369,7 @@ define(['taskbar'], function(taskbar) {
postContainer.css('height', $(window).height() - $('#header-menu').height());
}
- if(config.imgurClientIDSet) {
+ if(config.hasPostUploadPlugin) {
if(env === 'md' || env === 'lg') {
postContainer.find('.upload-instructions').removeClass('hide');
}
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index 294ac35ebd..f4d13233b0 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -26,8 +26,6 @@
-
-
diff --git a/src/imgur.js b/src/imgur.js
deleted file mode 100644
index 84f6c898ee..0000000000
--- a/src/imgur.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var request = require('request'),
- winston = require('winston');
-
-
-(function (imgur) {
- "use strict";
-
- imgur.upload = function (clientID, image, type, callback) {
- var options = {
- url: 'https://api.imgur.com/3/upload.json',
- headers: {
- 'Authorization': 'Client-ID ' + clientID
- }
- };
-
- var post = request.post(options, function (err, req, body) {
- if(err) {
- return callback(err, null);
- }
-
- try {
- var response = JSON.parse(body);
-
- if(response.success) {
- callback(null, response.data);
- } else {
- callback(new Error(response.data.error.message), null);
- }
- } catch(e) {
- winston.error('Unable to parse Imgur json response. [' + body +']');
- callback(e, null);
- }
- });
-
- post.form({
- type: type,
- image: image
- });
- };
-
-}(exports));
\ No newline at end of file
diff --git a/src/install.js b/src/install.js
index 32695c8aa6..ac203afed9 100644
--- a/src/install.js
+++ b/src/install.js
@@ -237,9 +237,6 @@ var async = require('async'),
}, {
field: 'minimumPasswordLength',
value: 6
- }, {
- field: 'imgurClientID',
- value: ''
}, {
field: 'maximumSignatureLength',
value: 255
diff --git a/src/posts.js b/src/posts.js
index c2fc8e1abc..e54c3921b3 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -400,22 +400,7 @@ var db = require('./database'),
plugins.fireHook('filter:post.upload', image, callback);
} else {
- if(meta.config.imgurClientID) {
- if(!image || !image.data) {
- return callback(new Error('invalid image'));
- }
-
- require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
- if(err) {
- return callback(err);
- }
-
- callback(null, {
- url: data.link,
- name: image.name
- });
- });
- } else if (meta.config.allowFileUploads) {
+ if (meta.config.allowFileUploads) {
Posts.uploadPostFile(image, callback);
} else {
callback(new Error('Uploads are disabled!'));
diff --git a/src/routes/api.js b/src/routes/api.js
index e139c5672e..89e16cf268 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -37,7 +37,7 @@ var path = require('path'),
config.minimumTitleLength = meta.config.minimumTitleLength;
config.maximumTitleLength = meta.config.maximumTitleLength;
config.minimumPostLength = meta.config.minimumPostLength;
- config.imgurClientIDSet = !! meta.config.imgurClientID;
+ config.hasPostUploadPlugin = Plugins.hasListeners('filter:post.uploadImage');
config.minimumUsernameLength = meta.config.minimumUsernameLength;
config.maximumUsernameLength = meta.config.maximumUsernameLength;
config.minimumPasswordLength = meta.config.minimumPasswordLength;