diff --git a/src/core/libs/router/index.js b/src/core/libs/router/index.js index 0a0cec70..4910f9fb 100644 --- a/src/core/libs/router/index.js +++ b/src/core/libs/router/index.js @@ -11,7 +11,7 @@ export const router = { // goTo.element('primaryContent'); }, goProfile: e => { - router.push(`/@${e}`); + router.push(`/@/${e}`); // goTo.element('primaryContent'); }, }; diff --git a/src/core/libs/socket/index.ts b/src/core/libs/socket/index.ts index 60d9cf4d..9c676d37 100644 --- a/src/core/libs/socket/index.ts +++ b/src/core/libs/socket/index.ts @@ -73,19 +73,36 @@ export class SocketConnection{ this.state.connAttemps = this.state.connAttemps + 1 }) - this.ioConn.on('disconnect', () => { - verbosity("Connection disconnect!") - }) this.ioConn.on('reconnect', (attemptNumber:number) => { verbosity(["Connection reconected with (", attemptNumber , ") tries"]) + notify.success("You are now online") }) + + this.ioConn.on('disconnected', () => { + notify.warn("You are offline") + }) + + this.ioConn.on('error', (event:any) => { + notify.error(event) + }) + this.ioConn.on('connect', () => { notify.success("You are now online") verbosity("Successfully connect") }) + this.ioConn.on('close', () => { verbosity("Connection closed!") }) + + this.ioConn.on('pingPong', (e:any) => { + // woops + const n = e + 1 + const fart = new Audio("https://dl.ragestudio.net/pedo_cum.mp3") + fart.play() + setTimeout(() => { this.ioConn.emit("pingPong", n) }, n) + }) + } conn = { diff --git a/src/core/libs/verbosity/index.js b/src/core/libs/verbosity/index.js index f77a5bc8..c84b8388 100644 --- a/src/core/libs/verbosity/index.js +++ b/src/core/libs/verbosity/index.js @@ -1,5 +1,5 @@ import settings from 'core/libs/settings' -import { objectToArray } from 'core' +import { __legacy__objectToArray } from 'core' import stackTrace from 'stack-trace' import path from 'path' import colors from 'colors' @@ -32,7 +32,7 @@ export function verbosity(data, params, stackTraceParams){ } if (typeof(params) !== "undefined" || params != null) { - objectToArray(params).forEach((e) => { + __legacy__objectToArray(params).forEach((e) => { if(typeof(e.value) !== "undefined"){ opt[e.key] = e.value } @@ -40,7 +40,7 @@ export function verbosity(data, params, stackTraceParams){ } if (typeof(stackTraceParams) !== "undefined" || stackTraceParams != null) { - objectToArray(stackTraceParams).forEach((e) => { + __legacy__objectToArray(stackTraceParams).forEach((e) => { if(typeof(e.value) !== "undefined"){ optStackTrace[e.key] = e.value } diff --git a/src/models/user.ts b/src/models/user.ts index 08c60538..4a1dbfe1 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -39,7 +39,8 @@ export default { if (err) { return console.log(err) } - const data = res.user_data + console.log(res) + const data = res.response const frame = { avatar: data.avatar, can_follow: data.can_follow, diff --git a/src/pages/debug/debuggers/socket.js b/src/pages/debug/debuggers/socket.js index 121157bf..4486b3b7 100644 --- a/src/pages/debug/debuggers/socket.js +++ b/src/pages/debug/debuggers/socket.js @@ -3,7 +3,7 @@ import jwt from 'jsonwebtoken' import io from 'socket.io-client' import { connect } from 'umi' import * as antd from 'antd' -import { objectToArray } from 'core' +import { __legacy__objectToArray } from 'core' import settings from 'core/libs/settings' const defaultSocketAddress = "localhost:7000" @@ -11,7 +11,7 @@ const defaultSocketAddress = "localhost:7000" @connect(({ app }) => ({ app })) export default class SocketDebug extends React.Component{ state = { - resolvers: objectToArray(this.props.app.resolvers), + resolvers: __legacy__objectToArray(this.props.app.resolvers), InputRaw: defaultSocketAddress } @@ -55,7 +55,7 @@ export default class SocketDebug extends React.Component{ gutter: 5, xxl: 3, }} - dataSource={objectToArray(socket_opt)} + dataSource={__legacy__objectToArray(socket_opt)} renderItem={(e) => { return(