small updates

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: aarch64-apple-darwin
@@ -66,3 +66,4 @@ jobs:
           releaseDraft: true
           prerelease: false
           args: ${{ matrix.settings.args }}
+          includeDebug: true

package.json

@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@ctrl/magnet-link": "^3.1.2",
+    "@getalby/sdk": "^2.4.0",
     "@nostr-dev-kit/ndk": "^0.8.23",
     "@nostr-fetch/adapter-ndk": "^0.12.2",
     "@radix-ui/react-alert-dialog": "^1.0.4",
@@ -30,13 +31,13 @@
     "@tanstack/react-query": "^4.33.0",
     "@tanstack/react-virtual": "3.0.0-beta.54",
     "@tauri-apps/api": "^1.4.0",
-    "@tiptap/extension-image": "^2.1.7",
+    "@tiptap/extension-image": "^2.1.8",
-    "@tiptap/extension-mention": "^2.1.7",
+    "@tiptap/extension-mention": "^2.1.8",
-    "@tiptap/extension-placeholder": "^2.1.7",
+    "@tiptap/extension-placeholder": "^2.1.8",
-    "@tiptap/pm": "^2.1.7",
+    "@tiptap/pm": "^2.1.8",
-    "@tiptap/react": "^2.1.7",
+    "@tiptap/react": "^2.1.8",
-    "@tiptap/starter-kit": "^2.1.7",
+    "@tiptap/starter-kit": "^2.1.8",
-    "@tiptap/suggestion": "^2.1.7",
+    "@tiptap/suggestion": "^2.1.8",
     "@void-cat/api": "^1.0.7",
     "dayjs": "^1.11.9",
     "destr": "^2.0.1",
@@ -50,7 +51,7 @@
     "qrcode.react": "^3.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.46.0",
+    "react-hook-form": "^7.46.1",
     "react-hotkeys-hook": "^4.4.1",
     "react-markdown": "^8.0.7",
     "react-player": "^2.12.0",
@@ -74,8 +75,8 @@
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
     "@types/youtube-player": "^5.5.7",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.5.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "@vitejs/plugin-react-swc": "^3.3.2",
     "autoprefixer": "^10.4.15",
     "clsx": "^2.0.0",

src-tauri/Cargo.lock

@@ -1494,6 +1494,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
 [[package]]
 name = "flate2"
 version = "1.0.27"
@@ -2416,9 +2422,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
  "either",
 ]
