From 9a69d5c54e87543459690c0bf169e995dab0a86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= Date: Mon, 17 Mar 2025 12:16:59 -0400 Subject: [PATCH] rename filter to trigger --- .../src/tools/achievements/achievement-processor.ts | 2 +- .../tools/achievements/examples/example-validators.ts | 10 +++++----- libs/common/src/tools/achievements/types.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/common/src/tools/achievements/achievement-processor.ts b/libs/common/src/tools/achievements/achievement-processor.ts index 2be603c22f9..79eda22f4ab 100644 --- a/libs/common/src/tools/achievements/achievement-processor.ts +++ b/libs/common/src/tools/achievements/achievement-processor.ts @@ -22,7 +22,7 @@ function achievements( withLatestFrom(validators$), // narrow the list of all live monitors to just those that may produce new logs map(([action, monitors]) => { - const triggered = monitors.filter((m) => m.filter(action)); + const triggered = monitors.filter((m) => m.trigger(action)); return [action, triggered] as const; }), withLatestFrom(captured$), diff --git a/libs/common/src/tools/achievements/examples/example-validators.ts b/libs/common/src/tools/achievements/examples/example-validators.ts index 86883c997bc..c762eeac4b5 100644 --- a/libs/common/src/tools/achievements/examples/example-validators.ts +++ b/libs/common/src/tools/achievements/examples/example-validators.ts @@ -17,7 +17,7 @@ const TotallyAttachedValidator = { validator: Type.HasTag, active: "until-earned", hidden: false, - filter(item) { + trigger(item) { return item.tags?.includes("with-attachment") ?? false; }, award(progress) { @@ -39,7 +39,7 @@ const ItemCreatedTracker = { validator: Type.Threshold, active: { metric: ItemCreatedProgress, high: 1 }, hidden: true, - filter(item) { + trigger(item) { return item.action === "vault-item-added"; }, measure(item, progress) { @@ -55,7 +55,7 @@ const ItemCreatedValidator = { validator: Type.Threshold, active: { metric: ItemCreatedProgress, high: 1 }, hidden: false, - filter(item) { + trigger(item) { return item.action === "vault-item-added"; }, measure(item, progress) { @@ -73,7 +73,7 @@ const ThreeItemsCreatedValidator = { validator: Type.Threshold, active: { metric: ItemCreatedProgress, low: 2, high: 3 }, hidden: false, - filter(item) { + trigger(item) { return item.action === "vault-item-added"; }, measure(_item, progress) { @@ -93,7 +93,7 @@ const FiveItemsCreatedValidator = { validator: Type.Threshold, active: { metric: ItemCreatedProgress, low: 4, high: 5 }, hidden: false, - filter(item) { + trigger(item) { return item.action === "vault-item-added"; }, measure(_item, progress) { diff --git a/libs/common/src/tools/achievements/types.ts b/libs/common/src/tools/achievements/types.ts index 19679d672ad..14a5c5b8557 100644 --- a/libs/common/src/tools/achievements/types.ts +++ b/libs/common/src/tools/achievements/types.ts @@ -56,7 +56,7 @@ export type Achievement = { // consumed by validator export type AchievementValidator = Achievement & { // when the watch triggers on incoming user events - filter: (item: UserActionEvent) => boolean; + trigger: (item: UserActionEvent) => boolean; // observe data from the event stream and produces measurements measure?: (item: UserActionEvent, metrics: Map) => AchievementProgressEvent[];