Vocab & UI: Repo, Deck and Loom now serve their collabs URI

src/Vervis/Handler/Deck.hs

@@ -171,6 +171,8 @@ getDeckR deckHash = do
                     }
                 }
             , AP.ticketTrackerTeam = Nothing
+            , AP.ticketTrackerCollaborators =
+                encodeRouteLocal $ DeckCollabsR deckHash
             }
         followButton =
             followW

src/Vervis/Handler/Loom.hs

@@ -112,26 +112,30 @@ getLoomR loomHash = do
     hashSigKey <- getEncodeKeyHashid
     perActor <- asksSite $ appPerActorKeys . appSettings
     let route mk = encodeRouteLocal $ mk loomHash
-        loomAP = AP.Actor
+        loomAP = AP.PatchTracker
-            { AP.actorLocal = AP.ActorLocal
+            { AP.patchTrackerActor = AP.Actor
-                { AP.actorId         = route LoomR
+                { AP.actorLocal = AP.ActorLocal
-                , AP.actorInbox      = route LoomInboxR
+                    { AP.actorId         = route LoomR
-                , AP.actorOutbox     = Just $ route LoomOutboxR
+                    , AP.actorInbox      = route LoomInboxR
-                , AP.actorFollowers  = Just $ route LoomFollowersR
+                    , AP.actorOutbox     = Just $ route LoomOutboxR
-                , AP.actorFollowing  = Nothing
+                    , AP.actorFollowers  = Just $ route LoomFollowersR
-                , AP.actorPublicKeys =
+                    , AP.actorFollowing  = Nothing
-                    map (Left . encodeRouteLocal) $
+                    , AP.actorPublicKeys =
-                    if perActor
+                        map (Left . encodeRouteLocal) $
-                        then map (LoomStampR loomHash . hashSigKey) sigKeyIDs
+                        if perActor
-                        else [ActorKey1R, ActorKey2R]
+                            then map (LoomStampR loomHash . hashSigKey) sigKeyIDs
-                , AP.actorSshKeys    = []
+                            else [ActorKey1R, ActorKey2R]
-                }
+                    , AP.actorSshKeys    = []
-            , AP.actorDetail = AP.ActorDetail
+                    }
-                { AP.actorType       = AP.ActorTypePatchTracker
+                , AP.actorDetail = AP.ActorDetail
-                , AP.actorUsername   = Nothing
+                    { AP.actorType       = AP.ActorTypePatchTracker
-                , AP.actorName       = Just $ actorName actor
+                    , AP.actorUsername   = Nothing
-                , AP.actorSummary    = Just $ actorDesc actor
+                    , AP.actorName       = Just $ actorName actor
+                    , AP.actorSummary    = Just $ actorDesc actor
+                    }
                 }
+            , AP.patchTrackerCollaborators =
+                encodeRouteLocal $ LoomCollabsR loomHash
             }
 
     provideHtmlAndAP loomAP $ redirect $ LoomClothsR loomHash

src/Vervis/Handler/Repo.hs

@@ -232,6 +232,7 @@ getRepoR repoHash = do
             , AP.repoLoom =
                 encodeRouteLocal . LoomR . hashLoom <$> repoLoom repo
             , AP.repoClone = encodeRouteLocal (RepoR repoHash) :| []
+            , AP.repoCollaborators = encodeRouteLocal $ RepoCollabsR repoHash
             }
 
         next =

src/Web/ActivityPub.hs

@@ -42,6 +42,7 @@ module Web.ActivityPub
     , Actor (..)
     , Repo (..)
     , TicketTracker (..)
+    , PatchTracker (..)
     , CollectionType (..)
     , Collection (..)
     , CollectionPageType (..)
@@ -639,6 +640,7 @@ data Repo u = Repo
     , repoVcs   :: VersionControlSystem
     , repoLoom  :: Maybe LocalURI
     , repoClone :: NonEmpty LocalURI
+    , repoCollaborators :: LocalURI
     }
 
 instance ActivityPub Repo where
@@ -653,16 +655,19 @@ instance ActivityPub Repo where
                 <*> o .: "versionControlSystem"
                 <*> withAuthorityMaybeO h (o .:? "sendPatchesTo")
                 <*> (traverse (withAuthorityO h . pure) =<< o .:*+ "cloneUri")
-    toSeries authority (Repo actor team vcs loom clone)
+                <*> withAuthorityO h (o .: "collaborators")
-        =  toSeries authority actor
+    toSeries h (Repo actor team vcs loom clone collabs)
-        <> "team"                 .= (ObjURI authority <$> team)
+        =  toSeries h actor
+        <> "team"                 .= (ObjURI h <$> team)
         <> "versionControlSystem" .= vcs
