diff --git a/shared/js/ui/frames/chat_frame.ts b/shared/js/ui/frames/chat_frame.ts index 0d2f3bc5..c7f6e7de 100644 --- a/shared/js/ui/frames/chat_frame.ts +++ b/shared/js/ui/frames/chat_frame.ts @@ -257,7 +257,7 @@ namespace chat { private _message_history: string[] = []; private _message_history_length = 100; - private _message_history_index = 1; + private _message_history_index = 0; typing_interval: number = 2000; /* update frequency */ callback_typing: () => any; diff --git a/shared/js/ui/frames/server_log.ts b/shared/js/ui/frames/server_log.ts index 51fee477..d6e29f22 100644 --- a/shared/js/ui/frames/server_log.ts +++ b/shared/js/ui/frames/server_log.ts @@ -542,6 +542,25 @@ namespace log { MessageBuilders["reconnect_execute"] = (data: event.ReconnectExecute, options) => { return tra("Reconnecting...") }; + + MessageBuilders["server_banned"] = (data: event.ServerBanned, options) => { + let result: JQuery[]; + + const time = data.time == 0 ? tr("ever") : MessageHelper.format_time(data.time * 1000, tr("one second")); + if(data.invoker.client_id > 0) { + if(data.message) + result = tra("You've been banned from the server by {0} for {1}. Reason: {2}", client_tag(data.invoker), time, data.message); + else + result = tra("You've been banned from the server by {0} for {1}.", client_tag(data.invoker), time); + } else { + if(data.message) + result = tra("You've been banned from the server for {0}. Reason: {1}", time, data.message); + else + result = tra("You've been banned from the server for {0}.", time); + } + + return result.map(e => e.addClass("log-error")); + }; } } } \ No newline at end of file