status-im
/
status-js-api
mirror of https://github.com/status-im/status-js-api.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: utf8

This commit is contained in:
Richard Ramos 2019-04-10 12:05:17 -04:00
parent 8a5376aa2d
commit e925d4b037
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/index.ts
View File

@ -12,7 +12,7 @@ if (typeof window !== "undefined") {
} }
const Web3 = typeof window !== "undefined" && window.web3 ? new web3Lib(window.web3.currentProvider) : web3Lib; const Web3 = typeof window !== "undefined" && window.web3 ? new web3Lib(window.web3.currentProvider) : web3Lib;
const { utils: { asciiToHex, hexToAscii } } = Web3; const { utils: { stringToHex, hexToUtf8 } } = Web3;
function createStatusPayload(content: string, messageType: string, clockValue: number, isJson = false) { function createStatusPayload(content: string, messageType: string, clockValue: number, isJson = false) {
const tag: string = constants.messageTags.message; const tag: string = constants.messageTags.message;
@ -24,7 +24,7 @@ function createStatusPayload(content: string, messageType: string, clockValue: n
const contentType = (isJson ? "content/json" : "text/plain"); const contentType = (isJson ? "content/json" : "text/plain");
const timestamp = new Date().getTime(); const timestamp = new Date().getTime();
return asciiToHex( return stringToHex(
JSON.stringify([ JSON.stringify([
tag, tag,
[content, contentType, messageType, clockValue, timestamp, ["^ ", "~:text", content]], [content, contentType, messageType, clockValue, timestamp, ["^ ", "~:text", content]],
@ -190,11 +190,11 @@ class StatusJS {
const messageHandler = (data: any) => { const messageHandler = (data: any) => {
try { try {
const username = utils.generateUsernameFromSeed(data.sig); const username = utils.generateUsernameFromSeed(data.sig);
const payloadArray = JSON.parse(hexToAscii(data.payload)); const payloadArray = JSON.parse(hexToUtf8(data.payload));
if (this.channels[channelName].lastClockValue < payloadArray[1][3]) { if (this.channels[channelName].lastClockValue < payloadArray[1][3]) {
this.channels[channelName].lastClockValue = payloadArray[1][3]; this.channels[channelName].lastClockValue = payloadArray[1][3];
} }
cb(null, {payload: hexToAscii(data.payload), data, username}); cb(null, {payload: hexToUtf8(data.payload), data, username});
} catch (err) { } catch (err) {
cb("Discarding invalid message received"); cb("Discarding invalid message received");
} }
@ -235,13 +235,13 @@ class StatusJS {
} }
try { try {
const payloadArray = JSON.parse(hexToAscii(data.payload)); const payloadArray = JSON.parse(hexToUtf8(data.payload));
if (this.contacts[data.sig].lastClockValue < payloadArray[1][3]) { if (this.contacts[data.sig].lastClockValue < payloadArray[1][3]) {
this.contacts[data.sig].lastClockValue = payloadArray[1][3]; this.contacts[data.sig].lastClockValue = payloadArray[1][3];
} }
if (payloadArray[0] === constants.messageTags.message) { if (payloadArray[0] === constants.messageTags.message) {
cb(null, {payload: hexToAscii(data.payload), data, username: this.contacts[data.sig].username}); cb(null, {payload: hexToUtf8(data.payload), data, username: this.contacts[data.sig].username});
} else if (payloadArray[0] === constants.messageTags.chatRequest) { } else if (payloadArray[0] === constants.messageTags.chatRequest) {
this.contacts[data.sig].displayName = payloadArray[1][0]; this.contacts[data.sig].displayName = payloadArray[1][0];
this.contacts[data.sig].profilePic = payloadArray[1][1]; this.contacts[data.sig].profilePic = payloadArray[1][1];