diff options
Diffstat (limited to 'build/server.js')
| -rw-r--r-- | build/server.js | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/build/server.js b/build/server.js index 9adcb91..dcbb2bc 100644 --- a/build/server.js +++ b/build/server.js @@ -5209,18 +5209,30 @@ server_Main.prototype = { _gthis.restartWaitTimer(); } } else { - this.cache.cacheYoutubeVideo(client,item.url,function(name) { - item = _$Types_VideoItemTools.withUrl(item,_gthis.cache.getFileUrl(name)); - if(item.duration > 1) { - item.duration -= 1; - } + var _g = item.playerType; + if(_g == "YoutubeType") { + this.cache.cacheYoutubeVideo(client,item.url,function(name) { + item = _$Types_VideoItemTools.withUrl(item,_gthis.cache.getFileUrl(name)); + if(item.duration > 1) { + item.duration -= 1; + } + data.addVideo.item = item; + _gthis.videoList.addItem(item,data.addVideo.atEnd); + _gthis.broadcast(data); + if(_gthis.videoList.items.length == 1) { + _gthis.restartWaitTimer(); + } + }); + } else { + var name = StringTools.replace("" + _g,"Type",""); + this.serverMessage(client,"No cache support for " + name + " player."); data.addVideo.item = item; _gthis.videoList.addItem(item,data.addVideo.atEnd); _gthis.broadcast(data); if(_gthis.videoList.items.length == 1) { _gthis.restartWaitTimer(); } - }); + } } break; case "BanClient": @@ -5352,7 +5364,7 @@ server_Main.prototype = { result[i] = { name : client1.name, id : client1.id, ip : _gthis.clientIp(client1.req), isBanned : (client1.group & 1) != 0, isAdmin : (client1.group & 8) != 0, isLeader : (client1.group & 4) != 0, isUser : (client1.group & 2) != 0}; } var json = server_Main.jsonStringify({ state : data1, clients : result, logs : this.logger.getLogs()},"\t"); - this.send(client,{ type : "ServerMessage", serverMessage : { textId : "Free space: " + tools_MathTools.toFixed(this.cache.getFreeSpace() / 1024) + "KiB"}}); + this.serverMessage(client,"Free space: " + tools_MathTools.toFixed(this.cache.getFreeSpace() / 1024) + "KiB"); this.send(client,{ type : "Dump", dump : { data : json}}); break; case "Flashback": @@ -5763,7 +5775,7 @@ server_Main.prototype = { } var state = client.hasPermission(perm,this.config.permissions); if(!state) { - this.send(client,{ type : "ServerMessage", serverMessage : { textId : "accessError"}}); + this.serverMessage(client,"accessError|" + perm); } return state; } @@ -5785,7 +5797,7 @@ server_Main.prototype = { client.setGroupFlag(ClientGroup.Banned,!isOutdated); if(isOutdated) { HxOverrides.remove(this.userList.bans,ban); - haxe_Log.trace("" + client.name + " ban removed",{ fileName : "src/server/Main.hx", lineNumber : 1063, className : "server.Main", methodName : "checkBan"}); + haxe_Log.trace("" + client.name + " ban removed",{ fileName : "src/server/Main.hx", lineNumber : 1062, className : "server.Main", methodName : "checkBan"}); this.sendClientList(); } break; |