indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Combine with setting hashtags from bio

merge-requests/30/head
Bob Mottram 2023-05-03 10:54:11 +01:00
parent a2c779acdf
commit 21e8fd8a6d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -7155,6 +7155,7 @@ class PubServer(BaseHTTPRequestHandler):
actor_changed = True actor_changed = True
# change user bio # change user bio
featured_tags = get_featured_hashtags(actor_json) + ' '
actor_json['tag'] = [] actor_json['tag'] = []
if fields.get('bio'): if fields.get('bio'):
if fields['bio'] != actor_json['summary']: if fields['bio'] != actor_json['summary']:
@ -7172,6 +7173,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.translate) self.server.translate)
if actor_tags: if actor_tags:
for _, tag in actor_tags.items(): for _, tag in actor_tags.items():
if tag['name'] + ' ' in featured_tags:
continue
actor_json['tag'].append(tag) actor_json['tag'].append(tag)
actor_changed = True actor_changed = True
else: else:
@ -7180,6 +7183,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
if check_name_and_bio: if check_name_and_bio:
redirect_path = 'previewAvatar' redirect_path = 'previewAvatar'
set_featured_hashtags(actor_json, featured_tags, True)
admin_nickname = \ admin_nickname = \
get_config_param(base_dir, 'admin') get_config_param(base_dir, 'admin')

8
person.py
View File

@ -1946,7 +1946,8 @@ def get_featured_hashtags(actor_json: {}) -> str:
return result.strip() return result.strip()
def set_featured_hashtags(actor_json: {}, hashtags: str) -> None: def set_featured_hashtags(actor_json: {}, hashtags: str,
append: bool = False) -> None:
"""sets featured hashtags """sets featured hashtags
""" """
separator_str = ' ' separator_str = ' '
@ -1986,4 +1987,7 @@ def set_featured_hashtags(actor_json: {}, hashtags: str) -> None:
continue continue
if tag_dict['type'] != 'Hashtag': if tag_dict['type'] != 'Hashtag':
result.append(tag_dict) result.append(tag_dict)
actor_json['tag'] = result if not append:
actor_json['tag'] = result
else:
actor_json['tag'] += result