♻️ Cleanup linter warnings (#1907)

bluesky-social · Dec 5, 2023 · 7e74f00 · 7e74f00
1 parent 50c1366
commit 7e74f00
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 85 deletions.
diff --git a/packages/bsky/src/services/moderation/index.ts b/packages/bsky/src/services/moderation/index.ts
@@ -639,7 +639,7 @@ export class ModerationService {
     const { did, recordPath } = getStatusIdentifierFromSubject(
       'did' in subject ? subject.did : subject.uri,
     )
-    let builder = this.db.db
+    const builder = this.db.db
       .selectFrom('moderation_subject_status')
       .where('did', '=', did)
       .where('recordPath', '=', recordPath || '')

diff --git a/packages/bsky/src/services/moderation/status.ts b/packages/bsky/src/services/moderation/status.ts
@@ -2,10 +2,7 @@
 
 import { AtUri } from '@atproto/syntax'
 import { PrimaryDatabase } from '../../db'
-import {
-  ModerationEvent,
-  ModerationSubjectStatus,
-} from '../../db/tables/moderation'
+import { ModerationSubjectStatus } from '../../db/tables/moderation'
 import {
   REVIEWOPEN,
   REVIEWCLOSED,

diff --git a/packages/bsky/tests/admin/moderation.test.ts b/packages/bsky/tests/admin/moderation.test.ts
@@ -387,7 +387,7 @@ describe('moderation', () => {
         createLabelVals: ['nsfw'],
         negateLabelVals: [],
       })
-      const { data: takedownAction } = await emitModEvent({
+      await emitModEvent({
         $type: 'com.atproto.admin.defs#modEventTakedown',
       })
 
@@ -779,7 +779,7 @@ describe('moderation', () => {
         negateLabelVals: ModEventLabel['negateLabelVals']
       },
     ) {
-      const { createLabelVals, negateLabelVals, ...rest } = opts
+      const { createLabelVals, negateLabelVals } = opts
       const result = await agent.api.com.atproto.admin.emitModerationEvent(
         {
           event: {

diff --git a/packages/bsky/tests/views/thread.test.ts b/packages/bsky/tests/views/thread.test.ts
@@ -165,22 +165,21 @@ describe('pds thread views', () => {
 
   describe('takedown', () => {
     it('blocks post by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: alice,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: alice,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as shallow post thread test, minus alice
       const promise = agent.api.app.bsky.feed.getPostThread(
@@ -211,22 +210,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks replies by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: carol,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: carol,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as deep post thread test, minus carol
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -255,22 +253,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks ancestors by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: bob,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: bob,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus bob
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -300,23 +297,22 @@ describe('pds thread views', () => {
 
     it('blocks post by record', async () => {
       const postRef = sc.posts[alice][1].ref
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: postRef.uriStr,
-              cid: postRef.cidStr,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: postRef.uriStr,
+            cid: postRef.cidStr,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       const promise = agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: postRef.uriStr },
@@ -354,23 +350,22 @@ describe('pds thread views', () => {
 
       const parent = threadPreTakedown.data.thread.parent?.['post']
 
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: parent.uri,
-              cid: parent.cid,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: parent.uri,
+            cid: parent.cid,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus parent post
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -407,7 +402,7 @@ describe('pds thread views', () => {
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
       const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
 
-      const actionResults = await Promise.all(
+      await Promise.all(
         [post1, post2].map((post) =>
           agent.api.com.atproto.admin.emitModerationEvent(
             {