From 465a912a706bed79e045dc0c555f477bf73d0c3b Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:08:51 +0200
Subject: [PATCH] fix user settings

---
 includes/class-webfinger.php | 1 +
 templates/user-settings.php  | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/class-webfinger.php b/includes/class-webfinger.php
index 4a3a1a6..9a53ac4 100644
--- a/includes/class-webfinger.php
+++ b/includes/class-webfinger.php
@@ -2,6 +2,7 @@
 namespace Activitypub;
 
 use WP_Error;
+use Activitypub\Collection\Users;
 
 /**
  * ActivityPub WebFinger Class
diff --git a/templates/user-settings.php b/templates/user-settings.php
index 24a6484..a98b6ce 100644
--- a/templates/user-settings.php
+++ b/templates/user-settings.php
@@ -1,3 +1,4 @@
+<?php $user = \Activitypub\Collection\Users::get_by_id( \get_current_user_id() ); ?>
 <h2 id="activitypub"><?php \esc_html_e( 'ActivityPub', 'activitypub' ); ?></h2>
 
 <table class="form-table">
@@ -8,11 +9,11 @@
 			</th>
 			<td>
 				<p>
-					<code><?php echo \esc_html( \Activitypub\get_webfinger_resource( \get_current_user_id() ) ); ?></code> or
-					<code><?php echo \esc_url( \get_author_posts_url( \get_current_user_id() ) ); ?></code>
+					<code><?php echo \esc_html( $user->get_resource() ); ?></code> or
+					<code><?php echo \esc_url( $user->get_url() ); ?></code>
 				</p>
 				<?php // translators: the webfinger resource ?>
-				<p class="description"><?php \printf( \esc_html__( 'Try to follow "@%s" by searching for it on Mastodon,Friendica & Co.', 'activitypub' ), \esc_html( \Activitypub\get_webfinger_resource( \get_current_user_id() ) ) ); ?></p>
+				<p class="description"><?php \printf( \esc_html__( 'Try to follow "@%s" by searching for it on Mastodon,Friendica & Co.', 'activitypub' ), \esc_html( $user->get_resource() ) ); ?></p>
 			</td>
 		</tr>
 		<tr class="activitypub-user-description-wrap">