From 03f2c2489249c133bf54bc77f94eae9428250914 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Wed, 24 May 2023 17:27:46 +0200
Subject: [PATCH] small improvements

---
 activitypub.php                                   | 2 +-
 includes/class-activitypub.php                    | 1 +
 includes/model/class-blog-user.php                | 4 ++++
 includes/model/class-user.php                     | 4 ++--
 includes/rest/{class-user.php => class-users.php} | 2 +-
 includes/rest/class-webfinger.php                 | 3 +--
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename includes/rest/{class-user.php => class-users.php} (99%)

diff --git a/activitypub.php b/activitypub.php
index 0f9e8d3..81639b8 100644
--- a/activitypub.php
+++ b/activitypub.php
@@ -39,7 +39,7 @@ function init() {
 	Collection\Followers::init();
 
 	// Configure the REST API route
-	Rest\User::init();
+	Rest\Users::init();
 	Rest\Outbox::init();
 	Rest\Inbox::init();
 	Rest\Followers::init();
diff --git a/includes/class-activitypub.php b/includes/class-activitypub.php
index 6ebfcbf..ae178d3 100644
--- a/includes/class-activitypub.php
+++ b/includes/class-activitypub.php
@@ -97,6 +97,7 @@ class Activitypub {
 					return $template;
 				}
 			}
+
 			return $json_template;
 		}
 
diff --git a/includes/model/class-blog-user.php b/includes/model/class-blog-user.php
index e237fcc..c8df74d 100644
--- a/includes/model/class-blog-user.php
+++ b/includes/model/class-blog-user.php
@@ -88,4 +88,8 @@ class Blog_User extends User {
 
 		return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
 	}
+
+	public function get_public_key() {
+		return '';
+	}
 }
diff --git a/includes/model/class-user.php b/includes/model/class-user.php
index ba24a66..29b65bf 100644
--- a/includes/model/class-user.php
+++ b/includes/model/class-user.php
@@ -3,6 +3,7 @@ namespace Activitypub\Model;
 
 use WP_Query;
 use WP_Error;
+use Activitypub\Signature;
 use Activitypub\Model\User;
 use Activitypub\User_Factory;
 
@@ -121,8 +122,7 @@ class User {
 	}
 
 	public function get_public_key() {
-		//return Signature::get_public_key( $this->user_id );
-		return null;
+		return Signature::get_public_key( $this->user_id );
 	}
 
 	/**
diff --git a/includes/rest/class-user.php b/includes/rest/class-users.php
similarity index 99%
rename from includes/rest/class-user.php
rename to includes/rest/class-users.php
index 4bb3783..56a10bc 100644
--- a/includes/rest/class-user.php
+++ b/includes/rest/class-users.php
@@ -13,7 +13,7 @@ use Activitypub\User_Factory;
  *
  * @see https://www.w3.org/TR/activitypub/#followers
  */
-class User {
+class Users {
 	/**
 	 * Initialize the class, registering WordPress hooks
 	 */
diff --git a/includes/rest/class-webfinger.php b/includes/rest/class-webfinger.php
index 4f1d5cf..9b07a95 100644
--- a/includes/rest/class-webfinger.php
+++ b/includes/rest/class-webfinger.php
@@ -47,8 +47,7 @@ class Webfinger {
 	 */
 	public static function webfinger( $request ) {
 		$resource = $request->get_param( 'resource' );
-
-		$user = User_Factory::get_by_resource( $resource );
+		$user     = User_Factory::get_by_resource( $resource );
 
 		if ( is_wp_error( $user ) ) {
 			return $user;