mirror
/
federation
kopia lustrzana https://gitlab.com/jaywink/federation
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #49 from jaywink/fix-hcard-selectors 

Fix hcard selectors in parse_profile_from_hcard
merge-requests/130/head
Jason Robinson 2016-09-13 12:02:46 +03:00 zatwierdzone przez GitHub
rodzic 8e29497e91 476c6114ec
commit 9617a6e56b
2 zmienionych plików z 11 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
CHANGELOG.md
Wyświetl plik

@ -6,6 +6,9 @@
### Changed
* Deprecate receiving user `key` attribute for Diaspora protocol. Instead correct attribute is now `private_key` for any user passed to `federation.inbound.handle_receive`. We already use `private_key` in the message creation code so this is just to unify the user related required attributes.
* DEPRECATION: There is a fallback with `key` for user objects in the receiving payload part of the Diaspora protocol until 0.8.0.
### Fixes
* Loosen up hCard selectors when parsing profile from hCard document in `federation.utils.diaspora.parse_profile_from_hcard`. The selectors now match Diaspora upcoming federation documentation.
## [0.5.0] - 2016-09-05

16
federation/utils/diaspora.py
Wyświetl plik

@ -105,16 +105,16 @@ def parse_profile_from_hcard(hcard):
doc = html.fromstring(hcard)
domain = urlparse(_get_element_attr_or_none(doc, "a#pod_location", "href")).netloc
profile = Profile(
name=_get_element_text_or_none(doc, "dl.entity_full_name span.fn"),
name=_get_element_text_or_none(doc, ".fn"),
image_urls={
"small": _get_element_attr_or_none(doc, "dl.entity_photo_small img.photo", "src"),
"medium": _get_element_attr_or_none(doc, "dl.entity_photo_medium img.photo", "src"),
"large": _get_element_attr_or_none(doc, "dl.entity_photo img.photo", "src"),
"small": _get_element_attr_or_none(doc, ".entity_photo_small .photo", "src"),
"medium": _get_element_attr_or_none(doc, ".entity_photo_medium .photo", "src"),
"large": _get_element_attr_or_none(doc, ".entity_photo .photo", "src"),
},
public=True if _get_element_text_or_none(doc, "dl.entity_searchable span.searchable") == "true" else False,
handle="%s@%s" % (_get_element_text_or_none(doc, "dl.entity_nickname span.nickname"), domain),
guid=_get_element_text_or_none(doc, "dl.entity_uid span.uid"),
public_key=_get_element_text_or_none(doc, "dl.entity_key pre.key"),
public=True if _get_element_text_or_none(doc, ".searchable") == "true" else False,
handle="%s@%s" % (_get_element_text_or_none(doc, ".nickname"), domain),
guid=_get_element_text_or_none(doc, ".uid"),
public_key=_get_element_text_or_none(doc, ".key"),
)
return profile