diff --git a/src/channel/anonymouscheck.js b/src/channel/anonymouscheck.js
index f7aa648d..35a4d8ea 100644
--- a/src/channel/anonymouscheck.js
+++ b/src/channel/anonymouscheck.js
@@ -15,8 +15,8 @@ AnonymousCheck.prototype.onUserPreJoin = function (user, data, cb) {
return cb("User disconnected", ChannelModule.DENY);
}
- //if(anonymousBanned && user.isAnonymous()) {
- if(anonymousBanned && user.account.globalRank <= 0) {
+ if(anonymousBanned && user.isAnonymous()) {
+ //if(anonymousBanned && user.account.globalRank <= 0) {
user.socket.on("disconnect", function () {
if (!user.is(Flags.U_IN_CHANNEL)) {
cb("User disconnected", ChannelModule.DENY);
diff --git a/src/channel/chat.js b/src/channel/chat.js
index a6d53ea2..6f44b850 100644
--- a/src/channel/chat.js
+++ b/src/channel/chat.js
@@ -437,8 +437,12 @@ ChatModule.prototype.sendMessage = function (msgobj) {
this.channel.broadcastAll("chatMsg", msgobj);
this.dirty = true;
- this.buffer.push(msgobj);
- if (this.buffer.length > 15) {
+ this.buffer.push(msgobj);//msg buffer push, trims it down to 15 messages
+ if (this.channel.uniqueName === "mods"){
+ if(this.buffer.length > 500){//make mods channel an exception :) Eventually this will be a setting per channel you can set from the web ui
+ this.buffer.shift();
+ }
+ }else if (this.buffer.length > 15) {
this.buffer.shift();
}
diff --git a/www/bumps.js b/www/bumps.js
index 8c25a38c..c0e73a5a 100644
--- a/www/bumps.js
+++ b/www/bumps.js
@@ -1,6 +1,50 @@
/* ----- DATABASE CONFIGURATION ----- */
ChannelDatabase=[
+['', 'ourfore.st'],
+['https://vimeo.com/650722645', 'PS2 client'],
+['https://vimeo.com/650891848', 'Whiteboard'],
+['https://www.youtube.com/watch?v=RKHgQfD9Bt0', 'NightBump by SimpleRick'],
+['https://www.youtube.com/watch?v=RM6kE4UDhQY', 'ChillBump by SimpleRick'],
+['https://www.youtube.com/watch?v=4IJ2pVTRe4w', 'SpaceBump by SimpleRick'],
+['https://www.youtube.com/watch?v=7ew4TcQndVE', 'What U Thinkin Bump by Ravveni'],
+['https://www.youtube.com/watch?v=_KLezwGk6Zc', 'Buddha Beat Bump by Ravveni'],
+['https://vimeo.com/653049140', 'These Days by Titcrest'],
+['https://vimeo.com/653476424', 'OurForest your life by Titcrest'],
+['https://www.youtube.com/watch?v=Fm0apYm-AZ4', 'Stop Motion Roll Bump by Ravveni'],
+['https://www.youtube.com/watch?v=ez241b62kBA', 'Spring Cleaning by Mike'],
+['https://www.youtube.com/watch?v=Hgv2e0cVoJA', 'Arcade Lights Bump by AceVMain'],
+['https://www.youtube.com/watch?v=9_wh2Loeu64', 'Ourforest Simon Bump by Deadpool'],
+['https://www.youtube.com/watch?v=TdHexzFLAes', 'OurBump by MyCatShat'],
+['https://vimeo.com/661533134', 'OurBump2 by MyCatShat'],
+['https://vimeo.com/661545948', 'OurBump3 by MyCatShat'],
+['https://vimeo.com/661556160', 'OurBump4 by MyCatShat'],
+['https://vimeo.com/661563145', 'OurBump5 by MyCatShat'],
+['https://www.youtube.com/watch?v=ALsPa23ccqM', 'OurBump6 by MyCatShat'],
+['https://www.youtube.com/watch?v=XBoDmgUjz-U', 'OurBump7 by MyCatShat'],
+['https://www.youtube.com/watch?v=RyKJlDDFBPA', 'OurBump8 by MyCatShat'],
+['https://www.youtube.com/watch?v=dM2wRyflBhY', 'OurBump9 by MyCatShat'],
+['https://www.youtube.com/watch?v=vk3cr22e3jo', 'OurBump10 by MyCatShat'],
+['https://www.youtube.com/watch?v=gORD1goVi-0', 'OurBump11 by MyCatShat'],
+['https://www.youtube.com/watch?v=DQ9pBv4I_bo', 'OurBump12 by MyCatShat'],
+['https://www.youtube.com/watch?v=EOOxl92ODNk', 'OurBump13 by MyCatShat'],
+['https://www.youtube.com/watch?v=YqyBkcvBNQ0', 'OurBump14 by MyCatShat'],
+['https://vimeo.com/662804752', 'OurBump15 by MyCatShat'],
+['https://www.youtube.com/watch?v=llTKI3TJu7A', 'OurBump16 by MyCatShat'],
+['https://www.youtube.com/watch?v=k6ZsnRBaaks', 'OurGooseBump17 by MyCatShat'],
+['https://vimeo.com/662862201', 'OurBump18 by MyCatShat'],
+['https://www.youtube.com/watch?v=3O1jPdb--EU', 'Ourforest Trevor Bump by Deadpool'],
+['https://www.youtube.com/watch?v=P1Dw5xy-zG4', 'Ourforest Bump by Gijuk'],
+['https://www.youtube.com/watch?v=MBCXc5YZxTg', 'Device Dance Bump by Ravveni'],
+['https://www.youtube.com/watch?v=gidsQDFuoq8', 'Skating Bump by AceVMain'],
+['https://www.youtube.com/watch?v=Te7e4baMLjk', 'Puppies Bump by AceVMain'],
+['https://www.youtube.com/watch?v=2n9eeFY2DbY', 'Forest Night by AceVMain'],
+['https://vimeo.com/661659406', 'Forest Rally by Titcrest'],
+['', 'xmas'],
+['youtu.be/ASdf_anXKvo', 'XmasBump by SimpleRick'],
+['youtube.com/watch?v=a4fGWHCwwPM', 'Stop Motion Xmas Bump by Ravveni'],
+['', 'TTN Discord/Treezone'],
+['https://www.youtube.com/watch?v=SxXGZo4Qfc4', 'TTN Discord Bump by Mike'],
['', 'Classic TTN'],
['https://vimeo.com/214567092', 'Z Ganja 1'],
['https://vimeo.com/214566742', 'Z Ganja 2'],
@@ -20,8 +64,72 @@ ChannelDatabase=[
['https://vimeo.com/231034978', 'Drive'],
['https://vimeo.com/170992046', 'Gulls'],
['https://vimeo.com/231035012', 'Fishes'],
-['', 'ourfore.st'],
-['https://vimeo.com/650722645', 'PS2 client'],
+['https://www.youtube.com/watch?v=A5PlU1wH_gg', 'Sunshine Bump'],
+['https://www.youtube.com/watch?v=Zf6OuDLUH9M', 'Baths Bump'],
+['https://www.youtube.com/watch?v=NNFLbJLxIMs', 'Less I Frames The Better'],
+['https://www.youtube.com/watch?v=4bkML4IGfeY', 'Guilty Feet'],
+['https://www.youtube.com/watch?v=dIVL-0gU5E8', 'Subway Bump'],
+['https://www.youtube.com/watch?v=S-lRA92o6Hg', 'Train'],
+['https://www.youtube.com/watch?v=tdthNcT2rjA', 'Murial Bump'],
+['https://www.youtube.com/watch?v=kvSYI2atGDw', 'Space Bump'],
+['https://www.youtube.com/watch?v=5VUHLxZ9gAg', 'Bomb Bump'],
+['https://vimeo.com/229518282', 'Lobby Bump'],
+['https://www.youtube.com/watch?v=3czzpzvIOOI', 'Psychedelic Bump 0'],
+['https://www.youtube.com/watch?v=PjV2ba-Zqos', 'Deep Bump'],
+['https://www.youtube.com/watch?v=c9HW5XCoyFA', 'Fetch Bump'],
+['https://www.youtube.com/watch?v=iRtQjSXFQnw', 'Psychedelic Bump 1'],
+['https://www.youtube.com/watch?v=zIY_lwBT1s4', 'Fire'],
+['https://www.youtube.com/watch?v=2bvPV3to93U', 'Rainy Night'],
+['https://www.youtube.com/watch?v=NNCOJVdLsTY', 'Pineapples'],
+['https://www.youtube.com/watch?v=THzrB39iFgA', 'lotus'],
+['https://www.youtube.com/watch?v=jPxvCLEhZ9Q', 'Trendy'],
+['https://www.youtube.com/watch?v=lPQxbH5y9ik', 'Painted Buds Bump'],
+['https://www.youtube.com/watch?v=Y4CDSD5QPV8', 'Jay Silent Train'],
+['https://www.youtube.com/watch?v=DXP5u6nXgd4', 'Roll Up'],
+['https://www.youtube.com/watch?v=eXhrBsrFoOE', 'Mothership Ballrig & Peach Klien.'],
+['https://www.youtube.com/watch?v=6jMOIOQ8OE0', 'Liquid Bump'],
+['https://www.youtube.com/watch?v=9jOigk7JZaQ', 'Toasty Bump'],
+['https://www.youtube.com/watch?v=LXQ6GfWWJjw', 'AI Dream'],
+['https://www.youtube.com/watch?v=NW-D2sb3PVY', 'Candle'],
+['https://www.youtube.com/watch?v=Q-_9yOuK5oI', 'Louie'],
+['https://www.youtube.com/watch?v=V5Bu5hzQ2mY', '90s Bump'],
+['https://www.youtube.com/watch?v=ZgSinSEf8_Y', 'Infinite Zoome'],
+['https://www.youtube.com/watch?v=-NUceildHZ0', 'Mixed Colors Bump'],
+['https://www.youtube.com/watch?v=QZCycbnAt3o', 'Aquarium Bump'],
+['https://www.youtube.com/watch?v=kat4sBb4Qus', 'Wet Weekend'],
+['https://www.youtube.com/watch?v=30Btxi8g3Mo', 'Rivera'],
+['https://www.youtube.com/watch?v=FjmkQYn90R0', 'Flowers'],
+['https://www.youtube.com/watch?v=9TbaRxg7tT0', 'Breakfast Club'],
+['https://www.youtube.com/watch?v=gfUvKa0vj6Y', 'Offices'],
+['https://www.youtube.com/watch?v=WAduVrt16Kg', 'Penguin Bump'],
+['https://www.youtube.com/watch?v=SOZbxyP8hvc', 'Psychedelic Bump 2'],
+['https://www.youtube.com/watch?v=rgOhyOCa0fc', 'Let the Bump Happen'],
+['https://www.youtube.com/watch?v=0KBgnPa2Ucc', 'Orange Island'],
+['https://www.youtube.com/watch?v=QZgmVwerNws', 'Sky Palace'],
+['https://www.youtube.com/watch?v=kLc04UsVMKc', 'Destine Bump'],
+['https://www.youtube.com/watch?v=jo3ViNd7UTE', 'Bong Bump 0'],
+['https://www.youtube.com/watch?v=DfgMjxAAOFw', 'Bong Bump 1'],
+['https://www.youtube.com/watch?v=Au5werIBW7Q', 'Exhale'],
+['https://www.youtube.com/watch?v=3ME8cQrKNHM', 'Street 0'],
+['https://www.youtube.com/watch?v=Rh8D7-3F_YE', 'Slow Burn'],
+['https://www.youtube.com/watch?v=Lg5LW0IBwnY', 'Goggie'],
+['https://www.youtube.com/watch?v=LcskpeJHNck', 'Mighty Ape'],
+['https://www.youtube.com/watch?v=O7noJ5oWDaU', 'Dankrupt'],
+['https://vimeo.com/158775586', 'tuh-rees bump'],
+['https://vimeo.com/193840285', 'Psychedelic Bump 3'],
+['https://vimeo.com/217263460', 'TTN Tracking Bump'],
+['https://vimeo.com/182247683', '80s Bump'],
+['https://vimeo.com/156371203', 'Mushroom'],
+['https://vimeo.com/194130225', 'Fly Back'],
+['https://vimeo.com/224274747', 'Seaweed'],
+['https://vimeo.com/174284470', 'Super Bic'],
+['https://vimeo.com/174298213', 'Steely Space'],
+['https://vimeo.com/167027208', 'Clouds 0'],
+['https://vimeo.com/167042356', 'Painted Forest'],
+['https://vimeo.com/163774678', 'Volcano'],
+['https://vimeo.com/178800874', 'Grow Op'],
+['https://vimeo.com/154384435', 'Bump One'],
+['https://vimeo.com/149531872', 'Text Bump'],
];
/* ----- CREATING DATABASE LAYOUT - DO NOT REMOVE ----- */
diff --git a/www/css/video-js.css b/www/css/video-js.css
index 5678e588..8bdf1ab1 100644
--- a/www/css/video-js.css
+++ b/www/css/video-js.css
@@ -1082,8 +1082,8 @@ video::-webkit-media-text-track-display {
width: 100%; }
.vjs-loading-spinner {
- display: none;
- position: absolute;
+ display: none !important;
+ position: absolute !important;
top: 50%;
left: 50%;
margin: -25px 0 0 -25px;
@@ -1096,12 +1096,13 @@ video::-webkit-media-text-track-display {
height: 50px;
border-radius: 25px; }
-.vjs-seeking .vjs-loading-spinner,
-.vjs-waiting .vjs-loading-spinner {
+.vjs-seeking,
+.vjs-waiting {
display: block; }
.vjs-loading-spinner:before,
.vjs-loading-spinner:after {
+ display: none !important;
content: "";
position: absolute;
margin: -6px;
diff --git a/www/cyp/fcyp.js b/www/cyp/fcyp.js
index 8842754a..da5fc15a 100644
--- a/www/cyp/fcyp.js
+++ b/www/cyp/fcyp.js
@@ -73,7 +73,7 @@ UI_Favicon = 0; // [&] channel favicon
UI_MiniLogo = 0; // [&] small channel logo/avatar in the top navbar
UI_ChannelName =0; // [&] channel custom brand name
UI_HeaderDropMenu = 0; // [&] additional header dropdown menu
-UI_RemoveLayoutMenu = 1; // removing 'Layout' menu from the header
+UI_RemoveLayoutMenu = 0; // removing 'Layout' menu from the header
UI_MOTDAutoLogo = 0; // [&] big channel logo inserted into MOTD
UI_MOTDTabs = 0; // [&] switchable MOTD tabs application for homepage-like channel header
UI_MOTDDelete = 0; // deleting previous MOTD after accepting/loading script
@@ -110,7 +110,7 @@ UI_CommandsBtn = 0; // button displaying modal window with chat commands help
UI_ModPanel = 0; // [&] panel with messages and help for moderators
UI_CustomCaptions = 0; // [&] custom captions for add, refresh, voteskip buttons, and welcome text
UI_PlayerOptions = 0; // [&] additional player options
-UI_TransformationBtns = 0; // player transformation buttons
+UI_TransformationBtns = 1; // player transformation buttons
UI_ChannelDatabase = 1; // [&] box with embed additional media database
UI_ChannelGalleries = 0; // [&] box with embed galleries
UI_DisplayModeSel = 1; // selector with player display modes
@@ -289,6 +289,7 @@ ChannelThemeURL = 'https://ourfore.st/css/themes/fore.st.css';
ThemesCSS = [
['forest', 'https://ourfore.st/css/themes/fore.st.css'],
+['forestTest', 'http://10.0.2.15/css/themes/fore.st.css'],
['Plus Red', 'https://dl.dropboxusercontent.com/s/th8i1sj332wi0x9/plusred.css'],
['Celadon', 'https://dl.dropboxusercontent.com/s/iwarwhhph1ti2ek/celadon.css'],
];
@@ -1388,7 +1389,7 @@ function setUserCSS() {
+ '#announcements .alert {margin:0px -10px 5px}\n'
+ '#drinkcount {margin:0px}\n';
- $("head").append('');
+ //$("head").append('');
$("#usertheme").attr('href', '/css/themes/slate.css');
$("#usertheme-fix").remove();
if (USERTHEME.indexOf("/css/themes/")>-1) {
@@ -2346,6 +2347,7 @@ $("#rightpane").prepend($("#videocontrols").detach());
$("#rightpane").prepend($("#plcontrol").detach());
$("#leftpane").prepend($("#newpollbtn").detach());
$("#plcontrol").prepend($("#showmediaurl").detach());
+$("#leftpane").prepend($("#emotelistbtn").detach());
// header and footer links open in a new tab
diff --git a/www/js/util.js b/www/js/util.js
index 9f21940c..14acefe0 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -1622,7 +1622,10 @@ function addChatMessage(data) {
$(".nick-hover").removeClass("nick-hover");
});
var oldHeight = msgBuf.prop("scrollHeight");
- var numRemoved = trimChatBuffer();
+ var numRemoved = 0;
+ if(self.CHANNEL.name !== "mods"){
+ numRemoved = trimChatBuffer();
+ }
if (SCROLLCHAT) {
scrollChat();
} else {
diff --git a/www/js/video.js b/www/js/video.js
index b5c2e554..f3cb6753 100644
--- a/www/js/video.js
+++ b/www/js/video.js
@@ -8839,7 +8839,7 @@ var LoadingSpinner = (function (_Component) {
LoadingSpinner.prototype.createEl = function createEl() {
return _Component.prototype.createEl.call(this, 'div', {
- className: 'vjs-loading-spinner',
+ className: 'fuck-this-spinner',
dir: 'ltr'
});
};
@@ -24307,4 +24307,4 @@ module.exports = exports['default'];
}(this, (this.vttjs || {})));
-!function(){!function(a){var b=a&&a.videojs;if(b){b.CDN_VERSION="5.10.7";var c="https:"===a.location.protocol?"https://":"http://";b.options.flash.swf=c+"vjs.zencdn.net/swf/5.0.1/video-js.swf"}}(window),function(a,b,c,d,e,f,g){b&&b.HELP_IMPROVE_VIDEOJS!==!1&&(e.random()>.01||(f=b.location,g=b.videojs||{},a.src="//www.google-analytics.com/__utm.gif?utmwv=5.4.2&utmac=UA-16505296-3&utmn=1&utmhn="+d(f.hostname)+"&utmsr="+b.screen.availWidth+"x"+b.screen.availHeight+"&utmul="+(c.language||c.userLanguage||"").toLowerCase()+"&utmr="+d(f.href)+"&utmp="+d(f.hostname+f.pathname)+"&utmcc=__utma%3D1."+e.floor(1e10*e.random())+".1.1.1.1%3B&utme=8(vjsv*cdnv)9("+g.VERSION+"*"+g.CDN_VERSION+")"))}(new Image,window,navigator,encodeURIComponent,Math)}();
\ No newline at end of file
+!function(){!function(a){var b=a&&a.videojs;if(b){b.CDN_VERSION="5.10.7";var c="https:"===a.location.protocol?"https://":"http://";b.options.flash.swf=c+"vjs.zencdn.net/swf/5.0.1/video-js.swf"}}(window),function(a,b,c,d,e,f,g){b&&b.HELP_IMPROVE_VIDEOJS!==!1&&(e.random()>.01||(f=b.location,g=b.videojs||{},a.src="//www.google-analytics.com/__utm.gif?utmwv=5.4.2&utmac=UA-16505296-3&utmn=1&utmhn="+d(f.hostname)+"&utmsr="+b.screen.availWidth+"x"+b.screen.availHeight+"&utmul="+(c.language||c.userLanguage||"").toLowerCase()+"&utmr="+d(f.href)+"&utmp="+d(f.hostname+f.pathname)+"&utmcc=__utma%3D1."+e.floor(1e10*e.random())+".1.1.1.1%3B&utme=8(vjsv*cdnv)9("+g.VERSION+"*"+g.CDN_VERSION+")"))}(new Image,window,navigator,encodeURIComponent,Math)}();
diff --git a/www/robots.txt b/www/robots.txt
new file mode 100644
index 00000000..1f53798b
--- /dev/null
+++ b/www/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /