diff --git a/CHANGELOG.md b/CHANGELOG.md index 93aef175..e384864c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.3.4] - 2024-05-29 +### Added +- YouTube advanced search with temporal and geolocation filters [#136](https://github.com/ncsa/standalone-smm-smile/issues/136) +- YouTube search channels and playlists [#127](https://github.com/ncsa/standalone-smm-smile/issues/127) +- Include latest publications to the citations [#148](https://github.com/ncsa/standalone-smm-smile/issues/148) + +### Fixed +- YouTube search histogram switching interval [#143](https://github.com/ncsa/standalone-smm-smile/issues/143) +- Reddit auth checkbox not visible [#144](https://github.com/ncsa/standalone-smm-smile/issues/144) + ## [0.3.3] - 2024-05-16 ### Added - YouTube Authorization flow[#122](https://github.com/ncsa/standalone-smm-smile/issues/122) diff --git a/README.md b/README.md index e8a24751..6d5382dc 100644 --- a/README.md +++ b/README.md @@ -83,3 +83,15 @@ You can find the deployed python code in [smm-analytics repository](https://open - Set the environment variable ```GA_KEY``` and provide the value of your Google Analytics 4 key. Please contact the **[SRTI lab](https://srtilab.techservices.illinois.edu/about/)** to request assistance on setting up the SMILE server. + + +#### Generate GraphQL Docs +1. Install `npm install -g @2fd/graphdoc` +2. Update package.json to include the following script: +```json + "graphdoc": { + "endpoint": "http://localhost:5050/graphql", + "output": "./public/graphql-doc/schema" + } +``` +3. Run `graphdoc --force` diff --git a/www/package-lock.json b/www/package-lock.json index 6fb86b0f..293bf7be 100644 --- a/www/package-lock.json +++ b/www/package-lock.json @@ -1,12 +1,12 @@ { "name": "smile_server", - "version": "0.3.3", + "version": "0.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "smile_server", - "version": "0.3.3", + "version": "0.3.4", "license": "MIT", "dependencies": { "amqplib": "^0.8.0", diff --git a/www/package.json b/www/package.json index f2fb6f7d..9f45d781 100644 --- a/www/package.json +++ b/www/package.json @@ -1,6 +1,6 @@ { "name": "smile_server", - "version": "0.3.3", + "version": "0.3.4", "description": "", "main": "app.js", "dependencies": { @@ -44,6 +44,10 @@ "start": " forever app.js", "docker-start": "node app.js" }, + "graphdoc": { + "endpoint": "http://localhost:5050/graphql", + "output": "./public/graphql-doc/schema" + }, "author": "Chen Wang ", "license": "MIT" } diff --git a/www/public/bootstrap/css/customized/search.css b/www/public/bootstrap/css/customized/search.css index 76d36e33..bf4bf799 100644 --- a/www/public/bootstrap/css/customized/search.css +++ b/www/public/bootstrap/css/customized/search.css @@ -429,7 +429,7 @@ nav-tabs li a:hover{ .grid-element{ width:calc(31%); - height:400px; + min-height:400px; float:left; margin:8px 8px; background-color:#f5f5f5; diff --git a/www/public/bootstrap/js/customized/history_pb.js b/www/public/bootstrap/js/customized/history_pb.js index 9962f22f..9762bd71 100644 --- a/www/public/bootstrap/js/customized/history_pb.js +++ b/www/public/bootstrap/js/customized/history_pb.js @@ -94,7 +94,13 @@ $.getScript("bootstrap/js/customized/view_helperFunc.js", function(){ var secondLevel = 'User Imported Data'; } else if (key1 === 'youtube-Search') { - var secondLevel = 'YouTube Search Results'; + var secondLevel = 'YouTube Videos'; + } + else if (key1 === 'youtube-Search-Channel') { + var secondLevel = 'YouTube Channels'; + } + else if (key1 === 'youtube-Search-Playlist') { + var secondLevel = 'YouTube Playlists'; } else if (key1 === 'networkx') { var secondLevel = 'Python NetworkX'; diff --git a/www/public/bootstrap/js/customized/query_auth.js b/www/public/bootstrap/js/customized/query_auth.js index cf9593ea..c81f247f 100644 --- a/www/public/bootstrap/js/customized/query_auth.js +++ b/www/public/bootstrap/js/customized/query_auth.js @@ -1,6 +1,6 @@ function authorize(platform){ // showing the check mark - $("#youtube-auth").find(".export-success").show(); + $(`#${platform}-auth`).find(".export-success").show(); // toggle the second auth panel $("#unauthorized").find("." + platform + "-auth").hide(); @@ -22,6 +22,8 @@ function authorize(platform){ } else if (platform === 'youtube') { $("#social-media option[value='queryYoutube']").removeAttr('disabled'); + $("#social-media option[value='queryYoutubeChannel']").removeAttr('disabled'); + $("#social-media option[value='queryYoutubePlaylist']").removeAttr('disabled'); } } diff --git a/www/public/bootstrap/js/customized/query_pb.js b/www/public/bootstrap/js/customized/query_pb.js index 202d728e..4b077cb4 100644 --- a/www/public/bootstrap/js/customized/query_pb.js +++ b/www/public/bootstrap/js/customized/query_pb.js @@ -15,7 +15,9 @@ function init(){ rdPost:{}, psPost:{}, psComment:{}, - youtubeSearch:{} + youtubeSearch:{}, + youtubeSearchChannel:{}, + youtubeSearchPlaylist:{}, }; // initialization @@ -65,7 +67,7 @@ function init(){ // customize advance dropdown $('#dropdownButton').on('click',function(){ if ($("#searchbox").val() !== '' && $("#searchbox").val() !== undefined){ - if (queryTerm !== "queryTweetV2" && queryTerm !== "queryYoutube"){ + if (queryTerm !== "queryTweetV2"){ $(this).parent().toggleClass('open'); if ($(this).parent().attr('class') === 'dropdown dropdown-lg open'){ // disable search and enable advanced search @@ -78,8 +80,7 @@ function init(){ // initialize the advanced panel // escape doule quotation mark - var keyword = $("#searchbox").val(); - var keyword = keyword.replace(/[\"]+/g, `\\"`); + var keyword = $("#searchbox").val().replace(/[\"]+/g, `\\"`); parameters['tweet']['q:'] = keyword; parameters['tweet']['fields'] = `\n\t\t\tid\n\t\t\tid_str\n\t\t\tcreated_at\n\t\t\ttext\n\t\t\tretweet_count`+ @@ -136,6 +137,44 @@ function init(){ parameters['psComment']['fields']=`\n\t\t\tcomment_author_name\n\t\t\tbody\n\t\t\tcomment_created\n\t\t\tid\n\t\t\tlink_id\n\t\t\tparent_id`+ `\n\t\t\tcomment_score\n\t\t\tsubreddit_display_name\n\t\t\tsubreddit_name_prefixed\n\t\t\tsubreddit_id`; + parameters['youtubeSearch']['q:'] = keyword; + parameters['youtubeSearch']['order:'] = "relevance"; + parameters['youtubeSearch']['videoDuration:'] = "any"; + parameters['youtubeSearch']['fields'] = "\n\t\t\tkind\n\t\t\tetag\n\t\t\tid{\n\t\t\t\tkind\n\t\t\t\tvideoId\n\t\t\t\tchannelId\n\t\t\t\tplaylistId\n\t\t\t}" + + "\n\t\t\tsnippet{\n\t\t\t\tpublishedAt\n\t\t\t\tchannelId\n\t\t\t\ttitle\n\t\t\t\tdescription\n\t\t\t\tdefault_thumbnails_url" + + "\n\t\t\t\tdefault_thumbnails_width\n\t\t\t\tdefault_thumbnails_height\n\t\t\t\tmedium_thumbnails_url\n\t\t\t\tmedium_thumbnails_width" + + "\n\t\t\t\tmedium_thumbnails_height\n\t\t\t\thigh_thumbnails_url\n\t\t\t\thigh_thumbnails_width\n\t\t\t\thigh_thumbnails_height" + + "\n\t\t\t\tstandard_thumbnails_url\n\t\t\t\tstandard_thumbnails_width\n\t\t\t\tstandard_thumbnails_height\n\t\t\t\tmaxres_thumbnails_url" + + "\n\t\t\t\tmaxres_thumbnails_width\n\t\t\t\thigh_thumbnails_height\n\t\t\t\tchannelTitle\n\t\t\t\tliveBroadcastContent\n\t\t\t}"; + + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + + parameters['youtubeSearchChannel']['q:'] = keyword; + parameters['youtubeSearchChannel']['type:'] = "channel"; + parameters['youtubeSearchChannel']['order:'] = "relevance"; + parameters['youtubeSearchChannel']['videoDuration:'] = "any"; + parameters['youtubeSearchChannel']['fields'] = "\n\t\t\tkind\n\t\t\tetag\n\t\t\tid{\n\t\t\t\tkind\n\t\t\t\tvideoId\n\t\t\t\tchannelId\n\t\t\t\tplaylistId\n\t\t\t}" + + "\n\t\t\tsnippet{\n\t\t\t\tpublishedAt\n\t\t\t\tchannelId\n\t\t\t\ttitle\n\t\t\t\tdescription\n\t\t\t\tdefault_thumbnails_url" + + "\n\t\t\t\tdefault_thumbnails_width\n\t\t\t\tdefault_thumbnails_height\n\t\t\t\tmedium_thumbnails_url\n\t\t\t\tmedium_thumbnails_width" + + "\n\t\t\t\tmedium_thumbnails_height\n\t\t\t\thigh_thumbnails_url\n\t\t\t\thigh_thumbnails_width\n\t\t\t\thigh_thumbnails_height" + + "\n\t\t\t\tstandard_thumbnails_url\n\t\t\t\tstandard_thumbnails_width\n\t\t\t\tstandard_thumbnails_height\n\t\t\t\tmaxres_thumbnails_url" + + "\n\t\t\t\tmaxres_thumbnails_width\n\t\t\t\thigh_thumbnails_height\n\t\t\t\tchannelTitle\n\t\t\t\tliveBroadcastContent\n\t\t\t}"; + + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + + parameters['youtubeSearchPlaylist']['q:'] = keyword; + parameters['youtubeSearchPlaylist']['type:'] = "playlist"; + parameters['youtubeSearchPlaylist']['order:'] = "relevance"; + parameters['youtubeSearchPlaylist']['videoDuration:'] = "any"; + parameters['youtubeSearchPlaylist']['fields'] = "\n\t\t\tkind\n\t\t\tetag\n\t\t\tid{\n\t\t\t\tkind\n\t\t\t\tvideoId\n\t\t\t\tchannelId\n\t\t\t\tplaylistId\n\t\t\t}" + + "\n\t\t\tsnippet{\n\t\t\t\tpublishedAt\n\t\t\t\tchannelId\n\t\t\t\ttitle\n\t\t\t\tdescription\n\t\t\t\tdefault_thumbnails_url" + + "\n\t\t\t\tdefault_thumbnails_width\n\t\t\t\tdefault_thumbnails_height\n\t\t\t\tmedium_thumbnails_url\n\t\t\t\tmedium_thumbnails_width" + + "\n\t\t\t\tmedium_thumbnails_height\n\t\t\t\thigh_thumbnails_url\n\t\t\t\thigh_thumbnails_width\n\t\t\t\thigh_thumbnails_height" + + "\n\t\t\t\tstandard_thumbnails_url\n\t\t\t\tstandard_thumbnails_width\n\t\t\t\tstandard_thumbnails_height\n\t\t\t\tmaxres_thumbnails_url" + + "\n\t\t\t\tmaxres_thumbnails_width\n\t\t\t\thigh_thumbnails_height\n\t\t\t\tchannelTitle\n\t\t\t\tliveBroadcastContent\n\t\t\t}"; + Query =updateString(queryTerm,parameters); $("#input").val(`{\n\n` + Query +`\n\n}`); } @@ -258,7 +297,7 @@ function init(){ $("#searchbox").attr("placeholder","Keyword that you wish to search..."); $("boolean").tooltip('hide'); } - else if ( queryTerm === 'queryYoutube'){ + else if ( queryTerm === 'queryYoutube' || queryTerm === 'queryYoutubeChannel' || queryTerm === 'queryYoutubePlaylist'){ $(".youtube-search").show(); $("#searchbox").attr("placeholder","Keywords for the Youtube content that you wish to search..."); @@ -358,6 +397,8 @@ function init(){ parameters['psPost']['q:'] = keyword; parameters['psComment']['q:'] = keyword; parameters['youtubeSearch']['q:'] = keyword; + parameters['youtubeSearchChannel']['q:'] = keyword; + parameters['youtubeSearchPlaylist']['q:'] = keyword; Query =updateString(queryTerm,parameters); $("#input").val(`{\n\n` + Query +`\n\n}`); @@ -839,7 +880,147 @@ function init(){ }); /*----------------------------------------------------- Youtube Search-------------------------------------------------------*/ - // TODO implement advanced youtube search here + // count + $("#youtube-count").change(function(){ + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + // order + $("input[name='ytOrder']").change(function(){ + parameters['youtubeSearch']['order:'] = $(this).val(); + parameters['youtubeSearchChannel']['order:'] = $(this).val(); + parameters['youtubeSearchPlaylist']['order:'] = $(this).val(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + + // duration + $("input[name='ytDuration']").change(function(){ + parameters['youtubeSearch']['videoDuration:'] = $(this).val(); + parameters['youtubeSearchChannel']['videoDuration:'] = $(this).val(); + parameters['youtubeSearchPlaylist']['videoDuration:'] = $(this).val(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + + // advanced + $("#ytFilters").change(function() { + if ($("#ytFilters").is(':checked')) { + $(".form-group.ytFilters").show(); + $("#channelId").change(function () { + parameters['youtubeSearch']['channelId:'] = $(this).val(); + parameters['youtubeSearchChannel']['channelId:'] = $(this).val(); + parameters['youtubeSearchPlaylist']['channelId:'] = $(this).val(); + Query = updateString(queryTerm, parameters); + $("#input").val(`{\n\n` + Query + `\n\n}`); + }); + $("#regionCode").change(function () { + parameters['youtubeSearch']['regionCode:'] = $(this).val(); + parameters['youtubeSearchChannel']['regionCode:'] = $(this).val(); + parameters['youtubeSearchPlaylist']['regionCode:'] = $(this).val(); + Query = updateString(queryTerm, parameters); + $("#input").val(`{\n\n` + Query + `\n\n}`); + }); + $("#relevanceLanguage").change(function () { + parameters['youtubeSearch']['relevanceLanguage:'] = $(this).val(); + parameters['youtubeSearchChannel']['relevanceLanguage:'] = $(this).val(); + parameters['youtubeSearchPlaylist']['relevanceLanguage:'] = $(this).val(); + Query = updateString(queryTerm, parameters); + $("#input").val(`{\n\n` + Query + `\n\n}`); + }); + } + else{ + $(".form-group.ytFilters").hide(); + parameters['youtubeSearch']['channelId:'] = ''; + parameters['youtubeSearchChannel']['channelId:'] = ''; + parameters['youtubeSearchPlaylist']['channelId:'] = ''; + parameters['youtubeSearch']['regionCode:'] = ''; + parameters['youtubeSearchChannel']['regionCode:'] = ''; + parameters['youtubeSearchPlaylist']['regionCode:'] = ''; + parameters['youtubeSearch']['relevanceLanguage:'] = ''; + parameters['youtubeSearchChannel']['relevanceLanguage:'] = ''; + parameters['youtubeSearchPlaylist']['relevanceLanguage:'] = ''; + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + if ( $('.dropdown.dropdown-lg.open').length ){ + pushAdvancedDropdown('on'); + } + } + }); + + // published range + $("#ytDateRange").change(function() { + if ($("#ytDateRange").is(':checked')) { + $(".form-group.ytDateRange").show(); + $("#publishedAfter").change(function(){ + let publishedAfter = new Date($("#publishedAfter").val()); + parameters['youtubeSearch']['publishedAfter:'] = publishedAfter.toISOString(); + parameters['youtubeSearchChannel']['publishedAfter:'] = publishedAfter.toISOString(); + parameters['youtubeSearchPlaylist']['publishedAfter:'] = publishedAfter.toISOString(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + $("#publishedBefore").change(function(){ + let publishedBefore = new Date($("#publishedBefore").val()); + parameters['youtubeSearch']['publishedBefore:'] = publishedBefore.toISOString(); + parameters['youtubeSearchChannel']['publishedBefore:'] = publishedBefore.toISOString(); + parameters['youtubeSearchPlaylist']['publishedBefore:'] = publishedBefore.toISOString(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + } + else{ + $(".form-group.ytDateRange").hide(); + parameters['youtubeSearch']['publishedAfter:'] = ''; + parameters['youtubeSearchChannel']['publishedAfter:'] = ''; + parameters['youtubeSearchPlaylist']['publishedAfter:'] = ''; + parameters['youtubeSearchChannel']['publishedBefore:'] = ''; + parameters['youtubeSearch']['publishedBefore:'] = ''; + parameters['youtubeSearchPlaylist']['publishedBefore:'] = ''; + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + if ( $('.dropdown.dropdown-lg.open').length ){ + pushAdvancedDropdown('on'); + } + } + }); + + + // location + $("#ytGeoSearch").change(function(){ + if ($("#ytGeoSearch").is(':checked')) { + $(".form-group.ytGeoSearch").show(); + $("#ytLocation").change(function(){ + parameters['youtubeSearch']['location:'] = $("#ytLocation").val(); + parameters['youtubeSearchChannel']['location:'] = $("#ytLocation").val(); + parameters['youtubeSearchPlaylist']['location:'] = $("#ytLocation").val(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + $("#ytLocationRadius").change(function(){ + parameters['youtubeSearch']['locationRadius:'] = $("#ytLocationRadius").val(); + parameters['youtubeSearchChannel']['locationRadius:'] = $("#ytLocationRadius").val(); + parameters['youtubeSearchPlaylist']['locationRadius:'] = $("#ytLocationRadius").val(); + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + }); + } + else { + $(".form-group.ytGeoSearch").hide(); + parameters['youtubeSearch']['location:'] = ''; + parameters['youtubeSearchChannel']['location:'] = ''; + parameters['youtubeSearchPlaylist']['location:'] = ''; + parameters['youtubeSearch']['locationRadius:'] = ''; + parameters['youtubeSearchChannel']['locationRadius:'] = ''; + parameters['youtubeSearchPlaylist']['locationRadius:'] = ''; + Query =updateString(queryTerm,parameters); + $("#input").val(`{\n\n` + Query +`\n\n}`); + if ( $('.dropdown.dropdown-lg.open').length ){ + pushAdvancedDropdown('on'); + } + } + + }); /*----------------------set intervals--------------------------------------------*/ $('input[name=histogram-interval]').change(function(){ @@ -904,9 +1085,15 @@ function updateString(queryTerm, parameters){ else if (queryTerm === 'pushshiftComment'){ query = `\treddit{\n\t\tpushshiftComment(`+ constructQuery(parameters.psComment) + `\n\t\t}\n\t}`; } - else if (queryTerm === 'youtubeSearch'){ + else if (queryTerm === 'queryYoutube'){ query = `\tyoutube{\n\t\tsearch(${constructQuery(parameters.youtubeSearch)}\n\t\t}\n\t}`; } + else if (queryTerm === 'queryYoutubeChannel'){ + query = `\tyoutube{\n\t\tsearch(${constructQuery(parameters.youtubeSearchChannel)}\n\t\t}\n\t}`; + } + else if (queryTerm === 'queryYoutubePlaylist'){ + query = `\tyoutube{\n\t\tsearch(${constructQuery(parameters.youtubeSearchPlaylist)}\n\t\t}\n\t}`; + } return query; } @@ -951,6 +1138,7 @@ function setDate(){ $("#until").attr('max', max); } + function setHitogramInterval(freq){ var filename = $("#sn-filename").val(); @@ -972,8 +1160,12 @@ function setHitogramInterval(freq){ prefix = 'reddit-Historical-Post'; }else if (queryTerm === 'pushshiftComment'){ prefix = 'reddit-Historical-Comment'; - }else if (queryTerm === 'youtubeSearch'){ + }else if (queryTerm === 'queryYoutube'){ prefix = 'youtube-Search'; + }else if (queryTerm === 'queryYoutubeChannel'){ + prefix = 'youtube-Search-Channel'; + }else if (queryTerm === 'queryYoutubePlaylist'){ + prefix = 'youtube-Search-Playlist'; } if (prefix === undefined || filename === '' || filename === undefined){ diff --git a/www/public/bootstrap/js/customized/query_submit.js b/www/public/bootstrap/js/customized/query_submit.js index 0b8d5497..6256853d 100644 --- a/www/public/bootstrap/js/customized/query_submit.js +++ b/www/public/bootstrap/js/customized/query_submit.js @@ -38,11 +38,21 @@ function submitQuery(textareaID,filenameID, dryrun = false){ prefix = 'reddit-Historical-Comment'; params = parameters.psComment ; pages = -999; - }else if (queryTerm === 'youtubeSearch'){ + }else if (queryTerm === 'queryYoutube'){ prefix = 'youtube-Search'; params = parameters.youtubeSearch ; pages = parseInt($("#youtube-count").val())/50; } + else if (queryTerm === 'queryYoutubeChannel'){ + prefix = 'youtube-Search-Channel'; + params = parameters.youtubeSearchChannel ; + pages = parseInt($("#youtube-count").val())/50; + } + else if (queryTerm === 'queryYoutubePlaylist'){ + prefix = 'youtube-Search-Playlist'; + params = parameters.youtubeSearchPlaylist ; + pages = parseInt($("#youtube-count").val())/50; + } if (dryrun){ $("#instruction").hide(); @@ -66,7 +76,12 @@ function submitQuery(textareaID,filenameID, dryrun = false){ renderPreview(data.rendering, prefix); $("#saveButton").removeAttr("disabled"); $("#save-result").show(); - } + + // close dropdown menu + $("#dropdownButton").parent().toggleClass('open'); + $("#simple-search-btn").prop('disabled',false); + pushAdvancedDropdown('off'); + } }, error: function(jqXHR, exception){ $("#error").val(jqXHR.responseText); @@ -470,7 +485,7 @@ function submitSearchbox(searchboxID, filenameID, dryrun = false){ if (dryrun) pages = 1; queryString = `{ youtube { - search(q: "${keyword}") { + search(q: "${keyword}", type:"video") { kind etag id{ @@ -509,6 +524,94 @@ function submitSearchbox(searchboxID, filenameID, dryrun = false){ prefix = 'youtube-Search'; params = parameters.youtubeSearch; } + else if (queryTerm === 'queryYoutubeChannel'){ + pages = 2; // TODO change me to 10 later + if (dryrun) pages = 1; + queryString = `{ + youtube { + search(q: "${keyword}", type:"channel") { + kind + etag + id{ + kind + videoId + channelId + playlistId + } + snippet{ + publishedAt + channelId + title + description + default_thumbnails_url + default_thumbnails_width + default_thumbnails_height + medium_thumbnails_url + medium_thumbnails_width + medium_thumbnails_height + high_thumbnails_url + high_thumbnails_width + high_thumbnails_height + standard_thumbnails_url + standard_thumbnails_width + standard_thumbnails_height + maxres_thumbnails_url + maxres_thumbnails_width + high_thumbnails_height + channelTitle + liveBroadcastContent + } + } + } + } + `; + prefix = 'youtube-Search-Channel'; + params = parameters.youtubeSearchChannel; + } + else if (queryTerm === 'queryYoutubePlaylist'){ + pages = 2; // TODO change me to 10 later + if (dryrun) pages = 1; + queryString = `{ + youtube { + search(q: "${keyword}", type:"playlist") { + kind + etag + id{ + kind + videoId + channelId + playlistId + } + snippet{ + publishedAt + channelId + title + description + default_thumbnails_url + default_thumbnails_width + default_thumbnails_height + medium_thumbnails_url + medium_thumbnails_width + medium_thumbnails_height + high_thumbnails_url + high_thumbnails_width + high_thumbnails_height + standard_thumbnails_url + standard_thumbnails_width + standard_thumbnails_height + maxres_thumbnails_url + maxres_thumbnails_width + high_thumbnails_height + channelTitle + liveBroadcastContent + } + } + } + } + `; + prefix = 'youtube-Search-Playlist'; + params = parameters.youtubeSearchPlaylist; + } if (dryrun){ $("#instruction").hide(); @@ -766,15 +869,26 @@ function renderPreview(rendering,prefix){ }); } - else if (prefix === 'youtube-Search') { + else if (prefix === 'youtube-Search' || prefix === 'youtube-Search-Channel' || prefix === 'youtube-Search-Playlist'){ $.each(rendering, function(i,val){ var img_url = val && val.snippet && val.snippet.medium_thumbnails_url ? val.snippet.medium_thumbnails_url: ""; + let imgElement = img_url ? `preview-img` : ""; + var created_at = val && val.snippet && val.snippet.publishedAt ? val.snippet.publishedAt: "Not Provided"; var channel = val && val.snippet && val.snippet.channelTitle ? val.snippet.channelTitle: "Not Provided"; var title = val && val.snippet && val.snippet.title ? val.snippet.title: "Not Provided"; - var url = val && val.id && val.id.videoId ? `https://www.youtube.com/watch?v=${val.id.videoId}`: ""; + let url = ""; + if (val && val.id) { + if (val.id.videoId) { + url = `https://www.youtube.com/watch?v=${val.id.videoId}`; + } else if (val.id.channelId) { + url = `https://www.youtube.com/channel/${val.id.channelId}`; + } else if (val.id.playlistId) { + url = `https://www.youtube.com/playlist?list=${val.id.playlistId}`; + } + } $("#grid").append(`
- preview-img + ${imgElement}

