RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bunIgnore

Browse Source
This commit is contained in:
Cyber 2025-11-18 07:15:14 +01:00 committed by GitHub
commit ed4556bc6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/config/types/subconfigurations/guild/AutoJoin.ts
View File

@ -20,4 +20,5 @@ export class AutoJoinConfiguration {
enabled: boolean = true; enabled: boolean = true;
guilds: string[] = []; guilds: string[] = [];
canLeave: boolean = true; canLeave: boolean = true;
bots: boolean = false;
} }

11
src/util/entities/User.ts
View File

@ -157,7 +157,7 @@ export class User extends BaseClass {
@OneToOne(() => UserSettings, { @OneToOne(() => UserSettings, {
cascade: true, cascade: true,
orphanedRowAction: "delete", orphanedRowAction: "delete",
nullable: true nullable: true,
}) })
@JoinColumn() @JoinColumn()
settings?: UserSettings; settings?: UserSettings;
@ -257,6 +257,7 @@ export class User extends BaseClass {
password, password,
id, id,
req, req,
bot,
}: { }: {
username: string; username: string;
password?: string; password?: string;
@ -264,6 +265,7 @@ export class User extends BaseClass {
date_of_birth?: Date; // "2000-04-03" date_of_birth?: Date; // "2000-04-03"
id?: string; id?: string;
req?: Request; req?: Request;
bot?: boolean;
}) { }) {
// trim special uf8 control characters -> Backspace, Newline, ... // trim special uf8 control characters -> Backspace, Newline, ...
username = trimSpecial(username); username = trimSpecial(username);
@ -306,6 +308,7 @@ export class User extends BaseClass {
premium_type: Config.get().defaults.user.premiumType ?? 0, premium_type: Config.get().defaults.user.premiumType ?? 0,
verified: Config.get().defaults.user.verified ?? true, verified: Config.get().defaults.user.verified ?? true,
created_at: new Date(), created_at: new Date(),
bot: !!bot,
}); });
user.validate(); user.validate();
@ -319,6 +322,12 @@ export class User extends BaseClass {
} }
setImmediate(async () => { setImmediate(async () => {
if (bot) {
const { guild } = Config.get();
if (!guild.autoJoin.bots) {
return;
}
}
if (Config.get().guild.autoJoin.enabled) { if (Config.get().guild.autoJoin.enabled) {
for (const guild of Config.get().guild.autoJoin.guilds || []) { for (const guild of Config.get().guild.autoJoin.guilds || []) {
await Member.addToGuild(user.id, guild).catch((e) => console.error("[Autojoin]", e)); await Member.addToGuild(user.id, guild).catch((e) => console.error("[Autojoin]", e));

1
src/util/util/Application.ts
View File

@ -7,6 +7,7 @@ export async function createAppBotUser(app: Application, req: Request) {
password: undefined, password: undefined,
id: app.id, id: app.id,
req, req,
bot: true,
}); });
user.id = app.id; user.id = app.id;