Skip to content

Commit 1688eba

Browse files
MarshalXMarshalX
authored
Update lexicons fetched from ec40af0 committed 2024-05-02T19:25:43Z (#322)
1 parent 1f8c476 commit 1688eba

10 files changed

+149
-3
lines changed

‎lexicons/app.bsky.actor.defs.json

+33
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
"#adultContentPref",
123123
"#contentLabelPref",
124124
"#savedFeedsPref",
125+
"#savedFeedsPrefV2",
125126
"#personalDetailsPref",
126127
"#feedViewPref",
127128
"#threadViewPref",
@@ -154,6 +155,38 @@
154155
}
155156
}
156157
},
158+
"savedFeed": {
159+
"type": "object",
160+
"required": ["id", "type", "value", "pinned"],
161+
"properties": {
162+
"id": {
163+
"type": "string"
164+
},
165+
"type": {
166+
"type": "string",
167+
"knownValues": ["feed", "list", "timeline"]
168+
},
169+
"value": {
170+
"type": "string"
171+
},
172+
"pinned": {
173+
"type": "boolean"
174+
}
175+
}
176+
},
177+
"savedFeedsPrefV2": {
178+
"type": "object",
179+
"required": ["items"],
180+
"properties": {
181+
"items": {
182+
"type": "array",
183+
"items": {
184+
"type": "ref",
185+
"ref": "app.bsky.actor.defs#savedFeed"
186+
}
187+
}
188+
}
189+
},
157190
"savedFeedsPref": {
158191
"type": "object",
159192
"required": ["pinned", "saved"],

‎lexicons/app.bsky.feed.defs.json

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
"parent": {
6969
"type": "union",
7070
"refs": ["#postView", "#notFoundPost", "#blockedPost"]
71+
},
72+
"grandparentAuthor": {
73+
"type": "ref",
74+
"ref": "app.bsky.actor.defs#profileViewBasic",
75+
"description": "When parent is a reply to another post, this is the author of that post."
7176
}
7277
}
7378
},

‎lexicons/tools.ozone.moderation.defs.json

+36
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
"#modEventAcknowledge",
2626
"#modEventEscalate",
2727
"#modEventMute",
28+
"#modEventUnmute",
29+
"#modEventMuteReporter",
30+
"#modEventUnmuteReporter",
2831
"#modEventEmail",
2932
"#modEventResolveAppeal",
3033
"#modEventDivert"
@@ -67,6 +70,9 @@
6770
"#modEventAcknowledge",
6871
"#modEventEscalate",
6972
"#modEventMute",
73+
"#modEventUnmute",
74+
"#modEventMuteReporter",
75+
"#modEventUnmuteReporter",
7076
"#modEventEmail",
7177
"#modEventResolveAppeal",
7278
"#modEventDivert"
@@ -128,6 +134,10 @@
128134
"type": "string",
129135
"format": "datetime"
130136
},
137+
"muteReportingUntil": {
138+
"type": "string",
139+
"format": "datetime"
140+
},
131141
"lastReviewedBy": {
132142
"type": "string",
133143
"format": "did"
@@ -242,6 +252,10 @@
242252
"comment": {
243253
"type": "string"
244254
},
255+
"isReporterMuted": {
256+
"type": "boolean",
257+
"description": "Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject."
258+
},
245259
"reportType": {
246260
"type": "ref",
247261
"ref": "com.atproto.moderation.defs#reasonType"
@@ -300,6 +314,28 @@
300314
}
301315
}
302316
},
317+
"modEventMuteReporter": {
318+
"type": "object",
319+
"description": "Mute incoming reports from an account",
320+
"required": ["durationInHours"],
321+
"properties": {
322+
"comment": { "type": "string" },
323+
"durationInHours": {
324+
"type": "integer",
325+
"description": "Indicates how long the account should remain muted."
326+
}
327+
}
328+
},
329+
"modEventUnmuteReporter": {
330+
"type": "object",
331+
"description": "Unmute incoming reports from an account",
332+
"properties": {
333+
"comment": {
334+
"type": "string",
335+
"description": "Describe reasoning behind the reversal."
336+
}
337+
}
338+
},
303339
"modEventEmail": {
304340
"type": "object",
305341
"description": "Keep a log of outgoing email to a user",

‎lexicons/tools.ozone.moderation.emitEvent.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"tools.ozone.moderation.defs#modEventLabel",
2222
"tools.ozone.moderation.defs#modEventReport",
2323
"tools.ozone.moderation.defs#modEventMute",
24-
"tools.ozone.moderation.defs#modEventReverseTakedown",
2524
"tools.ozone.moderation.defs#modEventUnmute",
25+
"tools.ozone.moderation.defs#modEventMuteReporter",
26+
"tools.ozone.moderation.defs#modEventUnmuteReporter",
27+
"tools.ozone.moderation.defs#modEventReverseTakedown",
2628
"tools.ozone.moderation.defs#modEventEmail",
2729
"tools.ozone.moderation.defs#modEventTag"
2830
]

