Skip to content

Commit 85f979b

Browse files
author
am
committed
fix: reconcile native sidebar with channel write base
Signed-off-by: am <6e30cd56c30e030cd31bb0939b94a7c257c9a09d5ba2d92cf2735da45629f248@buzz.block.builderlab.xyz>
1 parent af31d3d commit 85f979b

7 files changed

Lines changed: 9 additions & 10 deletions

File tree

‎src-tauri/capabilities/default.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"allow-relay-kit-prepare",
1717
"allow-relay-kit-decode",
1818
"allow-relay-direct-message",
19-
2019
"allow-relay-decode-sidebar",
2120
"allow-relay-sign-sidebar",
2221
"allow-get-os-idle-seconds",

‎src-tauri/src/identity.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,8 @@ impl IdentityHost {
570570
let State::Ready(key) = &identity.state else {
571571
return Err("Set up your identity first".into());
572572
};
573-
let secret = nostr::SecretKey::from_slice(key.0.as_ref()).map_err(|_| INVALID)?;
574-
let public = nostr::Keys::new(secret.clone()).public_key();
573+
let secret = NostrSecretKey::from_slice(key.0.as_ref()).map_err(|_| INVALID)?;
574+
let public = Keys::new(secret.clone()).public_key();
575575
if encrypt {
576576
nostr::nips::nip44::encrypt(
577577
&secret,

‎src-tauri/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ use os_idle::get_os_idle_seconds;
1818
mod relay;
1919
use identity::{identity_create, identity_export, identity_import, identity_restore, IdentityHost};
2020
use relay::{
21-
relay_channel_publish, relay_channel_sign, relay_direct_message, relay_http, relay_kit_decode,
22-
relay_kit_prepare, relay_kit_sign, relay_sign, relay_workflow_runs,
21+
relay_channel_publish, relay_channel_sign, relay_decode_sidebar, relay_direct_message,
22+
relay_http, relay_kit_decode, relay_kit_prepare, relay_kit_sign, relay_sign,
23+
relay_sign_sidebar, relay_workflow_runs,
2324
};
24-
use relay::{relay_decode_sidebar, relay_http, relay_sign, relay_sign_sidebar, relay_workflow_runs};
2525
mod terminal;
2626
use agent_models::{agent_models_begin, agent_models_cancel, agent_models_run, ModelHost};
2727
mod goose_models;

‎src-tauri/src/relay.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ async fn verify_owned_event(host: &IdentityHost, event: &serde_json::Value) -> R
342342
}
343343

344344
fn verify_signature(event: &serde_json::Value) -> Result<()> {
345-
let parsed: nostr::Event =
345+
let parsed: nostr::event::Event =
346346
serde_json::from_value(event.clone()).map_err(|_| "Invalid outgoing signature")?;
347347
parsed
348348
.verify()

‎src-tauri/src/relay/channel_writes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ pub(crate) async fn relay_kit_decode(
192192
let viewer = host.viewer().await?;
193193
let mut decoded = Vec::with_capacity(events.len());
194194
for event in events {
195-
let raw: nostr::Event =
195+
let raw: nostr::event::Event =
196196
serde_json::from_value(event.clone()).map_err(|_| "Invalid channel recipe")?;
197197
raw.verify().map_err(|_| "Invalid channel recipe")?;
198198
if event.get("pubkey").and_then(Value::as_str) != Some(&viewer)

‎src/features/relay/native-sidebar.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ it("decodes four self-encrypted coordinates through the narrow IPC command", asy
154154
expect(invoke).toHaveBeenCalledWith("relay_decode_sidebar", {
155155
events: [...records.values()],
156156
});
157-
expect(transport.writer?.kinds).not.toContain(30078);
157+
// Main also grants purpose-bound channel recipes (kind 30078); sidebar writes stay on narrow IPC.
158+
expect(transport.writer?.kinds).toContain(30078);
158159
});
159160

160161
it("creates a section, moves a channel, stars, mutes and sorts with encrypted readback", async () => {

‎src/features/relay/native.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
type ReadTransport,
2525
type Signer,
2626
} from "./transport";
27-
import { PublishRejected } from "./outbox";
2827
import { nativeSidebar } from "./native-sidebar";
2928

3029
export const nativeWriteKinds = [

0 commit comments

Comments
 (0)