@atproto/ozone 0.2.3 → 0.2.5

package/dist/mod-service/index.d.ts

@@ -74,35 +74,35 @@ export declare class ModerationService {
     } | {
         cids: CID[];
     }): Promise<{
-        id: number;
+        ageAssuranceState: string;
+        ageAssuranceUpdatedBy: string | null | undefined;
+        appealed: boolean | null;
+        blobCids: string[] | null;
         comment: string | null;
+        convoId: string;
         createdAt: string;
         did: string;
-        recordPath: string;
-        blobCids: string[] | null;
-        recordCid: string | null;
-        reviewState: "tools.ozone.moderation.defs#reviewOpen" | "tools.ozone.moderation.defs#reviewEscalated" | "tools.ozone.moderation.defs#reviewClosed" | "tools.ozone.moderation.defs#reviewNone";
-        muteUntil: string | null;
-        lastReviewedAt: string | null;
-        lastReviewedBy: string | null;
-        lastReportedAt: string | null;
-        lastAppealedAt: string | null;
-        takendown: boolean;
-        suspendUntil: string | null;
-        appealed: boolean | null;
-        updatedAt: string;
-        tags: string[] | null;
-        muteReportingUntil: string | null;
-        hostingStatus: string | null;
-        hostingDeletedAt: string | null;
-        hostingUpdatedAt: string | null;
         hostingCreatedAt: string | null;
         hostingDeactivatedAt: string | null;
+        hostingDeletedAt: string | null;
         hostingReactivatedAt: string | null;
-        ageAssuranceState: string;
-        convoId: string;
+        hostingStatus: string | null;
+        hostingUpdatedAt: string | null;
+        id: number;
+        lastAppealedAt: string | null;
+        lastReportedAt: string | null;
+        lastReviewedAt: string | null;
+        lastReviewedBy: string | null;
+        muteReportingUntil: string | null;
+        muteUntil: string | null;
         priorityScore: number | undefined;
-        ageAssuranceUpdatedBy: string | null | undefined;
+        recordCid: string | null;
+        recordPath: string;
+        reviewState: "tools.ozone.moderation.defs#reviewClosed" | "tools.ozone.moderation.defs#reviewEscalated" | "tools.ozone.moderation.defs#reviewNone" | "tools.ozone.moderation.defs#reviewOpen";
+        suspendUntil: string | null;
+        tags: string[] | null;
+        takendown: boolean;
+        updatedAt: string;
     }[]>;
     resolveSubjectsForAccount(did: string, createdBy: string, accountEvent: ModerationEventRow): Promise<void>;
     logEvent(info: {
@@ -118,34 +118,34 @@ export declare class ModerationService {
     }>;
     purgeAgeAssuranceEvents(subjectDid: string): Promise<void>;
     getLastReversibleEventForSubject(subject: ReversalSubject): Promise<{
-        id: number;
-        action: "tools.ozone.moderation.defs#modEventTakedown" | "tools.ozone.moderation.defs#modEventReverseTakedown" | "tools.ozone.moderation.defs#modEventComment" | "tools.ozone.moderation.defs#modEventReport" | "tools.ozone.moderation.defs#modEventLabel" | "tools.ozone.moderation.defs#modEventAcknowledge" | "tools.ozone.moderation.defs#modEventEscalate" | "tools.ozone.moderation.defs#modEventMute" | "tools.ozone.moderation.defs#modEventUnmute" | "tools.ozone.moderation.defs#modEventMuteReporter" | "tools.ozone.moderation.defs#modEventUnmuteReporter" | "tools.ozone.moderation.defs#modEventEmail" | "tools.ozone.moderation.defs#modEventResolveAppeal" | "tools.ozone.moderation.defs#modEventTag" | "tools.ozone.moderation.defs#accountEvent" | "tools.ozone.moderation.defs#identityEvent" | "tools.ozone.moderation.defs#recordEvent" | "tools.ozone.moderation.defs#modEventPriorityScore" | "tools.ozone.moderation.defs#revokeAccountCredentialsEvent" | "tools.ozone.moderation.defs#ageAssuranceEvent" | "tools.ozone.moderation.defs#ageAssuranceOverrideEvent" | "tools.ozone.moderation.defs#ageAssurancePurgeEvent";
-        subjectType: "com.atproto.repo.strongRef" | "com.atproto.admin.defs#repoRef" | "chat.bsky.convo.defs#convoRef" | "chat.bsky.convo.defs#messageRef";
-        subjectDid: string;
-        subjectUri: string | null;
-        subjectCid: string | null;
+        action: "tools.ozone.moderation.defs#accountEvent" | "tools.ozone.moderation.defs#ageAssuranceEvent" | "tools.ozone.moderation.defs#ageAssuranceOverrideEvent" | "tools.ozone.moderation.defs#ageAssurancePurgeEvent" | "tools.ozone.moderation.defs#identityEvent" | "tools.ozone.moderation.defs#modEventAcknowledge" | "tools.ozone.moderation.defs#modEventComment" | "tools.ozone.moderation.defs#modEventEmail" | "tools.ozone.moderation.defs#modEventEscalate" | "tools.ozone.moderation.defs#modEventLabel" | "tools.ozone.moderation.defs#modEventMute" | "tools.ozone.moderation.defs#modEventMuteReporter" | "tools.ozone.moderation.defs#modEventPriorityScore" | "tools.ozone.moderation.defs#modEventReport" | "tools.ozone.moderation.defs#modEventResolveAppeal" | "tools.ozone.moderation.defs#modEventReverseTakedown" | "tools.ozone.moderation.defs#modEventTag" | "tools.ozone.moderation.defs#modEventTakedown" | "tools.ozone.moderation.defs#modEventUnmute" | "tools.ozone.moderation.defs#modEventUnmuteReporter" | "tools.ozone.moderation.defs#recordEvent" | "tools.ozone.moderation.defs#revokeAccountCredentialsEvent";
+        addedTags: string[] | null;
         comment: string | null;
-        meta: Record<string, string | number | boolean> | null;
+        createLabelVals: string | null;
         createdAt: string;
         createdBy: string;
         durationInHours: number | null;
         expiresAt: string | null;
-        createLabelVals: string | null;
-        negateLabelVals: string | null;
+        externalId: string | null;
+        id: number;
         legacyRefId: number | null;
-        subjectBlobCids: string[] | null;
-        addedTags: string[] | null;
-        removedTags: string[] | null;
-        subjectMessageId: string | null;
+        meta: Record<string, string | number | boolean> | null;
         modTool: {
             name: string;
             meta?: { [_ in string]: unknown; };
         } | null;
+        negateLabelVals: string | null;
+        removedTags: string[] | null;
         severityLevel: string | null;
         strikeCount: number | null;
         strikeExpiresAt: string | null;
-        externalId: string | null;
+        subjectBlobCids: string[] | null;
+        subjectCid: string | null;
         subjectConvoId: string | null;
+        subjectDid: string;
+        subjectMessageId: string | null;
+        subjectType: "chat.bsky.convo.defs#convoRef" | "chat.bsky.convo.defs#messageRef" | "com.atproto.admin.defs#repoRef" | "com.atproto.repo.strongRef";
+        subjectUri: string | null;
     } | null | undefined>;
     getSubjectsDueForReversal(): Promise<ReversalSubject[]>;
     isSubjectSuspended(did: string): Promise<boolean>;
@@ -192,10 +192,10 @@ export declare class ModerationService {
     })[]>;
     getReporterStats(dids: string[]): Promise<ReporterStats[]>;
     getAccountTimeline(did: string): Promise<{
-        action: "tools.ozone.moderation.defs#modEventTakedown" | "tools.ozone.moderation.defs#modEventReverseTakedown" | "tools.ozone.moderation.defs#modEventComment" | "tools.ozone.moderation.defs#modEventReport" | "tools.ozone.moderation.defs#modEventLabel" | "tools.ozone.moderation.defs#modEventAcknowledge" | "tools.ozone.moderation.defs#modEventEscalate" | "tools.ozone.moderation.defs#modEventMute" | "tools.ozone.moderation.defs#modEventUnmute" | "tools.ozone.moderation.defs#modEventMuteReporter" | "tools.ozone.moderation.defs#modEventUnmuteReporter" | "tools.ozone.moderation.defs#modEventEmail" | "tools.ozone.moderation.defs#modEventResolveAppeal" | "tools.ozone.moderation.defs#modEventTag" | "tools.ozone.moderation.defs#accountEvent" | "tools.ozone.moderation.defs#identityEvent" | "tools.ozone.moderation.defs#recordEvent" | "tools.ozone.moderation.defs#modEventPriorityScore" | "tools.ozone.moderation.defs#revokeAccountCredentialsEvent" | "tools.ozone.moderation.defs#ageAssuranceEvent" | "tools.ozone.moderation.defs#ageAssuranceOverrideEvent" | "tools.ozone.moderation.defs#ageAssurancePurgeEvent";
-        subjectUri: string | null;
+        action: "tools.ozone.moderation.defs#accountEvent" | "tools.ozone.moderation.defs#ageAssuranceEvent" | "tools.ozone.moderation.defs#ageAssuranceOverrideEvent" | "tools.ozone.moderation.defs#ageAssurancePurgeEvent" | "tools.ozone.moderation.defs#identityEvent" | "tools.ozone.moderation.defs#modEventAcknowledge" | "tools.ozone.moderation.defs#modEventComment" | "tools.ozone.moderation.defs#modEventEmail" | "tools.ozone.moderation.defs#modEventEscalate" | "tools.ozone.moderation.defs#modEventLabel" | "tools.ozone.moderation.defs#modEventMute" | "tools.ozone.moderation.defs#modEventMuteReporter" | "tools.ozone.moderation.defs#modEventPriorityScore" | "tools.ozone.moderation.defs#modEventReport" | "tools.ozone.moderation.defs#modEventResolveAppeal" | "tools.ozone.moderation.defs#modEventReverseTakedown" | "tools.ozone.moderation.defs#modEventTag" | "tools.ozone.moderation.defs#modEventTakedown" | "tools.ozone.moderation.defs#modEventUnmute" | "tools.ozone.moderation.defs#modEventUnmuteReporter" | "tools.ozone.moderation.defs#recordEvent" | "tools.ozone.moderation.defs#revokeAccountCredentialsEvent";
         count: number;
         day: string;
+        subjectUri: string | null;
     }[]>;
 }
 export declare const TAKEDOWN_LABEL = "!takedown";

