diff --git a/promotion/banner.png b/promotion/banner.png new file mode 100644 index 00000000..1f37b49f Binary files /dev/null and b/promotion/banner.png differ diff --git a/src/socket/APISocketServer.js b/src/socket/APISocketServer.js index e077c6b2..352b9540 100644 --- a/src/socket/APISocketServer.js +++ b/src/socket/APISocketServer.js @@ -11,12 +11,13 @@ import WebSocket from 'ws'; import socketEvents from './socketEvents'; import { dehydrateOnlineCounter } from './packets/server'; -import chatProvider, { ChatProvider } from '../core/ChatProvider'; +import chatProvider from '../core/ChatProvider'; import { RegUser } from '../data/sql'; import { getIPFromRequest } from '../utils/ip'; import { setPixelByCoords } from '../core/setPixel'; import logger from '../core/logger'; import { APISOCKET_KEY } from '../core/config'; +import { checkIfMuted } from '../data/redis/chat'; class APISocketServer { @@ -243,7 +244,7 @@ class APISocketServer { /* * don't send if muted */ - const mutedTtl = await ChatProvider.checkIfMuted(uid); + const mutedTtl = await checkIfMuted(uid); if (mutedTtl !== -2) { return; } diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js index 78b7e411..de3c11f0 100644 --- a/src/socket/SocketServer.js +++ b/src/socket/SocketServer.js @@ -481,7 +481,7 @@ class SocketServer { } } catch (err) { // eslint-disable-next-line max-len - logger.error(`Got invalid ws text message ${text}, with error: ${err.message}`); + logger.error(`Got invalid ws text message ${text} from ${ws.user.ip}, with error: ${err.message}`); } }