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

Web: start adding metaformats support 

for #551
pull/741/head
Ryan Barrett 2023-11-29 12:00:48 -08:00
rodzic a112aa2f08
commit 18f79d2626
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
2 zmienionych plików z 31 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

35
tests/test_web.py
Wyświetl plik

@ -37,6 +37,14 @@ ACTOR_HTML = """\
</html>
"""
ACTOR_HTML_RESP = requests_response(ACTOR_HTML, url='https://user.com/')
ACTOR_HTML_METAFORMATS = """\
<html>
<head>
<title>Ms. ☕ Baz</title>
<meta property="article:author" content="/" />
</head>
</html>
"""
ACTOR_MF2 = {
'type': ['h-card'],
'properties': {
@ -1494,10 +1502,7 @@ class WebTest(TestCase):
status='complete',
our_as1={
**DELETE_AS1,
'actor': {
**ACTOR_AS1_UNWRAPPED,
'id': 'https://user.com/',
},
'actor': ACTOR_AS1_UNWRAPPED,
},
delivered=inboxes,
type='delete',
@ -1758,7 +1763,7 @@ http://this/404s
FULL_REDIR,
requests_response("""
<body>
<div class="h-entry">
<div class="h-review">
<p class="e-content">foo bar</p>
</div>
</body>
@ -2152,16 +2157,26 @@ class WebUtilTest(TestCase):
}, obj.mf2)
self.assert_equals({
**ACTOR_AS1_UNWRAPPED,
'id': 'https://user.com/',
'urls': [{'value': 'https://user.com/', 'displayName': 'Ms. ☕ Baz'}],
}, obj.as1)
def test_fetch_user_homepage_no_hcard(self, mock_get, __):
mock_get.return_value = REPOST
def test_fetch_user_homepage_metaformats(self, mock_get, __):
mock_get.return_value = requests_response(
ACTOR_HTML_METAFORMATS, url='https://user.com/')
obj = Object(id='https://user.com/')
with self.assertRaises(BadRequest):
Web.fetch(obj)
Web.fetch(obj)
expected_mf2 = copy.deepcopy(ACTOR_MF2)
expected_mf2['properties']['author'] = ['https://user.com/']
self.assert_equals(expected_mf2, obj.mf2, ignore=['rel-urls', 'url'])
self.assert_equals(ACTOR_AS1_UNWRAPPED, obj.as1, ignore=['author'])
def test_fetch_user_homepage_no_hcard(self, mock_get, __):
mock_get.return_value = TOOT_HTML
obj = Object(id='https://user.com/')
self.assertFalse(Web.fetch(obj))
def test_fetch_user_homepage_non_representative_hcard(self, mock_get, __):
mock_get.return_value = requests_response(

7
web.py
Wyświetl plik

@ -182,7 +182,6 @@ class Web(User, Protocol):
def verify(self):
"""Fetches site a couple ways to check for redirects and h-card.
Returns:
web.Web: user that was verified. May be different than self! eg if
self 's domain started with www and we switch to the root domain.
@ -393,6 +392,12 @@ class Web(User, Protocol):
if is_homepage:
logger.info(f"{url} is user's web url")
entry = mf2util.representative_hcard(parsed, parsed['url'])
if (not entry and len(parsed['items']) == 1
and parsed['items'][0]['type'] == ['h-entry']):
# metaformats synthetic item
# https://microformats.org/wiki/metaformats
entry = parsed['items'][0]
entry['type'] = ['h-card']
if not entry:
error(f"Couldn't find a representative h-card (http://microformats.org/wiki/representative-hcard-parsing) on {parsed['url']}")
logger.info(f'Representative h-card: {json_dumps(entry, indent=2)}')