diff options
| author | Erik Johnston <erikj@jki.re> | 2016-12-15 10:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 10:01:28 +0000 |
| commit | 4da3fc0ea070ad54e323c27f22cc67a5965ebd1a (patch) | |
| tree | fadb35dae7b6276937c0e88f0415aa3d52fb88f0 /synapse | |
| parent | Fixup membership query (diff) | |
| parent | Fix crash in url preview when html tag has no text (diff) | |
| download | synapse-4da3fc0ea070ad54e323c27f22cc67a5965ebd1a.tar.xz | |
Merge pull request #1701 from mbachry/fix-preview-crash
Fix crash in url preview
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 6a5a57102f..99760d622f 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -381,7 +381,10 @@ def _calc_og(tree, media_uri): if 'og:title' not in og: # do some basic spidering of the HTML title = tree.xpath("(//title)[1] | (//h1)[1] | (//h2)[1] | (//h3)[1]") - og['og:title'] = title[0].text.strip() if title else None + if title and title[0].text is not None: + og['og:title'] = title[0].text.strip() + else: + og['og:title'] = None if 'og:image' not in og: # TODO: extract a favicon failing all else |