diff --git a/app/activitypub/util.py b/app/activitypub/util.py index 49ef1332..782705cd 100644 --- a/app/activitypub/util.py +++ b/app/activitypub/util.py @@ -2349,7 +2349,7 @@ def resolve_remote_post(uri: str, community_id: int, announce_actor=None) -> Uni if post_request.status_code == 200: post_data = post_request.json() post_request.close() - # check again that it doesn't already exist (can happen with different but equivilent URLs) + # check again that it doesn't already exist (can happen with different but equivalent URLs) post = Post.query.filter_by(ap_id=post_data['id']).first() if post: return post diff --git a/app/community/routes.py b/app/community/routes.py index 2b57b942..bded84fd 100644 --- a/app/community/routes.py +++ b/app/community/routes.py @@ -139,7 +139,7 @@ def retrieve_remote_post(community_id: int): community = Community.query.get_or_404(community_id) if form.validate_on_submit(): address = form.address.data.strip() - new_post = resolve_remote_post(address, community_id) + new_post = resolve_remote_post(address, community_id) if new_post is None: flash(_('Post not found.'), 'warning') diff --git a/app/templates/community/community.html b/app/templates/community/community.html index d872a67a..43c37a88 100644 --- a/app/templates/community/community.html +++ b/app/templates/community/community.html @@ -148,12 +148,10 @@ {% endif %} {% if not community.is_local() %} -

- View community on original server -

-

- Retrieve a post from the original server -

+ {% endif %} {% if community.local_only %}

{{ _('Only people on %(instance_name)s can post or reply in this community.', instance_name=current_app.config['SERVER_NAME']) }}

diff --git a/app/templates/search/start.html b/app/templates/search/start.html index 6c81c1f5..f1a8ea48 100644 --- a/app/templates/search/start.html +++ b/app/templates/search/start.html @@ -52,7 +52,10 @@

{{ _('Results will have exactly that phrase in them.') }}

- +
{{ _('Trying to add a communitiy or post from another instance?') }}
+

{{ _('In many types of federated platforms you can put a URL of a post or community into the search in order to add it to your local instance. In PieFed the search is just for searching.') }}

+

{{ _('Add remote community') }}

+

{{ _('To add a post from a remote instance, find the community in PieFed then look for the "Retrieve a post from the original server" link.') }}