Redirect npub and nprofile to username if exists

handlers/nprofile.ts

@@ -1,6 +1,7 @@
 import { Context } from "@oak/oak";
 import { nip19 } from "@nostr/tools";
 import { log } from "../log.ts";
+import { lookupUsernameByPubkey } from "../ldap.ts";
 import { fetchProfileEvent } from "../nostr.ts";
 import { profilePageHtml } from "../html.ts"
 
@@ -10,12 +11,10 @@ const nprofileHandler = async function (ctx: Context) {
 
   try {
     const r = nip19.decode(nprofile);
-    const profileEvent = await fetchProfileEvent(r.data.pubkey);
+    const username = await lookupUsernameByPubkey(r.data.pubkey);
 
-    if (profileEvent) {
-      const html = profilePageHtml(profileEvent);
-
-      ctx.response.body = html;
+    if (username) {
+      ctx.response.redirect(`/@${username}`);
     } else {
       ctx.response.status = 404;
       ctx.response.body = "Not Found";

handlers/npub.ts

@@ -1,6 +1,7 @@
 import { Context } from "@oak/oak";
 import { nip19 } from "@nostr/tools";
 import { log } from "../log.ts";
+import { lookupUsernameByPubkey } from "../ldap.ts";
 import { fetchProfileEvent } from "../nostr.ts";
 import { profilePageHtml } from "../html.ts"
 
@@ -10,12 +11,10 @@ const npubHandler = async function (ctx: Context) {
 
   try {
     const r = nip19.decode(npub);
-    const profileEvent = await fetchProfileEvent(r.data);
+    const username = await lookupUsernameByPubkey(r.data);
 
-    if (profileEvent) {
-      const html = profilePageHtml(profileEvent);
-
-      ctx.response.body = html;
+    if (username) {
+      ctx.response.redirect(`/@${username}`);
     } else {
       ctx.response.status = 404;
       ctx.response.body = "Not Found";

handlers/username.ts

@@ -10,6 +10,12 @@ const usernameHandler = async function (ctx: Context) {
   const username = ctx.params.path.replace(/^@/, '');;
   const pubkey = await lookupPubkeyByUsername(username);
 
+  if (!pubkey) {
+    ctx.response.status = 404;
+    ctx.response.body = "Not Found";
+    return;
+  }
+
   try {
     const profileEvent = await fetchProfileEvent(pubkey);