patrick/feediverse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged and resolved conflicts #18

Browse Source
This commit is contained in:
Ed Summers
2020-09-29 11:13:36 -04:00
parent 5515e7bd0c 45897295d1
commit 79be320e06
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
feediverse.py
View File

@ -191,8 +191,8 @@ def get_entry(entry, include_images, generator=None):
hashtags = [] hashtags = []
for tag in entry.get('tags', []): for tag in entry.get('tags', []):
for t in tag['term'].split(): t = tag['term'].replace(' ', '_').replace('.', '').replace('-', '')
hashtags.append('#' + t) hashtags.append('#{}'.format(t))
summary = entry.get('summary', '') summary = entry.get('summary', '')
content = entry.get('content', '') or '' content = entry.get('content', '') or ''
if content: if content:
@ -204,6 +204,10 @@ def get_entry(entry, include_images, generator=None):
links = [l for l in entry.links if l.get("type") == "text/html"] links = [l for l in entry.links if l.get("type") == "text/html"]
if links: if links:
url = links[0]["href"] url = links[0]["href"]
=======
t = tag['term'].replace(' ', '_').replace('.', '').replace('-', '')
hashtags.append('#{}'.format(t))
>>>>>>> steinarb/fix-space-in-hashtags
return { return {
'url': url, 'url': url,
'link': entry.link, 'link': entry.link,