eslint ok in local
This commit is contained in:
parent
4f54d5a462
commit
2a87754419
2 changed files with 3 additions and 3 deletions
|
|
@ -10,7 +10,7 @@ export async function broadcast(fastify: FastifyInstance, data: ClientMessage, s
|
||||||
|
|
||||||
const Allusers: User[] = fastify.db.getAllUsers() ?? [];
|
const Allusers: User[] = fastify.db.getAllUsers() ?? [];
|
||||||
if (!data.user) return;
|
if (!data.user) return;
|
||||||
const senderUser = getUserByName(Allusers, data.user)
|
const senderUser = getUserByName(Allusers, data.user);
|
||||||
if (!senderUser) return;
|
if (!senderUser) return;
|
||||||
const list:BlockRelation[] = whoBlockedMe(fastify, senderUser.id);
|
const list:BlockRelation[] = whoBlockedMe(fastify, senderUser.id);
|
||||||
const sockets = await fastify.io.fetchSockets();
|
const sockets = await fastify.io.fetchSockets();
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess
|
||||||
let blockMsgFlag: boolean = false;
|
let blockMsgFlag: boolean = false;
|
||||||
const receiverUser: User | null = getUserByName(allUsers, clientInfo.user);
|
const receiverUser: User | null = getUserByName(allUsers, clientInfo.user);
|
||||||
if (!receiverUser) return;
|
if (!receiverUser) return;
|
||||||
|
|
||||||
|
|
||||||
const user: string = clientChat.get(socket.id)?.user ?? '';
|
const user: string = clientChat.get(socket.id)?.user ?? '';
|
||||||
const targetUser = `@${user}`;
|
const targetUser = `@${user}`;
|
||||||
|
|
@ -44,7 +44,7 @@ export async function sendPrivMessage(fastify: FastifyInstance, data: ClientMess
|
||||||
}
|
}
|
||||||
|
|
||||||
blockMsgFlag = checkNamePair(list, UserID, receiverUser.id) || false;
|
blockMsgFlag = checkNamePair(list, UserID, receiverUser.id) || false;
|
||||||
|
|
||||||
if (!blockMsgFlag) {
|
if (!blockMsgFlag) {
|
||||||
socket.emit('MsgObjectServer', { message: data });
|
socket.emit('MsgObjectServer', { message: data });
|
||||||
fastify.log.info({ senderID: `${UserID}`, msgPriv: data.text, target: `${receiverUser.id}` });
|
fastify.log.info({ senderID: `${UserID}`, msgPriv: data.text, target: `${receiverUser.id}` });
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue