From e2ab4dd51e3a66a8ac75afc29f7bc792806dfd80 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Mon, 25 Mar 2019 21:26:17 -0700 Subject: [PATCH] Adding a Followers object to the Actor See https://github.com/dariusk/rss-to-activitypub/issues/11 for more information on why this fix is needed. --- routes/admin.js | 1 + routes/inbox.js | 7 +++++-- routes/user.js | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/routes/admin.js b/routes/admin.js index bec6d5e..57d93c6 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -15,6 +15,7 @@ function createActor(name, domain, pubkey) { 'type': 'Person', 'preferredUsername': `${name}`, 'inbox': `https://${domain}/api/inbox`, + 'followers': `https://${domain}/u/${name}/followers`, 'publicKey': { 'id': `https://${domain}/u/${name}#main-key`, diff --git a/routes/inbox.js b/routes/inbox.js index e8f39a7..ee210c0 100644 --- a/routes/inbox.js +++ b/routes/inbox.js @@ -5,6 +5,9 @@ const express = require('express'), router = express.Router(); function signAndSend(message, name, domain, req, res, targetDomain) { + // get the URI of the actor object and append 'inbox' to it + let inbox = message.object.actor+'/inbox'; + let inboxFragment = inbox.replace('https://'+targetDomain,''); // get the private key let db = req.app.get('db'); db.get('select privkey from accounts where name = $name', {$name: `${name}@${domain}`}, (err, result) => { @@ -15,14 +18,14 @@ function signAndSend(message, name, domain, req, res, targetDomain) { let privkey = result.privkey; const signer = crypto.createSign('sha256'); let d = new Date(); - let stringToSign = `(request-target): post /inbox\nhost: ${targetDomain}\ndate: ${d.toUTCString()}`; + let stringToSign = `(request-target): post ${inboxFragment}\nhost: ${targetDomain}\ndate: ${d.toUTCString()}`; signer.update(stringToSign); signer.end(); const signature = signer.sign(privkey); const signature_b64 = signature.toString('base64'); let header = `keyId="https://${domain}/u/${name}",headers="(request-target) host date",signature="${signature_b64}"`; request({ - url: `https://${targetDomain}/inbox`, + url: inbox, headers: { 'Host': targetDomain, 'Date': d.toUTCString(), diff --git a/routes/user.js b/routes/user.js index 062e931..f86a2ba 100644 --- a/routes/user.js +++ b/routes/user.js @@ -10,16 +10,53 @@ router.get('/:name', function (req, res) { else { let db = req.app.get('db'); let domain = req.app.get('domain'); + let username = name; name = `${name}@${domain}`; db.get('select actor from accounts where name = $name', {$name: name}, (err, result) => { if (result === undefined) { return res.status(404).send(`No record found for ${name}.`); } else { - res.json(JSON.parse(result.actor)); + let tempActor = JSON.parse(result.actor); + // Added this followers URI for Pleroma compatibility, see https://github.com/dariusk/rss-to-activitypub/issues/11#issuecomment-471390881 + // New Actors should have this followers URI but in case of migration from an old version this will add it in on the fly + if (tempActor.followers === undefined) { + tempActor.followers = `https://${domain}/u/${username}/followers`; + } + res.json(tempActor); } }); } }); +router.get('/:name/followers', function (req, res) { + let name = req.params.name; + if (!name) { + return res.status(400).send('Bad request.'); + } + else { + let db = req.app.get('db'); + let domain = req.app.get('domain'); + let result = db.prepare('select followers from accounts where name = ?').get(`${name}@${domain}`); + let followers = JSON.parse(result.followers); + if (!followers) { + followers = []; + } + let followersCollection = { + "type":"OrderedCollection", + "totalItems":followers.length, + "id":`https://${domain}/u/${name}/followers`, + "first": { + "type":"OrderedCollectionPage", + "totalItems":followers.length, + "partOf":`https://${domain}/u/${name}/followers`, + "orderedItems": followers, + "id":`https://${domain}/u/${name}/followers?page=1` + }, + "@context":["https://www.w3.org/ns/activitystreams"] + }; + res.json(followersCollection); + } +}); + module.exports = router;