From 6be9e90cebe5f005a4ef3d7bb96688b6b5cad40e Mon Sep 17 00:00:00 2001 From: netkas Date: Fri, 7 Mar 2025 21:50:23 -0500 Subject: [PATCH] Refactor getIncomingChannels to improve peer address validation logic https://github.com/nosial/Socialbox-PHP/issues/25 --- src/Socialbox/Managers/EncryptionChannelManager.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Socialbox/Managers/EncryptionChannelManager.php b/src/Socialbox/Managers/EncryptionChannelManager.php index 662d549..7e29edf 100644 --- a/src/Socialbox/Managers/EncryptionChannelManager.php +++ b/src/Socialbox/Managers/EncryptionChannelManager.php @@ -335,14 +335,15 @@ */ public static function getIncomingChannels(string|PeerAddress $peerAddress, int $page=1, int $limit=100): array { + if(is_string($peerAddress) && !Validator::validatePeerAddress($peerAddress)) + { + throw new InvalidArgumentException('Invalid Peer Address'); + } + if($peerAddress instanceof PeerAddress) { $peerAddress = $peerAddress->getAddress(); } - elseif(!Validator::validatePeerAddress($peerAddress)) - { - throw new InvalidArgumentException('Invalid Peer Address'); - } if($page < 1) {