yrtria/azerothcore-armory
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Activity Actions

fix: character search duplicates because of account_access (#19)

Browse source
This commit is contained in:
Axel Cocat 2022-05-06 22:01:04 +02:00 • committed by GitHub
parent 216904fd6e
commit 08009a575c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/armory/DataTablesSsp.ts
View file

@ -23,6 +23,7 @@ export interface IColumnJoin {
column2: string; column2: string;
database2?: string; database2?: string;
kind: "INNER" | "FULL OUTER" | "LEFT" | "RIGHT"; kind: "INNER" | "FULL OUTER" | "LEFT" | "RIGHT";
where?: string;
} }
export class DataTablesSsp { export class DataTablesSsp {
@ -130,8 +131,9 @@ export class DataTablesSsp {
private join() { private join() {
for (const join of this.joins) { for (const join of this.joins) {
const db2 = join.database2 ? "`" + join.database2 + "`." : ""; const db2 = join.database2 ? `\`${join.database2}\`.` : "";
this.joinSql += `${join.kind} JOIN ${db2}\`${join.table2}\` ON ${db2}\`${join.table2}\`.\`${join.column2}\` = \`${join.table1}\`.\`${join.column1}\`\n`; const where = join.where ? ` ${join.where}` : "";
this.joinSql += `${join.kind} JOIN ${db2}\`${join.table2}\` ON ${db2}\`${join.table2}\`.\`${join.column2}\` = \`${join.table1}\`.\`${join.column1}\`${where}\n`;
} }
return this; return this;

4
src/armory/controllers/CharacterController.ts
View file

@ -315,10 +315,10 @@ export class CharacterController {
FROM \`characters\` FROM \`characters\`
LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\` LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\`
LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\` LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\`
LEFT JOIN \`${realm.authDatabase}\`.\`account_access\` ON \`account_access\`.\`id\` = \`characters\`.\`account\` LEFT JOIN \`${realm.authDatabase}\`.\`account_access\` ON \`account_access\`.\`id\` = \`characters\`.\`account\` AND \`account_access\`.\`RealmID\` IN (-1, ${realm.realmId}) AND \`account_access\`.\`gmlevel\` > 0
WHERE WHERE
${where} ${where}
AND (\`account_access\`.\`id\` IS NULL OR \`account_access\`.\`RealmID\` NOT IN (-1, ${realm.realmId}) OR \`account_access\`.\`gmlevel\` = 0 OR ? = 0) AND (\`account_access\`.\`id\` IS NULL OR ? = 0)
`, `,
values: [character, this.armory.config.hideGameMasters ? 1 : 0], values: [character, this.armory.config.hideGameMasters ? 1 : 0],
timeout: this.armory.config.dbQueryTimeout, timeout: this.armory.config.dbQueryTimeout,

5
src/armory/controllers/GuildController.ts
View file

@ -79,10 +79,9 @@ export class GuildController {
column2: "id", column2: "id",
database2: realm.authDatabase, database2: realm.authDatabase,
kind: "LEFT", kind: "LEFT",
where: `AND \`account_access\`.\`RealmID\` IN (-1, ${realm.realmId}) AND \`account_access\`.\`gmlevel\` > 0`,
}); });
ssp = ssp.where( ssp = ssp.where("`account_access`.`id` IS NULL");
`\`account_access\`.\`id\` IS NULL OR \`account_access\`.\`RealmID\` NOT IN (-1, ${realm.realmId}) OR \`account_access\`.\`gmlevel\` = 0`,
);
} }
const result = await ssp.where("`guildid` = ?", guildId).where("`deleteInfos_Account` IS NULL").run(this.armory.config.dbQueryTimeout); const result = await ssp.where("`guildid` = ?", guildId).where("`deleteInfos_Account` IS NULL").run(this.armory.config.dbQueryTimeout);

5
src/armory/controllers/IndexController.ts
View file

@ -50,10 +50,9 @@ export class IndexController {
column2: "id", column2: "id",
database2: realm.authDatabase, database2: realm.authDatabase,
kind: "LEFT", kind: "LEFT",
where: `AND \`account_access\`.\`RealmID\` IN (-1, ${realm.realmId}) AND \`account_access\`.\`gmlevel\` > 0`,
}); });
ssp = ssp.where( ssp = ssp.where("`account_access`.`id` IS NULL");
`\`account_access\`.\`id\` IS NULL OR \`account_access\`.\`RealmID\` NOT IN (-1, ${realm.realmId}) OR \`account_access\`.\`gmlevel\` = 0`,
);
} }
const result = await ssp.where("`deleteInfos_Account` IS NULL").run(this.armory.config.dbQueryTimeout); const result = await ssp.where("`deleteInfos_Account` IS NULL").run(this.armory.config.dbQueryTimeout);