‎lexicons/tools.ozone.moderation.queryStatuses.json

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
"type": "boolean",
3838
"description": "By default, we don't include muted subjects in the results. Set this to true to include them."
3939
},
40+
"onlyMuted": {
41+
"type": "boolean",
42+
"description": "When set to true, only muted subjects and reporters will be returned."
43+
},
4044
"reviewState": {
4145
"type": "string",
4246
"description": "Specify when fetching subjects in a certain state"

‎packages/atproto_client/models/app/bsky/actor/defs.py

+24
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class ViewerState(base.ModelBase):
105105
'models.AppBskyActorDefs.AdultContentPref',
106106
'models.AppBskyActorDefs.ContentLabelPref',
107107
'models.AppBskyActorDefs.SavedFeedsPref',
108+
'models.AppBskyActorDefs.SavedFeedsPrefV2',
108109
'models.AppBskyActorDefs.PersonalDetailsPref',
109110
'models.AppBskyActorDefs.FeedViewPref',
110111
'models.AppBskyActorDefs.ThreadViewPref',
@@ -139,6 +140,29 @@ class ContentLabelPref(base.ModelBase):
139140
)
140141

141142

143+
class SavedFeed(base.ModelBase):
144+
"""Definition model for :obj:`app.bsky.actor.defs`."""
145+
146+
id: str #: Id.
147+
pinned: bool #: Pinned.
148+
type: str #: Type.
149+
value: str #: Value.
150+
151+
py_type: t.Literal['app.bsky.actor.defs#savedFeed'] = Field(
152+
default='app.bsky.actor.defs#savedFeed', alias='$type', frozen=True
153+
)
154+
155+
156+
class SavedFeedsPrefV2(base.ModelBase):
157+
"""Definition model for :obj:`app.bsky.actor.defs`."""
158+
159+
items: t.List['models.AppBskyActorDefs.SavedFeed'] #: Items.
160+
161+
py_type: t.Literal['app.bsky.actor.defs#savedFeedsPrefV2'] = Field(
162+
default='app.bsky.actor.defs#savedFeedsPrefV2', alias='$type', frozen=True
163+
)
164+
165+
142166
class SavedFeedsPref(base.ModelBase):
143167
"""Definition model for :obj:`app.bsky.actor.defs`."""
144168

‎packages/atproto_client/models/app/bsky/feed/defs.py

+3
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ class ReplyRef(base.ModelBase):
9595
],
9696
Field(discriminator='py_type'),
9797
] #: Root.
98+
grandparent_author: t.Optional[
99+
'models.AppBskyActorDefs.ProfileViewBasic'
100+
] = None #: When parent is a reply to another post, this is the author of that post.
98101

