diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/Main.hx | 9 | ||||
| -rw-r--r-- | src/server/Main.hx | 33 |
2 files changed, 25 insertions, 17 deletions
diff --git a/src/client/Main.hx b/src/client/Main.hx index 8ed519b..e7f8f30 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -506,6 +506,15 @@ class Main { final text = switch (id) { case "usernameError": Lang.get(id).replace("$MAX", '${config.maxLoginLength}'); + case id if (id.startsWith("accessError")): + final args = id.split("|"); + final err = Lang.get(args[0]); + if (args[1] == null) { + '$err.'; + } else { + final permErr = Lang.get("noPermission").replace("$PERMISSION", args[1]); + '$err: $permErr'; + } default: Lang.get(id); } diff --git a/src/server/Main.hx b/src/server/Main.hx index 7c9041f..f5f247e 100644 --- a/src/server/Main.hx +++ b/src/server/Main.hx @@ -691,11 +691,18 @@ class Main { if (!item.doCache) { addVideo(); } else { - cache.cacheYoutubeVideo(client, item.url, (name) -> { - item = item.withUrl(cache.getFileUrl(name)); - if (item.duration > 1) item.duration -= 1; - addVideo(); - }); + switch item.playerType { + case YoutubeType: + cache.cacheYoutubeVideo(client, item.url, (name) -> { + item = item.withUrl(cache.getFileUrl(name)); + if (item.duration > 1) item.duration -= 1; + addVideo(); + }); + case type: + final name = '$type'.replace("Type", ""); + serverMessage(client, 'No cache support for $name player.'); + addVideo(); + } } case VideoLoaded: @@ -942,12 +949,9 @@ class Main { logs: logger.getLogs() } final json = jsonStringify(data, "\t"); - send(client, { - type: ServerMessage, - serverMessage: { - textId: "Free space: " + (cache.getFreeSpace() / 1024).toFixed() + "KiB" - } - }); + serverMessage(client, "Free space: " + + (cache.getFreeSpace() / 1024).toFixed() + + "KiB"); send(client, { type: Dump, dump: { @@ -1037,12 +1041,7 @@ class Main { if (client.isBanned) checkBan(client); final state = client.hasPermission(perm, config.permissions); if (!state) { - send(client, { - type: ServerMessage, - serverMessage: { - textId: "accessError" - } - }); + serverMessage(client, 'accessError|$perm'); } return state; } |