Skip to content

feat: persist no-ai feed preference #3773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nimrodkra merged 6 commits into from
Apr 3, 2026
Merged

feat: persist no-ai feed preference #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6147be1
feat: persist no-ai feed preference
nimrodkra Apr 2, 2026
2a5008d
fix: read saved no-ai setting from replica
nimrodkra Apr 2, 2026
302870b
fix: satisfy feed resolver lint formatting
nimrodkra Apr 2, 2026
20a512f
fix: update boot settings expectation for no-ai flag
nimrodkra Apr 2, 2026
de27ce7
Merge remote-tracking branch 'origin/main' into feat/no-ai-feed-prefe…
nimrodkra Apr 3, 2026
6552c6c
chore: rerun flaky ci test shard
nimrodkra Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions __tests__/__snapshots__/settings.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Object {
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"noAiFeedEnabled": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -48,6 +49,7 @@ Object {
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"noAiFeedEnabled": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -87,6 +89,7 @@ Object {
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"noAiFeedEnabled": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -126,6 +129,7 @@ Object {
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"noAiFeedEnabled": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down
1 change: 1 addition & 0 deletions __tests__/boot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,7 @@ describe('boot misc', () => {
sidebarSquadExpanded: true,
sidebarBookmarksExpanded: true,
clickbaitShieldEnabled: true,
noAiFeedEnabled: false,
},
});
});
Expand Down
95 changes: 95 additions & 0 deletions __tests__/feeds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
PostTag,
PostType,
SharePost,
Settings,
Source,
SourceMember,
SourceType,
Expand Down Expand Up @@ -728,6 +729,100 @@ describe('query feed', () => {
expect(res.data.feed.edges.length).toEqual(2);
});

it('should include no-ai blocked tags and title words when the saved setting is enabled', async () => {
loggedUser = '1';
await saveFeedFixtures();
await saveFixtures(con, Settings, [
{
userId: '1',
flags: {
noAiFeedEnabled: true,
},
},
]);
nock('http://localhost:6002')
.post('/config')
.reply(200, {
user_id: '1',
config: {
providers: {},
},
});
nock('http://localhost:6000')
.post('/feed.json', (body) => {
expect(body.blocked_tags).toEqual(
expect.arrayContaining(['golang', 'ai', 'openai']),
);
expect(body.blocked_title_words).toEqual(
expect.arrayContaining(['Claude', 'Elon Musk']),
);

return true;
})
.reply(200, {
data: [{ post_id: 'p1' }, { post_id: 'p4' }],
cursor: 'b',
});

const res = await client.query(QUERY, {
variables: {
...variables,
version: 20,
},
});

expect(res.errors).toBeFalsy();
expect(res.data.feed.edges.length).toEqual(2);
});

it('should include no-ai blocked tags and title words for TIME ranking when the saved setting is enabled', async () => {
loggedUser = '1';
await saveFeedFixtures();
await saveFixtures(con, Settings, [
{
userId: '1',
flags: {
noAiFeedEnabled: true,
},
},
]);
nock('http://localhost:6002')
.post('/config')
.reply(200, {
user_id: '1',
config: {
providers: {},
},
});
nock('http://localhost:6000')
.post('/feed.json', (body) => {
expect(body.blocked_tags).toEqual(
expect.arrayContaining(['golang', 'ai', 'openai']),
);
expect(body.blocked_title_words).toEqual(
expect.arrayContaining(['Claude', 'Elon Musk']),
);
expect(body.feed_config_name).toBe('for_you_by_date');

return true;
})
.reply(200, {
data: [{ post_id: 'p1' }, { post_id: 'p4' }],
cursor: 'b',
});

const res = await client.query(QUERY, {
variables: {
...variables,
ranking: Ranking.TIME,
version: 20,
},
});

expect(res.errors).toBeFalsy();
expect(res.data.feed.edges.length).toEqual(2);
});

describe('youtube content', () => {
beforeEach(async () => {
await saveFixtures(con, YouTubePost, videoPostsFixture);
Expand Down
45 changes: 45 additions & 0 deletions __tests__/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded
sidebarBookmarksExpanded
clickbaitShieldEnabled
noAiFeedEnabled
defaultWriteTab
}
}
Expand Down Expand Up @@ -157,6 +158,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
noAiFeedEnabled: null,
defaultWriteTab: null,
});
});
Expand All @@ -176,6 +178,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
noAiFeedEnabled: null,
defaultWriteTab: null,
});

Expand Down Expand Up @@ -312,6 +315,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
noAiFeedEnabled: null,
defaultWriteTab: null,
});
});
Expand Down Expand Up @@ -347,10 +351,51 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
noAiFeedEnabled: null,
defaultWriteTab: null,
});
});

it('should update the no ai feed flag', async () => {
loggedUser = '1';

const repo = con.getRepository(Settings);
await repo.save(
repo.create({
userId: '1',
flags: {
noAiFeedEnabled: false,
},
}),
);

const res = await client.mutate(MUTATION, {
variables: {
data: {
flags: {
noAiFeedEnabled: true,
},
},
},
});

expect(res.data.updateUserSettings.flags).toEqual({
sidebarCustomFeedsExpanded: null,
sidebarOtherExpanded: null,
sidebarResourcesExpanded: null,
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
noAiFeedEnabled: true,
defaultWriteTab: null,
});

const updated = await repo.findOneByOrFail({ userId: '1' });
expect(updated.flags).toEqual({
noAiFeedEnabled: true,
});
});