@@ -3129,9 +3135,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
 dependencies = [
  "cc",
  "libc",
@@ -4430,9 +4436,9 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
+checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85"
 dependencies = [
  "itertools",
  "nom",
@@ -4722,10 +4728,11 @@ dependencies = [
 
 [[package]]
 name = "stringprep"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
+ "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
 ]

src/app/auth/create/step-3.tsx

@@ -1,3 +1,4 @@
+import { NDKKind } from '@nostr-dev-kit/ndk';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
@@ -40,7 +41,7 @@ export function CreateStep3Screen() {
 
       const event = await publish({
         content: JSON.stringify(profile),
-        kind: 0,
+        kind: NDKKind.Metadata,
         tags: [],
       });
 
@@ -69,11 +70,15 @@ export function CreateStep3Screen() {
           <input type={'hidden'} {...register('banner')} value={banner} />
           <div className="relative">
             <div className="relative h-44 w-full bg-white/10 backdrop-blur-xl">
-              <Image
+              {banner ? (
-                src={banner}
+                <Image
-                alt="user's banner"
+                  src={banner}
-                className="h-full w-full object-cover"
+                  alt="user's banner"
-              />
+                  className="h-full w-full object-cover"
+                />
+              ) : (
+                <div className="h-full w-full bg-black/50" />
+              )}
               <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
                 <BannerUploader setBanner={setBanner} />
               </div>

src/app/auth/reset.tsx

@@ -2,7 +2,7 @@ import { appConfigDir } from '@tauri-apps/api/path';
 import { getPublicKey, nip19 } from 'nostr-tools';
 import { useState } from 'react';
 import { Resolver, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import { Stronghold } from 'tauri-plugin-stronghold-api';
 
 import { useStorage } from '@libs/storage/provider';
@@ -124,7 +124,7 @@ export function ResetScreen() {
                 {...register('privkey', { required: true })}
                 type="text"
                 placeholder="nsec..."
-                className="relative h-12 w-full rounded-lg bg-white/10 px-3.5 py-1 text-white !outline-none backdrop-blur-xl placeholder:text-white/10"
+                className="relative h-12 w-full rounded-lg bg-white/10 px-3.5 py-1 text-white !outline-none backdrop-blur-xl placeholder:text-white/50"
               />
             </div>
           </div>
@@ -137,7 +137,7 @@ export function ResetScreen() {
                 {...register('password', { required: true })}
                 type={passwordInput}
                 placeholder="min. 4 characters"
-                className="relative h-12 w-full rounded-lg bg-white/10 px-3.5 py-1 text-white !outline-none backdrop-blur-xl placeholder:text-white/10"
+                className="relative h-12 w-full rounded-lg bg-white/10 px-3.5 py-1 text-white !outline-none backdrop-blur-xl placeholder:text-white/50"
               />
               <button
                 type="button"
@@ -155,7 +155,7 @@ export function ResetScreen() {
               {errors.password && <p>{errors.password.message}</p>}
             </span>
           </div>
-          <div className="flex items-center justify-center">
+          <div className="flex flex-col items-center justify-center">
             <button
               type="submit"
               disabled={!isDirty || !isValid}
@@ -167,6 +167,12 @@ export function ResetScreen() {
                 'Continue →'
               )}
             </button>
+            <Link
+              to="/auth/unlock"
+              className="mt-1 inline-flex h-11 w-full items-center justify-center rounded-lg text-center text-white/50 hover:bg-white/10"
+            >
+              Back
+            </Link>
           </div>
         </form>
       </div>

src/app/auth/welcome.tsx

@@ -2,6 +2,7 @@ import { LogicalSize, getCurrent } from '@tauri-apps/api/window';
 import { useEffect } from 'react';
 import { Link } from 'react-router-dom';
 
+import { Frame } from '@shared/frame';
 import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
 
 export function WelcomeScreen() {
@@ -28,16 +29,16 @@ export function WelcomeScreen() {
   }, []);
 
   return (
-    <div className="flex h-screen w-full flex-col justify-between bg-white/10 backdrop-blur-xl">
+    <Frame className="flex h-screen w-full flex-col justify-between">
       <div className="flex flex-col gap-10 pt-16">
-        <div className="sflex flex-col gap-2 text-center">
+        <div className="flex flex-col gap-1.5 text-center">
-          <h1 className="text-3xl font-medium text-white">Welcome to Lume</h1>
+          <h1 className="text-3xl font-semibold text-white">Welcome to Lume</h1>
-          <h3 className="mx-auto w-2/3 text-white/50">
+          <p className="mx-auto w-2/3 leading-tight text-white/50">
             Let&apos;s get you up and connecting with all peoples around the world on
             Nostr
-          </h3>
+          </p>
         </div>
-        <div className="inline-flex w-full flex-col items-center gap-3 px-4 pb-10">
+        <div className="inline-flex w-full flex-col items-center gap-2 px-4 pb-10">
           <Link
             to="/auth/import"
             className="inline-flex h-11 w-2/3 items-center justify-between gap-2 rounded-lg bg-fuchsia-500 px-6 font-medium leading-none text-white hover:bg-fuchsia-600 focus:outline-none"
@@ -48,7 +49,7 @@ export function WelcomeScreen() {
           </Link>
           <Link
             to="/auth/create"
-            className="inline-flex h-11 w-2/3 items-center justify-center gap-2 rounded-lg bg-white/10 px-6 font-medium leading-none text-white/50 backdrop-blur-xl hover:bg-white/20 focus:outline-none"
+            className="inline-flex h-11 w-2/3 items-center justify-center gap-2 rounded-lg bg-white/10 px-6 font-medium leading-none text-white backdrop-blur-xl hover:bg-white/20 focus:outline-none"
           >
             Create new key
           </Link>
@@ -57,6 +58,6 @@ export function WelcomeScreen() {
       <div className="flex flex-1 items-end justify-center pb-10">
         <img src="/lume.png" alt="lume" className="h-auto w-1/3" />
       </div>
-    </div>
+    </Frame>
   );
 }

src/app/users/components/modal.tsx

@@ -1,6 +1,7 @@
 import { NDKEvent, NDKUserProfile } from '@nostr-dev-kit/ndk';
 import * as Dialog from '@radix-ui/react-dialog';
 import { useQueryClient } from '@tanstack/react-query';
+import { fetch } from '@tauri-apps/api/http';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
@@ -13,6 +14,12 @@ import { Image } from '@shared/image';
 
 import { useNostr } from '@utils/hooks/useNostr';
 
+interface NIP05 {
+  names: {
+    [key: string]: string;
+  };
+}
+
 export function EditProfileModal() {
   const queryClient = useQueryClient();
 
@@ -47,19 +54,26 @@ export function EditProfileModal() {
   });
 
   const verifyNIP05 = async (nip05: string) => {
-    const url = nip05.split('@');
+    const localPath = nip05.split('@')[0];
-    const username = url[0];
+    const service = nip05.split('@')[1];
-    const service = url[1];
+    const verifyURL = `https://${service}/.well-known/nostr.json?name=${localPath}`;
-    const verifyURL = `https://${service}/.well-known/nostr.json?name=${username}`;
 
     const res = await fetch(verifyURL, {
+      method: 'GET',
+      timeout: 10,
       headers: {
         'Content-Type': 'application/json; charset=utf-8',
       },
     });
 
-    console.log(res);
+    if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
-    return true;
+
+    const data = res.data as NIP05;
+    if (data.names) {
+      if (data.names[localPath] !== db.account.pubkey) return false;
+      return true;
+    }
+    return false;
   };
 
   const onSubmit = async (data: NDKUserProfile) => {

src/app/users/components/profile.tsx

@@ -91,7 +91,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
                   {user.about || user.bio}
                 </p>
               ) : (
-                <></>
+                <div />
               )}
               <UserStats pubkey={pubkey} />
             </div>

src/shared/bannerUploader.tsx

@@ -7,9 +7,7 @@ import { useImageUploader } from '@utils/hooks/useUploader';
 export function BannerUploader({
   setBanner,
 }: {
-  setBanner: Dispatch<
+  setBanner: Dispatch<SetStateAction<string>>;
-    SetStateAction<{ url: undefined | string; error?: undefined | string }>
-  >;
 }) {
   const upload = useImageUploader();
   const [loading, setLoading] = useState(false);
@@ -18,7 +16,7 @@ export function BannerUploader({
     setLoading(true);
     const image = await upload(null);
     if (image.url) {
-      setBanner(image);
+      setBanner(image.url);
     }
     setLoading(false);
   };

src/shared/nip05.tsx

@@ -25,7 +25,6 @@ export function NIP05({
       try {
         const localPath = nip05.split('@')[0];
         const service = nip05.split('@')[1];
-        // #TODO: use tauri native fetch to avoid CORS
         const verifyURL = `https://${service}/.well-known/nostr.json?name=${localPath}`;
 
         const res = await fetch(verifyURL, {

src/shared/notes/preview/link.tsx

@@ -49,7 +49,7 @@ export function LinkPreview({ urls }: { urls: string[] }) {
                   {data.title}
                 </h5>
                 {data.description && (
-                  <p className="line-clamp-3 break-words text-sm text-white/50">
+                  <p className="line-clamp-3 break-all text-sm text-white/50">
                     {data.description}
                   </p>
                 )}