Include nsfw flag for getPopular (bluesky-social#949)

add includeNsfw flag for whats hot
sarvex · May 1, 2023 · 1e24d3e · 1e24d3e
1 parent bff9654
commit 1e24d3e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/lexicons/app/bsky/unspecced/getPopular.json b/lexicons/app/bsky/unspecced/getPopular.json
@@ -8,6 +8,7 @@
       "parameters": {
         "type": "params",
         "properties": {
+          "includeNsfw": {"type": "boolean", "default": false},
           "limit": {"type": "integer", "minimum": 1, "maximum": 100, "default": 50},
           "cursor": {"type": "string"}
         }

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -5076,6 +5076,10 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            includeNsfw: {
+              type: 'boolean',
+              default: false,
+            },
             limit: {
               type: 'integer',
               minimum: 1,

diff --git a/packages/api/src/client/types/app/bsky/unspecced/getPopular.ts b/packages/api/src/client/types/app/bsky/unspecced/getPopular.ts
@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 import * as AppBskyFeedDefs from '../feed/defs'
 
 export interface QueryParams {
+  includeNsfw?: boolean
   limit?: number
   cursor?: string
 }

diff --git a/packages/pds/src/app-view/api/app/bsky/unspecced.ts b/packages/pds/src/app-view/api/app/bsky/unspecced.ts
@@ -8,18 +8,18 @@ import { NotEmptyArray } from '@atproto/common'
 
 const NO_WHATS_HOT_LABELS: NotEmptyArray<string> = [
   '!no-promote',
-  'porn',
-  'sexual',
   'corpse',
   'self-harm',
 ]
 
+const NSFW_LABELS = ['porn', 'sexual']
+
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.unspecced.getPopular({
     auth: ctx.accessVerifier,
     handler: async ({ params, auth }) => {
-      const { limit, cursor } = params
+      const { limit, cursor, includeNsfw } = params
       const requester = auth.credentials.did
       const db = ctx.db.db
       const { ref } = db.dynamic
@@ -28,6 +28,10 @@ export default function (server: Server, ctx: AppContext) {
       const actorService = ctx.services.appView.actor(ctx.db)
       const labelService = ctx.services.appView.label(ctx.db)
 
+      const labelsToFilter = includeNsfw
+        ? NO_WHATS_HOT_LABELS
+        : [...NO_WHATS_HOT_LABELS, ...NSFW_LABELS]
+
       const postsQb = feedService
         .selectPostQb()
         .leftJoin('post_agg', 'post_agg.uri', 'post.uri')
@@ -36,7 +40,7 @@ export default function (server: Server, ctx: AppContext) {
           qb
             .selectFrom('label')
             .selectAll()
-            .where('val', 'in', NO_WHATS_HOT_LABELS)
+            .where('val', 'in', labelsToFilter)
             .where((clause) =>
               clause
                 .whereRef('label.uri', '=', ref('post.creator'))

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -5076,6 +5076,10 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            includeNsfw: {
+              type: 'boolean',
+              default: false,
+            },
             limit: {
               type: 'integer',
               minimum: 1,

diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopular.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopular.ts
@@ -10,6 +10,7 @@ import { HandlerAuth } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
 export interface QueryParams {
+  includeNsfw: boolean
   limit: number
   cursor?: string
 }