mirror of
https://code.naskya.net/repos/ndqEd
synced 2025-03-20 15:14:54 +09:00
S2S: Switch from Grant->Accept->Enable to Invite->Accept->Grant
Giving access now starts with an Invite activity, followed by Accept from the Invite's recipient. Finally, the resource sends a Grant, which is the actual OCap.
This commit is contained in:
parent
0d96ee0775
commit
ac867e56f2
19 changed files with 697 additions and 532 deletions
th
104
th/models
104
th/models
|
@ -587,6 +587,28 @@ RemoteMessage
|
|||
|
||||
Collab
|
||||
|
||||
-------------------------------- Collab reason -------------------------------
|
||||
|
||||
CollabFulfillsLocalTopicCreation
|
||||
collab CollabId
|
||||
|
||||
UniqueCollabFulfillsLocalTopicCreation collab
|
||||
|
||||
CollabFulfillsInviteLocal
|
||||
collab CollabId
|
||||
invite OutboxItemId
|
||||
|
||||
UniqueCollabFulfillsInviteLocal collab
|
||||
UniqueCollabFulfillsInviteLocalInvite invite
|
||||
|
||||
CollabFulfillsInviteRemote
|
||||
collab CollabId
|
||||
actor RemoteActorId
|
||||
invite RemoteActivityId
|
||||
|
||||
UniqueCollabFulfillsInviteRemote collab
|
||||
UniqueCollabFulfillsInviteRemoteInvite invite
|
||||
|
||||
-------------------------------- Collab topic --------------------------------
|
||||
|
||||
-- Removed for now, until I figure out whether/how to federate custom roles
|
||||
|
@ -596,74 +618,30 @@ Collab
|
|||
--
|
||||
-- UniqueCollabRoleLocal collab
|
||||
|
||||
CollabTopicLocal
|
||||
CollabTopicRepo
|
||||
collab CollabId
|
||||
|
||||
UniqueCollabTopicLocal collab
|
||||
|
||||
CollabTopicLocalRepo
|
||||
collab CollabTopicLocalId
|
||||
repo RepoId
|
||||
|
||||
UniqueCollabTopicLocalRepo collab
|
||||
UniqueCollabTopicRepo collab
|
||||
|
||||
CollabTopicLocalDeck
|
||||
collab CollabTopicLocalId
|
||||
CollabTopicDeck
|
||||
collab CollabId
|
||||
deck DeckId
|
||||
|
||||
UniqueCollabTopicLocalDeck collab
|
||||
UniqueCollabTopicDeck collab
|
||||
|
||||
CollabTopicLocalLoom
|
||||
collab CollabTopicLocalId
|
||||
CollabTopicLoom
|
||||
collab CollabId
|
||||
loom LoomId
|
||||
|
||||
UniqueCollabTopicLocalLoom collab
|
||||
UniqueCollabTopicLoom collab
|
||||
|
||||
CollabTopicLocalReceive
|
||||
collab CollabTopicLocalId
|
||||
item InboxItemId
|
||||
|
||||
UniqueCollabTopicLocalReceiveCollab collab
|
||||
UniqueCollabTopicLocalReceiveItem item
|
||||
|
||||
CollabTopicLocalAccept
|
||||
collab CollabTopicLocalId
|
||||
accept OutboxItemId
|
||||
|
||||
UniqueCollabTopicLocalAcceptCollab collab
|
||||
UniqueCollabTopicLocalAcceptAccept accept
|
||||
|
||||
CollabTopicRemote
|
||||
CollabEnable
|
||||
collab CollabId
|
||||
topic RemoteObjectId
|
||||
actor RemoteActorId
|
||||
role LocalURI Maybe
|
||||
grant OutboxItemId
|
||||
|
||||
UniqueCollabTopicRemote collab
|
||||
|
||||
CollabTopicRemoteAccept
|
||||
collab CollabTopicRemoteId
|
||||
accept RemoteActivityId
|
||||
|
||||
UniqueCollabTopicRemoteAcceptCollab collab
|
||||
UniqueCollabTopicRemoteAcceptAccept accept
|
||||
|
||||
-------------------------------- Collab sender -------------------------------
|
||||
|
||||
CollabSenderLocal
|
||||
collab CollabId
|
||||
activity OutboxItemId
|
||||
|
||||
UniqueCollabSenderLocal collab
|
||||
UniqueCollabSenderLocalActivity activity
|
||||
|
||||
CollabSenderRemote
|
||||
collab CollabId
|
||||
actor RemoteActorId
|
||||
activity RemoteActivityId
|
||||
|
||||
UniqueCollabSenderRemote collab
|
||||
UniqueCollabSenderRemoteActivity activity
|
||||
UniqueCollabEnable collab
|
||||
UniqueCollabEnableGrant grant
|
||||
|
||||
-------------------------------- Collab recipient ----------------------------
|
||||
|
||||
|
@ -673,13 +651,6 @@ CollabRecipLocal
|
|||
|
||||
UniqueCollabRecipLocal collab
|
||||
|
||||
CollabRecipLocalReceive
|
||||
collab CollabRecipLocalId
|
||||
item InboxItemId
|
||||
|
||||
UniqueCollabRecipLocalReceiveCollab collab
|
||||
UniqueCollabRecipLocalReceiveItem item
|
||||
|
||||
CollabRecipLocalAccept
|
||||
collab CollabRecipLocalId
|
||||
accept OutboxItemId
|
||||
|
@ -700,13 +671,6 @@ CollabRecipRemoteAccept
|
|||
UniqueCollabRecipRemoteAcceptCollab collab
|
||||
UniqueCollabRecipRemoteAcceptAccept accept
|
||||
|
||||
-------------------------------- Collab reason -------------------------------
|
||||
|
||||
CollabFulfillsLocalTopicCreation
|
||||
collab CollabId
|
||||
|
||||
UniqueCollabFulfillsLocalTopicCreation collab
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue