Skip to content

Commit 144b4f6

Browse files
tlongwell-blocknpub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757
andauthored
fix(desktop): make invite QR downloadable (#2168)
Signed-off-by: npub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757 <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@sprout-oss.stage.blox.sqprod.co> Co-authored-by: npub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757 <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@sprout-oss.stage.blox.sqprod.co>
1 parent 4d58dea commit 144b4f6

7 files changed

Lines changed: 154 additions & 2 deletions

File tree

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export default defineConfig({
101101
"**/channel-sort.spec.ts",
102102
"**/identity-lost.spec.ts",
103103
"**/deep-link-invite.spec.ts",
104+
"**/invite-qr-download.spec.ts",
104105
"**/global-agent-config-screenshots.spec.ts",
105106
"**/doctor-states.spec.ts",
106107
"**/onboarding-avatar-skip.spec.ts",

‎desktop/src-tauri/src/commands/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ mod project_git_exec;
4040
mod project_git_workflow;
4141
mod project_repo_paths;
4242
mod project_terminal;
43+
mod qr_download;
4344
mod relay_members;
4445
mod relay_reconnect;
4546
mod social;
@@ -88,6 +89,7 @@ pub use project_git::*;
8889
pub use project_git_diff::*;
8990
pub use project_git_workflow::*;
9091
pub use project_terminal::*;
92+
pub use qr_download::*;
9193
pub use relay_members::*;
9294
pub use relay_reconnect::*;
9395
pub use social::*;
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
use base64::{engine::general_purpose::STANDARD, Engine as _};
2+
3+
use crate::commands::export_util::save_bytes_with_dialog;
4+
use crate::commands::media::sanitize_filename;
5+
use crate::commands::personas::PNG_MAGIC;
6+
7+
fn decode_png_data_url(data_url: &str) -> Result<Vec<u8>, String> {
8+
let encoded = data_url
9+
.strip_prefix("data:image/png;base64,")
10+
.ok_or_else(|| "invalid PNG data URL".to_string())?;
11+
let bytes = STANDARD
12+
.decode(encoded.trim())
13+
.map_err(|_| "invalid PNG data URL".to_string())?;
14+
if !bytes.starts_with(&PNG_MAGIC) {
15+
return Err("invalid PNG data URL".to_string());
16+
}
17+
Ok(bytes)
18+
}
19+
20+
/// Save a generated PNG data URL through the native save-file dialog.
21+
#[tauri::command]
22+
pub async fn save_png_data_url(
23+
data_url: String,
24+
filename: String,
25+
app: tauri::AppHandle,
26+
) -> Result<bool, String> {
27+
let bytes = decode_png_data_url(&data_url)?;
28+
let filename = sanitize_filename(&filename);
29+
save_bytes_with_dialog(&app, &filename, "PNG image", &["png"], &bytes).await
30+
}
31+
32+
#[cfg(test)]
33+
mod tests {
34+
use super::*;
35+
36+
#[test]
37+
fn decode_png_data_url_accepts_png_payload() {
38+
let encoded = STANDARD.encode([PNG_MAGIC.as_slice(), &[0, 1, 2]].concat());
39+
let bytes = decode_png_data_url(&format!("data:image/png;base64,{encoded}")).unwrap();
40+
assert!(bytes.starts_with(&PNG_MAGIC));
41+
}
42+
43+
#[test]
44+
fn decode_png_data_url_rejects_wrong_mime_or_bytes() {
45+
let png = STANDARD.encode(PNG_MAGIC);
46+
assert!(decode_png_data_url(&format!("data:image/jpeg;base64,{png}")).is_err());
47+
48+
let not_png = STANDARD.encode(b"not a png");
49+
assert!(decode_png_data_url(&format!("data:image/png;base64,{not_png}")).is_err());
50+
assert!(decode_png_data_url("data:image/png;base64,not-base64!").is_err());
51+
}
52+
}

‎desktop/src-tauri/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ pub fn run() {
745745
pick_and_upload_image,
746746
upload_media_bytes,
747747
download_image,
748+
save_png_data_url,
748749
download_file,
749750
fetch_media_bytes,
750751
copy_image_to_clipboard,

‎desktop/src/features/community-members/ui/InviteLinkSection.tsx‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { Check, Copy, Link2 } from "lucide-react";
2-
import { QRCodeSVG } from "qrcode.react";
2+
import { QRCodeCanvas } from "qrcode.react";
33
import * as React from "react";
44
import { toast } from "sonner";
55

66
import { mintInvite } from "@/shared/api/invites";
7+
import { invokeTauri } from "@/shared/api/tauri";
78
import { Button } from "@/shared/ui/button";
89
import {
910
DropdownMenu,
@@ -15,6 +16,11 @@ import {
1516
DropdownMenuTrigger,
1617
} from "@/shared/ui/dropdown-menu";
1718
import { writeTextToClipboard } from "@/shared/lib/clipboard";
19+
import {
20+
MediaContextMenu,
21+
type MediaContextMenuPosition,
22+
useDismissMediaContextMenu,
23+
} from "@/shared/ui/markdown/MediaContextMenu";
1824

1925
const TTL_OPTIONS: { label: string; value: number }[] = [
2026
{ label: "1 day", value: 24 * 60 * 60 },
@@ -48,6 +54,12 @@ export function InviteLinkSection() {
4854
expiresAt: number;
4955
} | null>(null);
5056
const [copied, setCopied] = React.useState(false);
57+
const [qrMenu, setQrMenu] = React.useState<MediaContextMenuPosition | null>(
58+
null,
59+
);
60+
const qrRef = React.useRef<HTMLCanvasElement | null>(null);
61+
const closeQrMenu = React.useCallback(() => setQrMenu(null), []);
62+
useDismissMediaContextMenu(Boolean(qrMenu), closeQrMenu);
5163

5264
const ttlLabel =
5365
TTL_OPTIONS.find((option) => option.value === ttlSecs)?.label ?? "3 days";
@@ -82,6 +94,20 @@ export function InviteLinkSection() {
8294
}
8395
}
8496

97+
async function handleDownloadQr() {
98+
closeQrMenu();
99+
const dataUrl = qrRef.current?.toDataURL("image/png");
100+
if (!dataUrl) return;
101+
try {
102+
await invokeTauri("save_png_data_url", {
103+
dataUrl,
104+
filename: "buzz-community-invite.png",
105+
});
106+
} catch (error) {
107+
toast.error(error instanceof Error ? error.message : "Download failed");
108+
}
109+
}
110+
85111
return (
86112
<div className="space-y-1.5">
87113
<span className="text-sm font-medium">Invite link</span>
@@ -160,10 +186,17 @@ export function InviteLinkSection() {
160186
{invite ? (
161187
<div className="flex flex-col gap-3 rounded-md border border-border/70 bg-background/70 p-3 sm:flex-row sm:items-center">
162188
<div className="shrink-0 self-center rounded-md bg-white p-2 text-black">
163-
<QRCodeSVG
189+
<QRCodeCanvas
190+
ref={qrRef}
164191
aria-label="Invite QR code"
165192
data-testid="invite-link-qr-code"
166193
level="M"
194+
onContextMenuCapture={(event) => {
195+
event.preventDefault();
196+
event.stopPropagation();
197+
event.nativeEvent.stopImmediatePropagation();
198+
setQrMenu({ x: event.clientX, y: event.clientY });
199+
}}
167200
size={128}
168201
value={invite.url}
169202
/>
@@ -185,6 +218,18 @@ export function InviteLinkSection() {
185218
until it expires.
186219
</p>
187220
)}
221+
{qrMenu ? (
222+
<MediaContextMenu
223+
dataAttributes={["data-invite-qr-context-menu"]}
224+
items={[
225+
{
226+
label: "Download image",
227+
onSelect: () => void handleDownloadQr(),
228+
},
229+
]}
230+
position={qrMenu}
231+
/>
232+
) : null}
188233
</div>
189234
);
190235
}

‎desktop/src/testing/e2eBridge.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10183,6 +10183,7 @@ export function maybeInstallE2eTauriMocks() {
1018310183
return buf;
1018410184
}
1018510185
case "download_image":
10186+
case "save_png_data_url":
1018610187
case "download_file":
1018710188
// The save dialog can't run headlessly; report a successful save so the
1018810189
// FileCard / image-menu click handlers resolve. Specs assert the
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import { expect, test } from "@playwright/test";
2+
3+
import { installMockBridge } from "../helpers/bridge";
4+
import { openSettings } from "../helpers/settings";
5+
6+
test.beforeEach(async ({ page }) => {
7+
await installMockBridge(page);
8+
await page.route("**/api/invites", async (route) => {
9+
await route.fulfill({
10+
contentType: "application/json",
11+
json: {
12+
code: "qr-download-test",
13+
expires_at: Math.floor(Date.now() / 1000) + 86_400,
14+
url: "buzz://join?relay=wss%3A%2F%2Frelay.example.com&code=qr-download-test",
15+
},
16+
status: 200,
17+
});
18+
});
19+
});
20+
21+
test("invite QR reuses the media menu and saves its PNG", async ({ page }) => {
22+
await page.goto("/");
23+
await openSettings(page, "community-members");
24+
await expect(page.getByTestId("settings-community-members")).toBeVisible();
25+
26+
await page.getByTestId("create-invite-link").click();
27+
const qrCode = page.getByTestId("invite-link-qr-code");
28+
await expect(qrCode).toBeVisible();
29+
30+
await qrCode.click({ button: "right", position: { x: 32, y: 32 } });
31+
const menu = page.locator("[data-invite-qr-context-menu]");
32+
await expect(menu).toBeVisible();
33+
await menu.getByRole("button", { name: "Download image" }).click();
34+
await expect(menu).not.toBeVisible();
35+
36+
const payload = await page.evaluate(() => {
37+
const log = (
38+
window as Window & {
39+
__BUZZ_E2E_COMMAND_LOG__?: Array<{
40+
command: string;
41+
payload: Record<string, unknown> | null;
42+
}>;
43+
}
44+
).__BUZZ_E2E_COMMAND_LOG__;
45+
return log?.find(({ command }) => command === "save_png_data_url")?.payload;
46+
});
47+
48+
expect(payload?.filename).toBe("buzz-community-invite.png");
49+
expect(payload?.dataUrl).toMatch(/^data:image\/png;base64,/);
50+
});

0 commit comments

Comments
 (0)