fix groups
This commit is contained in:
parent
652657d78f
commit
f468a33db8
@ -49,7 +49,8 @@ import {
|
|||||||
Emoji,
|
Emoji,
|
||||||
Role,
|
Role,
|
||||||
Sticker,
|
Sticker,
|
||||||
VoiceState, UserSettingsProtos,
|
VoiceState,
|
||||||
|
UserSettingsProtos,
|
||||||
} from "@spacebar/util";
|
} from "@spacebar/util";
|
||||||
import { check } from "./instanceOf";
|
import { check } from "./instanceOf";
|
||||||
import { In } from "typeorm";
|
import { In } from "typeorm";
|
||||||
@ -261,7 +262,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
|
|||||||
timePromise(() =>
|
timePromise(() =>
|
||||||
UserSettingsProtos.findOne({
|
UserSettingsProtos.findOne({
|
||||||
where: { user_id: this.user_id },
|
where: { user_id: this.user_id },
|
||||||
})
|
}),
|
||||||
),
|
),
|
||||||
timePromise(() =>
|
timePromise(() =>
|
||||||
Channel.find({
|
Channel.find({
|
||||||
@ -342,8 +343,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
for (const call of mergeMemberGuildsTrace.calls!) {
|
for (const call of mergeMemberGuildsTrace.calls!) {
|
||||||
if (typeof call !== "string")
|
if (typeof call !== "string") mergeMemberGuildsTrace.micros += (call as { micros: number }).micros;
|
||||||
mergeMemberGuildsTrace.micros += (call as { micros: number }).micros;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const totalQueryTime = taskSw.getElapsedAndReset();
|
const totalQueryTime = taskSw.getElapsedAndReset();
|
||||||
@ -363,9 +363,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
|
|||||||
{
|
{
|
||||||
...x,
|
...x,
|
||||||
// filter out @everyone role
|
// filter out @everyone role
|
||||||
roles: x.roles
|
roles: x.roles.filter((r) => r.id !== x.guild.id).map((x) => x.id),
|
||||||
.filter((r) => r.id !== x.guild.id)
|
|
||||||
.map((x) => x.id),
|
|
||||||
|
|
||||||
// add back user, which we don't fetch from db
|
// add back user, which we don't fetch from db
|
||||||
// TODO: For guild profiles, this may need to be changed.
|
// TODO: For guild profiles, this may need to be changed.
|
||||||
@ -461,6 +459,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
|
|||||||
last_message_id: channel.last_message_id,
|
last_message_id: channel.last_message_id,
|
||||||
type: channel.type,
|
type: channel.type,
|
||||||
recipients: channelUsers || [],
|
recipients: channelUsers || [],
|
||||||
|
icon: channel.icon,
|
||||||
|
name: channel.name,
|
||||||
is_spam: false, // TODO
|
is_spam: false, // TODO
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -621,7 +621,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val.calls.push("mergeMemberGuildsTrace", mergeMemberGuildsTrace)
|
val.calls.push("mergeMemberGuildsTrace", mergeMemberGuildsTrace);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user