summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-16 18:06:16 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-16 18:06:16 -0400
commit3f328546f8af55f655290aefad245b0f3b049bcd (patch)
tree66d52834e79b08f36f861db3c771e617c690f624 /web
parenta2ba1615d3093f4124b59ec57193c4703f1d0620 (diff)
parentc1e23faab71443bb7af6a74cc5705e000b66f53f (diff)
downloadchat-3f328546f8af55f655290aefad245b0f3b049bcd.tar.gz
chat-3f328546f8af55f655290aefad245b0f3b049bcd.tar.bz2
chat-3f328546f8af55f655290aefad245b0f3b049bcd.zip
Merge pull request #183 from nickago/MM-1073
MM-1073 Enable youtube metadata with a google developer key
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/utils.jsx23
-rw-r--r--web/static/config/config.js4
2 files changed, 19 insertions, 8 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 19c074606..6cae7fe89 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -303,18 +303,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">
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 45c713da2..0d564b77e 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -16,6 +16,10 @@ var config = {
RequireInviteNames: false,
AllowSignupDomainsWizard: false,
+ // Google Developer Key (for Youtube API links)
+ // Leave blank to disable
+ GoogleDeveloperKey: "",
+
// Privacy switches
ShowEmail: true,