Skip to content

Commit 1cb5b9b

Browse files
estrattonbaileyestrattonbailey
authored
Finalize report reasons (#4262)
* Finalize report reason lexicons * Codegen * Update NEW_TO_OLD_REASON_MAPPING in Ozone * Changeset
1 parent bd469a6 commit 1cb5b9b

File tree

18 files changed

+337
-571
lines changed

18 files changed

+337
-571
lines changed

‎.changeset/purple-toes-jam.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@atproto/ozone": patch
3+
"@atproto/api": patch
4+
---
5+
6+
Finalize report reason lexicons, update migration map in Ozone

‎lexicons/com/atproto/moderation/defs.json‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,27 @@
1414
"com.atproto.moderation.defs#reasonAppeal",
1515

1616
"tools.ozone.report.defs#reasonAppeal",
17+
"tools.ozone.report.defs#reasonOther",
1718

18-
"tools.ozone.report.defs#reasonViolenceAnimalWelfare",
19+
"tools.ozone.report.defs#reasonViolenceAnimal",
1920
"tools.ozone.report.defs#reasonViolenceThreats",
2021
"tools.ozone.report.defs#reasonViolenceGraphicContent",
21-
"tools.ozone.report.defs#reasonViolenceSelfHarm",
2222
"tools.ozone.report.defs#reasonViolenceGlorification",
2323
"tools.ozone.report.defs#reasonViolenceExtremistContent",
2424
"tools.ozone.report.defs#reasonViolenceTrafficking",
2525
"tools.ozone.report.defs#reasonViolenceOther",
2626

2727
"tools.ozone.report.defs#reasonSexualAbuseContent",
2828
"tools.ozone.report.defs#reasonSexualNCII",
29-
"tools.ozone.report.defs#reasonSexualSextortion",
3029
"tools.ozone.report.defs#reasonSexualDeepfake",
3130
"tools.ozone.report.defs#reasonSexualAnimal",
3231
"tools.ozone.report.defs#reasonSexualUnlabeled",
3332
"tools.ozone.report.defs#reasonSexualOther",
3433

3534
"tools.ozone.report.defs#reasonChildSafetyCSAM",
3635
"tools.ozone.report.defs#reasonChildSafetyGroom",
37-
"tools.ozone.report.defs#reasonChildSafetyMinorPrivacy",
38-
"tools.ozone.report.defs#reasonChildSafetyEndangerment",
36+
"tools.ozone.report.defs#reasonChildSafetyPrivacy",
3937
"tools.ozone.report.defs#reasonChildSafetyHarassment",
40-
"tools.ozone.report.defs#reasonChildSafetyPromotion",
4138
"tools.ozone.report.defs#reasonChildSafetyOther",
4239

4340
"tools.ozone.report.defs#reasonHarassmentTroll",
@@ -50,21 +47,19 @@
5047
"tools.ozone.report.defs#reasonMisleadingImpersonation",
5148
"tools.ozone.report.defs#reasonMisleadingSpam",
5249
"tools.ozone.report.defs#reasonMisleadingScam",
53-
"tools.ozone.report.defs#reasonMisleadingSyntheticContent",
54-
"tools.ozone.report.defs#reasonMisleadingMisinformation",
50+
"tools.ozone.report.defs#reasonMisleadingElections",
5551
"tools.ozone.report.defs#reasonMisleadingOther",
5652

5753
"tools.ozone.report.defs#reasonRuleSiteSecurity",
58-
"tools.ozone.report.defs#reasonRuleStolenContent",
5954
"tools.ozone.report.defs#reasonRuleProhibitedSales",
6055
"tools.ozone.report.defs#reasonRuleBanEvasion",
6156
"tools.ozone.report.defs#reasonRuleOther",
6257

63-
"tools.ozone.report.defs#reasonCivicElectoralProcess",
64-
"tools.ozone.report.defs#reasonCivicDisclosure",
65-
"tools.ozone.report.defs#reasonCivicInterference",
66-
"tools.ozone.report.defs#reasonCivicMisinformation",
67-
"tools.ozone.report.defs#reasonCivicImpersonation"
58+
"tools.ozone.report.defs#reasonSelfHarmContent",
59+
"tools.ozone.report.defs#reasonSelfHarmED",
60+
"tools.ozone.report.defs#reasonSelfHarmStunts",
61+
"tools.ozone.report.defs#reasonSelfHarmSubstances",
62+
"tools.ozone.report.defs#reasonSelfHarmOther"
6863
]
6964
},
7065
"reasonSpam": {
@@ -89,7 +84,7 @@
8984
},
9085
"reasonOther": {
9186
"type": "token",
92-
"description": "Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`."
87+
"description": "Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonOther`."
9388
},
9489
"reasonAppeal": {
9590
"type": "token",

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

Lines changed: 27 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,27 @@
66
"type": "string",
77
"knownValues": [
88
"tools.ozone.report.defs#reasonAppeal",
9+
"tools.ozone.report.defs#reasonOther",
910

10-
"tools.ozone.report.defs#reasonViolenceAnimalWelfare",
11+
"tools.ozone.report.defs#reasonViolenceAnimal",
1112
"tools.ozone.report.defs#reasonViolenceThreats",
1213
"tools.ozone.report.defs#reasonViolenceGraphicContent",
13-
"tools.ozone.report.defs#reasonViolenceSelfHarm",
1414
"tools.ozone.report.defs#reasonViolenceGlorification",
1515
"tools.ozone.report.defs#reasonViolenceExtremistContent",
1616
"tools.ozone.report.defs#reasonViolenceTrafficking",
1717
"tools.ozone.report.defs#reasonViolenceOther",
1818

1919
"tools.ozone.report.defs#reasonSexualAbuseContent",
2020
"tools.ozone.report.defs#reasonSexualNCII",
21-
"tools.ozone.report.defs#reasonSexualSextortion",
2221
"tools.ozone.report.defs#reasonSexualDeepfake",
2322
"tools.ozone.report.defs#reasonSexualAnimal",
2423
"tools.ozone.report.defs#reasonSexualUnlabeled",
2524
"tools.ozone.report.defs#reasonSexualOther",
2625

2726
"tools.ozone.report.defs#reasonChildSafetyCSAM",
2827
"tools.ozone.report.defs#reasonChildSafetyGroom",
29-
"tools.ozone.report.defs#reasonChildSafetyMinorPrivacy",
30-
"tools.ozone.report.defs#reasonChildSafetyEndangerment",
28+
"tools.ozone.report.defs#reasonChildSafetyPrivacy",
3129
"tools.ozone.report.defs#reasonChildSafetyHarassment",
32-
"tools.ozone.report.defs#reasonChildSafetyPromotion",
3330
"tools.ozone.report.defs#reasonChildSafetyOther",
3431

3532
"tools.ozone.report.defs#reasonHarassmentTroll",
@@ -42,28 +39,30 @@
4239
"tools.ozone.report.defs#reasonMisleadingImpersonation",
4340
"tools.ozone.report.defs#reasonMisleadingSpam",
4441
"tools.ozone.report.defs#reasonMisleadingScam",
45-
"tools.ozone.report.defs#reasonMisleadingSyntheticContent",
46-
"tools.ozone.report.defs#reasonMisleadingMisinformation",
42+
"tools.ozone.report.defs#reasonMisleadingElections",
4743
"tools.ozone.report.defs#reasonMisleadingOther",
4844

4945
"tools.ozone.report.defs#reasonRuleSiteSecurity",
50-
"tools.ozone.report.defs#reasonRuleStolenContent",
5146
"tools.ozone.report.defs#reasonRuleProhibitedSales",
5247
"tools.ozone.report.defs#reasonRuleBanEvasion",
5348
"tools.ozone.report.defs#reasonRuleOther",
5449

55-
"tools.ozone.report.defs#reasonCivicElectoralProcess",
56-
"tools.ozone.report.defs#reasonCivicDisclosure",
57-
"tools.ozone.report.defs#reasonCivicInterference",
58-
"tools.ozone.report.defs#reasonCivicMisinformation",
59-
"tools.ozone.report.defs#reasonCivicImpersonation"
50+
"tools.ozone.report.defs#reasonSelfHarmContent",
51+
"tools.ozone.report.defs#reasonSelfHarmED",
52+
"tools.ozone.report.defs#reasonSelfHarmStunts",
53+
"tools.ozone.report.defs#reasonSelfHarmSubstances",
54+
"tools.ozone.report.defs#reasonSelfHarmOther"
6055
]
6156
},
6257
"reasonAppeal": {
6358
"type": "token",
6459
"description": "Appeal a previously taken moderation action"
6560
},
66-
"reasonViolenceAnimalWelfare": {
61+
"reasonOther": {
62+
"type": "token",
63+
"description": "An issue not included in these options"
64+
},
65+
"reasonViolenceAnimal": {
6766
"type": "token",
6867
"description": "Animal welfare violations"
6968
},
@@ -75,10 +74,6 @@
7574
"type": "token",
7675
"description": "Graphic violent content"
7776
},
78-
"reasonViolenceSelfHarm": {
79-
"type": "token",
80-
"description": "Self harm"
81-
},
8277
"reasonViolenceGlorification": {
8378
"type": "token",
8479
"description": "Glorification of violence"
@@ -104,10 +99,6 @@
10499
"type": "token",
105100
"description": "Non-consensual intimate imagery"
106101
},
107-
"reasonSexualSextortion": {
108-
"type": "token",
109-
"description": "Sextortion"
110-
},
111102
"reasonSexualDeepfake": {
112103
"type": "token",
113104
"description": "Deepfake adult content"
@@ -133,22 +124,14 @@
133124
"type": "token",
134125
"description": "Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority."
135126
},
136-
"reasonChildSafetyMinorPrivacy": {
127+
"reasonChildSafetyPrivacy": {
137128
"type": "token",
138129
"description": "Privacy violation involving a minor"
139130
},
140-
"reasonChildSafetyEndangerment": {
141-
"type": "token",
142-
"description": "Child endangerment. These reports will be sent only be sent to the application's Moderation Authority."
143-
},
144131
"reasonChildSafetyHarassment": {
145132
"type": "token",
146133
"description": "Harassment or bullying of minors"
147134
},
148-
"reasonChildSafetyPromotion": {
149-
"type": "token",
150-
"description": "Promotion of child exploitation. These reports will be sent only be sent to the application's Moderation Authority."
151-
},
152135
"reasonChildSafetyOther": {
153136
"type": "token",
154137
"description": "Other child safety. These reports will be sent only be sent to the application's Moderation Authority."
@@ -191,13 +174,9 @@
191174
"type": "token",
192175
"description": "Scam"
193176
},
194-
"reasonMisleadingSyntheticContent": {
195-
"type": "token",
196-
"description": "Unlabelled gen-AI or synthetic content"
197-
},
198-
"reasonMisleadingMisinformation": {
177+
"reasonMisleadingElections": {
199178
"type": "token",
200-
"description": "Harmful false claims"
179+
"description": "False information about elections"
201180
},
202181
"reasonMisleadingOther": {
203182
"type": "token",
@@ -208,10 +187,6 @@
208187
"type": "token",
209188
"description": "Hacking or system attacks"
210189
},
211-
"reasonRuleStolenContent": {
212-
"type": "token",
213-
"description": "Stolen content"
214-
},
215190
"reasonRuleProhibitedSales": {
216191
"type": "token",
217192
"description": "Promoting or selling prohibited items or services"
@@ -224,26 +199,25 @@
224199
"type": "token",
225200
"description": "Other"
226201
},
227-
228-
"reasonCivicElectoralProcess": {
202+
"reasonSelfHarmContent": {
229203
"type": "token",
230-
"description": "Electoral process violations"
204+
"description": "Content promoting or depicting self-harm"
231205
},
232-
"reasonCivicDisclosure": {
206+
"reasonSelfHarmED": {
233207
"type": "token",
234-
"description": "Disclosure & transparency violations"
208+
"description": "Eating disorders"
235209
},
236-
"reasonCivicInterference": {
210+
"reasonSelfHarmStunts": {
237211
"type": "token",
238-
"description": "Voter intimidation or interference"
212+
"description": "Dangerous challenges or activities"
239213
},
240-
"reasonCivicMisinformation": {
214+
"reasonSelfHarmSubstances": {
241215
"type": "token",
242-
"description": "Election misinformation"
216+
"description": "Dangerous substances or drug abuse"
243217
},
244-
"reasonCivicImpersonation": {
218+
"reasonSelfHarmOther": {
245219
"type": "token",
246-
"description": "Impersonation of electoral officials/entities"
220+
"description": "Other dangerous content"
247221
}
248222
}
249223
}

‎packages/api/src/client/index.ts‎

Lines changed: 12 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)