diff --git a/script.js b/script.js index 15864cfe..4ac4f941 100644 --- a/script.js +++ b/script.js @@ -16,7 +16,7 @@ if ( injectNeeded ) { var CSS = /\.([\w\-_]+)\s*?\{content:\s*?"([^"]+)";\s*?background-image:\s*?url\("([^"]+)"\);\s*?height:\s*?(\d+)px;\s*?width:\s*?(\d+)[^}]*\}/mg, IMGUR_KEY = 'e48d122e3437051', CACHE_LENGTH = 10800000, - SERVER = '//commondatastorage.googleapis.com/frankerfacez/', + SERVER = '//cdn.frankerfacez.com/', DEBUG = location.search.indexOf('frankerfacez') !== -1; @@ -696,7 +696,7 @@ ffz.prototype.load_emotes = function(group, refresh) { if ( m != null ) name = m[1]; - this.get(SERVER + name + ".css", + this.get(SERVER + "channel/" + name + ".css", this.process_css.bind(this, group, undefined), refresh ? 1 : CACHE_LENGTH); } @@ -856,7 +856,7 @@ ffz.prototype.unload_emotes = function(group) { ffz.prototype.check_donor = function(username) { return this.donors[username] || false; } ffz.prototype.load_donors = function(refresh) { - this.get(SERVER + "donors.txt", + this.get(SERVER + "scripts/donors.txt", this.process_donors.bind(this), refresh ? 1 : CACHE_LENGTH); } diff --git a/script.min.js b/script.min.js index 1fe14f75..8d2663aa 100644 --- a/script.min.js +++ b/script.min.js @@ -19,12 +19,12 @@ a||"turbo"==a}).first();c.length?c.before(a):d.append(a)}};c.prototype.modify_li this.set("messageToSend","");d.run_command(this,a)}})};c.prototype.modify_room=function(){this._modify_room(App.Room);var b=App.Room.instances,d;for(d in b)if(b.hasOwnProperty(d)){var a=b[d];this.alive&&this.add_channel(a.id,a);a.tmiRoom&&this.alive?this.alter_tmi(a.id,a.tmiRoom):a.viewers&&this._modify_viewers(a.viewers);this._modify_room(a)}};c.prototype._modify_viewers=function(b){var d=this;b.reopen({tmiRoom:Ember.computed(function(a,b){1',id:--k.last_emote};a="!"===e[e.length-1]?RegExp("\\b"+e+"(?=\\W|$)","g"):RegExp("\\b"+e+"\\b","g");e={image:g,images:[g],text:e,channel:d,hidden:!1,regex:a,ffzset:b};n.push(e);k.emoticons.push(e); +f);e.type="text/css";e.innerHTML=a;document.body?document.body.appendChild(e):this.pending_styles.push(e);var l=0,k=this,n=this.collections[d]=[];a.replace(t,function(a,c,e,g,m,p){m=parseInt(m);p=parseInt(p);g={emoticon_set:h,height:m,width:p,url:g,html:'',id:--k.last_emote};a="!"===e[e.length-1]?new RegExp("\\b"+e+"(?=\\W|$)","g"):new RegExp("\\b"+e+"\\b","g");e={image:g,images:[g],text:e,channel:d,hidden:!1,regex:a,ffzset:b};n.push(e);k.emoticons.push(e); f.push({isEmoticon:!0,cls:c,regex:a});l++});this.log("Loaded "+l+" emotes from collection: "+b);return l}};c.prototype.unload_emotes=function(b){if(this.alive){var d=this.channels[b],a,c,h;if(!1!==d){d?(a=d.set_id,c=d.style,h="FFZ Channel Emotes: "+b,delete d.set,delete d.set_id,delete d.style):(a=this.globals[b],c=this.styles[b],h="FFZ Global Emotes"+("global"!=b?": "+b:""),delete this.globals[b],delete this.styles[b],d=this.global_sets.indexOf(a),-1!==d&&this.global_sets.splice(d,1));this.collections[h]&& -delete this.collections[h];if(c)try{c.parentNode.removeChild(c)}catch(f){}delete this.emotesets[a];this.manager&&delete this.manager.emoticonSets[a];this.emoticons=this.emoticons.filter(function(a){return a.ffzgroup!==b})}}};c.prototype.check_donor=function(b){return this.donors[b]||!1};c.prototype.load_donors=function(b){this.get("//commondatastorage.googleapis.com/frankerfacez/donors.txt",this.process_donors.bind(this),b?1:108E5)};c.prototype.process_donors=function(b){if(this.alive){this.donors= -{};var d=0;if(null!=b){b=b.trim().split(/\W+/);for(var a=0;aa?(this.log("Resource expired. Fetching: "+b),this.do_get(b,d,0,c,h)):this.getting[b]=!1}};c.prototype.do_get=function(b,d,a,c,h){function f(){var e=(a||0)+1;if(!h||e<=h)return setTimeout(k.do_get.bind(k,b,d,e,c,h),1E3),!0}if(this.alive){var e=new XMLHttpRequest;e.open("GET",b);if(c)for(var l in c)c.hasOwnProperty(l)&&e.setRequestHeader(l,c[l]);var k=this;e.addEventListener("error",function(a){if(!f()){k.getting[b]=!1;try{d(void 0)}catch(c){k.log("Error in callback: "+ c)}}},!1);e.addEventListener("load",function(a){if(200===e.status){if(a=e.responseText,m.localStorage){var c=localStorage.getItem("ffz_last_"+b),g=e.getResponseHeader("Last-Modified");if(c&&c==g){k.log("Resource not modified: "+b);localStorage.setItem("ffz_age_"+b,(new Date).getTime());k.getting[b]=!1;return}localStorage.setItem("ffz_last_"+b,g)}}else{if(304===e.status){k.log("Resource not modified: "+b);m.localStorage&&localStorage.setItem("ffz_age_"+b,(new Date).getTime());k.getting[b]=!1;return}if(404=== e.status)a=null;else{if(f())return;a=void 0}}m.localStorage&&void 0!==a&&(localStorage.setItem("ffz_"+b,JSON.stringify(a)),localStorage.setItem("ffz_age_"+b,(new Date).getTime()));k.getting[b]=!1;try{d(a)}catch(h){k.log("Error in callback: "+h)}},!1);e.send()}else this.getting[b]=!1};m.ffz=new c}})(this.unsafeWindow||window,window.chrome?!0:!1); \ No newline at end of file