From a8d966a3024176ec2e1633caa0596f9402078a21 Mon Sep 17 00:00:00 2001 From: dholms Date: Mon, 11 Sep 2023 17:32:17 -0500 Subject: [PATCH 1/3] fix schemas --- lexicons/com/atproto/sync/getRepo.json | 1 - lexicons/com/atproto/sync/listBlobs.json | 1 - packages/api/docs/labels.md | 54 +- .../api/docs/moderation-behaviors/posts.md | 529 +++++++++++++++++- .../api/docs/moderation-behaviors/profiles.md | 188 ++++++- packages/api/src/client/lexicons.ts | 2 - packages/bsky/src/lexicon/lexicons.ts | 2 - packages/pds/src/lexicon/lexicons.ts | 2 - 8 files changed, 717 insertions(+), 62 deletions(-) diff --git a/lexicons/com/atproto/sync/getRepo.json b/lexicons/com/atproto/sync/getRepo.json index 87ecaa1f796..6bb6de2b1e4 100644 --- a/lexicons/com/atproto/sync/getRepo.json +++ b/lexicons/com/atproto/sync/getRepo.json @@ -16,7 +16,6 @@ }, "since": { "type": "string", - "format": "cid", "description": "The revision of the repo to catch up from." } } diff --git a/lexicons/com/atproto/sync/listBlobs.json b/lexicons/com/atproto/sync/listBlobs.json index 01e01391256..9f25b1330a6 100644 --- a/lexicons/com/atproto/sync/listBlobs.json +++ b/lexicons/com/atproto/sync/listBlobs.json @@ -16,7 +16,6 @@ }, "since": { "type": "string", - "format": "cid", "description": "Optional revision of the repo to list blobs since" }, "limit": { diff --git a/packages/api/docs/labels.md b/packages/api/docs/labels.md index a2d8806b566..9531df460c1 100644 --- a/packages/api/docs/labels.md +++ b/packages/api/docs/labels.md @@ -1,44 +1,44 @@ -# Labels + # Labels + + This document is a reference for the labels used in the SDK. -This document is a reference for the labels used in the SDK. + **⚠️ Note**: These labels are still in development and may change over time. Not all are currently in use. -**⚠️ Note**: These labels are still in development and may change over time. Not all are currently in use. + ## Key -## Key + ### Label Preferences -### Label Preferences + The possible client interpretations for a label. -The possible client interpretations for a label. + - ignore Do nothing with the label. + - warn Provide some form of warning on the content (see "On Warn" behavior). + - hide Remove the content from feeds and apply the warning when directly viewed. -- ignore Do nothing with the label. -- warn Provide some form of warning on the content (see "On Warn" behavior). -- hide Remove the content from feeds and apply the warning when directly viewed. + Each label specifies which preferences it can support. If a label is not configurable, it must have only own supported preference. -Each label specifies which preferences it can support. If a label is not configurable, it must have only own supported preference. + ### Configurable? -### Configurable? + Non-configurable labels cannot have their preference changed by the user. -Non-configurable labels cannot have their preference changed by the user. + ### Flags -### Flags + Additional behaviors which a label can adopt. -Additional behaviors which a label can adopt. + - no-override The user cannot click through any covering of content created by the label. + - adult The user must have adult content enabled to configure the label. If adult content is not enabled, the label must adopt the strictest preference. -- no-override The user cannot click through any covering of content created by the label. -- adult The user must have adult content enabled to configure the label. If adult content is not enabled, the label must adopt the strictest preference. + ### On Warn -### On Warn + The kind of UI behavior used when a warning must be applied. -The kind of UI behavior used when a warning must be applied. + - blur Hide all of the content behind an interstitial. + - blur-media Hide only the media within the content (ie images) behind an interstitial. + - alert Display a descriptive warning but do not hide the content. + - null Do nothing. -- blur Hide all of the content behind an interstitial. -- blur-media Hide only the media within the content (ie images) behind an interstitial. -- alert Display a descriptive warning but do not hide the content. -- null Do nothing. - -## Label Behaviors + ## Label Behaviors @@ -267,7 +267,7 @@ The kind of UI behavior used when a warning must be applied.
-## Label Group Descriptions + ## Label Group Descriptions @@ -312,7 +312,7 @@ The kind of UI behavior used when a warning must be applied.
-## Label Descriptions + ## Label Descriptions @@ -535,4 +535,4 @@ The kind of UI behavior used when a warning must be applied. on content
Misleading
The moderators believe this account is spreading misleading information.

-
+ \ No newline at end of file diff --git a/packages/api/docs/moderation-behaviors/posts.md b/packages/api/docs/moderation-behaviors/posts.md index 5ddcf9ff602..ef3c6c7fc5d 100644 --- a/packages/api/docs/moderation-behaviors/posts.md +++ b/packages/api/docs/moderation-behaviors/posts.md @@ -38,12 +38,17 @@ Key: + + + + + Imperative label ('!hide') on author profile @@ -51,6 +56,7 @@ Key: + 🚫 @@ -58,9 +64,13 @@ Key: + + + + Imperative label ('!hide') on author account @@ -76,9 +86,13 @@ Key: + + + + Imperative label ('!hide') on quoted post @@ -86,9 +100,11 @@ Key: + + 🚫 @@ -96,6 +112,9 @@ Key: + + + Imperative label ('!hide') on quoted author account @@ -103,9 +122,11 @@ Key: + + 🚫 @@ -113,6 +134,9 @@ Key: + + + Imperative label ('!no-promote') on post @@ -120,15 +144,21 @@ Key: + + + + + + Imperative label ('!no-promote') on author profile @@ -136,15 +166,21 @@ Key: + + + + + + Imperative label ('!no-promote') on author account @@ -152,15 +188,21 @@ Key: + + + + + + Imperative label ('!no-promote') on quoted post @@ -168,15 +210,21 @@ Key: + + + + + + Imperative label ('!no-promote') on quoted author account @@ -184,15 +232,21 @@ Key: + + + + + + Imperative label ('!warn') on post @@ -204,12 +258,17 @@ Key: + + + + + Imperative label ('!warn') on author profile @@ -217,6 +276,7 @@ Key: + ✋ @@ -224,9 +284,13 @@ Key: + + + + Imperative label ('!warn') on author account @@ -242,9 +306,13 @@ Key: + + + + Imperative label ('!warn') on quoted post @@ -252,9 +320,11 @@ Key: + + ✋ @@ -262,6 +332,9 @@ Key: + + + Imperative label ('!warn') on quoted author account @@ -269,9 +342,11 @@ Key: + + ✋ @@ -279,6 +354,8 @@ Key: + + ScenarioFilterContentAvatarEmbed Blur label ('intolerant') on post (hide) @@ -291,12 +368,17 @@ Key: + + + + + Blur label ('intolerant') on author profile (hide) @@ -304,6 +386,7 @@ Key: + ✋ @@ -311,9 +394,13 @@ Key: + + + + Blur label ('intolerant') on author account (hide) @@ -329,9 +416,13 @@ Key: + + + + Blur label ('intolerant') on quoted post (hide) @@ -339,9 +430,11 @@ Key: + + ✋ @@ -349,6 +442,9 @@ Key: + + + Blur label ('intolerant') on quoted author account (hide) @@ -356,9 +452,11 @@ Key: + + ✋ @@ -366,6 +464,9 @@ Key: + + + Blur label ('intolerant') on post (warn) @@ -377,12 +478,17 @@ Key: + + + + + Blur label ('intolerant') on author profile (warn) @@ -390,6 +496,7 @@ Key: + ✋ @@ -397,9 +504,13 @@ Key: + + + + Blur label ('intolerant') on author account (warn) @@ -415,9 +526,13 @@ Key: + + + + Blur label ('intolerant') on quoted post (warn) @@ -425,9 +540,11 @@ Key: + + ✋ @@ -435,6 +552,9 @@ Key: + + + Blur label ('intolerant') on quoted author account (warn) @@ -442,9 +562,11 @@ Key: + + ✋ @@ -452,6 +574,9 @@ Key: + + + Blur label ('intolerant') on post (ignore) @@ -459,15 +584,21 @@ Key: + + + + + + Blur label ('intolerant') on author profile (ignore) @@ -475,15 +606,21 @@ Key: + + + + + + Blur label ('intolerant') on author account (ignore) @@ -491,15 +628,21 @@ Key: + + + + + + Blur label ('intolerant') on quoted post (ignore) @@ -507,15 +650,21 @@ Key: + + + + + + Blur label ('intolerant') on quoted author account (ignore) @@ -523,15 +672,20 @@ Key: + + + + + ScenarioFilterContentAvatarEmbed Blur-media label ('porn') on post (hide) @@ -540,9 +694,11 @@ Key: + + ✋ @@ -550,6 +706,9 @@ Key: + + + Blur-media label ('porn') on author profile (hide) @@ -557,6 +716,7 @@ Key: + ✋ @@ -564,9 +724,13 @@ Key: + + + + Blur-media label ('porn') on author account (hide) @@ -574,6 +738,7 @@ Key: + ✋ @@ -585,6 +750,9 @@ Key: + + + Blur-media label ('porn') on quoted post (hide) @@ -592,9 +760,11 @@ Key: + + ✋ @@ -602,6 +772,9 @@ Key: + + + Blur-media label ('porn') on quoted author account (hide) @@ -609,15 +782,21 @@ Key: + + + + + + Blur-media label ('porn') on post (warn) @@ -625,9 +804,11 @@ Key: + + ✋ @@ -635,6 +816,9 @@ Key: + + + Blur-media label ('porn') on author profile (warn) @@ -642,6 +826,7 @@ Key: + ✋ @@ -649,9 +834,13 @@ Key: + + + + Blur-media label ('porn') on author account (warn) @@ -659,6 +848,7 @@ Key: + ✋ @@ -670,6 +860,9 @@ Key: + + + Blur-media label ('porn') on quoted post (warn) @@ -677,9 +870,11 @@ Key: + + ✋ @@ -687,6 +882,9 @@ Key: + + + Blur-media label ('porn') on quoted author account (warn) @@ -694,15 +892,21 @@ Key: + + + + + + Blur-media label ('porn') on post (ignore) @@ -710,15 +914,21 @@ Key: + + + + + + Blur-media label ('porn') on author profile (ignore) @@ -726,15 +936,21 @@ Key: + + + + + + Blur-media label ('porn') on author account (ignore) @@ -742,15 +958,21 @@ Key: + + + + + + Blur-media label ('porn') on quoted post (ignore) @@ -758,15 +980,21 @@ Key: + + + + + + Blur-media label ('porn') on quoted author account (ignore) @@ -774,15 +1002,20 @@ Key: + + + + + ScenarioFilterContentAvatarEmbed Notice label ('scam') on post (hide) @@ -792,16 +1025,20 @@ Key: 🪧 - + + + + + Notice label ('scam') on author profile (hide) @@ -809,17 +1046,21 @@ Key: + 🪧 - + + + + Notice label ('scam') on author account (hide) @@ -828,18 +1069,20 @@ Key: 🪧 - 🪧 - + + + + Notice label ('scam') on quoted post (hide) @@ -847,17 +1090,21 @@ Key: + + 🪧 - + + + Notice label ('scam') on quoted author account (hide) @@ -865,17 +1112,21 @@ Key: + + 🪧 - + + + Notice label ('scam') on post (warn) @@ -884,16 +1135,20 @@ Key: 🪧 - + + + + + Notice label ('scam') on author profile (warn) @@ -901,17 +1156,21 @@ Key: + 🪧 - + + + + Notice label ('scam') on author account (warn) @@ -920,18 +1179,20 @@ Key: 🪧 - 🪧 - + + + + Notice label ('scam') on quoted post (warn) @@ -939,17 +1200,21 @@ Key: + + 🪧 - + + + Notice label ('scam') on quoted author account (warn) @@ -957,17 +1222,21 @@ Key: + + 🪧 - + + + Notice label ('scam') on post (ignore) @@ -975,15 +1244,21 @@ Key: + + + + + + Notice label ('scam') on author profile (ignore) @@ -991,15 +1266,21 @@ Key: + + + + + + Notice label ('scam') on author account (ignore) @@ -1007,15 +1288,21 @@ Key: + + + + + + Notice label ('scam') on quoted post (ignore) @@ -1023,15 +1310,21 @@ Key: + + + + + + Notice label ('scam') on quoted author account (ignore) @@ -1039,15 +1332,20 @@ Key: + + + + + ScenarioFilterContentAvatarEmbed Adult-only label on post when adult content is disabled @@ -1056,9 +1354,11 @@ Key: + + 🚫 @@ -1066,6 +1366,9 @@ Key: + + + Adult-only label on author profile when adult content is disabled @@ -1073,6 +1376,7 @@ Key: + 🚫 @@ -1080,9 +1384,13 @@ Key: + + + + Adult-only label on author account when adult content is disabled @@ -1090,6 +1398,7 @@ Key: + 🚫 @@ -1101,6 +1410,9 @@ Key: + + + Adult-only label on quoted post when adult content is disabled @@ -1108,9 +1420,11 @@ Key: + + 🚫 @@ -1118,6 +1432,9 @@ Key: + + + Adult-only label on quoted author account when adult content is disabled @@ -1125,15 +1442,20 @@ Key: + + + + + ScenarioFilterContentAvatarEmbed Self-post: Imperative label ('!hide') on post @@ -1146,12 +1468,17 @@ Key: + + + + + Self-post: Imperative label ('!hide') on author profile @@ -1159,15 +1486,21 @@ Key: + + + + + + Self-post: Imperative label ('!hide') on author account @@ -1175,15 +1508,21 @@ Key: + + + + + + Self-post: Imperative label ('!hide') on quoted post @@ -1191,9 +1530,11 @@ Key: + + ✋ @@ -1201,6 +1542,9 @@ Key: + + + Self-post: Imperative label ('!hide') on quoted author account @@ -1208,15 +1552,21 @@ Key: + + + + + + Self-post: Imperative label ('!warn') on post @@ -1228,12 +1578,17 @@ Key: + + + + + Self-post: Imperative label ('!warn') on author profile @@ -1241,15 +1596,21 @@ Key: + + + + + + Self-post: Imperative label ('!warn') on author account @@ -1257,15 +1618,21 @@ Key: + + + + + + Self-post: Imperative label ('!warn') on quoted post @@ -1273,9 +1640,11 @@ Key: + + ✋ @@ -1283,6 +1652,9 @@ Key: + + + Self-post: Imperative label ('!warn') on quoted author account @@ -1290,15 +1662,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on post (hide) @@ -1306,9 +1684,11 @@ Key: + + ✋ @@ -1316,6 +1696,9 @@ Key: + + + Self-post: Blur-media label ('porn') on author profile (hide) @@ -1323,15 +1706,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on author account (hide) @@ -1339,15 +1728,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on quoted post (hide) @@ -1355,9 +1750,11 @@ Key: + + ✋ @@ -1365,6 +1762,9 @@ Key: + + + Self-post: Blur-media label ('porn') on quoted author account (hide) @@ -1372,15 +1772,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on post (warn) @@ -1388,9 +1794,11 @@ Key: + + ✋ @@ -1398,6 +1806,9 @@ Key: + + + Self-post: Blur-media label ('porn') on author profile (warn) @@ -1405,15 +1816,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on author account (warn) @@ -1421,15 +1838,21 @@ Key: + + + + + + Self-post: Blur-media label ('porn') on quoted post (warn) @@ -1437,9 +1860,11 @@ Key: + + ✋ @@ -1447,6 +1872,9 @@ Key: + + + Self-post: Blur-media label ('porn') on quoted author account (warn) @@ -1454,15 +1882,20 @@ Key: + + + + + ScenarioFilterContentAvatarEmbed Post with blocked author @@ -1479,9 +1912,13 @@ Key: + + + + Post with blocked quoted author @@ -1489,9 +1926,11 @@ Key: + + 🚫 @@ -1499,6 +1938,9 @@ Key: + + + Post with author blocking user @@ -1514,9 +1956,13 @@ Key: + + + + Post with quoted author blocking user @@ -1524,9 +1970,11 @@ Key: + + 🚫 @@ -1534,6 +1982,9 @@ Key: + + + Post with muted author @@ -1545,12 +1996,17 @@ Key: + + + + + Post with muted quoted author @@ -1558,9 +2014,11 @@ Key: + + ✋ @@ -1568,6 +2026,9 @@ Key: + + + Post with muted-by-list author @@ -1579,12 +2040,17 @@ Key: + + + + + Post with muted-by-list quoted author @@ -1592,9 +2058,11 @@ Key: + + ✋ @@ -1602,6 +2070,8 @@ Key: + + ScenarioFilterContentAvatarEmbed Prioritization: post with blocking & blocked-by author @@ -1618,9 +2088,13 @@ Key: + + + + Prioritization: post with blocking & blocked-by quoted author @@ -1628,9 +2102,11 @@ Key: + + 🚫 @@ -1638,6 +2114,9 @@ Key: + + + Prioritization: '!hide' label on post by blocked user @@ -1653,9 +2132,13 @@ Key: + + + + Prioritization: '!hide' label on quoted post, post by blocked user @@ -1675,6 +2158,9 @@ Key: + + + Prioritization: '!hide' and 'intolerant' labels on post (hide) @@ -1686,12 +2172,17 @@ Key: + + + + + Prioritization: '!warn' and 'intolerant' labels on post (hide) @@ -1703,12 +2194,17 @@ Key: + + + + + Prioritization: '!hide' and 'porn' labels on post (hide) @@ -1720,12 +2216,17 @@ Key: + + + + + Prioritization: '!warn' and 'porn' labels on post (hide) @@ -1733,9 +2234,11 @@ Key: + + ✋ @@ -1743,4 +2246,4 @@ Key: - + \ No newline at end of file diff --git a/packages/api/docs/moderation-behaviors/profiles.md b/packages/api/docs/moderation-behaviors/profiles.md index b8d7c94ce91..3d2f9af96b3 100644 --- a/packages/api/docs/moderation-behaviors/profiles.md +++ b/packages/api/docs/moderation-behaviors/profiles.md @@ -38,6 +38,7 @@ Key: + 🚫 @@ -45,6 +46,9 @@ Key: + + + Imperative label ('!hide') on profile @@ -52,6 +56,7 @@ Key: + 🚫 @@ -63,6 +68,9 @@ Key: + + + Imperative label ('!no-promote') on account @@ -70,15 +78,21 @@ Key: + + + + + + Imperative label ('!no-promote') on profile @@ -86,15 +100,21 @@ Key: + + + + + + Imperative label ('!warn') on account @@ -106,6 +126,7 @@ Key: + ✋ @@ -113,6 +134,9 @@ Key: + + + Imperative label ('!warn') on profile @@ -120,6 +144,7 @@ Key: + ✋ @@ -131,6 +156,8 @@ Key: + + ScenarioFilterAccountProfileAvatar Blur label ('intolerant') on account (hide) @@ -143,6 +170,7 @@ Key: + ✋ @@ -150,6 +178,9 @@ Key: + + + Blur label ('intolerant') on profile (hide) @@ -157,6 +188,7 @@ Key: + ✋ @@ -168,6 +200,9 @@ Key: + + + Blur label ('intolerant') on account (warn) @@ -179,6 +214,7 @@ Key: + ✋ @@ -186,6 +222,9 @@ Key: + + + Blur label ('intolerant') on profile (warn) @@ -193,6 +232,7 @@ Key: + ✋ @@ -204,6 +244,9 @@ Key: + + + Blur label ('intolerant') on account (ignore) @@ -211,15 +254,21 @@ Key: + + + + + + Blur label ('intolerant') on profile (ignore) @@ -227,15 +276,20 @@ Key: + + + + + ScenarioFilterAccountProfileAvatar Blur-media label ('porn') on account (hide) @@ -248,6 +302,7 @@ Key: + ✋ @@ -255,6 +310,9 @@ Key: + + + Blur-media label ('porn') on profile (hide) @@ -262,9 +320,11 @@ Key: + + ✋ @@ -272,6 +332,9 @@ Key: + + + Blur-media label ('porn') on account (warn) @@ -283,6 +346,7 @@ Key: + ✋ @@ -290,6 +354,9 @@ Key: + + + Blur-media label ('porn') on profile (warn) @@ -297,9 +364,11 @@ Key: + + ✋ @@ -307,6 +376,9 @@ Key: + + + Blur-media label ('porn') on account (ignore) @@ -314,15 +386,21 @@ Key: + + + + + + Blur-media label ('porn') on profile (ignore) @@ -330,15 +408,20 @@ Key: + + + + + ScenarioFilterAccountProfileAvatar Notice label ('scam') on account (hide) @@ -348,18 +431,20 @@ Key: 🪧 - + 🪧 - + + + Notice label ('scam') on profile (hide) @@ -367,19 +452,21 @@ Key: + 🪧 - 🪧 - + + + Notice label ('scam') on account (warn) @@ -388,18 +475,20 @@ Key: 🪧 - + 🪧 - + + + Notice label ('scam') on profile (warn) @@ -407,19 +496,21 @@ Key: + 🪧 - 🪧 - + + + Notice label ('scam') on account (ignore) @@ -427,15 +518,21 @@ Key: + + + + + + Notice label ('scam') on profile (ignore) @@ -443,15 +540,20 @@ Key: + + + + + ScenarioFilterAccountProfileAvatar Adult-only label on account when adult content is disabled @@ -464,6 +566,7 @@ Key: + 🚫 @@ -471,6 +574,9 @@ Key: + + + Adult-only label on profile when adult content is disabled @@ -478,9 +584,11 @@ Key: + + 🚫 @@ -488,6 +596,8 @@ Key: + + ScenarioFilterAccountProfileAvatar Self-profile: !hide on account @@ -497,18 +607,20 @@ Key: 🪧 - + 🪧 - + + + Self-profile: !hide on profile @@ -516,19 +628,20 @@ Key: + 🪧 - 🪧 - + + ScenarioFilterAccountProfileAvatar Mute/block: Blocking user @@ -537,9 +650,11 @@ Key: + + 🚫 @@ -547,6 +662,9 @@ Key: + + + Mute/block: Blocked by user @@ -554,9 +672,11 @@ Key: + + 🚫 @@ -564,6 +684,9 @@ Key: + + + Mute/block: Muted user @@ -571,15 +694,21 @@ Key: + + + + + + Mute/block: Muted-by-list user @@ -587,15 +716,20 @@ Key: + + + + + ScenarioFilterAccountProfileAvatar Prioritization: blocking & blocked-by user @@ -604,9 +738,11 @@ Key: + + 🚫 @@ -614,6 +750,9 @@ Key: + + + Prioritization: '!hide' label on account of blocked user @@ -625,6 +764,7 @@ Key: + 🚫 @@ -632,6 +772,9 @@ Key: + + + Prioritization: '!hide' and 'intolerant' labels on account (hide) @@ -643,6 +786,7 @@ Key: + 🚫 @@ -650,6 +794,9 @@ Key: + + + Prioritization: '!warn' and 'intolerant' labels on account (hide) @@ -661,6 +808,7 @@ Key: + ✋ @@ -668,6 +816,9 @@ Key: + + + Prioritization: '!warn' and 'porn' labels on account (hide) @@ -679,6 +830,7 @@ Key: + ✋ @@ -686,6 +838,9 @@ Key: + + + Prioritization: intolerant label on account (hide) and scam label on profile (warn) @@ -698,7 +853,6 @@ Key: 🪧 - ✋ @@ -706,6 +860,9 @@ Key: + + + Prioritization: !hide on account, !warn on profile @@ -725,6 +882,9 @@ Key: + + + Prioritization: !warn on account, !hide on profile @@ -744,4 +904,4 @@ Key: - + \ No newline at end of file diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts index 193b9c39d37..c2e1a183222 100644 --- a/packages/api/src/client/lexicons.ts +++ b/packages/api/src/client/lexicons.ts @@ -3149,7 +3149,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'The revision of the repo to catch up from.', }, }, @@ -3178,7 +3177,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'Optional revision of the repo to list blobs since', }, limit: { diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts index 193b9c39d37..c2e1a183222 100644 --- a/packages/bsky/src/lexicon/lexicons.ts +++ b/packages/bsky/src/lexicon/lexicons.ts @@ -3149,7 +3149,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'The revision of the repo to catch up from.', }, }, @@ -3178,7 +3177,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'Optional revision of the repo to list blobs since', }, limit: { diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts index 193b9c39d37..c2e1a183222 100644 --- a/packages/pds/src/lexicon/lexicons.ts +++ b/packages/pds/src/lexicon/lexicons.ts @@ -3149,7 +3149,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'The revision of the repo to catch up from.', }, }, @@ -3178,7 +3177,6 @@ export const schemaDict = { }, since: { type: 'string', - format: 'cid', description: 'Optional revision of the repo to list blobs since', }, limit: { From f5c6618bd79d0e49ad0c7ccbc87b9dccb80b80fe Mon Sep 17 00:00:00 2001 From: dholms Date: Mon, 11 Sep 2023 17:37:33 -0500 Subject: [PATCH 2/3] test --- packages/pds/tests/sync/sync.test.ts | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/packages/pds/tests/sync/sync.test.ts b/packages/pds/tests/sync/sync.test.ts index 73947eddbc3..27311cbf81d 100644 --- a/packages/pds/tests/sync/sync.test.ts +++ b/packages/pds/tests/sync/sync.test.ts @@ -118,6 +118,39 @@ describe('repo sync', () => { expect(commit.data.cid).toEqual(currRoot?.toString()) }) + it('syncs `since` a given rev', async () => { + const repoBefore = await repo.Repo.load(storage, currRoot) + + // add a post + const { obj, uri } = await makePost(sc, did) + if (!repoData[uri.collection]) { + repoData[uri.collection] = {} + } + repoData[uri.collection][uri.rkey] = obj + uris.push(uri) + + const carRes = await agent.api.com.atproto.sync.getRepo({ + did, + since: repoBefore.commit.rev, + }) + const car = await repo.readCarWithRoot(carRes.data) + expect(car.blocks.size).toBeLessThan(10) // should only contain new blocks + const synced = await repo.verifyDiff( + repoBefore, + car.blocks, + car.root, + did, + ctx.repoSigningKey.did(), + ) + expect(synced.writes.length).toBe(1) + await storage.applyCommit(synced.commit) + const loaded = await repo.Repo.load(storage, car.root) + const contents = await loaded.getContents() + expect(contents).toEqual(repoData) + + currRoot = car.root + }) + it('sync a record proof', async () => { const collection = Object.keys(repoData)[0] const rkey = Object.keys(repoData[collection])[0] From 65aeac3ce7bcba3b534e80b02aaab27a756e3648 Mon Sep 17 00:00:00 2001 From: dholms Date: Mon, 11 Sep 2023 17:45:50 -0500 Subject: [PATCH 3/3] format --- packages/api/docs/labels.md | 54 +- .../api/docs/moderation-behaviors/posts.md | 529 +----------------- .../api/docs/moderation-behaviors/profiles.md | 188 +------ 3 files changed, 54 insertions(+), 717 deletions(-) diff --git a/packages/api/docs/labels.md b/packages/api/docs/labels.md index 9531df460c1..a2d8806b566 100644 --- a/packages/api/docs/labels.md +++ b/packages/api/docs/labels.md @@ -1,44 +1,44 @@ - # Labels - - This document is a reference for the labels used in the SDK. +# Labels - **⚠️ Note**: These labels are still in development and may change over time. Not all are currently in use. +This document is a reference for the labels used in the SDK. - ## Key +**⚠️ Note**: These labels are still in development and may change over time. Not all are currently in use. - ### Label Preferences +## Key - The possible client interpretations for a label. +### Label Preferences - - ignore Do nothing with the label. - - warn Provide some form of warning on the content (see "On Warn" behavior). - - hide Remove the content from feeds and apply the warning when directly viewed. +The possible client interpretations for a label. - Each label specifies which preferences it can support. If a label is not configurable, it must have only own supported preference. +- ignore Do nothing with the label. +- warn Provide some form of warning on the content (see "On Warn" behavior). +- hide Remove the content from feeds and apply the warning when directly viewed. - ### Configurable? +Each label specifies which preferences it can support. If a label is not configurable, it must have only own supported preference. - Non-configurable labels cannot have their preference changed by the user. +### Configurable? - ### Flags +Non-configurable labels cannot have their preference changed by the user. - Additional behaviors which a label can adopt. +### Flags - - no-override The user cannot click through any covering of content created by the label. - - adult The user must have adult content enabled to configure the label. If adult content is not enabled, the label must adopt the strictest preference. +Additional behaviors which a label can adopt. - ### On Warn +- no-override The user cannot click through any covering of content created by the label. +- adult The user must have adult content enabled to configure the label. If adult content is not enabled, the label must adopt the strictest preference. - The kind of UI behavior used when a warning must be applied. +### On Warn - - blur Hide all of the content behind an interstitial. - - blur-media Hide only the media within the content (ie images) behind an interstitial. - - alert Display a descriptive warning but do not hide the content. - - null Do nothing. +The kind of UI behavior used when a warning must be applied. - ## Label Behaviors +- blur Hide all of the content behind an interstitial. +- blur-media Hide only the media within the content (ie images) behind an interstitial. +- alert Display a descriptive warning but do not hide the content. +- null Do nothing. + +## Label Behaviors @@ -267,7 +267,7 @@
- ## Label Group Descriptions +## Label Group Descriptions @@ -312,7 +312,7 @@
- ## Label Descriptions +## Label Descriptions @@ -535,4 +535,4 @@ on content
Misleading
The moderators believe this account is spreading misleading information.

-
\ No newline at end of file + diff --git a/packages/api/docs/moderation-behaviors/posts.md b/packages/api/docs/moderation-behaviors/posts.md index ef3c6c7fc5d..5ddcf9ff602 100644 --- a/packages/api/docs/moderation-behaviors/posts.md +++ b/packages/api/docs/moderation-behaviors/posts.md @@ -38,17 +38,12 @@ Key: - - - - - Imperative label ('!hide') on author profile @@ -56,7 +51,6 @@ Key: - 🚫 @@ -64,13 +58,9 @@ Key: - - - - Imperative label ('!hide') on author account @@ -86,13 +76,9 @@ Key: - - - - Imperative label ('!hide') on quoted post @@ -100,11 +86,9 @@ Key: - - 🚫 @@ -112,9 +96,6 @@ Key: - - - Imperative label ('!hide') on quoted author account @@ -122,11 +103,9 @@ Key: - - 🚫 @@ -134,9 +113,6 @@ Key: - - - Imperative label ('!no-promote') on post @@ -144,21 +120,15 @@ Key: - - - - - - Imperative label ('!no-promote') on author profile @@ -166,21 +136,15 @@ Key: - - - - - - Imperative label ('!no-promote') on author account @@ -188,21 +152,15 @@ Key: - - - - - - Imperative label ('!no-promote') on quoted post @@ -210,21 +168,15 @@ Key: - - - - - - Imperative label ('!no-promote') on quoted author account @@ -232,21 +184,15 @@ Key: - - - - - - Imperative label ('!warn') on post @@ -258,17 +204,12 @@ Key: - - - - - Imperative label ('!warn') on author profile @@ -276,7 +217,6 @@ Key: - ✋ @@ -284,13 +224,9 @@ Key: - - - - Imperative label ('!warn') on author account @@ -306,13 +242,9 @@ Key: - - - - Imperative label ('!warn') on quoted post @@ -320,11 +252,9 @@ Key: - - ✋ @@ -332,9 +262,6 @@ Key: - - - Imperative label ('!warn') on quoted author account @@ -342,11 +269,9 @@ Key: - - ✋ @@ -354,8 +279,6 @@ Key: - - ScenarioFilterContentAvatarEmbed Blur label ('intolerant') on post (hide) @@ -368,17 +291,12 @@ Key: - - - - - Blur label ('intolerant') on author profile (hide) @@ -386,7 +304,6 @@ Key: - ✋ @@ -394,13 +311,9 @@ Key: - - - - Blur label ('intolerant') on author account (hide) @@ -416,13 +329,9 @@ Key: - - - - Blur label ('intolerant') on quoted post (hide) @@ -430,11 +339,9 @@ Key: - - ✋ @@ -442,9 +349,6 @@ Key: - - - Blur label ('intolerant') on quoted author account (hide) @@ -452,11 +356,9 @@ Key: - - ✋ @@ -464,9 +366,6 @@ Key: - - - Blur label ('intolerant') on post (warn) @@ -478,17 +377,12 @@ Key: - - - - - Blur label ('intolerant') on author profile (warn) @@ -496,7 +390,6 @@ Key: - ✋ @@ -504,13 +397,9 @@ Key: - - - - Blur label ('intolerant') on author account (warn) @@ -526,13 +415,9 @@ Key: - - - - Blur label ('intolerant') on quoted post (warn) @@ -540,11 +425,9 @@ Key: - - ✋ @@ -552,9 +435,6 @@ Key: - - - Blur label ('intolerant') on quoted author account (warn) @@ -562,11 +442,9 @@ Key: - - ✋ @@ -574,9 +452,6 @@ Key: - - - Blur label ('intolerant') on post (ignore) @@ -584,21 +459,15 @@ Key: - - - - - - Blur label ('intolerant') on author profile (ignore) @@ -606,21 +475,15 @@ Key: - - - - - - Blur label ('intolerant') on author account (ignore) @@ -628,21 +491,15 @@ Key: - - - - - - Blur label ('intolerant') on quoted post (ignore) @@ -650,21 +507,15 @@ Key: - - - - - - Blur label ('intolerant') on quoted author account (ignore) @@ -672,20 +523,15 @@ Key: - - - - - ScenarioFilterContentAvatarEmbed Blur-media label ('porn') on post (hide) @@ -694,11 +540,9 @@ Key: - - ✋ @@ -706,9 +550,6 @@ Key: - - - Blur-media label ('porn') on author profile (hide) @@ -716,7 +557,6 @@ Key: - ✋ @@ -724,13 +564,9 @@ Key: - - - - Blur-media label ('porn') on author account (hide) @@ -738,7 +574,6 @@ Key: - ✋ @@ -750,9 +585,6 @@ Key: - - - Blur-media label ('porn') on quoted post (hide) @@ -760,11 +592,9 @@ Key: - - ✋ @@ -772,9 +602,6 @@ Key: - - - Blur-media label ('porn') on quoted author account (hide) @@ -782,21 +609,15 @@ Key: - - - - - - Blur-media label ('porn') on post (warn) @@ -804,11 +625,9 @@ Key: - - ✋ @@ -816,9 +635,6 @@ Key: - - - Blur-media label ('porn') on author profile (warn) @@ -826,7 +642,6 @@ Key: - ✋ @@ -834,13 +649,9 @@ Key: - - - - Blur-media label ('porn') on author account (warn) @@ -848,7 +659,6 @@ Key: - ✋ @@ -860,9 +670,6 @@ Key: - - - Blur-media label ('porn') on quoted post (warn) @@ -870,11 +677,9 @@ Key: - - ✋ @@ -882,9 +687,6 @@ Key: - - - Blur-media label ('porn') on quoted author account (warn) @@ -892,21 +694,15 @@ Key: - - - - - - Blur-media label ('porn') on post (ignore) @@ -914,21 +710,15 @@ Key: - - - - - - Blur-media label ('porn') on author profile (ignore) @@ -936,21 +726,15 @@ Key: - - - - - - Blur-media label ('porn') on author account (ignore) @@ -958,21 +742,15 @@ Key: - - - - - - Blur-media label ('porn') on quoted post (ignore) @@ -980,21 +758,15 @@ Key: - - - - - - Blur-media label ('porn') on quoted author account (ignore) @@ -1002,20 +774,15 @@ Key: - - - - - ScenarioFilterContentAvatarEmbed Notice label ('scam') on post (hide) @@ -1025,20 +792,16 @@ Key: 🪧 + - - - - - Notice label ('scam') on author profile (hide) @@ -1046,21 +809,17 @@ Key: - 🪧 + - - - - Notice label ('scam') on author account (hide) @@ -1069,20 +828,18 @@ Key: 🪧 + 🪧 + - - - - Notice label ('scam') on quoted post (hide) @@ -1090,21 +847,17 @@ Key: - - 🪧 + - - - Notice label ('scam') on quoted author account (hide) @@ -1112,21 +865,17 @@ Key: - - 🪧 + - - - Notice label ('scam') on post (warn) @@ -1135,20 +884,16 @@ Key: 🪧 + - - - - - Notice label ('scam') on author profile (warn) @@ -1156,21 +901,17 @@ Key: - 🪧 + - - - - Notice label ('scam') on author account (warn) @@ -1179,20 +920,18 @@ Key: 🪧 + 🪧 + - - - - Notice label ('scam') on quoted post (warn) @@ -1200,21 +939,17 @@ Key: - - 🪧 + - - - Notice label ('scam') on quoted author account (warn) @@ -1222,21 +957,17 @@ Key: - - 🪧 + - - - Notice label ('scam') on post (ignore) @@ -1244,21 +975,15 @@ Key: - - - - - - Notice label ('scam') on author profile (ignore) @@ -1266,21 +991,15 @@ Key: - - - - - - Notice label ('scam') on author account (ignore) @@ -1288,21 +1007,15 @@ Key: - - - - - - Notice label ('scam') on quoted post (ignore) @@ -1310,21 +1023,15 @@ Key: - - - - - - Notice label ('scam') on quoted author account (ignore) @@ -1332,20 +1039,15 @@ Key: - - - - - ScenarioFilterContentAvatarEmbed Adult-only label on post when adult content is disabled @@ -1354,11 +1056,9 @@ Key: - - 🚫 @@ -1366,9 +1066,6 @@ Key: - - - Adult-only label on author profile when adult content is disabled @@ -1376,7 +1073,6 @@ Key: - 🚫 @@ -1384,13 +1080,9 @@ Key: - - - - Adult-only label on author account when adult content is disabled @@ -1398,7 +1090,6 @@ Key: - 🚫 @@ -1410,9 +1101,6 @@ Key: - - - Adult-only label on quoted post when adult content is disabled @@ -1420,11 +1108,9 @@ Key: - - 🚫 @@ -1432,9 +1118,6 @@ Key: - - - Adult-only label on quoted author account when adult content is disabled @@ -1442,20 +1125,15 @@ Key: - - - - - ScenarioFilterContentAvatarEmbed Self-post: Imperative label ('!hide') on post @@ -1468,17 +1146,12 @@ Key: - - - - - Self-post: Imperative label ('!hide') on author profile @@ -1486,21 +1159,15 @@ Key: - - - - - - Self-post: Imperative label ('!hide') on author account @@ -1508,21 +1175,15 @@ Key: - - - - - - Self-post: Imperative label ('!hide') on quoted post @@ -1530,11 +1191,9 @@ Key: - - ✋ @@ -1542,9 +1201,6 @@ Key: - - - Self-post: Imperative label ('!hide') on quoted author account @@ -1552,21 +1208,15 @@ Key: - - - - - - Self-post: Imperative label ('!warn') on post @@ -1578,17 +1228,12 @@ Key: - - - - - Self-post: Imperative label ('!warn') on author profile @@ -1596,21 +1241,15 @@ Key: - - - - - - Self-post: Imperative label ('!warn') on author account @@ -1618,21 +1257,15 @@ Key: - - - - - - Self-post: Imperative label ('!warn') on quoted post @@ -1640,11 +1273,9 @@ Key: - - ✋ @@ -1652,9 +1283,6 @@ Key: - - - Self-post: Imperative label ('!warn') on quoted author account @@ -1662,21 +1290,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on post (hide) @@ -1684,11 +1306,9 @@ Key: - - ✋ @@ -1696,9 +1316,6 @@ Key: - - - Self-post: Blur-media label ('porn') on author profile (hide) @@ -1706,21 +1323,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on author account (hide) @@ -1728,21 +1339,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on quoted post (hide) @@ -1750,11 +1355,9 @@ Key: - - ✋ @@ -1762,9 +1365,6 @@ Key: - - - Self-post: Blur-media label ('porn') on quoted author account (hide) @@ -1772,21 +1372,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on post (warn) @@ -1794,11 +1388,9 @@ Key: - - ✋ @@ -1806,9 +1398,6 @@ Key: - - - Self-post: Blur-media label ('porn') on author profile (warn) @@ -1816,21 +1405,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on author account (warn) @@ -1838,21 +1421,15 @@ Key: - - - - - - Self-post: Blur-media label ('porn') on quoted post (warn) @@ -1860,11 +1437,9 @@ Key: - - ✋ @@ -1872,9 +1447,6 @@ Key: - - - Self-post: Blur-media label ('porn') on quoted author account (warn) @@ -1882,20 +1454,15 @@ Key: - - - - - ScenarioFilterContentAvatarEmbed Post with blocked author @@ -1912,13 +1479,9 @@ Key: - - - - Post with blocked quoted author @@ -1926,11 +1489,9 @@ Key: - - 🚫 @@ -1938,9 +1499,6 @@ Key: - - - Post with author blocking user @@ -1956,13 +1514,9 @@ Key: - - - - Post with quoted author blocking user @@ -1970,11 +1524,9 @@ Key: - - 🚫 @@ -1982,9 +1534,6 @@ Key: - - - Post with muted author @@ -1996,17 +1545,12 @@ Key: - - - - - Post with muted quoted author @@ -2014,11 +1558,9 @@ Key: - - ✋ @@ -2026,9 +1568,6 @@ Key: - - - Post with muted-by-list author @@ -2040,17 +1579,12 @@ Key: - - - - - Post with muted-by-list quoted author @@ -2058,11 +1592,9 @@ Key: - - ✋ @@ -2070,8 +1602,6 @@ Key: - - ScenarioFilterContentAvatarEmbed Prioritization: post with blocking & blocked-by author @@ -2088,13 +1618,9 @@ Key: - - - - Prioritization: post with blocking & blocked-by quoted author @@ -2102,11 +1628,9 @@ Key: - - 🚫 @@ -2114,9 +1638,6 @@ Key: - - - Prioritization: '!hide' label on post by blocked user @@ -2132,13 +1653,9 @@ Key: - - - - Prioritization: '!hide' label on quoted post, post by blocked user @@ -2158,9 +1675,6 @@ Key: - - - Prioritization: '!hide' and 'intolerant' labels on post (hide) @@ -2172,17 +1686,12 @@ Key: - - - - - Prioritization: '!warn' and 'intolerant' labels on post (hide) @@ -2194,17 +1703,12 @@ Key: - - - - - Prioritization: '!hide' and 'porn' labels on post (hide) @@ -2216,17 +1720,12 @@ Key: - - - - - Prioritization: '!warn' and 'porn' labels on post (hide) @@ -2234,11 +1733,9 @@ Key: - - ✋ @@ -2246,4 +1743,4 @@ Key: - \ No newline at end of file + diff --git a/packages/api/docs/moderation-behaviors/profiles.md b/packages/api/docs/moderation-behaviors/profiles.md index 3d2f9af96b3..b8d7c94ce91 100644 --- a/packages/api/docs/moderation-behaviors/profiles.md +++ b/packages/api/docs/moderation-behaviors/profiles.md @@ -38,7 +38,6 @@ Key: - 🚫 @@ -46,9 +45,6 @@ Key: - - - Imperative label ('!hide') on profile @@ -56,7 +52,6 @@ Key: - 🚫 @@ -68,9 +63,6 @@ Key: - - - Imperative label ('!no-promote') on account @@ -78,21 +70,15 @@ Key: - - - - - - Imperative label ('!no-promote') on profile @@ -100,21 +86,15 @@ Key: - - - - - - Imperative label ('!warn') on account @@ -126,7 +106,6 @@ Key: - ✋ @@ -134,9 +113,6 @@ Key: - - - Imperative label ('!warn') on profile @@ -144,7 +120,6 @@ Key: - ✋ @@ -156,8 +131,6 @@ Key: - - ScenarioFilterAccountProfileAvatar Blur label ('intolerant') on account (hide) @@ -170,7 +143,6 @@ Key: - ✋ @@ -178,9 +150,6 @@ Key: - - - Blur label ('intolerant') on profile (hide) @@ -188,7 +157,6 @@ Key: - ✋ @@ -200,9 +168,6 @@ Key: - - - Blur label ('intolerant') on account (warn) @@ -214,7 +179,6 @@ Key: - ✋ @@ -222,9 +186,6 @@ Key: - - - Blur label ('intolerant') on profile (warn) @@ -232,7 +193,6 @@ Key: - ✋ @@ -244,9 +204,6 @@ Key: - - - Blur label ('intolerant') on account (ignore) @@ -254,21 +211,15 @@ Key: - - - - - - Blur label ('intolerant') on profile (ignore) @@ -276,20 +227,15 @@ Key: - - - - - ScenarioFilterAccountProfileAvatar Blur-media label ('porn') on account (hide) @@ -302,7 +248,6 @@ Key: - ✋ @@ -310,9 +255,6 @@ Key: - - - Blur-media label ('porn') on profile (hide) @@ -320,11 +262,9 @@ Key: - - ✋ @@ -332,9 +272,6 @@ Key: - - - Blur-media label ('porn') on account (warn) @@ -346,7 +283,6 @@ Key: - ✋ @@ -354,9 +290,6 @@ Key: - - - Blur-media label ('porn') on profile (warn) @@ -364,11 +297,9 @@ Key: - - ✋ @@ -376,9 +307,6 @@ Key: - - - Blur-media label ('porn') on account (ignore) @@ -386,21 +314,15 @@ Key: - - - - - - Blur-media label ('porn') on profile (ignore) @@ -408,20 +330,15 @@ Key: - - - - - ScenarioFilterAccountProfileAvatar Notice label ('scam') on account (hide) @@ -431,20 +348,18 @@ Key: 🪧 + - 🪧 + - - - Notice label ('scam') on profile (hide) @@ -452,21 +367,19 @@ Key: - 🪧 + 🪧 + - - - Notice label ('scam') on account (warn) @@ -475,20 +388,18 @@ Key: 🪧 + - 🪧 + - - - Notice label ('scam') on profile (warn) @@ -496,21 +407,19 @@ Key: - 🪧 + 🪧 + - - - Notice label ('scam') on account (ignore) @@ -518,21 +427,15 @@ Key: - - - - - - Notice label ('scam') on profile (ignore) @@ -540,20 +443,15 @@ Key: - - - - - ScenarioFilterAccountProfileAvatar Adult-only label on account when adult content is disabled @@ -566,7 +464,6 @@ Key: - 🚫 @@ -574,9 +471,6 @@ Key: - - - Adult-only label on profile when adult content is disabled @@ -584,11 +478,9 @@ Key: - - 🚫 @@ -596,8 +488,6 @@ Key: - - ScenarioFilterAccountProfileAvatar Self-profile: !hide on account @@ -607,20 +497,18 @@ Key: 🪧 + - 🪧 + - - - Self-profile: !hide on profile @@ -628,20 +516,19 @@ Key: - 🪧 + 🪧 + - - ScenarioFilterAccountProfileAvatar Mute/block: Blocking user @@ -650,11 +537,9 @@ Key: - - 🚫 @@ -662,9 +547,6 @@ Key: - - - Mute/block: Blocked by user @@ -672,11 +554,9 @@ Key: - - 🚫 @@ -684,9 +564,6 @@ Key: - - - Mute/block: Muted user @@ -694,21 +571,15 @@ Key: - - - - - - Mute/block: Muted-by-list user @@ -716,20 +587,15 @@ Key: - - - - - ScenarioFilterAccountProfileAvatar Prioritization: blocking & blocked-by user @@ -738,11 +604,9 @@ Key: - - 🚫 @@ -750,9 +614,6 @@ Key: - - - Prioritization: '!hide' label on account of blocked user @@ -764,7 +625,6 @@ Key: - 🚫 @@ -772,9 +632,6 @@ Key: - - - Prioritization: '!hide' and 'intolerant' labels on account (hide) @@ -786,7 +643,6 @@ Key: - 🚫 @@ -794,9 +650,6 @@ Key: - - - Prioritization: '!warn' and 'intolerant' labels on account (hide) @@ -808,7 +661,6 @@ Key: - ✋ @@ -816,9 +668,6 @@ Key: - - - Prioritization: '!warn' and 'porn' labels on account (hide) @@ -830,7 +679,6 @@ Key: - ✋ @@ -838,9 +686,6 @@ Key: - - - Prioritization: intolerant label on account (hide) and scam label on profile (warn) @@ -853,6 +698,7 @@ Key: 🪧 + ✋ @@ -860,9 +706,6 @@ Key: - - - Prioritization: !hide on account, !warn on profile @@ -882,9 +725,6 @@ Key: - - - Prioritization: !warn on account, !hide on profile @@ -904,4 +744,4 @@ Key: - \ No newline at end of file +