Merge pull request #29 from PurrCoding/28-issue-ads-showing-on-youtube

Use invidious on Youtube ( + Live)

workshop/gamemodes/cinema_modded/gamemode/extensions/sh_util.lua

@@ -50,4 +50,106 @@ function ParseElementContent( element )
 	local output = element:gsub( "^%s-<%w->%s-", "" )
 	-- Trim end
 	return output:gsub( "%s-</%w->%s-$", "" )
+end
+
+
+local countrys = {
+	DM="Dominica",IO="British Indian Ocean Territory",
+	FM="Micronesia, Federated States of",AM="Armenia",
+	JO="Jordan",CM="Cameroon",
+	BM="Bermuda",FO="Faroe Islands",
+	AO="Angola",DO="Dominican Republic",
+	BO="Bolivia, Plurinational State of",TK="Tokelau",
+	ZM="Zambia",CO="Colombia",
+	TM="Turkmenistan",RS="Serbia",
+	MS="Montserrat",PS="Palestine, State of",
+	PM="Saint Pierre and Miquelon",SM="San Marino",
+	MM="Myanmar",WS="Samoa",
+	TO="Tonga",BQ="Bonaire, Sint Eustatius and Saba",
+	RO="Romania",MO="Macao",
+	GQ="Equatorial Guinea",SO="Somalia",
+	AQ="Antarctica",BS="Bahamas",
+	TW="Taiwan, Province of China",AS="American Samoa",
+	MW="Malawi",IQ="Iraq",
+	ZW="Zimbabwe",ES="Spain",
+	GU="Guam",YE="Yemen",
+	AU="Australia",IS="Iceland",
+	LS="Lesotho",SZ="Swaziland",
+	ZA="South Africa",LU="Luxembourg",
+	AW="Aruba",NU="Niue",
+	GW="Guinea-Bissau",BW="Botswana",
+	VI="Virgin Islands, U.S.",BH="Bahrain",
+	CW="Curaçao",PY="Paraguay",
+	VE="Venezuela, Bolivarian Republic of",KY="Cayman Islands",
+	VU="Vanuatu",UZ="Uzbekistan",LY="Libya",
+	UY="Uruguay",KW="Kuwait",
+	UM="United States Minor Outlying Islands",US="United States",
+	CY="Cyprus",BY="Belarus",PH="Philippines",
+	AE="United Arab Emirates",GY="Guyana",
+	UA="Ukraine",BB="Barbados",UG="Uganda",
+	TV="Tuvalu",TC="Turks and Caicos Islands",
+	PR="Puerto Rico",GB="United Kingdom",
+	PN="Pitcairn",GD="Grenada",
+	TG="Togo",AD="Andorra",
+	SH="Saint Helena, Ascension and Tristan da Cunha",
+	CD="Congo, the Democratic Republic of the",
+	TH="Thailand",TZ="Tanzania, United Republic of",
+	LB="Lebanon",TJ="Tajikistan",
+	AF="Afghanistan",ID="Indonesia",
+	GF="French Guiana",SY="Syrian Arab Republic",
+	SS="South Sudan",BF="Burkina Faso",
+	CF="Central African Republic",SE="Sweden",
+	KH="Cambodia",NF="Norfolk Island",
+	EH="Western Sahara",SD="Sudan",
+	VC="Saint Vincent and the Grenadines",MD="Moldova, Republic of",
+	SR="Suriname",LK="Sri Lanka",CH="Switzerland",
+	GS="South Georgia and the South Sandwich Islands",WF="Wallis and Futuna",
+	TF="French Southern Territories",GH="Ghana",SB="Solomon Islands",
+	SI="Slovenia",PF="French Polynesia",SK="Slovakia",
+	SX="Sint Maarten (Dutch part)",BJ="Benin",IL="Israel",
+	NL="Netherlands",SG="Singapore",FJ="Fiji",
+	RU="Russian Federation",DJ="Djibouti",GL="Greenland",
+	IN="India",AL="Albania",SC="Seychelles",
+	CL="Chile",SN="Senegal",SA="Saudi Arabia",
+	BL="Saint Barthélemy",HN="Honduras",BI="Burundi",
+	SJ="Svalbard and Jan Mayen",GN="Guinea",MF="Saint Martin (French part)",
+	LC="Saint Lucia",BN="Brunei Darussalam",CN="China",
+	KN="Saint Kitts and Nevis",TL="Timor-Leste",MR="Mauritania",
+	RW="Rwanda",SL="Sierra Leone",PL="Poland",ML="Mali",
+	EE="Estonia",QA="Qatar",TR="Turkey",VN="Viet Nam",
+	TT="Trinidad and Tobago",TN="Tunisia",GP="Guadeloupe",
+	ST="Sao Tome and Principe",PT="Portugal",MT="Malta",
+	KP="Korea, Democratic People's Republic of",PG="Papua New Guinea",
+	BR="Brazil",JP="Japan",GG="Guernsey",
+	AR="Argentina",FR="France",GR="Greece",
+	SV="El Salvador",ER="Eritrea",PW="Palau",
+	KR="Korea, Republic of",HR="Croatia",
+	IR="Iran, Islamic Republic of",NR="Nauru",
+	PK="Pakistan",LR="Liberia",HU="Hungary",
+	LT="Lithuania",IT="Italy",MX="Mexico",
+	NO="Norway",HT="Haiti",BV="Bouvet Island",
+	CV="Cape Verde",MP="Northern Mariana Islands",BD="Bangladesh",
+	MZ="Mozambique",TD="Chad",LV="Latvia",NI="Nicaragua",
+	NZ="New Zealand",AT="Austria",NP="Nepal",CX="Christmas Island",
+	MV="Maldives",MK="Macedonia, the Former Yugoslav Republic of",KZ="Kazakhstan",
+	ME="Montenegro",MN="Mongolia",AX="Åland Islands",
+	FK="Falkland Islands (Malvinas)",CA="Canada",BA="Bosnia and Herzegovina",
+	BZ="Belize",CZ="Czech Republic",GA="Gabon",AZ="Azerbaijan",
+	YT="Mayotte",MU="Mauritius",DZ="Algeria",MQ="Martinique",
+	CC="Cocos (Keeling) Islands",LA="Lao People's Democratic Republic",MH="Marshall Islands",
+	NA="Namibia",MY="Malaysia",PA="Panama",
+	DE="Germany",GE="Georgia",MA="Morocco",
+	NC="New Caledonia",DK="Denmark",VA="Holy See (Vatican City State)",
+	BE="Belgium",BT="Bhutan",MC="Monaco",AG="Antigua and Barbuda",
+	NE="Niger",IE="Ireland",BG="Bulgaria",KE="Kenya",JE="Jersey",
+	CG="Congo",NG="Nigeria",GM="Gambia",KI="Kiribati",CU="Cuba",
+	PE="Peru",LI="Liechtenstein",RE="Réunion",KG="Kyrgyzstan",
+	VG="Virgin Islands, British",EG="Egypt",CI="Côte d'Ivoire",HK="Hong Kong",
+	ET="Ethiopia",MG="Madagascar",GI="Gibraltar",FI="Finland",AI="Anguilla",
+	EC="Ecuador",GT="Guatemala",OM="Oman",CK="Cook Islands",IM="Isle of Man",
+	HM="Heard Island and McDonald Islands",KM="Comoros",JM="Jamaica",CR="Costa Rica"
+}
+
+function getCountryName(letter)
+	return (letter and countrys[letter] and countrys[letter]) or "Unkown"
 end

workshop/gamemodes/cinema_modded/gamemode/modules/scoreboard/cl_queue.lua

@@ -60,6 +60,13 @@ function QUEUE:Init()
 	end
 	self.Options:AddItem(RefreshButton)
 
+	local InstanceButton = vgui.Create( "TheaterButton" )
+	InstanceButton:SetText( "YouTube Instance Switcher" )
+	InstanceButton.DoClick = function(self)
+		RunConsoleCommand( "cinema_invidious_switch" )
+	end
+	self.Options:AddItem(InstanceButton)
+
 end
 
 function QUEUE:AddVideo( vid )