furk4ngg/keppler
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Site > Chat > Add HTML entities back again

Browse Source
This commit is contained in:
brunosimon
2017-09-01 23:10:41 +02:00
parent c1af95234d
commit 4e08317a6f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/chat.js
+5 -3
View File
@@ -2,6 +2,7 @@ const ids = require('./ids.js')
const robotNames = require('./assets/data/robot-names.json') const robotNames = require('./assets/data/robot-names.json')
const nodeNotifier = require('node-notifier') const nodeNotifier = require('node-notifier')
const path = require('path') const path = require('path')
const HTMLEntities = require('html-entities')
class Chat class Chat
{ {
@@ -12,6 +13,7 @@ class Chat
this.users = {} this.users = {}
this.messages = [] this.messages = []
this.availableRobotNames = this.shuffle(robotNames.slice()) this.availableRobotNames = this.shuffle(robotNames.slice())
this.htmlEntities = new HTMLEntities.XmlEntities()
this.setSocket() this.setSocket()
@@ -58,7 +60,7 @@ class Chat
const broadcastMessage = {} const broadcastMessage = {}
broadcastMessage.id = data.id broadcastMessage.id = data.id
broadcastMessage.time = data.time broadcastMessage.time = data.time
broadcastMessage.text = data.text broadcastMessage.text = this.htmlEntities.encode(data.text)
broadcastMessage.file = data.file broadcastMessage.file = data.file
broadcastMessage.version = data.version broadcastMessage.version = data.version
broadcastMessage.line = data.line broadcastMessage.line = data.line
@@ -86,7 +88,7 @@ class Chat
} }
// Update name // Update name
user.name = data.name user.name = this.htmlEntities.encode(data.name)
// Debug // Debug
if(this.config.debug >= 1) if(this.config.debug >= 1)
@@ -199,7 +201,7 @@ class Chat
const broadcastMessage = {} const broadcastMessage = {}
broadcastMessage.id = data.id broadcastMessage.id = data.id
broadcastMessage.time = data.time broadcastMessage.time = data.time
broadcastMessage.text = data.text broadcastMessage.text = this.htmlEntities.encode(data.text)
broadcastMessage.file = data.file broadcastMessage.file = data.file
broadcastMessage.version = data.version broadcastMessage.version = data.version
broadcastMessage.line = data.line broadcastMessage.line = data.line
package.json
+1
View File
@@ -62,6 +62,7 @@
"extract-text-webpack-plugin": "^2.0.0", "extract-text-webpack-plugin": "^2.0.0",
"file-loader": "^0.11.1", "file-loader": "^0.11.1",
"friendly-errors-webpack-plugin": "^1.1.3", "friendly-errors-webpack-plugin": "^1.1.3",
"html-entities": "^1.2.1",
"html-webpack-plugin": "^2.28.0", "html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.3", "http-proxy-middleware": "^0.17.3",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
site/src/components/chat/template.html
+1 -1
View File
@@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="infos" v-if="user"> <div class="infos" v-if="user">
Your nickname is <input class="user-name" :style="`color: ${user.color};`" v-model="userName" @change="onUserNameChange($event)" @keydown="onUserNameKeyDown($event)"/> Your nickname is <input maxlength="22" class="user-name" :style="`color: ${user.color};`" v-model="userName" @change="onUserNameChange($event)" @keydown="onUserNameKeyDown($event)"/>
</div> </div>
<div class="question" v-if="question"> <div class="question" v-if="question">
Question: Question: