merge: pull request #1143 from Asraye/fix/member-sidebar
commit
41f47a1a3f
|
|
@ -76,17 +76,25 @@ function useEntries(
|
||||||
|
|
||||||
keys.forEach((key) => {
|
keys.forEach((key) => {
|
||||||
let u;
|
let u;
|
||||||
|
let member;
|
||||||
|
|
||||||
if (isServer) {
|
if (isServer) {
|
||||||
const { server, user } = JSON.parse(key);
|
const { server, user } = JSON.parse(key);
|
||||||
if (server !== channel.server_id) return;
|
if (server !== channel.server_id) return;
|
||||||
|
|
||||||
u = client.users.get(user);
|
u = client.users.get(user);
|
||||||
|
member = client.members.get(key);
|
||||||
|
|
||||||
|
if (!member?.hasPermission(channel, "ViewChannel")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
u = client.users.get(key);
|
u = client.users.get(key);
|
||||||
|
member = client.members.get(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!u) return;
|
if (!u) return;
|
||||||
|
|
||||||
const member = client.members.get(key);
|
|
||||||
const sort = member?.nickname ?? u.username;
|
const sort = member?.nickname ?? u.username;
|
||||||
const entry = [u, sort] as [User, string];
|
const entry = [u, sort] as [User, string];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue