A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(limits): match rule traits regardless of case
Hampuse2a50387f12e
diff --git a/packages/limits/src/LimitRuleRuntime.ts b/packages/limits/src/LimitRuleRuntime.tsindex 413b9b435..4f98667ca 100644--- a/packages/limits/src/LimitRuleRuntime.ts+++ b/packages/limits/src/LimitRuleRuntime.ts@@ -52,11 +52,19 @@ function isValidLimitValue(value: number | undefined): value is number {return value >= 0;}+function areRequiredTraitsPresent(required: Array<string> | undefined, available: Set<string>): boolean {+ if (!required || required.length === 0) {+ return true;+ }+ const normalized = new Set(Array.from(available, (trait) => trait.toLowerCase()));+ return required.every((trait) => normalized.has(trait.toLowerCase()));+}+export function ruleMatches(filters: LimitFilter | undefined, ctx: LimitMatchContext): boolean {if (!filters) {return true;}- if (!areRequiredEntriesPresent(filters.traits, ctx.traits)) {+ if (!areRequiredTraitsPresent(filters.traits, ctx.traits)) {return false;}if (!areRequiredEntriesPresent(filters.guildFeatures, ctx.guildFeatures)) {diff --git a/packages/limits/src/__tests__/LimitTraitCase.test.ts b/packages/limits/src/__tests__/LimitTraitCase.test.tsnew file mode 100644index 000000000..056f6bbc4--- /dev/null+++ b/packages/limits/src/__tests__/LimitTraitCase.test.ts@@ -0,0 +1,41 @@+// SPDX-License-Identifier: AGPL-3.0-or-later++import {resolveLimits} from '@fluxer/limits/src/LimitResolver';+import {ruleMatches} from '@fluxer/limits/src/LimitRuleRuntime';+import {describe, expect, test} from 'vitest';++const NO_GUILD = new Set<string>();++describe('trait filters', () => {+ test.each([+ {rule: ['Premium'], user: ['premium']},+ {rule: ['premium'], user: ['Premium']},+ {rule: ['VIP', 'beta'], user: ['vip', 'BETA']},+ ])('match $rule for traits $user without regard to case', ({rule, user}) => {+ expect(ruleMatches({traits: rule}, {traits: new Set(user), guildFeatures: NO_GUILD})).toBe(true);+ });++ test('still need every trait in the filter', () => {+ expect(ruleMatches({traits: ['vip', 'beta']}, {traits: new Set(['VIP']), guildFeatures: NO_GUILD})).toBe(false);+ });++ test('keep guild features exact', () => {+ expect(+ ruleMatches(+ {guildFeatures: ['VERY_LARGE_GUILD']},+ {traits: new Set(), guildFeatures: new Set(['very_large_guild'])},+ ),+ ).toBe(false);+ });++ test('apply a rule written with a capital letter to the lowercase trait', () => {+ const {limits} = resolveLimits(+ {+ traitDefinitions: ['Premium'],+ rules: [{id: 'premium', filters: {traits: ['Premium']}, limits: {max_guilds: 321}}],+ },+ {traits: new Set(['premium']), guildFeatures: NO_GUILD},+ );+ expect(limits.max_guilds).toBe(321);+ });+});