From 93e293a5b2afda0209bddc692ed9cd3518a694df Mon Sep 17 00:00:00 2001 From: kakawait Date: Sun, 25 Oct 2015 19:59:32 +0100 Subject: [PATCH] First draft to support Oembed protocol as defined http://oembed.com/ Currently only support soundcloud (futur providers will be add) --- .meteor/versions | 1 - .../client/baseWidget.coffee | 3 + .../client/oembedFrameWidget.html} | 8 ++- packages/rocketchat-oembed/package.js | 5 ++ .../rocketchat-oembed/server/providers.coffee | 55 +++++++++++++++++++ .../lib/client/widget.coffee | 3 - .../lib/server/server.coffee | 19 ------- packages/rocketchat-soundcloud/package.js | 28 ---------- 8 files changed, 69 insertions(+), 53 deletions(-) rename packages/{rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html => rocketchat-oembed/client/oembedFrameWidget.html} (67%) create mode 100644 packages/rocketchat-oembed/server/providers.coffee delete mode 100644 packages/rocketchat-soundcloud/lib/client/widget.coffee delete mode 100644 packages/rocketchat-soundcloud/lib/server/server.coffee delete mode 100644 packages/rocketchat-soundcloud/package.js diff --git a/.meteor/versions b/.meteor/versions index 15562e4f1fe..937836621ce 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -142,7 +142,6 @@ rocketchat:oembed@0.0.1 rocketchat:slashcommands-invite@0.0.1 rocketchat:slashcommands-join@0.0.1 rocketchat:slashcommands-leave@0.0.1 -rocketchat:soundcloud@0.0.1 rocketchat:spotify@0.0.1 rocketchat:statistics@0.0.1 rocketchat:theme@0.0.1 diff --git a/packages/rocketchat-oembed/client/baseWidget.coffee b/packages/rocketchat-oembed/client/baseWidget.coffee index 8a84ed7a506..9caa79832b0 100644 --- a/packages/rocketchat-oembed/client/baseWidget.coffee +++ b/packages/rocketchat-oembed/client/baseWidget.coffee @@ -15,4 +15,7 @@ Template.oembedBaseWidget.helpers if this.parsedUrl?.host is 'www.youtube.com' and this.meta?.twitterPlayer? return 'oembedYoutubeWidget' + if this.meta?.oembedHtml? + return 'oembedFrameWidget' + return 'oembedUrlWidget' diff --git a/packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html b/packages/rocketchat-oembed/client/oembedFrameWidget.html similarity index 67% rename from packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html rename to packages/rocketchat-oembed/client/oembedFrameWidget.html index f478120bed7..6965b8e6102 100644 --- a/packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html +++ b/packages/rocketchat-oembed/client/oembedFrameWidget.html @@ -1,7 +1,11 @@ -