From cf36d79cad6537d6c25f33763157feea7149d55f Mon Sep 17 00:00:00 2001 From: yggverse Date: Sun, 5 May 2024 04:27:33 +0300 Subject: [PATCH] resolve static route in priority --- src/Controller/Server/Nex.php | 48 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/Controller/Server/Nex.php b/src/Controller/Server/Nex.php index 1efcdb1..4495cac 100644 --- a/src/Controller/Server/Nex.php +++ b/src/Controller/Server/Nex.php @@ -78,6 +78,15 @@ class Nex implements MessageComponentInterface // Route request switch (true) { + // Try static route settings + case isset($this->_config->route->{$request}): + + $response = file_get_contents( + $this->_config->route->{$request} + ); + + break; + // Chanel item case (bool) preg_match('/\/(?\d+)($|\.gmi)$/i', $request, $attribute): @@ -207,35 +216,24 @@ class Nex implements MessageComponentInterface // Not found default: - // Try static route settings - if (isset($this->_config->route->{$request})) - { - $response = file_get_contents( - $this->_config->route->{$request} - ); - } + // Create site map + $lines = []; - // Build site map - else + // Get channels + foreach ((array) $this->_database->getChannels() as $channel) { - $lines = []; - - // Get channels - foreach ((array) $this->_database->getChannels() as $channel) - { - $lines[] = sprintf( - '=> /%s %s', - $channel->alias, - $channel->title - ); - } - - // Build response - $response = implode( - PHP_EOL, - $lines + $lines[] = sprintf( + '=> /%s %s', + $channel->alias, + $channel->title ); } + + // Build response + $response = implode( + PHP_EOL, + $lines + ); } // Debug message event on enabled