From 3b4ee38f9908f0cec486dad629d44679c5466cb9 Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Mon, 27 Jul 2015 15:15:38 +0900 Subject: [PATCH] add util for adding "http" to URL; add isVideo posts helper --- packages/telescope-api/lib/server/api.js | 6 +----- packages/telescope-lib/lib/utils.js | 11 +++++++++-- packages/telescope-posts/lib/helpers.js | 9 +++++++++ packages/telescope-rss/lib/server/rss.js | 7 ++----- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/telescope-api/lib/server/api.js b/packages/telescope-api/lib/server/api.js index 60ea72bde..1fc34c004 100644 --- a/packages/telescope-api/lib/server/api.js +++ b/packages/telescope-api/lib/server/api.js @@ -21,11 +21,7 @@ serveAPI = function(limitSegment){ properties.domain = Telescope.utils.getDomain(url); if (post.thumbnailUrl) { - // add http: if missing - if (post.thumbnailUrl.substring(0, 5) !== "http:" && post.thumbnailUrl.substring(0, 6) !== "https:") { - post.thumbnailUrl = "http:"+post.thumbnailUrl; - } - properties.thumbnailUrl = post.thumbnailUrl; + properties.thumbnailUrl = Telescope.utils.addHttp(post.thumbnailUrl); } var twitterName = Users.getTwitterNameById(post.userId); diff --git a/packages/telescope-lib/lib/utils.js b/packages/telescope-lib/lib/utils.js index 968f3cca5..94d931754 100644 --- a/packages/telescope-lib/lib/utils.js +++ b/packages/telescope-lib/lib/utils.js @@ -169,6 +169,14 @@ Telescope.utils.invitesEnabled = function() { return Settings.get("requireViewInvite") || Settings.get("requirePostInvite"); }; +// add http: if missing +Telescope.utils.addHttp = function (url) { + if (url.substring(0, 5) !== "http:" && url.substring(0, 6) !== "https:") { + url = "http:"+url; + } + return url; +}; + ///////////////////////////// // String Helper Functions // ///////////////////////////// @@ -228,5 +236,4 @@ Telescope.getNestedProperty = function (obj, desc) { var arr = desc.split("."); while(arr.length && (obj = obj[arr.shift()])); return obj; -} - +}; diff --git a/packages/telescope-posts/lib/helpers.js b/packages/telescope-posts/lib/helpers.js index b4c08a923..df4b39d06 100644 --- a/packages/telescope-posts/lib/helpers.js +++ b/packages/telescope-posts/lib/helpers.js @@ -92,3 +92,12 @@ Posts.checkForSameUrl = function (url, currentUser) { Posts.current = function () { return Posts.findOne(Router.current().data().post._id); }; + +/** + * Check to see if a post is a link to a video + * @param {Object} post + */ +Posts.isVideo = function (post) { + return post.media && post.media.type === "video"; +}; +Posts.helpers({isVideo: function () {return Posts.isVideo(this);}}); diff --git a/packages/telescope-rss/lib/server/rss.js b/packages/telescope-rss/lib/server/rss.js index b679881b5..f1033df83 100644 --- a/packages/telescope-rss/lib/server/rss.js +++ b/packages/telescope-rss/lib/server/rss.js @@ -30,11 +30,8 @@ servePostRSS = function(view, url) { }; if (post.thumbnailUrl) { - // add http: if missing - if (post.thumbnailUrl.substring(0, 5) !== "http:" && post.thumbnailUrl.substring(0, 6) !== "https:") { - post.thumbnailUrl = "http:"+post.thumbnailUrl; - } - feedItem.custom_elements = [{"imageUrl": post.thumbnailUrl}, {"content": post.thumbnailUrl}]; + var url = Telescope.utils.addHttp(post.thumbnailUrl); + feedItem.custom_elements = [{"imageUrl":url}, {"content": url}]; } feed.item(feedItem);