-        <> "sendPatchesTo"        .=? (ObjURI authority <$> loom)
+        <> "sendPatchesTo"        .=? (ObjURI h <$> loom)
-        <> "cloneUri"             .=*+ (ObjURI authority <$> clone)
+        <> "cloneUri"             .=*+ (ObjURI h <$> clone)
+        <> "collaborators"        .= ObjURI h collabs
 
 data TicketTracker u = TicketTracker
     { ticketTrackerActor :: Actor u
     , ticketTrackerTeam  :: Maybe LocalURI
+    , ticketTrackerCollaborators :: LocalURI
     }
 
 instance ActivityPub TicketTracker where
@@ -674,9 +679,29 @@ instance ActivityPub TicketTracker where
         fmap (h,) $
             TicketTracker a
                 <$> withAuthorityMaybeO h (o .:|? "team")
-    toSeries authority (TicketTracker actor team)
+                <*> withAuthorityO h (o .: "collaborators")
-        =  toSeries authority actor
+    toSeries h (TicketTracker actor team collabs)
-        <> "team" .= (ObjURI authority <$> team)
+        =  toSeries h actor
+        <> "team" .= (ObjURI h <$> team)
+        <> "collaborators"  .= ObjURI h collabs
+
+data PatchTracker u = PatchTracker
+    { patchTrackerActor :: Actor u
+    , patchTrackerCollaborators :: LocalURI
+    }
+
+instance ActivityPub PatchTracker where
+    jsonldContext _ = [as2Context, secContext, forgeContext]
+    parseObject o = do
+        (h, a) <- parseObject o
+        unless (actorType (actorDetail a) == ActorTypePatchTracker) $
+            fail "Actor type isn't PatchTracker"
+        fmap (h,) $
+            PatchTracker a
+                <$> withAuthorityO h (o .: "collaborators")
+    toSeries h (PatchTracker actor collabs)
+        =  toSeries h actor
+        <> "collaborators"  .= ObjURI h collabs
 
 data CollectionType = CollectionTypeUnordered | CollectionTypeOrdered
 

templates/deck/widget/nav.hamlet

@@ -1,6 +1,6 @@
 $# This file is part of Vervis.
 $#
-$# Written in 2019, 2022 by fr33domlover <fr33domlover@riseup.net>.
+$# Written in 2019, 2022, 2023 by fr33domlover <fr33domlover@riseup.net>.
 $#
 $# ♡ Copying is an act of love. Please copy, reuse and share.
 $#

templates/loom/widget/nav.hamlet

@@ -1,6 +1,6 @@
 $# This file is part of Vervis.
 $#
-$# Written in 2019, 2022 by fr33domlover <fr33domlover@riseup.net>.
+$# Written in 2019, 2022, 2023 by fr33domlover <fr33domlover@riseup.net>.
 $#
 $# ♡ Copying is an act of love. Please copy, reuse and share.
 $#
@@ -28,10 +28,11 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
     <a href=@{LoomFollowersR loomHash}>
       [🐤 Followers]
   <span>
-    [🤝 Collaborators]
+    <a href=@{LoomCollabsR loomHash}>
+      [🤝 Collaborators]
   <span>
     <a href=@{LoomClothsR loomHash}>
-      [🧩 Merge Requests]
+      [🥂 Merge Requests]
   <span>
     <a href=@{RepoR $ hashRepo $ loomRepo loom}>
       [🗃 Repository]

templates/repo/source-darcs.hamlet

@@ -1,6 +1,6 @@
 $# This file is part of Vervis.
 $#
-$# Written in 2016, 2018, 2019, 2020, 2022
+$# Written in 2016, 2018, 2019, 2020, 2022, 2023
 $# by fr33domlover <fr33domlover@riseup.net>.
 $#
 $# ♡ Copying is an act of love. Please copy, reuse and share.
@@ -46,6 +46,7 @@ $# ^{personNavW user}
     <a href=@{RepoFollowersR repo}>
       [🐤 Followers]
   <span>
+    <a href=@{RepoCollabsR repo}>
       [🤝 Collaborators]
   <span>
     <a href=@{RepoCommitsR repo}>

templates/repo/source-git.hamlet

@@ -1,6 +1,6 @@
 $# This file is part of Vervis.
 $#
-$# Written in 2016, 2018, 2019, 2020, 2022
+$# Written in 2016, 2018, 2019, 2020, 2022, 2023
 $# by fr33domlover <fr33domlover@riseup.net>.
 $#
 $# ♡ Copying is an act of love. Please copy, reuse and share.
@@ -46,6 +46,7 @@ $# ^{personNavW user}
     <a href=@{RepoFollowersR repo}>
       [🐤 Followers]
   <span>
+    <a href=@{RepoCollabsR repo}>
       [🤝 Collaborators]
   <span>
     <a href=@{RepoCommitsR repo}>