mirror
/
bridgy-fed
kopia lustrzana https://github.com/snarfed/bridgy-fed
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

merging receive: Web.fetch: default actor/author to home page URL 

for #529
pull/582/head
Ryan Barrett 2023-07-10 11:26:09 -07:00
rodzic ceb72e516c
commit a2ed0afda8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
2 zmienionych plików z 37 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

36
tests/test_web.py
Wyświetl plik

@ -262,11 +262,11 @@ AS2_CREATE = {
},
'to': [as2.PUBLIC_AUDIENCE],
}
AS2_UPDATE = {
**AS2_CREATE,
AS2_UPDATE = copy.deepcopy(AS2_CREATE)
AS2_UPDATE.update({
'id': 'http://localhost/r/https://user.com/reply#bridgy-fed-update-2022-01-02T03:04:05+00:00',
'type': 'Update',
}
})
del AS2_UPDATE['published']
# we should generate this if it's not already in mf2 because Mastodon
# requires it for updates
@ -946,7 +946,8 @@ class WebTest(TestCase):
source_protocol='web',
mf2=LIKE_MF2,
type='like',
labels=['activity'],
labels=['activity', 'user'],
status='ignored',
)
def test_post_type_discovery_multiple_types(self, mock_get, mock_post):
@ -1184,7 +1185,11 @@ class WebTest(TestCase):
follow = requests_response(html, url='https://user.com/follow',
content_type=CONTENT_TYPE_HTML)
mock_get.side_effect = [follow, ACTOR]
mock_get.side_effect = [
follow,
ACTOR_HTML_RESP, # authorship on follower
ACTOR, # followee AS2
]
mock_post.return_value = requests_response('abc xyz')
got = self.client.post('/_ah/queue/webmention', data={
@ -1863,6 +1868,27 @@ class WebUtilTest(TestCase):
Web.fetch(obj)
self.assert_equals({**REPOST_MF2, 'url': 'https://user.com/repost'}, obj.mf2)
def test_fetch_default_author_to_user(self, mock_get, __):
mock_get.return_value = requests_response("""\
<html>
<body class="h-entry">
<p class="p-name">hello i am a post</p>
</body>
</html>
""", url='https://user.com/post', content_type=CONTENT_TYPE_HTML)
obj = Object(id='https://user.com/post')
Web.fetch(obj)
self.assert_equals({
'type': ['h-entry'],
'properties': {
'name': ['hello i am a post'],
'author': ['https://user.com/'],
'url': ['https://user.com/post'],
},
'url': 'https://user.com/post',
}, obj.mf2)
def test_fetch_user_homepage(self, mock_get, __):
mock_get.return_value = ACTOR_HTML_RESP

6
web.py
Wyświetl plik

@ -346,6 +346,12 @@ class Web(User, Protocol):
props.setdefault('url', [parsed['url']])
logger.info(f'Extracted microformats2 entry: {json_dumps(entry, indent=2)}')
# default actor/author to home page URL
if not props.get('author'):
homepage = urljoin(url, '/')
logger.info(f'Defaulting author to {homepage}')
props['author'] = [homepage]
# run full authorship algorithm if necessary: https://indieweb.org/authorship
# duplicated in microformats2.json_to_object
author = util.get_first(props, 'author')