@atproto/ozone 0.1.80 → 0.1.81

package/dist/lexicon/types/tools/ozone/team/listMembers.d.ts

@@ -5,6 +5,8 @@ import express from 'express';
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server';
 import type * as ToolsOzoneTeamDefs from './defs.js';
 export interface QueryParams {
+    disabled?: boolean;
+    roles?: string[];
     limit: number;
     cursor?: string;
 }

package/dist/lexicon/types/tools/ozone/team/listMembers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listMembers.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/tools/ozone/team/listMembers.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,KAAK,kBAAkB,MAAM,WAAW,CAAA;AAMpD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,kBAAkB,CAAC,MAAM,EAAE,CAAA;CACrC;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,CAAA;AAEpC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,kBAAkB,CAAA;AAC9E,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;IACrB,oBAAoB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1C,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA"}
+{"version":3,"file":"listMembers.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/tools/ozone/team/listMembers.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,KAAK,kBAAkB,MAAM,WAAW,CAAA;AAMpD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,kBAAkB,CAAC,MAAM,EAAE,CAAA;CACrC;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,CAAA;AAEpC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,kBAAkB,CAAA;AAC9E,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;IACrB,oBAAoB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1C,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA"}

package/dist/team/index.d.ts

@@ -9,9 +9,11 @@ export declare class TeamService {
     db: Database;
     constructor(db: Database);
     static creator(): (db: Database) => TeamService;
-    list({ cursor, limit, }: {
+    list({ cursor, limit, roles, disabled, }: {
         cursor?: string;
         limit?: number;
+        disabled?: boolean;
+        roles?: string[];
     }): Promise<{
         members: Selectable<Member>[];
         cursor?: string;

package/dist/team/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAC1E,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,wCAAwC,CAAA;AAG7E,MAAM,MAAM,kBAAkB,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,WAAW,CAAA;AAE9D,qBAAa,WAAW;IACH,EAAE,EAAE,QAAQ;gBAAZ,EAAE,EAAE,QAAQ;IAE/B,MAAM,CAAC,OAAO,SACA,QAAQ;IAGhB,IAAI,CAAC,EACT,MAAM,EACN,KAAU,GACX,EAAE;QACD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAazD,MAAM,CAAC,EACX,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,GACd,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,GAAG;QACvD,SAAS,CAAC,EAAE,IAAI,CAAA;QAChB,SAAS,CAAC,EAAE,IAAI,CAAA;KACjB,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAkBzB,MAAM,CAAC,EACX,IAAI,EACJ,GAAG,EACH,aAAa,GACd,EAAE,IAAI,CACL,UAAU,CAAC,MAAM,CAAC,EAClB,MAAM,GAAG,KAAK,GAAG,eAAe,CACjC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBX,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,OAAO,CACd,IAAI,CACF,UAAU,CAAC,MAAM,CAAC,EAClB,MAAM,GAAG,UAAU,GAAG,eAAe,GAAG,WAAW,CACpD,CACF,GACA,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAiBxB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU9C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAUrE,aAAa,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;;;;;IAenC,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IA0BtC,IAAI,CACR,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,EAC7B,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,UAAU,EAAE,CAAC;CAiBzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAA;AAC1E,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,wCAAwC,CAAA;AAG7E,MAAM,MAAM,kBAAkB,GAAG,CAAC,EAAE,EAAE,QAAQ,KAAK,WAAW,CAAA;AAE9D,qBAAa,WAAW;IACH,EAAE,EAAE,QAAQ;gBAAZ,EAAE,EAAE,QAAQ;IAE/B,MAAM,CAAC,OAAO,SACA,QAAQ;IAGhB,IAAI,CAAC,EACT,MAAM,EACN,KAAU,EACV,KAAK,EACL,QAAQ,GACT,EAAE;QACD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KACjB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IA6BzD,MAAM,CAAC,EACX,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,GACd,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,GAAG;QACvD,SAAS,CAAC,EAAE,IAAI,CAAA;QAChB,SAAS,CAAC,EAAE,IAAI,CAAA;KACjB,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAkBzB,MAAM,CAAC,EACX,IAAI,EACJ,GAAG,EACH,aAAa,GACd,EAAE,IAAI,CACL,UAAU,CAAC,MAAM,CAAC,EAClB,MAAM,GAAG,KAAK,GAAG,eAAe,CACjC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBX,MAAM,CACV,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,OAAO,CACd,IAAI,CACF,UAAU,CAAC,MAAM,CAAC,EAClB,MAAM,GAAG,UAAU,GAAG,eAAe,GAAG,WAAW,CACpD,CACF,GACA,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAiBxB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU9C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAUrE,aAAa,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;;;;;IAenC,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IA0BtC,IAAI,CACR,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,EAC7B,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,UAAU,EAAE,CAAC;CAiBzB"}

package/dist/team/index.js

@@ -17,11 +17,23 @@ class TeamService {
     static creator() {
         return (db) => new TeamService(db);
     }
-    async list({ cursor, limit = 25, }) {
+    async list({ cursor, limit = 25, roles, disabled, }) {
         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')

package/dist/team/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/team/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.80",
+  "version": "0.1.81",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [

package/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,

package/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
 }

package/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')

package/tests/__snapshots__/team.test.ts.snap

@@ -348,341 +348,3 @@ Array [
   },
 ]
 `;
-
-exports[`team management listMembers allows all members to list all members 3`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;
-
-exports[`team management listMembers allows all members to list all members 4`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;

package/tests/team.test.ts

@@ -1,4 +1,4 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ToolsOzoneTeamDefs } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
 
@@ -38,8 +38,8 @@ describe('team management', () => {
   describe('listMembers', () => {
     it('allows all members to list all members', async () => {
       const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+        adminAgent.tools.ozone.team.listMembers({}),
+        triageAgent.tools.ozone.team.listMembers({}),
       ])
       expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
       expect(forSnapshot(forTriage.members)).toMatchSnapshot()
@@ -47,20 +47,50 @@ describe('team management', () => {
 
       expect(forAdmin.members.length).toEqual(forTriage.members.length)
     })
-  })
-  describe('listMembers', () => {
-    it('allows all members to list all members', async () => {
-      const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+    it('allows filtering members by role', async () => {
+      const [{ data: onlyAdmins }, { data: onlyTriage }] = await Promise.all([
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLEADMIN],
+        }),
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLETRIAGE],
+        }),
       ])
-      expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
-      expect(forSnapshot(forTriage.members)).toMatchSnapshot()
-      // Validate that the list looks the same to both admin and triage members
 
-      expect(forAdmin.members.length).toEqual(forTriage.members.length)
+      expect(
+        onlyAdmins.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLEADMIN,
+        ),
+      ).toBeUndefined()
+
+      expect(
+        onlyTriage.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLETRIAGE,
+        ),
+      ).toBeUndefined()
+    })
+    it('allows filtering members by disabled status', async () => {
+      const [{ data: onlyDisabled }, { data: onlyEnabled }] = await Promise.all(
+        [
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: true,
+          }),
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: false,
+          }),
+        ],
+      )
+
+      expect(
+        onlyDisabled.members.find(({ disabled }) => !disabled),
+      ).toBeUndefined()
+
+      expect(
+        onlyEnabled.members.find(({ disabled }) => disabled),
+      ).toBeUndefined()
     })
   })
+
   describe('addMember', () => {
     const newMemberData = {
       did: 'did:plc:newMember',
@@ -69,15 +99,15 @@ describe('team management', () => {
     }
     it('only allows admins to add member', async () => {
       await expect(
-        triageAgent.api.tools.ozone.team.addMember(newMemberData),
+        triageAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('Must be an admin to add a member')
       const { data: newMember } =
-        await adminAgent.api.tools.ozone.team.addMember(newMemberData)
+        await adminAgent.tools.ozone.team.addMember(newMemberData)
       expect(forSnapshot(newMember)).toMatchSnapshot()
     })
     it('throws error when trying to add existing member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.addMember(newMemberData),
+        adminAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('member already exists')
     })
   })
@@ -85,19 +115,19 @@ describe('team management', () => {
     it('only allows admins to delete members', async () => {
       const {
         data: { members: initialMembers },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
       await expect(
-        triageAgent.api.tools.ozone.team.deleteMember({
+        triageAgent.tools.ozone.team.deleteMember({
           did: sc.dids.bob,
         }),
       ).rejects.toThrow('Must be an admin to delete a member')
 
-      await adminAgent.api.tools.ozone.team.deleteMember({
+      await adminAgent.tools.ozone.team.deleteMember({
         did: sc.dids.bob,
       })
       const {
         data: { members: membersAfterDelete },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
 
       expect(membersAfterDelete.length).toEqual(initialMembers.length - 1)
       expect(membersAfterDelete.map(({ did }) => did)).not.toContain(
@@ -107,7 +137,7 @@ describe('team management', () => {
 
     it('throws error when trying to remove non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.deleteMember({
+        adminAgent.tools.ozone.team.deleteMember({
           did: 'did:plc:test',
         }),
       ).rejects.toThrow('member not found')
@@ -118,19 +148,19 @@ describe('team management', () => {
       const getCarol = async () => {
         const {
           data: { members },
-        } = await adminAgent.api.tools.ozone.team.listMembers({})
+        } = await adminAgent.tools.ozone.team.listMembers({})
 
         return members.find(({ did }) => did === sc.dids.carol)
       }
       await expect(
-        triageAgent.api.tools.ozone.team.updateMember({
+        triageAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: sc.dids.carol,
           role: 'tools.ozone.team.defs#roleAdmin',
         }),
       ).rejects.toThrow('Must be an admin to update a member')
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         role: 'tools.ozone.team.defs#roleAdmin',
       })
@@ -141,7 +171,7 @@ describe('team management', () => {
       // Verify that params that we didn't send did not get updated
       expect(carolAfterRoleChange?.disabled).toEqual(false)
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         disabled: true,
       })
@@ -152,7 +182,7 @@ describe('team management', () => {
     })
     it('throws error when trying to update non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.updateMember({
+        adminAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: 'did:plc:test',
           role: 'tools.ozone.team.defs#roleAdmin',