src/Socialbox/Classes/Configuration/InstanceConfiguration.php

@@ -47,7 +47,7 @@
          */
         public function getDomain(): ?string
         {
-            return strtolower($this->domain);
+            return $this->domain;
         }
 
         /**

src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php

@@ -34,18 +34,13 @@
             // Check if host is making the request & the identifier is not empty
             try
             {
-                $identifyAs = null;
                 if ($request->getPeer()->getUsername() === ReservedUsernames::HOST->value && $request->getIdentifyAs() !== null)
                 {
                     $identifyAs = $request->getIdentifyAs();
                 }
                 else
                 {
-                    $requestingPeer = $request->getPeer();
+                    $identifyAs = $request->getPeer()->getAddress();
-                    if($requestingPeer->getUsername() !== ReservedUsernames::HOST->value)
-                    {
-                        $identifyAs = $requestingPeer->getAddress();
-                    }
                 }
             }
             catch (DatabaseOperationException $e)

src/Socialbox/Objects/PeerAddress.php

@@ -20,8 +20,8 @@
          */
         public function __construct(string $username, string $domain)
         {
-            $this->username = strtolower($username);
+            $this->username = $username;
-            $this->domain = strtolower($domain);
+            $this->domain = $domain;
         }
 
         /**
@@ -78,6 +78,11 @@
          */
         public function isExternal(): bool
         {
+            if($this->isHost())
+            {
+                return false;
+            }
+
             return $this->domain !== Configuration::getInstanceConfiguration()->getDomain();
         }
 

src/Socialbox/Socialbox.php

@@ -978,12 +978,12 @@
          */
         public static function resolvePeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null): Peer
         {
-            if(strtolower($peerAddress->getDomain()) !== strtolower(Configuration::getInstanceConfiguration()->getDomain()))
+            if($peerAddress->getDomain() !== Configuration::getInstanceConfiguration()->getDomain())
             {
                 return self::resolveExternalPeer($peerAddress, $identifiedAs);
             }
 
-            if(strtolower($peerAddress->getUsername()) === strtolower(ReservedUsernames::HOST->value))
+            if($peerAddress->getUsername() === ReservedUsernames::HOST->value)
             {
                 return new Peer([
                     'address' => sprintf('%s@%s', ReservedUsernames::HOST->value, Configuration::getInstanceConfiguration()->getDomain()),

tests/Socialbox/AddressBookTest.php

@@ -767,7 +767,7 @@
 
             $contact = $johnClient->addressBookGetContact($aliceClient->getIdentifiedAs());
             $this->assertInstanceOf(Contact::class, $contact);
-            $this->assertEquals($aliceClient->getIdentifiedAs()->getAddress(), $contact->getAddress()->getAddress());
+            $this->assertEquals($aliceClient->getIdentifiedAs(), $contact->getAddress()->getAddress());
 
             $this->expectException(RpcException::class);
             $johnClient->addressBookGetContact('non-existent@coffee.com');