99102
py_type: t.Literal['app.bsky.feed.defs#replyRef'] = Field(
100103
default='app.bsky.feed.defs#replyRef', alias='$type', frozen=True

‎packages/atproto_client/models/tools/ozone/moderation/defs.py

+31
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ class ModEventView(base.ModelBase):
3131
'models.ToolsOzoneModerationDefs.ModEventAcknowledge',
3232
'models.ToolsOzoneModerationDefs.ModEventEscalate',
3333
'models.ToolsOzoneModerationDefs.ModEventMute',
34+
'models.ToolsOzoneModerationDefs.ModEventUnmute',
35+
'models.ToolsOzoneModerationDefs.ModEventMuteReporter',
36+
'models.ToolsOzoneModerationDefs.ModEventUnmuteReporter',
3437
'models.ToolsOzoneModerationDefs.ModEventEmail',
3538
'models.ToolsOzoneModerationDefs.ModEventResolveAppeal',
3639
'models.ToolsOzoneModerationDefs.ModEventDivert',
@@ -66,6 +69,9 @@ class ModEventViewDetail(base.ModelBase):
6669
'models.ToolsOzoneModerationDefs.ModEventAcknowledge',
6770
'models.ToolsOzoneModerationDefs.ModEventEscalate',
6871
'models.ToolsOzoneModerationDefs.ModEventMute',
72+
'models.ToolsOzoneModerationDefs.ModEventUnmute',
73+
'models.ToolsOzoneModerationDefs.ModEventMuteReporter',
74+
'models.ToolsOzoneModerationDefs.ModEventUnmuteReporter',
6975
'models.ToolsOzoneModerationDefs.ModEventEmail',
7076
'models.ToolsOzoneModerationDefs.ModEventResolveAppeal',
7177
'models.ToolsOzoneModerationDefs.ModEventDivert',
@@ -110,6 +116,7 @@ class SubjectStatusView(base.ModelBase):
110116
last_reported_at: t.Optional[str] = None #: Last reported at.
111117
last_reviewed_at: t.Optional[str] = None #: Last reviewed at.
112118
last_reviewed_by: t.Optional[str] = None #: Last reviewed by.
119+
mute_reporting_until: t.Optional[str] = None #: Mute reporting until.
113120
mute_until: t.Optional[str] = None #: Mute until.
114121
subject_blob_cids: t.Optional[t.List[str]] = None #: Subject blob cids.
115122
subject_repo_handle: t.Optional[str] = None #: Subject repo handle.
@@ -195,6 +202,9 @@ class ModEventReport(base.ModelBase):
195202

196203
report_type: 'models.ComAtprotoModerationDefs.ReasonType' #: Report type.
197204
comment: t.Optional[str] = None #: Comment.
205+
is_reporter_muted: t.Optional[
206+
bool
207+
] = None #: Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject.
198208

199209
py_type: t.Literal['tools.ozone.moderation.defs#modEventReport'] = Field(
200210
default='tools.ozone.moderation.defs#modEventReport', alias='$type', frozen=True
@@ -254,6 +264,27 @@ class ModEventUnmute(base.ModelBase):
254264
)
255265

256266

267+
class ModEventMuteReporter(base.ModelBase):
268+
"""Definition model for :obj:`tools.ozone.moderation.defs`. Mute incoming reports from an account."""
269+
270+
duration_in_hours: int #: Indicates how long the account should remain muted.
271+
comment: t.Optional[str] = None #: Comment.
272+
273+
py_type: t.Literal['tools.ozone.moderation.defs#modEventMuteReporter'] = Field(
274+
default='tools.ozone.moderation.defs#modEventMuteReporter', alias='$type', frozen=True
275+
)
276+
277+
278+
class ModEventUnmuteReporter(base.ModelBase):
279+
"""Definition model for :obj:`tools.ozone.moderation.defs`. Unmute incoming reports from an account."""
280+
281+
comment: t.Optional[str] = None #: Describe reasoning behind the reversal.
282+
283+
py_type: t.Literal['tools.ozone.moderation.defs#modEventUnmuteReporter'] = Field(
284+
default='tools.ozone.moderation.defs#modEventUnmuteReporter', alias='$type', frozen=True
285+
)
286+
287+
257288
class ModEventEmail(base.ModelBase):
258289
"""Definition model for :obj:`tools.ozone.moderation.defs`. Keep a log of outgoing email to a user."""
259290

‎packages/atproto_client/models/tools/ozone/moderation/emit_event.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ class Data(base.DataModelBase):
2828
'models.ToolsOzoneModerationDefs.ModEventLabel',
2929
'models.ToolsOzoneModerationDefs.ModEventReport',
3030
'models.ToolsOzoneModerationDefs.ModEventMute',
31-
'models.ToolsOzoneModerationDefs.ModEventReverseTakedown',
3231
'models.ToolsOzoneModerationDefs.ModEventUnmute',
32+
'models.ToolsOzoneModerationDefs.ModEventMuteReporter',
33+
'models.ToolsOzoneModerationDefs.ModEventUnmuteReporter',
34+
'models.ToolsOzoneModerationDefs.ModEventReverseTakedown',
3335
'models.ToolsOzoneModerationDefs.ModEventEmail',
3436
'models.ToolsOzoneModerationDefs.ModEventTag',
3537
],
@@ -53,8 +55,10 @@ class DataDict(t.TypedDict):
5355
'models.ToolsOzoneModerationDefs.ModEventLabel',
5456
'models.ToolsOzoneModerationDefs.ModEventReport',
5557
'models.ToolsOzoneModerationDefs.ModEventMute',
56-
'models.ToolsOzoneModerationDefs.ModEventReverseTakedown',
5758
'models.ToolsOzoneModerationDefs.ModEventUnmute',
59+
'models.ToolsOzoneModerationDefs.ModEventMuteReporter',
60+
'models.ToolsOzoneModerationDefs.ModEventUnmuteReporter',
61+
'models.ToolsOzoneModerationDefs.ModEventReverseTakedown',
5862
'models.ToolsOzoneModerationDefs.ModEventEmail',
5963
'models.ToolsOzoneModerationDefs.ModEventTag',
6064
],

‎packages/atproto_client/models/tools/ozone/moderation/query_statuses.py

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class Params(base.ParamsModelBase):
2828
] = None #: By default, we don't include muted subjects in the results. Set this to true to include them.
2929
last_reviewed_by: t.Optional[str] = None #: Get all subject statuses that were reviewed by a specific moderator.
3030
limit: t.Optional[int] = Field(default=50, ge=1, le=100) #: Limit.
31+
only_muted: t.Optional[bool] = None #: When set to true, only muted subjects and reporters will be returned.
3132
reported_after: t.Optional[str] = None #: Search subjects reported after a given timestamp.
3233
reported_before: t.Optional[str] = None #: Search subjects reported before a given timestamp.
3334
review_state: t.Optional[str] = None #: Specify when fetching subjects in a certain state.
@@ -53,6 +54,9 @@ class ParamsDict(t.TypedDict):
5354
t.Optional[str]
5455
] #: Get all subject statuses that were reviewed by a specific moderator.
5556
limit: te.NotRequired[t.Optional[int]] #: Limit.
57+
only_muted: te.NotRequired[
58+
t.Optional[bool]
59+
] #: When set to true, only muted subjects and reporters will be returned.
5660
reported_after: te.NotRequired[t.Optional[str]] #: Search subjects reported after a given timestamp.
5761
reported_before: te.NotRequired[t.Optional[str]] #: Search subjects reported before a given timestamp.
5862
review_state: te.NotRequired[t.Optional[str]] #: Specify when fetching subjects in a certain state.

0 commit comments

Comments
 (0)