✨ Allow filtering ozone team list by role and status (#3554)

* ✨ Allow filtering ozone team list by role and status * fix style * changeset --------- Co-authored-by: Matthieu Sieben <[email protected]>
bluesky-social · Feb 19, 2025 · 7449f86 · 7449f86
1 parent 7b93618
commit 7449f86
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 366 deletions.
diff --git a/.changeset/lucky-comics-talk.md b/.changeset/lucky-comics-talk.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Allow filtering Ozone members based on role and status
diff --git a/lexicons/tools/ozone/team/listMembers.json b/lexicons/tools/ozone/team/listMembers.json
@@ -8,13 +8,24 @@
       "parameters": {
         "type": "params",
         "properties": {
+          "disabled": {
+            "type": "boolean"
+          },
+          "roles": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
           "limit": {
             "type": "integer",
             "minimum": 1,
             "maximum": 100,
             "default": 50
           },
-          "cursor": { "type": "string" }
+          "cursor": {
+            "type": "string"
+          }
         }
       },
       "output": {
@@ -23,7 +34,9 @@
           "type": "object",
           "required": ["members"],
           "properties": {
-            "cursor": { "type": "string" },
+            "cursor": {
+              "type": "string"
+            },
             "members": {
               "type": "array",
               "items": {

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -13953,6 +13953,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            disabled: {
+              type: 'boolean',
+            },
+            roles: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,

diff --git a/packages/api/src/client/types/tools/ozone/team/listMembers.ts b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -13,6 +13,8 @@ const is$typed = _is$typed,
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
+  disabled?: boolean
+  roles?: string[]
   limit?: number
   cursor?: string
 }

diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
@@ -13953,6 +13953,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            disabled: {
+              type: 'boolean',
+            },
+            roles: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,

diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -14,6 +14,8 @@ const is$typed = _is$typed,
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
+  disabled?: boolean
+  roles?: string[]
   limit: number
   cursor?: string
 }

diff --git a/packages/ozone/src/team/index.ts b/packages/ozone/src/team/index.ts
@@ -21,14 +21,34 @@ export class TeamService {
   async list({
     cursor,
     limit = 25,
+    roles,
+    disabled,
   }: {
     cursor?: string
     limit?: number
+    disabled?: boolean
+    roles?: string[]
   }): Promise<{ members: Selectable<Member>[]; cursor?: string }> {
     let builder = this.db.db.selectFrom('member').selectAll()
     if (cursor) {
       builder = builder.where('createdAt', '>', new Date(cursor))
     }
+    if (roles !== undefined) {
+      const knownRoles = roles.filter(
+        (r) =>
+          r === 'tools.ozone.team.defs#roleAdmin' ||
+          r === 'tools.ozone.team.defs#roleModerator' ||
+          r === 'tools.ozone.team.defs#roleTriage',
+      )
+
+      // Optimization: no need to query to know that no values will be returned
+      if (!knownRoles.length) return { members: [] }
+
+      builder = builder.where('role', 'in', knownRoles)
+    }
+    if (disabled !== undefined) {
+      builder = builder.where('disabled', disabled ? 'is' : 'is not', true)
+    }
     const members = await builder
       .limit(limit)
       .orderBy('createdAt', 'asc')