package/dist/mod-service/index.d.ts.map

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

package/dist/mod-service/index.js

@@ -107,19 +107,16 @@ export class ModerationService {
         }
         // If subjectType is set to 'account' let that take priority and ignore collections filter
         if (collections.length && subjectType !== 'account') {
-            builder = builder.where('subjectUri', 'is not', null).where((qb) => {
-                collections.forEach((collection) => {
-                    qb = qb.orWhere('subjectUri', 'like', `%/${collection}/%`);
-                });
-                return qb;
-            });
+            builder = builder
+                .where('subjectUri', 'is not', null)
+                .where((eb) => eb.or(collections.map((collection) => eb('subjectUri', 'like', `%/${collection}/%`))));
         }
         if (types.length) {
-            builder = builder.where((qb) => {
+            builder = builder.where((eb) => {
                 if (types.length === 1) {
-                    return qb.where('action', '=', types[0]);
+                    return eb('action', '=', types[0]);
                 }
-                return qb.where('action', 'in', types);
+                return eb('action', 'in', types);
             });
         }
         if (createdBy) {
@@ -135,12 +132,7 @@ export class ModerationService {
             // the input may end in || in which case, there may be item in the array which is just '' and we want to ignore those
             const keywords = comment.split('||').filter((keyword) => !!keyword.trim());
             if (keywords.length > 1) {
-                builder = builder.where((qb) => {
-                    keywords.forEach((keyword) => {
-                        qb = qb.orWhere('comment', 'ilike', `%${keyword}%`);
-                    });
-                    return qb;
-                });
+                builder = builder.where((eb) => eb.or(keywords.map((keyword) => eb('comment', 'ilike', `%${keyword}%`))));
             }
             else if (keywords.length === 1) {
                 builder = builder.where('comment', 'ilike', `%${keywords[0]}%`);
@@ -170,12 +162,7 @@ export class ModerationService {
             builder = builder.where(sql `meta->>'reportType'`, 'in', reportTypes);
         }
         if (policies?.length) {
-            builder = builder.where((qb) => {
-                policies.forEach((policy) => {
-                    qb = qb.orWhere(sql `meta->>'policies'`, 'ilike', `%${policy}%`);
-                });
-                return qb;
-            });
+            builder = builder.where((eb) => eb.or(policies.map((policy) => eb(sql `meta->>'policies'`, 'ilike', `%${policy}%`))));
         }
         if (modTool?.length) {
             builder = builder
@@ -261,7 +248,7 @@ export class ModerationService {
         const subjectsToBeResolved = await this.db.db
             .selectFrom('moderation_subject_status')
             .where('did', '=', did)
-            .where((qb) => qb.where('recordPath', '!=', '').orWhere('convoId', '!=', ''))
+            .where((eb) => eb.or([eb('recordPath', '!=', ''), eb('convoId', '!=', '')]))
             .where('reviewState', 'in', [REVIEWESCALATED, REVIEWOPEN])
             .selectAll()
             .execute();
@@ -555,8 +542,7 @@ export class ModerationService {
         const now = new Date().toISOString();
         const subjects = await this.db.db
             .selectFrom('moderation_subject_status')
-            .where('suspendUntil', '<', now)
-            .orWhere('muteUntil', '<', now)
+            .where((eb) => eb.or([eb('suspendUntil', '<', now), eb('muteUntil', '<', now)]))
             .selectAll()
             .execute();
         return subjects.map((row) => ({
@@ -794,12 +780,7 @@ export class ModerationService {
         if (subjectType !== 'account' && collections?.length) {
             builder = builder
                 .where('moderation_subject_status.recordPath', '!=', '')
-                .where((qb) => {
-                for (const collection of collections) {
-                    qb = qb.orWhere('moderation_subject_status.recordPath', 'like', `${collection}/%`);
-                }
-                return qb;
-            });
+                .where((eb) => eb.or(collections.map((collection) => eb('moderation_subject_status.recordPath', 'like', `${collection}/%`))));
         }
         if (ignoreSubjects?.length) {
             builder = builder
@@ -850,37 +831,32 @@ export class ModerationService {
                     : builder.where('moderation_subject_status.appealed', '=', appealed);
         }
         if (!includeMuted) {
-            builder = builder.where((qb) => qb
-                .where('moderation_subject_status.muteUntil', '<', new Date().toISOString())
-                .orWhere('moderation_subject_status.muteUntil', 'is', null));
+            builder = builder.where((eb) => eb.or([
+                eb('moderation_subject_status.muteUntil', '<', new Date().toISOString()),
+                eb('moderation_subject_status.muteUntil', 'is', null),
+            ]));
         }
         if (onlyMuted) {
-            builder = builder.where((qb) => qb
-                .where('moderation_subject_status.muteUntil', '>', new Date().toISOString())
-                .orWhere('moderation_subject_status.muteReportingUntil', '>', new Date().toISOString()));
+            builder = builder.where((eb) => eb.or([
+                eb('moderation_subject_status.muteUntil', '>', new Date().toISOString()),
+                eb('moderation_subject_status.muteReportingUntil', '>', new Date().toISOString()),
+            ]));
         }
         // ["tag1", "tag2 && tag3", "tag4"] => [["tag1"], ["tag2", "tag3"], ["tag4"]]
         const conditions = parseTags(tags);
         if (conditions?.length) {
             // [["tag1"], ["tag2", "tag3"], ["tag4"]] => (tags ? 'tag1') OR (tags ? 'tag2' AND tags ? 'tag3') OR (tags ? 'tag4')
-            builder = builder.where((qb) => {
-                for (const subTags of conditions) {
-                    // OR between every conditions items (subTags)
-                    qb = qb.orWhere((qb) => {
-                        // AND between every subTags items (subTag)
-                        for (const subTag of subTags) {
-                            qb = qb.where(sql `${ref('moderation_subject_status.tags')} ? ${subTag}`);
-                        }
-                        return qb;
-                    });
-                }
-                return qb;
-            });
+            builder = builder.where((eb) => 
+            // OR between every conditions items (subTags)
+            eb.or(conditions.map((subTags) => 
+            // AND between every subTags items (subTag)
+            eb.and(subTags.map((subTag) => sql `${ref('moderation_subject_status.tags')} ? ${subTag}`)))));
         }
         if (excludeTags?.length) {
-            builder = builder.where((qb) => qb
-                .where(sql `NOT(${ref('moderation_subject_status.tags')} ?| array[${sql.join(excludeTags)}]::TEXT[])`)
-                .orWhere('tags', 'is', null));
+            builder = builder.where((eb) => eb.or([
+                sql `NOT(${ref('moderation_subject_status.tags')} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
+                eb('tags', 'is', null),
+            ]));
         }
         if (minAccountSuspendCount != null && minAccountSuspendCount > 0) {
             builder = builder.where('account_events_stats.suspendCount', '>=', minAccountSuspendCount);