From b003845f39f70b99316f65921ae4f515765e0d1f Mon Sep 17 00:00:00 2001 From: netkas Date: Thu, 31 Oct 2024 12:18:44 -0400 Subject: [PATCH] Add `useDatabase` parameter to resolveDomain method --- src/Socialbox/Classes/ServerResolver.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Socialbox/Classes/ServerResolver.php b/src/Socialbox/Classes/ServerResolver.php index 29d25a1..3e3e8d6 100644 --- a/src/Socialbox/Classes/ServerResolver.php +++ b/src/Socialbox/Classes/ServerResolver.php @@ -19,19 +19,18 @@ class ServerResolver * @throws ResolutionException If the DNS TXT records cannot be resolved or if required information is missing. * @throws DatabaseOperationException */ - public static function resolveDomain(string $domain): ResolvedServer + public static function resolveDomain(string $domain, bool $useDatabase=true): ResolvedServer { // First query the database to check if the domain is already resolved - if(ResolvedServersManager::resolvedServerExists($domain)) + if($useDatabase) { - // If the resolved server was updated in the last 30 minutes, return it - if(ResolvedServersManager::getResolvedServerUpdated($domain) > (time() - 1800)) + $resolvedServer = ResolvedServersManager::getResolvedServer($domain); + if($resolvedServer !== null) { - return ResolvedServersManager::getResolvedServer($domain)->toResolvedServer(); + return $resolvedServer->toResolvedServer(); } } - $txtRecords = self::dnsGetTxtRecords($domain); if ($txtRecords === false) {