AP: default actors to type Application, add disclaimer with links to …

…profile bio

thanks for the nudge @fromjasonstuff!

activitypub.py

@@ -24,6 +24,7 @@
     add,
     CACHE_TIME,
     CONTENT_TYPE_HTML,
+    DOMAINS,
     DOMAIN_RE,
     error,
     host_url,
@@ -752,6 +753,17 @@ def postprocess_as2_actor(actor, user):
                          ['https://w3id.org/security/v1']),
         })
 
+    if (user.key.id() not in DOMAINS
+        and (not user.direct
+             # Web users only
+             or (getattr(user, 'last_webmention_in', 'unset') is None))):
+        actor['type'] = 'Application'
+        disclaimer = f'[<a href="https://{PRIMARY_DOMAIN}{user.user_page_path()}">bridged</a> from <a href="{user.web_url()}">{user.handle_or_id()}</a> by <a href="https://{PRIMARY_DOMAIN}/">Bridgy Fed</a>]'
+        if not actor['summary'].endswith(disclaimer):
+            if actor['summary']:
+                actor['summary'] += '\n\n'
+            actor['summary'] += disclaimer
+
     return actor
 
 # source protocol in subdomain.

tests/test_activitypub.py

@@ -54,11 +54,11 @@
         'https://www.w3.org/ns/activitystreams',
         'https://w3id.org/security/v1',
     ],
-    'type': 'Person',
+    'type': 'Application',
     'id': 'http://localhost/user.com',
     'url': 'http://localhost/r/https://user.com/',
     'preferredUsername': 'user.com',
-    'summary': '',
+    'summary': '[<a href="https://fed.brid.gy/web/user.com">bridged</a> from <a href="https://user.com/">user.com</a> by <a href="https://fed.brid.gy/">Bridgy Fed</a>]',
     'inbox': 'http://localhost/user.com/inbox',
     'outbox': 'http://localhost/user.com/outbox',
     'following': 'http://localhost/user.com/following',
@@ -437,6 +437,8 @@ def test_actor_handle_new_user(self, _, __, ___):
         self.assert_equals({
             **ACTOR,
             **ACTOR_FAKE,
+            'summary': '[<a href="https://fed.brid.gy/fa/fake:handle:user">bridged</a> from <a href="fake:user">fake:handle:user</a> by <a href="https://fed.brid.gy/">Bridgy Fed</a>]',
+            'type': 'Application',
         }, got.json, ignore=['publicKeyPem'])
 
     def test_actor_no_handle(self, *_):

tests/test_web.py

@@ -77,10 +77,11 @@
     'urls': [{'value': 'https://user.com/', 'displayName': 'Ms. ☕ Baz'}],
 }
 ACTOR_AS2 = {
-    'type': 'Person',
+    'type': 'Application',
     'id': 'http://localhost/user.com',
     'url': 'http://localhost/r/https://user.com/',
     'name': 'Ms. ☕ Baz',
+    'summary': '[<a href="https://fed.brid.gy/web/user.com">bridged</a> from <a href="https://user.com/">user.com</a> by <a href="https://fed.brid.gy/">Bridgy Fed</a>]',
     'preferredUsername': 'user.com',
     'inbox': 'http://localhost/user.com/inbox',
     'outbox': 'http://localhost/user.com/outbox',