From 51b42d13a370a9a79a618742c62de42c6cb666d8 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius.kazemi@gmail.com>
Date: Wed, 11 Dec 2019 19:03:42 -0800
Subject: Fixing federation bug

---
 package-lock.json |  8 ++------
 routes.js         | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 58c466e..59aac7d 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1140,7 +1140,6 @@
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -1159,7 +1158,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -1339,8 +1337,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -1446,8 +1443,7 @@
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
diff --git a/routes.js b/routes.js
index c04077b..e442e1a 100755
--- a/routes.js
+++ b/routes.js
@@ -148,15 +148,15 @@ function createActivityPubActor(eventID, domain, pubkey) {
       'https://w3id.org/security/v1'
     ],
 
-    'id': `https://${domain}/u/${eventID}`,
+    'id': `https://${domain}/${eventID}`,
     'type': 'Person',
-    'preferredUsereventID': `${eventID}`,
+    'preferredUsername': `${eventID}`,
     'inbox': `https://${domain}/api/inbox`,
-    'followers': `https://${domain}/u/${eventID}/followers`,
+    'followers': `https://${domain}/${eventID}/followers`,
 
     'publicKey': {
-      'id': `https://${domain}/u/${eventID}#main-key`,
-      'owner': `https://${domain}/u/${eventID}`,
+      'id': `https://${domain}/${eventID}#main-key`,
+      'owner': `https://${domain}/${eventID}`,
       'publicKeyPem': pubkey
     }
   });
-- 
cgit v1.2.3