Remove Tavern from API v3 list of guilds when 'guild' or 'publicGuilds' type parameter get added. (Fixes #12407) (#12438)

* Excluding tavern from showing up in GET /groups API when 'guilds' or 'publicGuilds' type parameter is included.

* Fixed test errors.

* Resolved pull request #12438 issues.

Moved Tavern exclusion to Group model, removed Group controller back to the original and resolved test failures.
This commit is contained in:
Alexander Colen
2020-08-17 06:38:07 -04:00
committed by GitHub
parent 10f89c8d79
commit 0cfe0473b9
2 changed files with 17 additions and 5 deletions

View File

@@ -301,7 +301,7 @@ schema.statics.getGroups = async function getGroups (options = {}) {
case 'guilds': {
const query = {
type: 'guild',
_id: { $in: user.guilds },
_id: { $in: user.guilds, $ne: TAVERN_ID },
};
_.assign(query, filters);
const userGuildsQuery = this.find(query).select(groupFields);
@@ -330,6 +330,7 @@ schema.statics.getGroups = async function getGroups (options = {}) {
const query = {
type: 'guild',
privacy: 'public',
_id: { $ne: TAVERN_ID },
};
_.assign(query, filters);