Skip to content

Skip query of the auth database if hideGameMasters is false. Issue #36 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meteokr wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −14
Open

Skip query of the auth database if hideGameMasters is false. Issue #36 #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 36 additions & 14 deletions src/armory/controllers/CharacterController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,20 +342,42 @@ export class CharacterController {

private async getCharacterData(realm: IRealmConfig, character: string | number): Promise<ICharacterData> {
const where = typeof character === "string" ? "LOWER(`characters`.`name`) = LOWER(?)" : "`characters`.`guid` = ?";
const [rows] = await this.armory.getCharactersDb(realm.name).query({
sql: `
SELECT \`characters\`.\`guid\`, \`characters\`.\`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\`, \`guild\`.\`name\` AS \`guild\`
FROM \`characters\`
LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\`
LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\`
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}
AND (\`account_access\`.\`id\` IS NULL OR ? = 0)
`,
values: [character, this.armory.config.hideGameMasters ? 1 : 0],
timeout: this.armory.config.dbQueryTimeout,
});
const baseQuery = `
SELECT \`characters\`.\`guid\`, \`characters\`.\`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\`, \`guild\`.\`name\` AS \`guild\`
FROM \`characters\`
LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\`
LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\`
`;
let additionalSql = '';
const queryParams: any[] = [character];

if (this.armory.config.hideGameMasters) {
additionalSql = `
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
${typeof character === "string"
? "LOWER(`characters`.`name`) = LOWER(?)"
: "`characters`.`guid` = ?"
}
AND (\`account_access\`.\`id\` IS NULL OR ? = 0)
`;
queryParams.push(1); // Hide GMs
} else {
additionalSql = `
WHERE
${typeof character === "string"
? "LOWER(`characters`.`name`) = LOWER(?)"
: "`characters`.`guid` = ?"
}
`;
queryParams.push(0); // No GM filter
}
const sql = baseQuery + additionalSql;
const [rows] = await this.armory.getCharactersDb(realm.name).query({
sql,
values: queryParams,
timeout: this.armory.config.dbQueryTimeout,
});

if ((rows as RowDataPacket[]).length === 0) {
return null;
Expand Down