diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | default-config.json | 38 | ||||
| -rw-r--r-- | src/client/Main.hx | 3 |
4 files changed, 46 insertions, 4 deletions
@@ -4,4 +4,4 @@ /user/state.json
/user/res/
/user/logs/
-/user/errors/
+/user/crashes/
@@ -9,7 +9,7 @@ Even if some original features are not implemented yet, there is some new things - Way to play local videos for network users (without NAT loopback feature)
- `/30`, `/-21`, etc to rewind video playback in seconds
- Override every front-end file you want (`user/res` folder)
-- Updated Des theme
+- Reworked Modern theme
### Setup
- Open `4200` port in your router settings
@@ -24,3 +24,8 @@ It's just works, but you can also check [user/ folder](/user/README.md) for serv - Install Haxe 4, VSCode and vshaxe extension.
- `haxelib install all` to install extern libs.
- Open project in VSCode and press `F5` for client+server build and run.
+
+### About
+- [Original idea](https://github.com/calzoneman/sync) and layout by Calvin Montgomery.
+- Original theme by Thomas Park.
+- Default emotes by [emlan](https://www.deviantart.com/emlan).
diff --git a/default-config.json b/default-config.json index ec00b60..e983066 100644 --- a/default-config.json +++ b/default-config.json @@ -6,7 +6,43 @@ "videoLimit": 0, "leaderRequest": "everyone", "emotes": [ - {"name":":haxe:", "image":"https://haxe.org/favicon.ico"} + {"name": ":adorable:", "image": "https://i.imgur.com/5GxNwDY.png"}, + {"name": ":angry:", "image": "https://i.imgur.com/Mx9lhMZ.png"}, + {"name": ":artist:", "image": "https://i.imgur.com/8wQxnse.png"}, + {"name": ":back:", "image": "https://i.imgur.com/hafcTP1.png"}, + {"name": ":beaten:", "image": "https://i.imgur.com/QIvPD83.png"}, + {"name": ":cold:", "image": "https://i.imgur.com/fwgJPJ2.png"}, + {"name": ":confusion:", "image": "https://i.imgur.com/rQHCTPI.png"}, + {"name": ":doh:", "image": "https://i.imgur.com/EaFIosT.png"}, + {"name": ":drink:", "image": "https://i.imgur.com/mSeXSIk.png"}, + {"name": ":eh:", "image": "https://i.imgur.com/lrpyuCX.png"}, + {"name": ":ehehe:", "image": "https://i.imgur.com/UrxypoB.png"}, + {"name": ":fallen:", "image": "https://i.imgur.com/ihYXAlM.png"}, + {"name": ":frustrated:", "image": "https://i.imgur.com/pSY67Ja.gif"}, + {"name": ":goodmood:", "image": "https://i.imgur.com/t5WgyL6.gif"}, + {"name": ":happy:", "image": "https://i.imgur.com/2JNBCk7.png"}, + {"name": ":hmm:", "image": "https://i.imgur.com/u0O7xrc.png"}, + {"name": ":honor:", "image": "https://i.imgur.com/Dkn7JfX.png"}, + {"name": ":hot:", "image": "https://i.imgur.com/9IHCj1a.png"}, + {"name": ":hungry:", "image": "https://i.imgur.com/QoVVKYK.png"}, + {"name": ":idea:", "image": "https://i.imgur.com/l3HoqtG.png"}, + {"name": ":ill:", "image": "https://i.imgur.com/EgY26B0.png"}, + {"name": ":awesome:", "image": "https://i.imgur.com/3COHK8w.png"}, + {"name": ":lovebreak:", "image": "https://i.imgur.com/FcTCnCx.png"}, + {"name": ":loveformoney:", "image": "https://i.imgur.com/Z18e5NZ.png"}, + {"name": ":money:", "image": "https://i.imgur.com/1uM0wky.png"}, + {"name": ":nani:", "image": "https://i.imgur.com/bePPNni.png"}, + {"name": ":ok:", "image": "https://i.imgur.com/gub2TDR.png"}, + {"name": ":ontheway:", "image": "https://i.imgur.com/fWWBeBz.png"}, + {"name": ":romantic:", "image": "https://i.imgur.com/sze1iiu.png"}, + {"name": ":sad:", "image": "https://i.imgur.com/yAjo1kC.png"}, + {"name": ":scared:", "image": "https://i.imgur.com/rsqs0fw.png"}, + {"name": ":sleep:", "image": "https://i.imgur.com/UbR9xv3.png"}, + {"name": ":think:", "image": "https://i.imgur.com/nAoKYYi.png"}, + {"name": ":tired:", "image": "https://i.imgur.com/mKCmaIQ.png"}, + {"name": ":tricky:", "image": "https://i.imgur.com/gC7NlqY.png"}, + {"name": ":writer:", "image": "https://i.imgur.com/rJLs4Ig.png"}, + {"name": ":haxe:", "image": "https://i.imgur.com/F9Tllyv.png"} ], "filters": [ { diff --git a/src/client/Main.hx b/src/client/Main.hx index 3a819b2..b2e224d 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -457,6 +457,8 @@ class Main { nameDiv.textContent = name + ": "; final textDiv = document.createSpanElement(); + text = text.htmlEscape(); + if (text.startsWith("/")) { if (name == personal.name) handleCommands(text.substr(1)); } else { @@ -464,7 +466,6 @@ class Main { text = filter.regex.replace(text, filter.replace); } } - text = text.htmlEscape(); textDiv.innerHTML = text; final isInChatEnd = msgBuf.scrollHeight - msgBuf.scrollTop == msgBuf.clientHeight; |