${channel}

 •${created_at}

diff --git a/www/public/graphql-doc/schema/boolean.doc.html b/www/public/graphql-doc/schema/boolean.doc.html index 67eff157..7f51b0ba 100644 --- a/www/public/graphql-doc/schema/boolean.doc.html +++ b/www/public/graphql-doc/schema/boolean.doc.html @@ -75,46 +75,11 @@

Enums

Objects

@@ -275,15 +360,19 @@

  • crimsonQuery
  • pushshiftPost
  • redditComment
  • redditLink
  • redditQuery
  • subreddit
  • tweetReturn a tweet.
  • twtUserReturn a twitter user.
  • pushshiftPost
  • redditComment
  • redditLink
  • redditQuery
  • subreddit
  • tweetReturn a tweet.
  • tweetV2Return a tweet.
  • twitterQueryQuery user, tweet, geolocation by keywords.
  • twtEditControlsV2twtEditControlsV2
  • twtUserReturn a twitter user.
  • twtWithheldV2twtWithheldV2
  • youtubeQueryA search result contains information about a YouTube video, channel, or playlist that matches the + search parameters specified in an API request. While a search result points to a uniquely identifiable resource, + like a video, it does not have its own persistent data.
  • __DirectiveA Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document. -In some cases, you need to provide options to alter GraphQL's execution behavior in ways field arguments will not suffice, such as conditionally including or skipping a field. Directives provide this by describing additional information to the executor.
  • __EnumValueOne possible value for a given Enum. Enum values are unique values, not a placeholder for a string or numeric value. However an Enum value is returned in a JSON response as a string.
  • __FieldObject and Interface types are described by a list of Fields, each of which has a name, potentially a list of arguments, and a return type.
  • __EnumValueOne possible value for a given Enum. Enum values are unique values, not a placeholder for a string or numeric value. However an Enum value is returned in a JSON response as a string.
  • __FieldObject and Interface types are described by a list of Fields, each of which has a name, potentially a list of arguments, and a return type.
  • __InputValueArguments provided to Fields or Directives and the input fields of an InputObject are represented as Input Values which describe their type and optionally a default value.
  • __TypeThe fundamental unit of any GraphQL Schema is the type. There are many kinds of types in GraphQL as represented by the `__TypeKind` enum. +Depending on the kind of a type, certain fields describe information about that type. Scalar types provide no information beyond a name, description and optional `specifiedByUrl`, while Enum types provide their values. Object and Interface types provide the fields they describe. Abstract types, Union and Interface, provide the Object types possible at runtime. List and NonNull types compose other types.">__TypeThe fundamental unit of any GraphQL Schema is the type. There are many kinds of types in GraphQL as represented by the `__TypeKind` enum. -Depending on the kind of a type, certain fields describe information about that type. Scalar types provide no information beyond a name and description, while Enum types provide their values. Object and Interface types provide the fields they describe. Abstract types, Union and Interface, provide the Object types possible at runtime. List and NonNull types compose other types.
  • +Depending on the kind of a type, certain fields describe information about that type. Scalar types provide no information beyond a name, description and optional `specifiedByUrl`, while Enum types provide their values. Object and Interface types provide the fields they describe. Abstract types, Union and Interface, provide the Object types possible at runtime. List and NonNull types compose other types.