From cf3dec5768d12e116477968d867f63d2b134162a Mon Sep 17 00:00:00 2001 From: rimu <3310831+rimu@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:44:10 +1200 Subject: [PATCH] profile_id or user_name.lower() everywhere #194 --- app/activitypub/routes.py | 14 +++++++------- app/activitypub/util.py | 2 +- app/admin/routes.py | 1 + app/cli.py | 4 ++-- app/community/routes.py | 6 +++--- app/models.py | 2 +- app/templates/base.html | 4 ++-- app/templates/user/_user_nav.html | 2 +- app/templates/user/filters.html | 2 +- app/templates/user/notifications.html | 2 +- app/templates/user/show_profile.html | 2 +- app/topic/routes.py | 2 +- app/user/routes.py | 10 +++++----- app/user/utils.py | 2 +- app/utils.py | 2 +- 15 files changed, 29 insertions(+), 28 deletions(-) diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index 52918213..8d99def9 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -255,17 +255,17 @@ def user_profile(actor): server = current_app.config['SERVER_NAME'] actor_data = { "@context": default_context(), "type": "Person" if not user.bot else "Service", - "id": f"https://{server}/u/{actor}", - "preferredUsername": actor, + "id": f"https://{server}/u/{actor.lower()}", + "preferredUsername": actor.lower(), "name": user.title if user.title else user.user_name, - "inbox": f"https://{server}/u/{actor}/inbox", - "outbox": f"https://{server}/u/{actor}/outbox", + "inbox": f"https://{server}/u/{actor.lower()}/inbox", + "outbox": f"https://{server}/u/{actor.lower()}/outbox", "discoverable": user.searchable, "indexable": user.indexable, "manuallyApprovesFollowers": False if not user.ap_manually_approves_followers else user.ap_manually_approves_followers, "publicKey": { - "id": f"https://{server}/u/{actor}#main-key", - "owner": f"https://{server}/u/{actor}", + "id": f"https://{server}/u/{actor.lower()}#main-key", + "owner": f"https://{server}/u/{actor.lower()}", "publicKeyPem": user.public_key # .replace("\n", "\\n") #LOOKSWRONG }, "endpoints": { @@ -1390,7 +1390,7 @@ def process_user_follow_request(request_json, activitypublog_id, remote_user_id) "type": "Accept", "id": f"https://{current_app.config['SERVER_NAME']}/activities/accept/" + gibberish(32) } - if post_request(remote_user.ap_inbox_url, accept, local_user.private_key, f"https://{current_app.config['SERVER_NAME']}/u/{local_user.user_name}#main-key"): + if post_request(remote_user.ap_inbox_url, accept, local_user.private_key, f"{local_user.profile_id()}#main-key"): activity_log.result = 'success' else: activity_log.exception_message = 'Error sending Accept' diff --git a/app/activitypub/util.py b/app/activitypub/util.py index 773783ca..74776ab3 100644 --- a/app/activitypub/util.py +++ b/app/activitypub/util.py @@ -496,7 +496,7 @@ def refresh_user_profile_task(user_id): {'user_id': user.id, 'indexable': new_indexable}) - user.user_name = activity_json['preferredUsername'] + user.user_name = activity_json['preferredUsername'].lower() if 'name' in activity_json: user.title = activity_json['name'] user.about_html = parse_summary(activity_json) diff --git a/app/admin/routes.py b/app/admin/routes.py index 6faa4f5d..54d676d1 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -726,6 +726,7 @@ def admin_users_add(): user = User() if form.validate_on_submit(): user.user_name = form.user_name.data + user.title = form.user_name.data user.set_password(form.password.data) user.about = form.about.data user.email = form.email.data diff --git a/app/cli.py b/app/cli.py index 7680ee29..eb9eb0c3 100644 --- a/app/cli.py +++ b/app/cli.py @@ -158,9 +158,9 @@ def register(app): admin_user.roles.append(admin_role) admin_user.verified = True admin_user.last_seen = utcnow() - admin_user.ap_profile_id = f"https://{current_app.config['SERVER_NAME']}/u/{admin_user.user_name}" + admin_user.ap_profile_id = f"https://{current_app.config['SERVER_NAME']}/u/{admin_user.user_name.lower()}" admin_user.ap_public_url = f"https://{current_app.config['SERVER_NAME']}/u/{admin_user.user_name}" - admin_user.ap_inbox_url = f"https://{current_app.config['SERVER_NAME']}/u/{admin_user.user_name}/inbox" + admin_user.ap_inbox_url = f"https://{current_app.config['SERVER_NAME']}/u/{admin_user.user_name.lower()}/inbox" db.session.add(admin_user) db.session.commit() diff --git a/app/community/routes.py b/app/community/routes.py index 4ff97afd..5d40ae36 100644 --- a/app/community/routes.py +++ b/app/community/routes.py @@ -386,7 +386,7 @@ def subscribe(actor): db.session.add(join_request) db.session.commit() follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{current_user.user_name}", + "actor": current_user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", @@ -426,7 +426,7 @@ def unsubscribe(actor): if '@' in actor: # this is a remote community, so activitypub is needed undo_id = f"https://{current_app.config['SERVER_NAME']}/activities/undo/" + gibberish(15) follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{current_user.user_name}", + "actor": current_user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", @@ -478,7 +478,7 @@ def join_then_add(actor): db.session.add(join_request) db.session.commit() follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{current_user.user_name}", + "actor": current_user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", diff --git a/app/models.py b/app/models.py index e2075c94..ac30fa65 100644 --- a/app/models.py +++ b/app/models.py @@ -836,7 +836,7 @@ class User(UserMixin, db.Model): join(CommunityMember).filter(CommunityMember.is_banned == False, CommunityMember.user_id == self.id).all() def profile_id(self): - result = self.ap_profile_id if self.ap_profile_id else f"https://{current_app.config['SERVER_NAME']}/u/{self.user_name}" + result = self.ap_profile_id if self.ap_profile_id else f"https://{current_app.config['SERVER_NAME']}/u/{self.user_name.lower()}" return result def public_url(self): diff --git a/app/templates/base.html b/app/templates/base.html index 67772d3c..65ce463e 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -192,9 +192,9 @@
  • - + diff --git a/app/templates/user/_user_nav.html b/app/templates/user/_user_nav.html index f8bb8122..261743da 100644 --- a/app/templates/user/_user_nav.html +++ b/app/templates/user/_user_nav.html @@ -4,7 +4,7 @@ {{ _('Settings') }} - + {{ _('Profile') }} diff --git a/app/templates/user/filters.html b/app/templates/user/filters.html index 8116c315..cb37eaab 100644 --- a/app/templates/user/filters.html +++ b/app/templates/user/filters.html @@ -72,7 +72,7 @@ {% for user in blocked_users %} - {{ user.display_name() }} + {{ user.display_name() }} {{ _('Unblock') }} {% endfor %} diff --git a/app/templates/user/notifications.html b/app/templates/user/notifications.html index 30b27786..7dd64054 100644 --- a/app/templates/user/notifications.html +++ b/app/templates/user/notifications.html @@ -51,7 +51,7 @@
    - {{ _('Profile') }} + {{ _('Profile') }}
    {{ _('Settings') }} diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html index 4fa8324c..6caedee6 100644 --- a/app/templates/user/show_profile.html +++ b/app/templates/user/show_profile.html @@ -151,7 +151,7 @@
    - {{ _('Profile') }} + {{ _('Profile') }}
    {{ _('Settings') }} diff --git a/app/topic/routes.py b/app/topic/routes.py index a29ad1b9..e03ef8ce 100644 --- a/app/topic/routes.py +++ b/app/topic/routes.py @@ -273,7 +273,7 @@ def send_community_follow(community_id, join_request_id, user_id): user = User.query.get(user_id) community = Community.query.get(community_id) follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}", + "actor": current_user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", diff --git a/app/user/routes.py b/app/user/routes.py index d69b6e25..bc988cc6 100644 --- a/app/user/routes.py +++ b/app/user/routes.py @@ -704,7 +704,7 @@ def import_settings_task(user_id, filename): db.session.add(join_request) db.session.commit() follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}", + "actor": current_user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", @@ -875,16 +875,16 @@ def fediverse_redirect(actor): if form.validate_on_submit(): redirect_url = '' if form.instance_type.data == 'mastodon': - redirect_url = f'https://{form.instance_url.data}/@{user.user_name}@{current_app.config["SERVER_NAME"]}' + redirect_url = f'https://{form.instance_url.data}/@{user.user_name.lower()}@{current_app.config["SERVER_NAME"]}' elif form.instance_type.data == 'lemmy': flash(_("Lemmy can't follow profiles, sorry"), 'error') return render_template('user/fediverse_redirect.html', form=form, user=user, send_to='', current_app=current_app) elif form.instance_type.data == 'friendica': - redirect_url = f'https://{form.instance_url.data}/search?q={user.user_name}@{current_app.config["SERVER_NAME"]}' + redirect_url = f'https://{form.instance_url.data}/search?q={user.user_name.lower()}@{current_app.config["SERVER_NAME"]}' elif form.instance_type.data == 'hubzilla': - redirect_url = f'https://{form.instance_url.data}/search?q={user.user_name}@{current_app.config["SERVER_NAME"]}' + redirect_url = f'https://{form.instance_url.data}/search?q={user.user_name.lower()}@{current_app.config["SERVER_NAME"]}' elif form.instance_type.data == 'pixelfed': - redirect_url = f'https://{form.instance_url.data}/i/results?q={user.user_name}@{current_app.config["SERVER_NAME"]}' + redirect_url = f'https://{form.instance_url.data}/i/results?q={user.user_name.lower()}@{current_app.config["SERVER_NAME"]}' resp = make_response(redirect(redirect_url)) resp.set_cookie('remote_instance_url', form.instance_url.data, expires=datetime(year=2099, month=12, day=30)) diff --git a/app/user/utils.py b/app/user/utils.py index 8b3b0727..ed988c74 100644 --- a/app/user/utils.py +++ b/app/user/utils.py @@ -93,7 +93,7 @@ def purge_user_then_delete_task(user_id): def unsubscribe_from_community(community, user): undo_id = f"https://{current_app.config['SERVER_NAME']}/activities/undo/" + gibberish(15) follow = { - "actor": f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}", + "actor": user.profile_id(), "to": [community.ap_profile_id], "object": community.ap_profile_id, "type": "Follow", diff --git a/app/utils.py b/app/utils.py index 4a54b5cf..ddf87dbb 100644 --- a/app/utils.py +++ b/app/utils.py @@ -753,7 +753,7 @@ def finalize_user_setup(user, application_required=False): user.public_key = public_key user.ap_profile_id = f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}".lower() user.ap_public_url = f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}" - user.ap_inbox_url = f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name}/inbox" + user.ap_inbox_url = f"https://{current_app.config['SERVER_NAME']}/u/{user.user_name.lower()}/inbox" db.session.commit() send_welcome_email(user, application_required)