diff --git a/server/index.js b/server/index.js index 73e1e5989..0dc312a0a 100644 --- a/server/index.js +++ b/server/index.js @@ -1,6 +1,5 @@ var express = require('express'); var UploadService = require('./services/upload'); -var EmbedService = require('./services/embed'); // Express app var app = express(); @@ -19,7 +18,6 @@ app.get('/', function(req, res) { }); app.post('/upload', UploadService); -app.get('/embed', EmbedService); app.listen(process.env.PORT || 5000, function() { console.log('content-kit-server: listening on port %d', this.address().port); diff --git a/server/services/embed.js b/server/services/embed.js deleted file mode 100644 index bc227dc99..000000000 --- a/server/services/embed.js +++ /dev/null @@ -1,26 +0,0 @@ -var embedly = require('embedly'); - -module.exports = function(req, res) { - - new embedly({key: process.env.EMBEDLY_KEY}, function(err, api) { - if (err) { - return res.status(500).json(err); - } - - var url = req.query.url; - if (!(/^https?:\/\//i).test(url)) { - url = 'http://' + url; - } - - api.oembed({url: url}, function(err, objs) { - if (err) { - var message = window.JSON.parse(objs).error_message; - return res.status(500).json(message); - } - - res.json(objs[0]); - }); - - }); - -}; diff --git a/src/js/commands/oembed.js b/src/js/commands/oembed.js deleted file mode 100644 index cc52ad398..000000000 --- a/src/js/commands/oembed.js +++ /dev/null @@ -1,62 +0,0 @@ -import Command from './base'; -import Prompt from '../views/prompt'; -import Message from '../views/message'; -import { inherit } from 'content-kit-utils'; -import { OEmbedder } from '../utils/http-utils'; - -/* -function loadTwitterWidgets(element) { - if (window.twttr) { - window.twttr.widgets.load(element); - } else { - var script = document.createElement('script'); - script.async = true; - script.src = 'http://platform.twitter.com/widgets.js'; - document.head.appendChild(script); - } -} -*/ - -function OEmbedCommand(options) { - Command.call(this, { - name: 'embed', - button: '', - prompt: new Prompt({ - command: this, - placeholder: 'Paste a YouTube or Twitter url...' - }) - }); - - this.embedService = new OEmbedder({ url: options.serviceUrl }); -} -inherit(OEmbedCommand, Command); - -OEmbedCommand.prototype.exec = function(url) { - var command = this; - var embedIntent = command.embedIntent; - - embedIntent.showLoading(); - this.embedService.fetch({ - url: url, - complete: function(response, error) { - embedIntent.hideLoading(); - if (error) { - var errorMsg = error; - if (error.target && error.target.status === 0) { - errorMsg = 'Error: could not connect to embed service.'; - } else if (typeof error !== 'string') { - errorMsg = 'Error: unexpected embed error.'; - } - new Message().showError(errorMsg); - embedIntent.show(); - } else if (response.error_message) { - new Message().showError(response.error_message); - embedIntent.show(); - } else { - throw new Error('Unimplemented EmbedModel is not a thing'); - } - } - }); -}; - -export default OEmbedCommand; diff --git a/src/js/editor/editor.js b/src/js/editor/editor.js index 277de63ce..ada2da6e5 100644 --- a/src/js/editor/editor.js +++ b/src/js/editor/editor.js @@ -12,7 +12,6 @@ import SubheadingCommand from '../commands/subheading'; import UnorderedListCommand from '../commands/unordered-list'; import OrderedListCommand from '../commands/ordered-list'; import ImageCommand from '../commands/image'; -import OEmbedCommand from '../commands/oembed'; import CardCommand from '../commands/card'; import ImageCard from '../cards/image'; @@ -64,7 +63,6 @@ const defaults = { ], embedCommands: [ new ImageCommand(), - new OEmbedCommand({ serviceUrl: '/embed' }), new CardCommand() ], autoTypingCommands: [ diff --git a/src/js/utils/http-utils.js b/src/js/utils/http-utils.js index 7347995b9..337e1bba6 100644 --- a/src/js/utils/http-utils.js +++ b/src/js/utils/http-utils.js @@ -14,14 +14,6 @@ function createXHR(options) { return xhr; } -function xhrGet(options) { - options.method = 'GET'; - var xhr = createXHR(options); - try { - xhr.send(); - } catch(error) {} -} - function xhrPost(options) { options.method = 'POST'; var xhr = createXHR(options); @@ -83,27 +75,4 @@ FileUploader.prototype.upload = function(options) { }); }; -function OEmbedder(options) { - options = options || {}; - var url = options.url; - if (url) { - this.url = url; - } else { - throw new Error('OEmbedder: setting the `url` to an embed service is required'); - } -} - -OEmbedder.prototype.fetch = function(options) { - var callback = options.complete; - xhrGet({ - url: this.url + "?url=" + encodeURI(options.url), - success: function(response) { - if (callback) { callback.call(this, responseJSON(response)); } - }, - error: function(error) { - if (callback) { callback.call(this, null, responseJSON(error)); } - } - }); -}; - -export { FileUploader, OEmbedder }; +export { FileUploader };