1 files changed, 47 insertions, 10 deletions

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 19c074606..416ea5ae4 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -198,7 +198,13 @@ module.exports.getTimestamp = function() {
 }
 
 var testUrlMatch = function(text) {
-    var urlMatcher = new Autolinker.matchParser.MatchParser;
+    var urlMatcher = new Autolinker.matchParser.MatchParser({
+      urls: true,
+      emails: false,
+      twitter: false,
+      phone: false,
+      hashtag: false,
+    });
     var result = [];
     var replaceFn = function(match) {
       var linkData = {};
@@ -303,18 +309,25 @@ var getYoutubeEmbed = function(link) {
     };
 
     var success = function(data) {
-        $('.video-uploader.'+youtubeId).html(data.data.uploader);
-        $('.video-title.'+youtubeId).find('a').html(data.data.title);
+        if(!data.items.length || !data.items[0].snippet) {
+          return;
+        }
+        var metadata = data.items[0].snippet;
+        $('.video-uploader.'+youtubeId).html(metadata.channelTitle);
+        $('.video-title.'+youtubeId).find('a').html(metadata.title);
         $(".post-list-holder-by-time").scrollTop($(".post-list-holder-by-time")[0].scrollHeight);
         $(".post-list-holder-by-time").perfectScrollbar('update');
     };
 
-    $.ajax({
-        async: true,
-        url: 'https://gdata.youtube.com/feeds/api/videos/'+youtubeId+'?v=2&alt=jsonc',
-        type: 'GET',
-        success: success
-    });
+    if(config.GoogleDeveloperKey) {
+      $.ajax({
+          async: true,
+          url: "https://www.googleapis.com/youtube/v3/videos",
+          type: 'GET',
+          data: {part:"snippet", id:youtubeId, key:config.GoogleDeveloperKey},
+          success: success
+      });
+    }
 
     return (
         <div className="post-comment">
@@ -783,7 +796,6 @@ module.exports.getHomeLink = function() {
 	return window.location.protocol + "//" + parts.join(".");
 }
 
-
 module.exports.changeColor =function(col, amt) {
 
     var usePound = false;
@@ -811,5 +823,30 @@ module.exports.changeColor =function(col, amt) {
     else if (g < 0) g = 0;
 
     return (usePound?"#":"") + String("000000" + (g | (b << 8) | (r << 16)).toString(16)).slice(-6);
+};
 
+module.exports.getFullName = function(user) {
+    if (user.first_name && user.last_name) {
+        return user.first_name + " " + user.last_name;
+    } else if (user.first_name) {
+        return user.first_name;
+    } else if (user.last_name) {
+        return user.last_name;
+    } else {
+        return "";
+    }
+};
+
+module.exports.getDisplayName = function(user) {
+    if (user.nickname && user.nickname.trim().length > 0) {
+        return user.nickname;
+    } else {
+        var fullName = module.exports.getFullName(user);
+
+        if (fullName) {
+            return fullName;
+        } else {
+            return user.username;
+        }
+    }
 };