reya/lume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: clean up

Browse Source
This commit is contained in:
reya
2024-11-08 09:02:57 +07:00
parent 50bf6c04c1
commit c6da06cd4d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src-tauri/src/commands/account.rs
View File

@@ -111,16 +111,23 @@ pub async fn connect_account(uri: String, state: State<'_, Nostr>) -> Result<Str
// Handle auth url // Handle auth url
nostr_connect.auth_url_handler(AuthHandler); nostr_connect.auth_url_handler(AuthHandler);
let bunker_uri = nostr_connect let keyring = Entry::new("Lume Safe Storage", &remote_npub).map_err(|err| err.to_string())?;
let reuse_bunker = nostr_connect
.bunker_uri() .bunker_uri()
.await .await
.map_err(|err| err.to_string())?; .map_err(|err| err.to_string())?;
let keyring = Entry::new("Lume Safe Storage", &remote_npub).map_err(|err| err.to_string())?; let mut reuse_uri = reuse_bunker.to_string();
if let Some(secret) = reuse_bunker.secret() {
let replace = format!("&secret={}", secret);
reuse_uri = reuse_uri.replace(replace.as_str(), "");
}
let account = Account { let account = Account {
secret_key: app_secret, secret_key: app_secret,
nostr_connect: Some(bunker_uri.to_string()), nostr_connect: Some(reuse_uri),
}; };
// Save secret key to keyring // Save secret key to keyring

2
src/routes/columns/_layout/launchpad.$id.lazy.tsx
View File

@@ -73,7 +73,7 @@ function Newsfeeds() {
: item.tags.find((tag) => tag[0] === "title")?.[1] || "Unnamed"; : item.tags.find((tag) => tag[0] === "title")?.[1] || "Unnamed";
const label = const label =
item.kind === 3 item.kind === 3
? `newsfeed-${id.slice(0, 5)}` ? `newsfeed-${item.pubkey.slice(0, 5)}`
: item.tags.find((tag) => tag[0] === "d")?.[1] || nanoid(); : item.tags.find((tag) => tag[0] === "d")?.[1] || nanoid();
return ( return (

6
src/routes/columns/_layout/notification.$id.lazy.tsx
View File

@@ -120,19 +120,19 @@ function Screen() {
> >
<Tabs.List className="h-11 shrink-0 flex items-center"> <Tabs.List className="h-11 shrink-0 flex items-center">
<Tabs.Trigger <Tabs.Trigger
className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50" className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
value="replies" value="replies"
> >
Replies Replies
</Tabs.Trigger> </Tabs.Trigger>
<Tabs.Trigger <Tabs.Trigger
className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50" className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
value="reactions" value="reactions"
> >
Reactions Reactions
</Tabs.Trigger> </Tabs.Trigger>
<Tabs.Trigger <Tabs.Trigger
className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-900 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-800 data-[state=inactive]:opacity-50" className="flex-1 inline-flex h-11 items-center justify-center gap-2 px-3 text-sm font-medium border-b border-neutral-100 dark:border-neutral-700 data-[state=active]:border-neutral-200 dark:data-[state=active]:border-neutral-600 data-[state=inactive]:opacity-50"
value="zaps" value="zaps"
> >
Zaps Zaps