From da24008a0c1c8ea6ee93785d9f0fc8109850e63f Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 2 Jun 2017 04:30:19 -0400 Subject: [PATCH 01/83] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c5055d3..6d0988a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # Inter-Dimensional Cable -http://inter-dimensionalcable.xyz +Mirror of http://inter-dimensionalcable.xyz web app source + +My idea is using the code to create a version compatible with keyboard/gamepad (of course I have not programmed anything beacuse no time :/ ). You know, for not-so-lucid people on their couches. From 3a3e16b20a854623401b656be7e37e22db1458a6 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 14 Jun 2017 23:35:28 -0400 Subject: [PATCH 02/83] Create CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index b2a410c..19e05e2 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -inter-dimensionalcable.xyz +in-terdimensionalcable20.xyz From 6c34fb3570eb699556c36e2c9d05d40b4c561211 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 14 Jun 2017 23:37:04 -0400 Subject: [PATCH 03/83] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 19e05e2..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -in-terdimensionalcable20.xyz From 1153eb7f90befc15ca1134d7682c61b12e331c85 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 18:53:59 -0400 Subject: [PATCH 04/83] Create test.html --- test.html | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 test.html diff --git a/test.html b/test.html new file mode 100644 index 0000000..7e5b5b8 --- /dev/null +++ b/test.html @@ -0,0 +1,26 @@ + + + + +

Checkboxes

+
+I have a bike
+I have a car +
+ +

JavaScript Alert

+ + + + + + + + + From 6603e0dbed472d76ee434c622be625bf8f1922eb Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 20:46:27 -0400 Subject: [PATCH 05/83] Update test.html --- test.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test.html b/test.html index 7e5b5b8..91cf3f8 100644 --- a/test.html +++ b/test.html @@ -4,8 +4,10 @@

Checkboxes

-I have a bike
-I have a car +/r/InterdimensionalCable
+/r/NotTimAndEric
+/r/ACIDS
+/r/fifthworldvideos

JavaScript Alert

@@ -13,14 +15,12 @@

JavaScript Alert

- - - From c56d037ad5f83d7b7b8c295baad395bb14b7865b Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 21:25:08 -0400 Subject: [PATCH 06/83] Update test.html --- test.html | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/test.html b/test.html index 91cf3f8..c814510 100644 --- a/test.html +++ b/test.html @@ -1,7 +1,10 @@ - +

Checkboxes

/r/InterdimensionalCable
@@ -15,10 +18,17 @@

JavaScript Alert

