7cc5c4f330d47060/owobot
1
0
Fork 0
Code Issues Pull requests Projects Releases11 Packages Wiki Activity Actions

Fix the chat parser

Browse source
This commit is contained in:
7cc5c4f330d47060 2024-08-17 07:31:18 -04:00
parent 2cfdb2a1be
commit 9fe7bfd3f7
Signed by: 7cc5c4f330d47060
SSH key fingerprint: SHA256:e+4tcZut1nBpe10PqjaO+Rvie0Q7W4qIvFzcUw+7riA
3 changed files with 50 additions and 11 deletions

49
plugins/!chat.js
View file

@ -20,10 +20,22 @@ module.exports = {
const parsed = parsePlain(json)
const split = parsed.split(': ')
const chatName = split.splice(0, 1)[0]
const chatNameSplit = chatName.split(" ");
const nickname = chatNameSplit[chatNameSplit.length-1]
const username = b.findRealName(chatName)
const uuid = b.findUUID(username)
b.emit('chat', { json, type: 'profileless', uuid, message: split.join(': '), username })
b.emit('chat', {
json,
type: 'profileless',
uuid,
message: split.join(': '),
nickname,
username
})
} else if (data.type === 6 || data.type === 7) {
const uuid = b.findUUID(parsePlain(parse1204(data.name)))
const nickname = b.findDisplayName(uuid)
console.log(uuid)
b.emit('chat', {
json: {
translate: messageTypes[data.type],
@ -35,11 +47,14 @@ module.exports = {
]
},
type: 'profileless',
uuid: data.senderUuid,
uuid,
message: parsePlain(data.message),
nickname,
username: parsePlain(parse1204(data.name))
})
} else {
const uuid = b.findUUID(parsePlain(parse1204(data.name)))
const nickname = b.findDisplayName(uuid)
b.emit('chat', {
json: {
translate: messageTypes[data.type],
@ -50,16 +65,24 @@ module.exports = {
]
},
type: 'profileless',
uuid: '00000000-0000-0000-0000-000000000000',
uuid,
message: parsePlain(parse1204(data.message)),
nickname,
username: parsePlain(parse1204(data.name))
})
}
})
b._client.on('player_chat', (data) => {
console.log(parsePlain(parse1204(data.networkName)))
if (data.type === 4) {
b.emit('chat', { json: parse1204(data.unsignedChatContent), type: 'player', uuid: data.senderUuid, message: data.plainMessage, username: parsePlain(parse1204(data.networkName)) })
b.emit('chat', {
json: parse1204(data.unsignedChatContent),
type: 'player', uuid: data.senderUuid,
message: data.plainMessage,
nickname: parsePlain(parse1204(data.networkName)),
username: b.findRealNameFromUUID(data.senderUuid)
})
} else if (data.type === 6 || data.type === 7) {
b.emit('chat', {
json: {
@ -74,7 +97,8 @@ module.exports = {
type: 'player',
uuid: data.senderUuid,
message: parsePlain(data.plainMessage),
username: parsePlain(parse1204(data.networkName))
nickname: parsePlain(parse1204(data.networkName)),
username: b.findRealNameFromUUID(data.senderUuid)
})
} else {
b.emit('chat', {
@ -89,7 +113,8 @@ module.exports = {
type: 'player',
uuid: data.senderUuid,
message: parsePlain(data.plainMessage),
username: parsePlain(parse1204(data.networkName))
nickname: parsePlain(parse1204(data.networkName)),
username: b.findRealNameFromUUID(data.senderUuid)
})
}
})
@ -99,9 +124,17 @@ module.exports = {
const parsed = parsePlain(json)
const split = parsed.split(': ')
const chatName = split.splice(0, 1)[0]
const chatNameSplit = chatName.split(" ");
const nickname = chatNameSplit[chatNameSplit.length-1]
const username = b.findRealName(chatName)
const uuid = b.findUUID(username)
b.emit('chat', { json, type: 'system', uuid, message: split.join(': '), username })
b.emit('chat', {
json,
type: 'system',
uuid, message: split.join(': '),
nickname,
username
})
})
b._client.on('chat', (data) => { // Legacy chat
@ -140,7 +173,7 @@ module.exports = {
for (const i in b.prefix) {
if (fullCommand.startsWith(b.prefix[i])) {
const command = fullCommand.slice(b.prefix[i].length)
b.runCommand(data.username, data.uuid, command, b.prefix[i])
b.runCommand(data.username, data.nickname, data.uuid, command, b.prefix[i])
}
}
})

3
plugins/command.js
View file

@ -18,7 +18,7 @@ module.exports = {
load: (b) => {
b.prefix = settings.prefix
b.lastCmd = 0
b.runCommand = (name, uuid, text, prefix) => {
b.runCommand = (name, nickname, uuid, text, prefix) => {
if (uuid === '00000000-0000-0000-0000-000000000000') return
if (Date.now() - b.lastCmd <= 1000) return
const userSettings = loadSettings(uuid)
@ -26,7 +26,6 @@ module.exports = {
const cmd = text.split(' ')
const lang = settings.defaultLang
const verify = hashcheck(cmd)
const nickname = b.findDisplayName(uuid)
if (verify > 0) {
text = cmd.slice(0, cmd.length - 1).join(' ')
}

9
plugins/player.js
View file

@ -23,7 +23,7 @@ module.exports = {
} else if (data.data[i].name !== undefined) {
buffer2[uuid] = { realName: data.data[i].name, displayName: parse(parseNBT(displayName)) }
} else if (data.data[i].displayName !== undefined) {
buffer2[uuid] = { displayName: displayName.plain }
buffer2[uuid] = { displayName: parse(parseNBT(displayName)) }
}
}
for (const uuid in buffer2) {
@ -48,6 +48,13 @@ module.exports = {
}
return '[[[[ no name ]]]]'
}
b.findRealNameFromUUID = (name) => {
if(b.players[name]){
return b.players[name].realName
} else {
return "[[[[ no name ]]]]"
}
}
b.findDisplayName = (name) => {
if(b.players[name]){
const displayName = b.players[name].displayName.split(" ");