michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

sanitize user display names #336

Browse source
This commit is contained in:
rimu 2024-10-10 19:46:55 +13:00
parent 522a607647
commit 1f18a05a4d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/activitypub/util.py
View file

@ -476,9 +476,9 @@ def refresh_user_profile_task(user_id):
{'user_id': user.id, {'user_id': user.id,
'indexable': new_indexable}) 'indexable': new_indexable})
user.user_name = activity_json['preferredUsername'] user.user_name = activity_json['preferredUsername'].strip()
if 'name' in activity_json: if 'name' in activity_json:
user.title = activity_json['name'] user.title = activity_json['name'].strip()
if 'summary' in activity_json: if 'summary' in activity_json:
about_html = activity_json['summary'] about_html = activity_json['summary']
if about_html is not None and not about_html.startswith('<'): # PeerTube if about_html is not None and not about_html.startswith('<'): # PeerTube
@ -565,7 +565,7 @@ def refresh_community_profile_task(community_id):
community.nsfw = activity_json['sensitive'] if 'sensitive' in activity_json else False community.nsfw = activity_json['sensitive'] if 'sensitive' in activity_json else False
if 'nsfl' in activity_json and activity_json['nsfl']: if 'nsfl' in activity_json and activity_json['nsfl']:
community.nsfl = activity_json['nsfl'] community.nsfl = activity_json['nsfl']
community.title = activity_json['name'] community.title = activity_json['name'].strip()
community.restricted_to_mods = activity_json['postingRestrictedToMods'] if 'postingRestrictedToMods' in activity_json else False community.restricted_to_mods = activity_json['postingRestrictedToMods'] if 'postingRestrictedToMods' in activity_json else False
community.new_mods_wanted = activity_json['newModsWanted'] if 'newModsWanted' in activity_json else False community.new_mods_wanted = activity_json['newModsWanted'] if 'newModsWanted' in activity_json else False
community.private_mods = activity_json['privateMods'] if 'privateMods' in activity_json else False community.private_mods = activity_json['privateMods'] if 'privateMods' in activity_json else False
@ -679,8 +679,8 @@ def refresh_community_profile_task(community_id):
def actor_json_to_model(activity_json, address, server): def actor_json_to_model(activity_json, address, server):
if activity_json['type'] == 'Person' or activity_json['type'] == 'Service': if activity_json['type'] == 'Person' or activity_json['type'] == 'Service':
try: try:
user = User(user_name=activity_json['preferredUsername'], user = User(user_name=activity_json['preferredUsername'].strip(),
title=activity_json['name'] if 'name' in activity_json else None, title=activity_json['name'].strip() if 'name' in activity_json else None,
email=f"{address}@{server}", email=f"{address}@{server}",
matrix_user_id=activity_json['matrixUserId'] if 'matrixUserId' in activity_json else '', matrix_user_id=activity_json['matrixUserId'] if 'matrixUserId' in activity_json else '',
indexable=activity_json['indexable'] if 'indexable' in activity_json else True, indexable=activity_json['indexable'] if 'indexable' in activity_json else True,
@ -756,8 +756,8 @@ def actor_json_to_model(activity_json, address, server):
if 'nsfl' in activity_json and activity_json['nsfl'] and not site.enable_nsfl: if 'nsfl' in activity_json and activity_json['nsfl'] and not site.enable_nsfl:
return None return None
community = Community(name=activity_json['preferredUsername'], community = Community(name=activity_json['preferredUsername'].strip(),
title=activity_json['name'], title=activity_json['name'].strip(),
nsfw=activity_json['sensitive'] if 'sensitive' in activity_json else False, nsfw=activity_json['sensitive'] if 'sensitive' in activity_json else False,
restricted_to_mods=activity_json['postingRestrictedToMods'] if 'postingRestrictedToMods' in activity_json else False, restricted_to_mods=activity_json['postingRestrictedToMods'] if 'postingRestrictedToMods' in activity_json else False,
new_mods_wanted=activity_json['newModsWanted'] if 'newModsWanted' in activity_json else False, new_mods_wanted=activity_json['newModsWanted'] if 'newModsWanted' in activity_json else False,

2
app/user/routes.py
View file

@ -117,7 +117,7 @@ def edit_profile(actor):
form = ProfileForm() form = ProfileForm()
old_email = user.email old_email = user.email
if form.validate_on_submit() and not current_user.banned: if form.validate_on_submit() and not current_user.banned:
current_user.title = form.title.data current_user.title = form.title.data.strip()
current_user.email = form.email.data.strip() current_user.email = form.email.data.strip()
# Email address has changed - request verification of new address # Email address has changed - request verification of new address
if form.email.data.strip() != old_email: if form.email.data.strip() != old_email: