From 572b1abae344729f1df3498992226af4c603d586 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Thu, 14 Mar 2024 21:29:27 -0700
Subject: [PATCH] resolver work continued

---
 src/Module/Apresolver.php | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Module/Apresolver.php b/src/Module/Apresolver.php
index ac1488059..b819a5181 100644
--- a/src/Module/Apresolver.php
+++ b/src/Module/Apresolver.php
@@ -30,9 +30,34 @@ class Apresolver extends Controller
             if (!($query && isset($query[0]['channel_id']))) {
                 http_status_exit(404, 'Not found');
             }
-            // @todo set link header in dest url
-            $mappedPath = z_root() . $this->mapObject(str_replace('did:ap:key:' . $key, '', $url), $query[0]);
-            goaway($mappedPath);
+            $mappedPath = $this->mapObject(str_replace('did:ap:key:' . $key, '', $url), $query[0]);
+            $localPath = ltrim($mappedPath, '/');
+            App::$cmd = $localPath;
+            $controller = ucfirst(substr($localPath, 0, strpos($localPath, '/')));
+            $module = new $controller;
+            App::$argv = explode('/', App::$cmd);
+
+            App::$argc = count(App::$argv);
+            if ((array_key_exists('0', App::$argv)) && strlen(App::$argv[0])) {
+                if (strpos(App::$argv[0],'.')) {
+                    $_REQUEST['module_format'] = substr(App::$argv[0],strpos(App::$argv[0], '.') + 1);
+                    App::$argv[0] =  substr(App::$argv[0], 0, strpos(App::$argv[0], '.'));
+                }
+
+                App::$module = str_replace(".", "_", App::$argv[0]);
+                App::$module = str_replace("-", "_", App::$module);
+                if (str_starts_with(App::$module, '_')) {
+                    App::$module = substr(App::$module, 1);
+                }
+            }
+            else {
+                App::$argc = 1;
+                App::$argv = ['home'];
+                App::$module = 'home';
+            }
+            
+            $module->init();
+
         }
     }