translate webmention from home page into profile (actor) Update

for #376, #331

Author: snarfed

activitypub.py

@@ -39,7 +39,7 @@
 @flask_util.cached(cache, CACHE_TIME)
 def actor(domain):
     """Fetches a domain's h-card and converts to AS2 actor."""
-    actor = common.actor(domain)
+    _, _, actor, _ = common.actor(domain)
     return (actor, {
         'Content-Type': as2.CONTENT_TYPE,
         'Access-Control-Allow-Origin': '*',

common.py

@@ -546,7 +546,7 @@ def actor(domain, user=None):
       domain: str
       user: :class:`User`, optional
 
-    Returns: dict, AS2 actor
+    Returns: (dict mf2 item, dict AS1 actor, dict AS2 actor, User)
     """
     tld = domain.split('.')[-1]
     if tld in TLD_BLOCKLIST:
@@ -586,7 +586,7 @@ def actor(domain, user=None):
     })
 
     logger.info(f'Generated AS2 actor: {json_dumps(actor_as2, indent=2)}')
-    return actor_as2
+    return hcard, actor_as1, actor_as2, user
 
 
 def fetch_followers(domain, collection):

models.py

@@ -211,7 +211,8 @@ def verify(self):
 
         # check home page
         try:
-            self.actor_as2 = json_dumps(common.actor(self.key.id(), user=self))
+            _, _, actor_as2, _ = common.actor(self.key.id(), user=self)
+            self.actor_as2 = json_dumps(actor_as2)
             self.has_hcard = True
         except (BadRequest, NotFound):
             self.actor_as2 = None

templates/docs.html

@@ -33,6 +33,7 @@
 <p><em>Setup</em></p>
 <li><a href="#setup">How do I set it up?</a></li>
 <li><a href="#profile">How do I set up my profile?</a></li>
+<li><a href="#update-profile">How do I update my profile?</a></li>
 <li><a href="#user-page">Where's my user page and dashboard?</a></li>
 
 <br>
@@ -173,6 +174,11 @@ <h3 id="setup">Setup</h3>
 </pre>
 </li>
 
+<li id="update-profile" class="question">How do I update my profile?</li>
+<li class="answer">
+<p> If you've changed the <a href="https://indieweb.org/representative_h-card">representative h-card</a> on your site's home page, and you want to update your profile in Mastodon to match, click the <button class="btn btn-default glyphicon glyphicon-refresh"></button> button next to your domain <a href="/web-site">on your user page</a>. Alternatively, you can send a webmention from your home page to <code>https://fed.brid.gy/</code>.
+</li>
+
 <li id="user-page" class="question">Where's my user page and dashboard?</li>
 <li class="answer">
 <p>

tests/test_redirect.py

@@ -77,7 +77,7 @@ def _test_as2(self, accept, mock_get):
         del repost['cc']
         repost.update({
             'to': [as2.PUBLIC_AUDIENCE],
-            'object': 'http://orig/post',
+            'object': 'https://orig/post',
         })
 
         mock_get.return_value = requests_response(