Skip to content

Commit 6e7acf8

Browse files
authored
Merge pull request #4 from eurosky-social/quentin/merge-2026-04-22
Merge bluesky-social/atproto changes up to 98d1d01 ( 2026 04 22 )
2 parents 2fa94aa + be81fdf commit 6e7acf8

160 files changed

Lines changed: 10639 additions & 653 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

lexicons/app/bsky/actor/defs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@
160160
"allowIncoming": {
161161
"type": "string",
162162
"knownValues": ["all", "none", "following"]
163+
},
164+
"allowGroupInvites": {
165+
"type": "string",
166+
"knownValues": ["all", "none", "following"]
163167
}
164168
}
165169
},

lexicons/chat/bsky/actor/declaration.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"allowIncoming": {
1414
"type": "string",
1515
"knownValues": ["all", "none", "following"]
16+
},
17+
"allowGroupInvites": {
18+
"description": "[NOTE: This is under active development and should be considered unstable while this note is here]. Declaration about group chat invitation preferences for the record owner.",
19+
"type": "string",
20+
"knownValues": ["all", "none", "following"]
1621
}
1722
}
1823
}

lexicons/chat/bsky/actor/defs.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
"lexicon": 1,
33
"id": "chat.bsky.actor.defs",
44
"defs": {
5+
"memberRole": {
6+
"type": "string",
7+
"knownValues": ["owner", "standard"]
8+
},
59
"profileViewBasic": {
610
"type": "object",
711
"required": ["did", "handle"],
@@ -23,13 +27,41 @@
2327
"type": "array",
2428
"items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
2529
},
30+
"createdAt": { "type": "string", "format": "datetime" },
2631
"chatDisabled": {
2732
"type": "boolean",
2833
"description": "Set to true when the actor cannot actively participate in conversations"
2934
},
3035
"verification": {
3136
"type": "ref",
3237
"ref": "app.bsky.actor.defs#verificationState"
38+
},
39+
"kind": {
40+
"description": "Union field that has data specific to different kinds of convos.",
41+
"type": "union",
42+
"refs": ["#directConvoMember", "#groupConvoMember"]
43+
}
44+
}
45+
},
46+
"directConvoMember": {
47+
"description": "[NOTE: This is under active development and should be considered unstable while this note is here].",
48+
"type": "object",
49+
"properties": {}
50+
},
51+
"groupConvoMember": {
52+
"description": "[NOTE: This is under active development and should be considered unstable while this note is here].",
53+
"type": "object",
54+
"required": ["role"],
55+
"properties": {
56+
"addedBy": {
57+
"description": "Who added this member. Only present if the member was added (instead of joining via link).",
58+
"type": "ref",
59+
"ref": "#profileViewBasic"
60+
},
61+
"role": {
62+
"description": "The member's role within this conversation. Only present in group conversation member lists.",
63+
"type": "ref",
64+
"ref": "#memberRole"
3365
}
3466
}
3567
}

lexicons/chat/bsky/authFullChatClient.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"inheritAud": true,
1818
"lxm": [
1919
"chat.bsky.actor.deleteAccount",
20-
"chat.bsky.actor.exportAccountData",
2120
"chat.bsky.convo.acceptConvo",
2221
"chat.bsky.convo.addReaction",
2322
"chat.bsky.convo.deleteMessageForSelf",
23+
"chat.bsky.convo.exportAccountData",
2424
"chat.bsky.convo.getConvo",
2525
"chat.bsky.convo.getConvoAvailability",
2626
"chat.bsky.convo.getConvoForMembers",

lexicons/chat/bsky/convo/acceptConvo.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"defs": {
55
"main": {
66
"type": "procedure",
7+
"description": "Marks a conversation as accepted, so it is shown in the list of accepted convos instead on the request convos.",
8+
"errors": [{ "name": "InvalidConvo" }],
79
"input": {
810
"encoding": "application/json",
911
"schema": {

lexicons/chat/bsky/convo/addReaction.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
}
3838
},
3939
"errors": [
40+
{ "name": "InvalidConvo" },
41+
{
42+
"name": "ReactionNotAllowed",
43+
"description": "Indicates that reactions are not allowed on this message, e.g. because it is a system message."
44+
},
4045
{
4146
"name": "ReactionMessageDeleted",
4247
"description": "Indicates that the message has been deleted and reactions can no longer be added/removed."

0 commit comments

Comments
 (0)