Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DC client throwing on GUILD_CREATE

Browse Source
This commit is contained in:
Madeline 2023-04-12 21:03:49 +10:00
parent 5771552408
commit 9a6390b9bd
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/dtos/ReadyGuildDTO.ts
View File

@ -16,7 +16,14 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Channel, Emoji, Guild, Member, Role, Sticker } from "../entities"; import {
Channel,
Emoji,
Guild,
PublicMember,
Role,
Sticker,
} from "../entities";
export interface IReadyGuildDTO { export interface IReadyGuildDTO {
application_command_counts?: { 1: number; 2: number; 3: number }; // ???????????? application_command_counts?: { 1: number; 2: number; 3: number }; // ????????????
@ -28,7 +35,7 @@ export interface IReadyGuildDTO {
large: boolean | undefined; large: boolean | undefined;
lazy: boolean; lazy: boolean;
member_count: number | undefined; member_count: number | undefined;
members: Member[]; members: PublicMember[];
premium_subscription_count: number | undefined; premium_subscription_count: number | undefined;
properties: { properties: {
name: string; name: string;
@ -76,7 +83,7 @@ export class ReadyGuildDTO implements IReadyGuildDTO {
large: boolean | undefined; large: boolean | undefined;
lazy: boolean; lazy: boolean;
member_count: number | undefined; member_count: number | undefined;
members: Member[]; members: PublicMember[];
premium_subscription_count: number | undefined; premium_subscription_count: number | undefined;
properties: { properties: {
name: string; name: string;
@ -127,7 +134,7 @@ export class ReadyGuildDTO implements IReadyGuildDTO {
this.large = guild.large; this.large = guild.large;
this.lazy = true; // ?????????? this.lazy = true; // ??????????
this.member_count = guild.member_count; this.member_count = guild.member_count;
this.members = guild.members; this.members = guild.members?.map((x) => x.toPublicMember());
this.premium_subscription_count = guild.premium_subscription_count; this.premium_subscription_count = guild.premium_subscription_count;
this.properties = { this.properties = {
name: guild.name, name: guild.name,

26
src/util/entities/Member.ts
View File

@ -330,17 +330,25 @@ export class Member extends BaseClassWithoutId {
}); });
const memberCount = await Member.count({ where: { guild_id } }); const memberCount = await Member.count({ where: { guild_id } });
const memberPreview = await Member.find({
where: { const memberPreview = (
guild_id, await Member.find({
user: { where: {
sessions: { guild_id,
status: Not("invisible" as const), // lol typescript? user: {
sessions: {
status: Not("invisible" as const), // lol typescript?
},
}, },
}, },
}, relations: ["user", "roles"],
take: 10, take: 10,
}); })
).map((member) => ({
...member.toPublicMember(),
user: member.user.toPublicUser(),
roles: member.roles.map((x) => x.id),
}));
if ( if (
await Member.count({ await Member.count({