Skip to content

Following: Improve follow error handling #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2025
Merged

Following: Improve follow error handling #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057fcde
Following: Improve follow error handling
obenland Jul 21, 2025
be066a2
Fix comma placement
obenland Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions includes/table/class-following.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function process_action() {
}
break;
case 'follow':
$redirect_to = \remove_query_arg( array( 's' ), $redirect_to );
$redirect_to = \remove_query_arg( array( 'resource', 's' ), $redirect_to );

if ( ! isset( $_REQUEST['activitypub-profile'], $_REQUEST['_wpnonce'] ) ) {
return;
Expand All @@ -125,7 +125,9 @@ public function process_action() {
$profile = \sanitize_text_field( \wp_unslash( $_REQUEST['activitypub-profile'] ) );
$result = follow( $profile, $this->user_id );
if ( \is_wp_error( $result ) ) {
\add_settings_error( 'activitypub', 'followed', $result->get_error_message() );
/* translators: %s: Account profile that could not be followed */
\add_settings_error( 'activitypub', 'followed', \sprintf( \__( 'Unable to follow account “%s”. Please verify the account exists and try again.', 'activitypub' ), \esc_html( $profile ) ) );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we maybe (also) change the origin error message to be more desciptive and enduser friendly?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think that would be good

$redirect_to = \add_query_arg( 'resource', $profile, $redirect_to );
} else {
\add_settings_error( 'activitypub', 'followed', \__( 'Account followed.', 'activitypub' ), 'success' );
}
Expand Down
5 changes: 2 additions & 3 deletions templates/following-list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<li><p><?php echo wp_kses_post( __( 'Profile link: <code>https://example.com/@username</code>', 'activitypub' ) ); ?></p></li>
</ul>

<p><?php echo esc_html__( '(Make sure the user you&rsquo;re following is part of the fediverse and supports ActivityPub)', 'activitypub' ); ?></p>
<p><?php echo esc_html__( '(Make sure the user you&#8217;re following is part of the fediverse and supports ActivityPub)', 'activitypub' ); ?></p>
</div>
</div>
</div>
Expand All @@ -78,11 +78,10 @@
</form>
<div class="edit-term-notes">
<strong><?php esc_html_e( 'About Followings', 'activitypub' ); ?></strong>
<p class="description"><?php esc_html_e( 'When you follow another author, a follow request is sent on your behalf. If you see &#8220;Pending,&#8221; it means your follow request hasn&#8217;t been accepted yet—so you aren&#8217;t following that author until they approve your request. This is a normal part of the ActivityPub protocol and helps ensure that authors have control over who follows them.', 'activitypub' ); ?></p>
<p class="description"><?php esc_html_e( 'When you follow another author, a follow request is sent on your behalf. If you see &#8220;Pending&#8221;, it means your follow request hasn&#8217;t been accepted yet&#8212;so you aren&#8217;t following that author until they approve your request. This is a normal part of the ActivityPub protocol and helps ensure that authors have control over who follows them.', 'activitypub' ); ?></p>
</div>
</div>
</div>
</div>
</div>
</div>

Loading