@atproto/bsky 0.0.14 → 0.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/api/app/bsky/feed/searchPosts.d.ts +3 -0
- package/dist/api/com/atproto/moderation/util.d.ts +4 -3
- package/dist/config.d.ts +2 -2
- package/dist/context.d.ts +16 -1
- package/dist/db/index.js +26 -1
- package/dist/db/index.js.map +3 -3
- package/dist/db/migrations/20231003T202833377Z-create-moderation-subject-status.d.ts +3 -0
- package/dist/db/migrations/index.d.ts +1 -0
- package/dist/db/pagination.d.ts +2 -1
- package/dist/db/{periodic-moderation-action-reversal.d.ts → periodic-moderation-event-reversal.d.ts} +3 -5
- package/dist/db/tables/moderation.d.ts +24 -34
- package/dist/feed-gen/types.d.ts +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3332 -2430
- package/dist/index.js.map +3 -3
- package/dist/lexicon/index.d.ts +18 -18
- package/dist/lexicon/lexicons.d.ts +460 -385
- package/dist/lexicon/types/app/bsky/feed/defs.d.ts +1 -7
- package/dist/lexicon/types/app/bsky/graph/defs.d.ts +1 -0
- package/dist/lexicon/types/com/atproto/admin/defs.d.ts +116 -48
- package/dist/lexicon/types/com/atproto/admin/{takeModerationAction.d.ts → emitModerationEvent.d.ts} +5 -6
- package/dist/lexicon/types/com/atproto/admin/{getModerationAction.d.ts → getModerationEvent.d.ts} +1 -1
- package/dist/lexicon/types/com/atproto/admin/{getModerationActions.d.ts → queryModerationEvents.d.ts} +5 -1
- package/dist/lexicon/types/com/atproto/admin/{getModerationReports.d.ts → queryModerationStatuses.d.ts} +12 -6
- package/dist/lexicon/types/com/atproto/admin/sendEmail.d.ts +1 -0
- package/dist/lexicon/types/com/atproto/{admin/getModerationReport.d.ts → temp/fetchLabels.d.ts} +7 -3
- package/dist/migrate-moderation-data.d.ts +1 -0
- package/dist/services/actor/views.d.ts +2 -5
- package/dist/services/feed/index.d.ts +1 -0
- package/dist/services/feed/util.d.ts +9 -1
- package/dist/services/feed/views.d.ts +6 -17
- package/dist/services/graph/index.d.ts +5 -29
- package/dist/services/graph/types.d.ts +1 -0
- package/dist/services/moderation/index.d.ts +135 -72
- package/dist/services/moderation/pagination.d.ts +36 -0
- package/dist/services/moderation/status.d.ts +13 -0
- package/dist/services/moderation/types.d.ts +35 -0
- package/dist/services/moderation/views.d.ts +18 -14
- package/dist/util/debug.d.ts +1 -1
- package/package.json +14 -15
- package/src/api/app/bsky/actor/getSuggestions.ts +45 -21
- package/src/api/app/bsky/feed/getActorFeeds.ts +2 -1
- package/src/api/app/bsky/feed/getActorLikes.ts +1 -3
- package/src/api/app/bsky/feed/getAuthorFeed.ts +1 -3
- package/src/api/app/bsky/feed/getFeed.ts +9 -9
- package/src/api/app/bsky/feed/getFeedGenerator.ts +3 -0
- package/src/api/app/bsky/feed/getFeedGenerators.ts +2 -1
- package/src/api/app/bsky/feed/getListFeed.ts +1 -3
- package/src/api/app/bsky/feed/getPostThread.ts +31 -58
- package/src/api/app/bsky/feed/getPosts.ts +21 -18
- package/src/api/app/bsky/feed/getSuggestedFeeds.ts +2 -1
- package/src/api/app/bsky/feed/getTimeline.ts +1 -3
- package/src/api/app/bsky/feed/searchPosts.ts +130 -0
- package/src/api/app/bsky/graph/getList.ts +6 -3
- package/src/api/app/bsky/graph/getListBlocks.ts +3 -2
- package/src/api/app/bsky/graph/getListMutes.ts +2 -1
- package/src/api/app/bsky/graph/getLists.ts +2 -1
- package/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts +3 -1
- package/src/api/blob-resolver.ts +6 -11
- package/src/api/com/atproto/admin/emitModerationEvent.ts +220 -0
- package/src/api/com/atproto/admin/{getModerationActions.ts → getModerationEvent.ts} +5 -11
- package/src/api/com/atproto/admin/getRecord.ts +1 -0
- package/src/api/com/atproto/admin/{getModerationReports.ts → queryModerationEvents.ts} +13 -16
- package/src/api/com/atproto/admin/queryModerationStatuses.ts +55 -0
- package/src/api/com/atproto/admin/util.ts +3 -1
- package/src/api/com/atproto/moderation/createReport.ts +9 -7
- package/src/api/com/atproto/moderation/util.ts +38 -20
- package/src/api/com/atproto/temp/fetchLabels.ts +30 -0
- package/src/api/index.ts +12 -14
- package/src/auth.ts +29 -21
- package/src/auto-moderator/index.ts +26 -19
- package/src/config.ts +6 -6
- package/src/context.ts +15 -9
- package/src/db/migrations/20231003T202833377Z-create-moderation-subject-status.ts +123 -0
- package/src/db/migrations/index.ts +1 -0
- package/src/db/pagination.ts +26 -3
- package/src/db/{periodic-moderation-action-reversal.ts → periodic-moderation-event-reversal.ts} +51 -55
- package/src/db/tables/moderation.ts +35 -52
- package/src/feed-gen/best-of-follows.ts +6 -3
- package/src/feed-gen/bsky-team.ts +1 -1
- package/src/feed-gen/hot-classic.ts +1 -1
- package/src/feed-gen/mutuals.ts +6 -2
- package/src/feed-gen/types.ts +1 -1
- package/src/feed-gen/whats-hot.ts +1 -1
- package/src/feed-gen/with-friends.ts +7 -3
- package/src/index.ts +2 -1
- package/src/lexicon/index.ts +52 -67
- package/src/lexicon/lexicons.ts +674 -579
- package/src/lexicon/types/app/bsky/actor/defs.ts +2 -2
- package/src/lexicon/types/app/bsky/actor/searchActors.ts +2 -2
- package/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts +2 -2
- package/src/lexicon/types/app/bsky/feed/defs.ts +1 -18
- package/src/lexicon/types/app/bsky/feed/searchPosts.ts +3 -3
- package/src/lexicon/types/app/bsky/graph/defs.ts +3 -2
- package/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts +4 -4
- package/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts +3 -3
- package/src/lexicon/types/com/atproto/admin/defs.ts +278 -84
- package/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts +1 -1
- package/src/lexicon/types/com/atproto/admin/{takeModerationAction.ts → emitModerationEvent.ts} +13 -11
- package/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts +1 -1
- package/src/lexicon/types/com/atproto/admin/{getModerationReport.ts → getModerationEvent.ts} +1 -1
- package/src/lexicon/types/com/atproto/admin/{getModerationReports.ts → queryModerationEvents.ts} +8 -15
- package/src/lexicon/types/com/atproto/admin/queryModerationStatuses.ts +70 -0
- package/src/lexicon/types/com/atproto/admin/sendEmail.ts +1 -0
- package/src/lexicon/types/com/atproto/label/defs.ts +9 -9
- package/src/lexicon/types/com/atproto/label/queryLabels.ts +2 -2
- package/src/lexicon/types/com/atproto/repo/applyWrites.ts +1 -1
- package/src/lexicon/types/com/atproto/repo/createRecord.ts +2 -2
- package/src/lexicon/types/com/atproto/repo/deleteRecord.ts +2 -2
- package/src/lexicon/types/com/atproto/repo/listRecords.ts +1 -1
- package/src/lexicon/types/com/atproto/repo/putRecord.ts +3 -3
- package/src/lexicon/types/com/atproto/sync/listBlobs.ts +1 -1
- package/src/lexicon/types/com/atproto/sync/subscribeRepos.ts +4 -4
- package/src/lexicon/types/com/atproto/{admin/getModerationActions.ts → temp/fetchLabels.ts} +3 -5
- package/src/migrate-moderation-data.ts +414 -0
- package/src/services/actor/views.ts +5 -14
- package/src/services/feed/index.ts +26 -7
- package/src/services/feed/util.ts +47 -19
- package/src/services/feed/views.ts +68 -4
- package/src/services/graph/index.ts +21 -3
- package/src/services/graph/types.ts +1 -0
- package/src/services/indexing/plugins/block.ts +2 -3
- package/src/services/indexing/plugins/feed-generator.ts +2 -3
- package/src/services/indexing/plugins/follow.ts +2 -3
- package/src/services/indexing/plugins/like.ts +2 -3
- package/src/services/indexing/plugins/list-block.ts +2 -3
- package/src/services/indexing/plugins/list-item.ts +2 -3
- package/src/services/indexing/plugins/list.ts +2 -3
- package/src/services/indexing/plugins/post.ts +3 -4
- package/src/services/indexing/plugins/repost.ts +2 -3
- package/src/services/indexing/plugins/thread-gate.ts +2 -3
- package/src/services/label/index.ts +2 -3
- package/src/services/moderation/index.ts +380 -395
- package/src/services/moderation/pagination.ts +96 -0
- package/src/services/moderation/status.ts +244 -0
- package/src/services/moderation/types.ts +49 -0
- package/src/services/moderation/views.ts +278 -329
- package/src/util/debug.ts +2 -2
- package/tests/__snapshots__/feed-generation.test.ts.snap +322 -6
- package/tests/__snapshots__/indexing.test.ts.snap +0 -6
- package/tests/admin/__snapshots__/get-record.test.ts.snap +30 -132
- package/tests/admin/__snapshots__/get-repo.test.ts.snap +14 -60
- package/tests/admin/__snapshots__/moderation-events.test.ts.snap +146 -0
- package/tests/admin/__snapshots__/moderation-statuses.test.ts.snap +64 -0
- package/tests/admin/__snapshots__/moderation.test.ts.snap +0 -125
- package/tests/admin/get-record.test.ts +5 -9
- package/tests/admin/get-repo.test.ts +38 -9
- package/tests/admin/moderation-events.test.ts +221 -0
- package/tests/admin/moderation-statuses.test.ts +145 -0
- package/tests/admin/moderation.test.ts +512 -860
- package/tests/admin/repo-search.test.ts +2 -3
- package/tests/auto-moderator/fuzzy-matcher.test.ts +2 -1
- package/tests/auto-moderator/takedowns.test.ts +45 -18
- package/tests/feed-generation.test.ts +57 -9
- package/tests/views/__snapshots__/block-lists.test.ts.snap +3 -9
- package/tests/views/__snapshots__/blocks.test.ts.snap +0 -9
- package/tests/views/__snapshots__/mute-lists.test.ts.snap +5 -5
- package/tests/views/__snapshots__/mutes.test.ts.snap +0 -3
- package/tests/views/__snapshots__/thread.test.ts.snap +0 -30
- package/tests/views/actor-search.test.ts +2 -3
- package/tests/views/author-feed.test.ts +42 -36
- package/tests/views/follows.test.ts +40 -35
- package/tests/views/list-feed.test.ts +17 -9
- package/tests/views/notifications.test.ts +13 -9
- package/tests/views/profile.test.ts +20 -18
- package/tests/views/suggestions.test.ts +15 -7
- package/tests/views/thread.test.ts +54 -26
- package/tests/views/threadgating.test.ts +51 -19
- package/tests/views/timeline.test.ts +21 -13
- package/dist/api/com/atproto/admin/reverseModerationAction.d.ts +0 -3
- package/dist/api/com/atproto/admin/takeModerationAction.d.ts +0 -3
- package/dist/lexicon/types/com/atproto/admin/resolveModerationReports.d.ts +0 -36
- package/dist/lexicon/types/com/atproto/admin/reverseModerationAction.d.ts +0 -36
- package/src/api/com/atproto/admin/getModerationAction.ts +0 -44
- package/src/api/com/atproto/admin/getModerationReport.ts +0 -43
- package/src/api/com/atproto/admin/resolveModerationReports.ts +0 -24
- package/src/api/com/atproto/admin/reverseModerationAction.ts +0 -115
- package/src/api/com/atproto/admin/takeModerationAction.ts +0 -156
- package/src/lexicon/types/com/atproto/admin/getModerationAction.ts +0 -41
- package/src/lexicon/types/com/atproto/admin/resolveModerationReports.ts +0 -49
- package/src/lexicon/types/com/atproto/admin/reverseModerationAction.ts +0 -49
- package/tests/admin/__snapshots__/get-moderation-action.test.ts.snap +0 -172
- package/tests/admin/__snapshots__/get-moderation-actions.test.ts.snap +0 -178
- package/tests/admin/__snapshots__/get-moderation-report.test.ts.snap +0 -177
- package/tests/admin/__snapshots__/get-moderation-reports.test.ts.snap +0 -307
- package/tests/admin/get-moderation-action.test.ts +0 -100
- package/tests/admin/get-moderation-actions.test.ts +0 -164
- package/tests/admin/get-moderation-report.test.ts +0 -100
- package/tests/admin/get-moderation-reports.test.ts +0 -332
- /package/dist/api/com/atproto/admin/{getModerationAction.d.ts → emitModerationEvent.d.ts} +0 -0
- /package/dist/api/com/atproto/admin/{getModerationActions.d.ts → getModerationEvent.d.ts} +0 -0
- /package/dist/api/com/atproto/admin/{getModerationReport.d.ts → queryModerationEvents.d.ts} +0 -0
- /package/dist/api/com/atproto/admin/{getModerationReports.d.ts → queryModerationStatuses.d.ts} +0 -0
- /package/dist/api/com/atproto/{admin/resolveModerationReports.d.ts → temp/fetchLabels.d.ts} +0 -0
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { TestNetwork, SeedClient } from '@atproto/dev-env'
|
|
2
|
+
import AtpAgent, {
|
|
3
|
+
ComAtprotoAdminDefs,
|
|
4
|
+
ComAtprotoAdminQueryModerationStatuses,
|
|
5
|
+
} from '@atproto/api'
|
|
6
|
+
import { forSnapshot } from '../_util'
|
|
7
|
+
import basicSeed from '../seeds/basic'
|
|
8
|
+
import {
|
|
9
|
+
REASONMISLEADING,
|
|
10
|
+
REASONSPAM,
|
|
11
|
+
} from '../../src/lexicon/types/com/atproto/moderation/defs'
|
|
12
|
+
|
|
13
|
+
describe('moderation-statuses', () => {
|
|
14
|
+
let network: TestNetwork
|
|
15
|
+
let agent: AtpAgent
|
|
16
|
+
let pdsAgent: AtpAgent
|
|
17
|
+
let sc: SeedClient
|
|
18
|
+
|
|
19
|
+
const emitModerationEvent = async (eventData) => {
|
|
20
|
+
return pdsAgent.api.com.atproto.admin.emitModerationEvent(eventData, {
|
|
21
|
+
encoding: 'application/json',
|
|
22
|
+
headers: network.bsky.adminAuthHeaders('moderator'),
|
|
23
|
+
})
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const queryModerationStatuses = (statusQuery) =>
|
|
27
|
+
agent.api.com.atproto.admin.queryModerationStatuses(statusQuery, {
|
|
28
|
+
headers: network.bsky.adminAuthHeaders('moderator'),
|
|
29
|
+
})
|
|
30
|
+
|
|
31
|
+
const seedEvents = async () => {
|
|
32
|
+
const bobsAccount = {
|
|
33
|
+
$type: 'com.atproto.admin.defs#repoRef',
|
|
34
|
+
did: sc.dids.bob,
|
|
35
|
+
}
|
|
36
|
+
const carlasAccount = {
|
|
37
|
+
$type: 'com.atproto.admin.defs#repoRef',
|
|
38
|
+
did: sc.dids.alice,
|
|
39
|
+
}
|
|
40
|
+
const bobsPost = {
|
|
41
|
+
$type: 'com.atproto.repo.strongRef',
|
|
42
|
+
uri: sc.posts[sc.dids.bob][1].ref.uriStr,
|
|
43
|
+
cid: sc.posts[sc.dids.bob][1].ref.cidStr,
|
|
44
|
+
}
|
|
45
|
+
const alicesPost = {
|
|
46
|
+
$type: 'com.atproto.repo.strongRef',
|
|
47
|
+
uri: sc.posts[sc.dids.alice][1].ref.uriStr,
|
|
48
|
+
cid: sc.posts[sc.dids.alice][1].ref.cidStr,
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
for (let i = 0; i < 4; i++) {
|
|
52
|
+
await emitModerationEvent({
|
|
53
|
+
event: {
|
|
54
|
+
$type: 'com.atproto.admin.defs#modEventReport',
|
|
55
|
+
reportType: i % 2 ? REASONSPAM : REASONMISLEADING,
|
|
56
|
+
comment: 'X',
|
|
57
|
+
},
|
|
58
|
+
// Report bob's account by alice and vice versa
|
|
59
|
+
subject: i % 2 ? bobsAccount : carlasAccount,
|
|
60
|
+
createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
|
|
61
|
+
})
|
|
62
|
+
await emitModerationEvent({
|
|
63
|
+
event: {
|
|
64
|
+
$type: 'com.atproto.admin.defs#modEventReport',
|
|
65
|
+
reportType: REASONSPAM,
|
|
66
|
+
comment: 'X',
|
|
67
|
+
},
|
|
68
|
+
// Report bob's post by alice and vice versa
|
|
69
|
+
subject: i % 2 ? bobsPost : alicesPost,
|
|
70
|
+
createdBy: i % 2 ? sc.dids.alice : sc.dids.bob,
|
|
71
|
+
})
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
beforeAll(async () => {
|
|
76
|
+
network = await TestNetwork.create({
|
|
77
|
+
dbPostgresSchema: 'bsky_moderation_statuses',
|
|
78
|
+
})
|
|
79
|
+
agent = network.bsky.getClient()
|
|
80
|
+
pdsAgent = network.pds.getClient()
|
|
81
|
+
sc = network.getSeedClient()
|
|
82
|
+
await basicSeed(sc)
|
|
83
|
+
await network.processAll()
|
|
84
|
+
await seedEvents()
|
|
85
|
+
})
|
|
86
|
+
|
|
87
|
+
afterAll(async () => {
|
|
88
|
+
await network.close()
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
describe('query statuses', () => {
|
|
92
|
+
it('returns statuses for subjects that received moderation events', async () => {
|
|
93
|
+
const response = await queryModerationStatuses({})
|
|
94
|
+
|
|
95
|
+
expect(forSnapshot(response.data.subjectStatuses)).toMatchSnapshot()
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
it('returns paginated statuses', async () => {
|
|
99
|
+
// We know there will be exactly 4 statuses in db
|
|
100
|
+
const getPaginatedStatuses = async (
|
|
101
|
+
params: ComAtprotoAdminQueryModerationStatuses.QueryParams,
|
|
102
|
+
) => {
|
|
103
|
+
let cursor: string | undefined = ''
|
|
104
|
+
const statuses: ComAtprotoAdminDefs.SubjectStatusView[] = []
|
|
105
|
+
let count = 0
|
|
106
|
+
do {
|
|
107
|
+
const results = await queryModerationStatuses({
|
|
108
|
+
limit: 1,
|
|
109
|
+
cursor,
|
|
110
|
+
...params,
|
|
111
|
+
})
|
|
112
|
+
cursor = results.data.cursor
|
|
113
|
+
statuses.push(...results.data.subjectStatuses)
|
|
114
|
+
count++
|
|
115
|
+
// The count is just a brake-check to prevent infinite loop
|
|
116
|
+
} while (cursor && count < 10)
|
|
117
|
+
|
|
118
|
+
return statuses
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
const list = await getPaginatedStatuses({})
|
|
122
|
+
expect(list[0].id).toEqual(4)
|
|
123
|
+
expect(list[list.length - 1].id).toEqual(1)
|
|
124
|
+
|
|
125
|
+
await emitModerationEvent({
|
|
126
|
+
subject: list[1].subject,
|
|
127
|
+
event: {
|
|
128
|
+
$type: 'com.atproto.admin.defs#modEventAcknowledge',
|
|
129
|
+
comment: 'X',
|
|
130
|
+
},
|
|
131
|
+
createdBy: sc.dids.bob,
|
|
132
|
+
})
|
|
133
|
+
|
|
134
|
+
const listReviewedFirst = await getPaginatedStatuses({
|
|
135
|
+
sortDirection: 'desc',
|
|
136
|
+
sortField: 'lastReviewedAt',
|
|
137
|
+
})
|
|
138
|
+
|
|
139
|
+
// Verify that the item that was recently reviewed comes up first when sorted descendingly
|
|
140
|
+
// while the result set always contains same number of items regardless of sorting
|
|
141
|
+
expect(listReviewedFirst[0].id).toEqual(list[1].id)
|
|
142
|
+
expect(listReviewedFirst.length).toEqual(list.length)
|
|
143
|
+
})
|
|
144
|
+
})
|
|
145
|
+
})
|