From 3ca62dc8c8b6aae8ae27904f6b3b591e94997860 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Fri, 16 Oct 2020 13:14:24 +0200 Subject: [PATCH] fix #18, refactor `objectToArray` to legacy util --- src/core/libs/router/index.js | 2 +- src/core/libs/socket/index.ts | 23 ++++++++++++++++--- src/core/libs/verbosity/index.js | 6 ++--- src/models/user.ts | 3 ++- src/pages/debug/debuggers/socket.js | 6 ++--- src/pages/explore/index.js | 5 ++-- src/pages/index.js | 4 ++-- .../settings/components/electron/index.js | 4 ++-- src/theme/base/index.less | 1 + 9 files changed, 37 insertions(+), 17 deletions(-) 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(
diff --git a/src/pages/explore/index.js b/src/pages/explore/index.js index bbbbd40b..1b0c04d5 100644 --- a/src/pages/explore/index.js +++ b/src/pages/explore/index.js @@ -18,14 +18,15 @@ export default class Explore extends React.Component { request(){ v3_model.api_request( { - body: {limit: settings("post_catchlimit"), type: "get_news_feed"}, + body: {limit: settings("post_catchlimit"), fetch: "get_news_feed"}, serverKey: this.props.app.server_key, userToken: this.props.app.session_token, endpoint: endpoints.posts }, (err, res) => { try { - this.setState({ feed: res.data }) + console.log(res) + this.setState({ feed: res.response }) } catch (error) { // terrible (⓿_⓿) } diff --git a/src/pages/index.js b/src/pages/index.js index c5ddd843..8e5ab6b4 100755 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'umi'; import * as antd from 'antd' import * as Icons from 'components/Icons' -import { objectToArray } from 'core' +import { __legacy__objectToArray } from 'core' @connect(({ app, contextMenu }) => ({ app, contextMenu })) class PageIndex extends React.PureComponent { @@ -25,7 +25,7 @@ class PageIndex extends React.PureComponent { render() { const modelToMap = (data) => { if(!data) return false - return objectToArray(data).map(e => { + return __legacy__objectToArray(data).map(e => { try { const v = JSON.stringify(e.value) if(!v) return false diff --git a/src/pages/settings/components/electron/index.js b/src/pages/settings/components/electron/index.js index 509c317c..af033069 100644 --- a/src/pages/settings/components/electron/index.js +++ b/src/pages/settings/components/electron/index.js @@ -3,7 +3,7 @@ import * as antd from 'antd' import * as Icons from 'components/Icons' import styles from './index.less' import { connect } from 'umi'; -import { package_json, objectToArray } from 'core' +import { package_json, __legacy__objectToArray } from 'core' const AppTech = (info) => { if (!info) return null @@ -40,7 +40,7 @@ export default class ElectronSettings extends React.PureComponent{ g_umi: window.g_umi, process: window.process, react_version: React.version, - deps: objectToArray(package_json.dependencies) + deps: __legacy__objectToArray(package_json.dependencies) } }) } diff --git a/src/theme/base/index.less b/src/theme/base/index.less index ae3f5e79..b42de6a2 100644 --- a/src/theme/base/index.less +++ b/src/theme/base/index.less @@ -85,6 +85,7 @@ body { + text-rendering: optimizeLegibility!important; -webkit-app-region: no-drag; scroll-behavior: smooth;