it('should update opt out companion settings', async () => {
loggedUser = '1';

Expand Down
1 change: 1 addition & 0 deletions src/common/flags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const transformSettingFlags = ({ flags }: Pick<Settings, 'flags'>) => {
sidebarResourcesExpanded: flags?.sidebarResourcesExpanded ?? true,
sidebarBookmarksExpanded: flags?.sidebarBookmarksExpanded ?? true,
clickbaitShieldEnabled: flags?.clickbaitShieldEnabled ?? true,
noAiFeedEnabled: flags?.noAiFeedEnabled ?? false,
...flags,
};
};
3 changes: 3 additions & 0 deletions src/entity/Settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export type SettingsFlags = Partial<{
sidebarResourcesExpanded: boolean;
sidebarBookmarksExpanded: boolean;
clickbaitShieldEnabled: boolean;
noAiFeedEnabled: boolean;
prompt: object;
timezoneMismatchIgnore: string;
lastPrompt: string;
Expand All @@ -47,6 +48,7 @@ export type SettingsFlagsPublic = Pick<
| 'sidebarResourcesExpanded'
| 'sidebarBookmarksExpanded'
| 'clickbaitShieldEnabled'
| 'noAiFeedEnabled'
| 'prompt'
| 'timezoneMismatchIgnore'
| 'lastPrompt'
Expand Down Expand Up @@ -163,6 +165,7 @@ export const SETTINGS_DEFAULT = {
sidebarResourcesExpanded: true,
sidebarBookmarksExpanded: true,
clickbaitShieldEnabled: true,
noAiFeedEnabled: false,
defaultWriteTab: DefaultWriteTab.NewPost,
},
};
72 changes: 46 additions & 26 deletions src/schema/feeds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
FeedType,
Post,
PostType,
Settings,
Source,
UserPost,
} from '../entity';
Expand Down Expand Up @@ -88,6 +89,7 @@ import { SourceMemberRoles } from '../roles';
import { ContentPreferenceKeyword } from '../entity/contentPreference/ContentPreferenceKeyword';
import { briefingPostIdsMaxItems } from '../common/brief';
import { NO_AI_BLOCKED_TAGS, NO_AI_BLOCKED_WORDS } from '../common/noAiFilter';
import { queryReadReplica } from '../common/queryReadReplica';

interface GQLTagsCategory {
id: string;
Expand Down Expand Up @@ -1392,6 +1394,16 @@ const wrapGeneratorWithNoAi = (generator: FeedGenerator): FeedGenerator =>
},
}));

const isSavedNoAiEnabled = async (ctx: AuthContext): Promise<boolean> => {
const settings = await queryReadReplica(ctx.con, ({ queryRunner }) =>
queryRunner.manager.getRepository(Settings).findOneBy({
userId: ctx.userId,
}),
);

return settings?.flags?.noAiFeedEnabled ?? false;
};

const feedResolverV1: IFieldResolver<unknown, Context, ConfiguredFeedArgs> =
feedResolver(
(
Expand Down Expand Up @@ -1591,32 +1603,40 @@ export const resolvers: IResolvers<unknown, BaseContext> = {
}
return anonymousFeedResolverV1(source, args, ctx, info);
},
feed: (source, args: ConfiguredFeedArgs, ctx: Context, info) => {
if (args.version >= 2 && args.ranking === Ranking.POPULARITY) {
const generator = versionToFeedGenerator(args.version);

return feedResolverCursor(
source,
{
...(args as FeedArgs),
generator: args.noAi ? wrapGeneratorWithNoAi(generator) : generator,
},
ctx,
info,
);
}
if (args.version >= 2 && args.ranking === Ranking.TIME) {
const generator = versionToTimeFeedGenerator(args.version);

return feedResolverCursor(
source,
{
...(args as FeedArgs),
generator: args.noAi ? wrapGeneratorWithNoAi(generator) : generator,
},
ctx,
info,
);
feed: async (source, args: ConfiguredFeedArgs, ctx: AuthContext, info) => {
if (args.version >= 2) {
const shouldApplyNoAi = args.noAi || (await isSavedNoAiEnabled(ctx));
Comment thread
nimrodkra marked this conversation as resolved.
const getGeneratorWithNoAi = (
generator: FeedGenerator,
): FeedGenerator =>
shouldApplyNoAi ? wrapGeneratorWithNoAi(generator) : generator;

if (args.ranking === Ranking.POPULARITY) {
return feedResolverCursor(
source,
{
...(args as FeedArgs),
generator: getGeneratorWithNoAi(
versionToFeedGenerator(args.version),
),
},
ctx,
info,
);
}
if (args.ranking === Ranking.TIME) {
return feedResolverCursor(
source,
{
...(args as FeedArgs),
generator: getGeneratorWithNoAi(
versionToTimeFeedGenerator(args.version),
),
},
ctx,
info,
);
}
}
return feedResolverV1(source, args, ctx, info);
},
Expand Down
2 changes: 2 additions & 0 deletions src/schema/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export const typeDefs = /* GraphQL */ `
sidebarResourcesExpanded: Boolean
sidebarBookmarksExpanded: Boolean
clickbaitShieldEnabled: Boolean
noAiFeedEnabled: Boolean
timezoneMismatchIgnore: String
lastPrompt: String
defaultWriteTab: DefaultWriteTab
Expand All @@ -84,6 +85,7 @@ export const typeDefs = /* GraphQL */ `
sidebarResourcesExpanded: Boolean
sidebarBookmarksExpanded: Boolean
clickbaitShieldEnabled: Boolean
noAiFeedEnabled: Boolean
prompt: JSONObject
timezoneMismatchIgnore: String
lastPrompt: String
Expand Down
Loading