diff --git a/src/services/guildService.ts b/src/services/guildService.ts index 2c7d683f..2f229d1f 100644 --- a/src/services/guildService.ts +++ b/src/services/guildService.ts @@ -95,7 +95,6 @@ export const getGuildClient = async (guild: TGuildDatabaseDocument, accountId: s LongMOTD: guild.LongMOTD, Members: members, Ranks: guild.Ranks, - TradeTax: guild.TradeTax, Tier: guild.Tier, Vault: getGuildVault(guild), ActiveDojoColorResearch: guild.ActiveDojoColorResearch, @@ -126,7 +125,11 @@ export const getDojoClient = async ( const dojo: IDojoClient = { _id: { $oid: guild._id.toString() }, Name: guild.Name, - Tier: 1, + Tier: guild.Tier, + GuildEmblem: guild.Emblem, + TradeTax: guild.TradeTax, + NumContributors: guild.CeremonyContributors?.length ?? 0, + CeremonyResetDate: guild.CeremonyResetDate ? toMongoDate(guild.CeremonyResetDate) : undefined, FixedContributions: true, DojoRevision: 1, Vault: getGuildVault(guild), diff --git a/src/types/guildTypes.ts b/src/types/guildTypes.ts index d7d6d66d..8af68809 100644 --- a/src/types/guildTypes.ts +++ b/src/types/guildTypes.ts @@ -10,7 +10,6 @@ export interface IGuildClient { LongMOTD?: ILongMOTD; Members: IGuildMemberClient[]; Ranks: IGuildRank[]; - TradeTax: number; Tier: number; Vault: IGuildVault; ActiveDojoColorResearch: string; @@ -143,6 +142,7 @@ export interface IDojoClient { _id: IOid; // ID of the guild Name: string; Tier: number; + TradeTax?: number; FixedContributions: boolean; DojoRevision: number; AllianceId?: IOid; @@ -155,6 +155,8 @@ export interface IDojoClient { ContentURL?: string; GuildEmblem?: boolean; DojoComponents: IDojoComponentClient[]; + NumContributors?: number; + CeremonyResetDate?: IMongoDate; } export interface IDojoComponentClient {