From a8b0252a4a278b923a1c1904822833a33efb9c46 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 21:53:43 -0400 Subject: [PATCH 07/83] Update get-video.js --- js/get-video.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/get-video.js b/js/get-video.js index a9e4853..ed9e3a3 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -333,6 +333,7 @@ $(function () { }; var on_ready = function (event) { + alert("hola"); let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); // Volume control From cccb8b2183d1da061b120e613f6008d3e78d1dcf Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 21:58:08 -0400 Subject: [PATCH 08/83] Update get-video.js --- js/get-video.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/get-video.js b/js/get-video.js index ed9e3a3..2ab3595 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -334,6 +334,7 @@ $(function () { var on_ready = function (event) { alert("hola"); + channel_manager(player, get_next_video, play_clip); let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); // Volume control From 4d4468e8c3302326530071ff35f2effdf0931cb7 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 22:08:25 -0400 Subject: [PATCH 09/83] Update get-video.js --- js/get-video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index 2ab3595..bcfab88 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -333,7 +333,7 @@ $(function () { }; var on_ready = function (event) { - alert("hola"); + alert("hola\n"+volume_controller(player)); channel_manager(player, get_next_video, play_clip); let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); From 34ab067cc7c5e9986ccf424d108893d3b2206f89 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 22:21:59 -0400 Subject: [PATCH 10/83] Update get-video.js --- js/get-video.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index bcfab88..9a816ed 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -335,7 +335,9 @@ $(function () { var on_ready = function (event) { alert("hola\n"+volume_controller(player)); channel_manager(player, get_next_video, play_clip); - let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); + // Changing this line because I need to run this in legacy machines + //let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); + var [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); // Volume control $("#mute").on("click", animate_callback(toggle_mute)); From df4fb2ca7ab1d3088f72f9ff315e9f6313a9ee36 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 22:37:30 -0400 Subject: [PATCH 11/83] Update index.html --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 28fda6e..e340128 100644 --- a/index.html +++ b/index.html @@ -67,6 +67,7 @@ 5 6 7 + I have a bike
8 9 Menu From baba1b7cfd9a519f33dd1cc607f4e1f74c9b84e9 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 22:46:24 -0400 Subject: [PATCH 12/83] Update index.html --- index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index e340128..477c702 100644 --- a/index.html +++ b/index.html @@ -67,7 +67,6 @@ 5 6 7 - I have a bike
8 9 Menu @@ -107,6 +106,10 @@

Menu - MrMcTV v1.0

+ I have a bike
+ I have a bike
+ I have a bike
+ I have a bike

A non-stop stream of intergalactic content from /r/InterdimensionalCable straight to your eyeholes.

Past Shows

From b68bb6b2d606f601c59bcee042294517ca0c473c Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 23:03:01 -0400 Subject: [PATCH 13/83] Update get-video.js --- js/get-video.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/get-video.js b/js/get-video.js index 9a816ed..b8435dc 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -1,3 +1,5 @@ +var tx_subs = ["/r/InterdimensionalCable", "/r/NotTimAndEric", "/r/ACIDS", "/r/fifthworldvideos"]; +var len_subs = tx_subs.length; if (!Array.prototype.randomElement) { Array.prototype.randomElement = function () { @@ -32,7 +34,7 @@ $(function () { var videos = [], played = []; var get_api_call = function (time, sort) { - return `https://www.reddit.com/r/InterdimensionalCable/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=50`; + return `https://www.reddit.com/r/InterdimensionalCable/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=1`; }; var add_youtube_url = function (reddit_post_data) { @@ -333,8 +335,6 @@ $(function () { }; var on_ready = function (event) { - alert("hola\n"+volume_controller(player)); - channel_manager(player, get_next_video, play_clip); // Changing this line because I need to run this in legacy machines //let [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); var [toggle_mute, volume_up, volume_down, play_clip] = volume_controller(player); From 26495c4ecd15eef459fec38f3f17b38e2190dcdf Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 23:32:19 -0400 Subject: [PATCH 14/83] Update get-video.js --- js/get-video.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index b8435dc..1360730 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -1,6 +1,16 @@ +//Adding support to different subredits var tx_subs = ["/r/InterdimensionalCable", "/r/NotTimAndEric", "/r/ACIDS", "/r/fifthworldvideos"]; var len_subs = tx_subs.length; +var cb_subs = new Array(4); +cb_subs[0] = $("#IDC"); // Interdimensional Cable +cb_subs[1] = $("#NTE"); // Not Tim and Eric +cb_subs[2] = $("#ACI"); // ACIDS +cb_subs[3] = $("#FWV"); // Fifth World Videos + +cb_subs[0].checked = true; + +//Begining of original code if (!Array.prototype.randomElement) { Array.prototype.randomElement = function () { return this[Math.floor(Math.random() * this.length)]; @@ -34,7 +44,7 @@ $(function () { var videos = [], played = []; var get_api_call = function (time, sort) { - return `https://www.reddit.com/r/InterdimensionalCable/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=1`; + return `https://www.reddit.com/r/InterdimensionalCable/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=2`; }; var add_youtube_url = function (reddit_post_data) { From fc53d2fed01afc2f9cf337801b570b261283ede3 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 23:32:42 -0400 Subject: [PATCH 15/83] Update index.html --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 477c702..79770bf 100644 --- a/index.html +++ b/index.html @@ -106,10 +106,10 @@

Menu - MrMcTV v1.0

- I have a bike
- I have a bike
- I have a bike
- I have a bike
+ /r/InterdimensionalCable
+ /r/NotTimAndEric
+ /r/ACIDS
+ /r/fifthworldvideos

A non-stop stream of intergalactic content from /r/InterdimensionalCable straight to your eyeholes.

Past Shows

From 6a9ae3940a38cfcc384b901d17ef681ff2d918eb Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 23:53:27 -0400 Subject: [PATCH 16/83] Update get-video.js --- js/get-video.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/js/get-video.js b/js/get-video.js index 1360730..f191556 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -2,14 +2,6 @@ var tx_subs = ["/r/InterdimensionalCable", "/r/NotTimAndEric", "/r/ACIDS", "/r/fifthworldvideos"]; var len_subs = tx_subs.length; -var cb_subs = new Array(4); -cb_subs[0] = $("#IDC"); // Interdimensional Cable -cb_subs[1] = $("#NTE"); // Not Tim and Eric -cb_subs[2] = $("#ACI"); // ACIDS -cb_subs[3] = $("#FWV"); // Fifth World Videos - -cb_subs[0].checked = true; - //Begining of original code if (!Array.prototype.randomElement) { Array.prototype.randomElement = function () { @@ -44,7 +36,19 @@ $(function () { var videos = [], played = []; var get_api_call = function (time, sort) { - return `https://www.reddit.com/r/InterdimensionalCable/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=2`; + var random_sub = 0; + var cb_subs = new Array(4); + + cb_subs[0] = $("#IDC"); // Interdimensional Cable + cb_subs[1] = $("#NTE"); // Not Tim and Eric + cb_subs[2] = $("#ACI"); // ACIDS + cb_subs[3] = $("#FWV"); // Fifth World Videos + do { + var random_sub = Math.floor(4 * Math.random()); + } + while ( cb_subs[random_sub].checked == false ); + + return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=2`; }; var add_youtube_url = function (reddit_post_data) { From 633fe1dd520bd6b80edc05db24f49dc8c7e9c5de Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 16 Jun 2017 23:57:20 -0400 Subject: [PATCH 17/83] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 79770bf..a5ef05a 100644 --- a/index.html +++ b/index.html @@ -106,7 +106,7 @@

Menu - MrMcTV v1.0

- /r/InterdimensionalCable
+ /r/InterdimensionalCable
/r/NotTimAndEric
/r/ACIDS
/r/fifthworldvideos
From 8fa2cdc28a005fffa8b8d6f477637c70f8753527 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 00:02:27 -0400 Subject: [PATCH 18/83] Update get-video.js --- js/get-video.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index f191556..0a8abda 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -47,7 +47,13 @@ $(function () { var random_sub = Math.floor(4 * Math.random()); } while ( cb_subs[random_sub].checked == false ); - + tx_message = "Checkeados:\n"; + for (i = 0; i < len_subs; i++) { + if ( cb_subs[i].checked == true ) + tx_message += " · " + tx_subs[i] + "\n"; + } + alert(tx_message); + return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=2`; }; From f014d125686f1efa0323a438f7b1027d3f161183 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 00:07:43 -0400 Subject: [PATCH 19/83] Update get-video.js --- js/get-video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index 0a8abda..e816769 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -54,7 +54,7 @@ $(function () { } alert(tx_message); - return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=2`; + return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&limit=20`; }; var add_youtube_url = function (reddit_post_data) { From 0352baf2908ec30fbbf36ebca8015e1a1f327aa7 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 00:31:46 -0400 Subject: [PATCH 20/83] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index a5ef05a..69b73d2 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,6 @@ Inter-Dimensional Cable - @@ -134,6 +133,7 @@

Past Shows

+ From 0a80f51bcc3cc7f07a3f76b6e3fc33465ea951e7 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 18:55:17 -0400 Subject: [PATCH 63/83] Update index.html Fixing behaviour of right arrow --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 00a3654..8f2b25f 100644 --- a/index.html +++ b/index.html @@ -144,6 +144,9 @@

Past Shows

if (event.which == 45)//Vol (-) $("#volume-down").click(); + + if (event.which == 74) // -> (next) (CH+) + $("#channel-up").click(); }); $(document).keydown(function(event){ if (event.which == 83) //(S)ilence (Mute) @@ -172,9 +175,6 @@

Past Shows

if (event.which == 74) // J (vi down/next button) (CH+) $("#channel-up").click(); - - if (event.which == 74) // -> (next) (CH+) - $("#channel-up").click(); }); }); From 22b22668683a1b3b1964fc178cba7b53f8ed5261 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 18:57:26 -0400 Subject: [PATCH 64/83] Update index.html Fixing my stupid mistake with left arrow. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 8f2b25f..20449e1 100644 --- a/index.html +++ b/index.html @@ -145,7 +145,7 @@

Past Shows

if (event.which == 45)//Vol (-) $("#volume-down").click(); - if (event.which == 74) // -> (next) (CH+) + if (event.which == 39) // -> (next) (CH+) $("#channel-up").click(); }); $(document).keydown(function(event){ From 54556f3e258656d09d5bcb4174d7f9fa1469ee1d Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 20:43:09 -0400 Subject: [PATCH 65/83] Update index.html Ok, now left arrow should change the channel. Also supported links to reddit with "R" key. --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 20449e1..3139569 100644 --- a/index.html +++ b/index.html @@ -144,9 +144,6 @@

Past Shows

if (event.which == 45)//Vol (-) $("#volume-down").click(); - - if (event.which == 39) // -> (next) (CH+) - $("#channel-up").click(); }); $(document).keydown(function(event){ if (event.which == 83) //(S)ilence (Mute) @@ -156,7 +153,7 @@

Past Shows

$("#menu").click(); if (event.which == 82) //(R)eddit (OK) - $("#video-url").click(); + $("#video-url")[0].click(); if (event.which == 90) //(Z)oom $("#zoom").click(); @@ -175,6 +172,9 @@

Past Shows

if (event.which == 74) // J (vi down/next button) (CH+) $("#channel-up").click(); + + if (event.which == 39) // -> (next) (CH+) + $("#channel-up").click(); }); }); From 4061c5c2a6ecef9b5e12734b9d1b7982176b2b15 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 20:51:50 -0400 Subject: [PATCH 66/83] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3139569..be94d0c 100644 --- a/index.html +++ b/index.html @@ -75,7 +75,7 @@
CH + VOL
- - OK + OK VOL
+
From 27d012349834530cd635111c52934ff697ce33b1 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 21:42:17 -0400 Subject: [PATCH 67/83] Update get-video.js Adding more source of variety. 50 links are requested, but each one had 14% of chance of being processed. --- js/get-video.js | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/js/get-video.js b/js/get-video.js index 5202789..1d42880 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -1,6 +1,8 @@ //Adding support to different subredits var tx_subs = ["/r/InterdimensionalCable", "/r/NotTimAndEric", "/r/ACIDS", "/r/fifthworldvideos","/r/IllBeYourGuide"]; var len_subs = tx_subs.length; +var MAX_REQ = 50; //Max number of links will be requested each JSON call +var PROB = 14; //Probability of accepting link (percentage) //Begining of original code if (!Array.prototype.randomElement) { @@ -34,6 +36,11 @@ $(function () { var youtube_video_regex = new RegExp(/(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\/?\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/); var videos = [], played = []; + + var probability_filter = function() { + var trial = 100*Math.random(); + return trial <= PROB; + } var get_api_call = function (time, sort, page, random_page) { var cb_subs = new Array(len_subs); @@ -76,21 +83,25 @@ $(function () { api_response[0].data.children.forEach(function (child) { random_post_data = child.data; suffix = `?after=`+ random_post_data.name; - new_url = `https://www.reddit.com`+tx_subs[random_sub]+`/`+page+`.json`+suffix+`&limit=7` + new_url = `https://www.reddit.com`+tx_subs[random_sub]+`/`+page+`.json`+suffix+`&limit=`+(MAX_REQ-1); is_ready = true; - if (add_youtube_url(child.data)) { - console.log("Added " + child.data.url); - } else { - console.log("Ignored " + child.data.url); - } - }); - $.getJSON(new_url, function (api_response) { - api_response.data.children.forEach(function (child) { + if(probability_filter()){ if (add_youtube_url(child.data)) { console.log("Added " + child.data.url); } else { console.log("Ignored " + child.data.url); } + } + }); + $.getJSON(new_url, function (api_response) { + api_response.data.children.forEach(function (child) { + if(probability_filter()){ + if (add_youtube_url(child.data)) { + console.log("Added " + child.data.url); + } else { + console.log("Ignored " + child.data.url); + } + } }); }).fail(function () { // Re-Poll on timeout/parse failure @@ -99,10 +110,10 @@ $(function () { }); return "nada" }else{ - return "https://www.reddit.com"+tx_subs[random_sub]+"/randomrising.json?limit=7"; + return "https://www.reddit.com"+tx_subs[random_sub]+"/randomrising.json?limit="+(MAX_REQ); } }else{ - return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&show="all"&limit=7`+suffix; + return `https://www.reddit.com`+tx_subs[random_sub]+`/search.json?q=site%3Ayoutube.com+OR+site%3Ayoutu.be&restrict_sr=on&sort=${sort}&t=${time}&show="all"&limit=`+MAX_REQ+suffix; } return null; @@ -148,10 +159,12 @@ $(function () { if (url != "nada") {//Dirty awful hack $.getJSON(url, function (api_response) { api_response.data.children.forEach(function (child) { - if (add_youtube_url(child.data)) { - console.log("Added " + child.data.url); - } else { - console.log("Ignored " + child.data.url); + if(probability_filter()){ + if (add_youtube_url(child.data)) { + console.log("Added " + child.data.url); + } else { + console.log("Ignored " + child.data.url); + } } }); }).fail(function () { From b874493cfaf3b378d73f28f8a5f35bd18658ce14 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 22:03:24 -0400 Subject: [PATCH 68/83] Update style.css Changing presentation of the list of previous videos. --- css/style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/css/style.css b/css/style.css index bc3a70e..02e211d 100644 --- a/css/style.css +++ b/css/style.css @@ -417,10 +417,11 @@ html[data-useragent*=Firefox] .menu-overlay #video::before { } .shows{ display: flex; - flex-direction: column; - height: 7.3vw; - overflow-y: auto; - overflow-x: hidden; + /*flex-direction: column;*/ + /*height: 7.3vw;*/ + /*overflow-y: auto;*/ + overflow-y: hidden; + /*overflow-x: hidden;*/ } .zoom .shows{ height: calc(10.5vw * var(--scale-ratio)); From 72b682231083c25c7cf0de5dbd340ec2fdb9d527 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 22:15:22 -0400 Subject: [PATCH 69/83] Update style.css Fixing zoomed version of menu. --- css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 02e211d..1228a10 100644 --- a/css/style.css +++ b/css/style.css @@ -424,7 +424,7 @@ html[data-useragent*=Firefox] .menu-overlay #video::before { /*overflow-x: hidden;*/ } .zoom .shows{ - height: calc(10.5vw * var(--scale-ratio)); + /*height: calc(10.5vw * var(--scale-ratio));*/ } .shows li, .zoom .shows li{ padding: 0; @@ -472,7 +472,7 @@ html[data-useragent*=Firefox] .menu-overlay #video::before { flex-grow: 0; } .zoom .shows .video-info{ - max-width: calc(13.1vw * var(--scale-ratio)) + /*max-width: calc(13.1vw * var(--scale-ratio))*/ } .shows .video-title{ font-size: 1vw; From f8b1ecf61c9837621c8f443c4e35b6b797dc3201 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 22:20:24 -0400 Subject: [PATCH 70/83] Update get-video.js --- js/get-video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/get-video.js b/js/get-video.js index 1d42880..8d4978e 100644 --- a/js/get-video.js +++ b/js/get-video.js @@ -343,7 +343,7 @@ $(function () { }; var channel_manager = function (player, get_next_video, play_clip) { - var channel_names = ["1", "2", "TWO", "3", "4", "42", "1337", "5", "6", "117", "💵", "💰", "7", "A113", "8", "AMMEL", "9", "10", "🐐", "101", "C137", "👌😂", "🍌", "🍆", "20", "30", "40", "50", "60", "69", "70", "80", "90", "100", "/co/", "C132", "35C", "J19ζ7"]; + var channel_names = ["1", "2", "TWO", "3", "4", "42", "1337", "5", "6", "117", "💵", "💰", "7", "A113", "8", "AMMEL", "9", "10", "🐐", "101", "C137", "👌😂", "🍌", "☭", "🍆", "20", "30", "40", "50", "60", "69", "70", "80", "90", "100", "/co/", "C132", "35C", "J19ζ7"]; var quotes = ["sexsells", "imporv", "relax", "billmurray", "movie"]; var handle_quote = function () { From e4bde70b164e21fa5b872ca87cd08cbc31d58b8b Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 17 Jun 2017 22:56:38 -0400 Subject: [PATCH 71/83] Update index.html Modified the help --- index.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index be94d0c..b857664 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@