Compare commits
5 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a08fd9698f | ||
|
|
7d46dbd437 | ||
|
|
5f107299e3 | ||
|
|
c34133ded1 | ||
|
|
0d059cbbd3 |
@@ -53,3 +53,6 @@ shared = { path = "../shared" }
|
|||||||
tailwind_fuse = "0.3.2"
|
tailwind_fuse = "0.3.2"
|
||||||
js-sys = "0.3.85"
|
js-sys = "0.3.85"
|
||||||
base64 = "0.22.1"
|
base64 = "0.22.1"
|
||||||
|
serde-wasm-bindgen = "0.6.5"
|
||||||
|
leptos-use = "0.13"
|
||||||
|
codee = "0.2"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
|
use leptos_use::on_click_outside;
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn ContextMenu(
|
pub fn ContextMenu(
|
||||||
@@ -8,6 +9,10 @@ pub fn ContextMenu(
|
|||||||
on_close: Callback<()>,
|
on_close: Callback<()>,
|
||||||
on_action: Callback<(String, String)>, // (Action, Hash)
|
on_action: Callback<(String, String)>, // (Action, Hash)
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
|
let container_ref = create_node_ref::<html::Div>();
|
||||||
|
|
||||||
|
let _ = on_click_outside(container_ref, move |_| on_close.call(()));
|
||||||
|
|
||||||
let handle_action = move |action: &str| {
|
let handle_action = move |action: &str| {
|
||||||
let hash = torrent_hash.clone();
|
let hash = torrent_hash.clone();
|
||||||
let action_str = action.to_string();
|
let action_str = action.to_string();
|
||||||
@@ -22,16 +27,8 @@ pub fn ContextMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
// Backdrop to catch clicks outside
|
|
||||||
<div
|
|
||||||
class="fixed inset-0 z-[99] cursor-default"
|
|
||||||
role="button"
|
|
||||||
tabindex="-1"
|
|
||||||
on:click=move |_| on_close.call(())
|
|
||||||
on:contextmenu=move |e| e.prevent_default()
|
|
||||||
></div>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
|
node_ref=container_ref
|
||||||
class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
|
class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
|
||||||
style=format!("left: {}px; top: {}px", position.0, position.1)
|
style=format!("left: {}px; top: {}px", position.0, position.1)
|
||||||
on:contextmenu=move |e| e.prevent_default()
|
on:contextmenu=move |e| e.prevent_default()
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
|
use leptos_use::on_click_outside;
|
||||||
|
use leptos_use::storage::use_local_storage;
|
||||||
|
use codee::string::FromToStringCodec;
|
||||||
use shared::GlobalLimitRequest;
|
use shared::GlobalLimitRequest;
|
||||||
|
|
||||||
fn format_bytes(bytes: i64) -> String {
|
fn format_bytes(bytes: i64) -> String {
|
||||||
@@ -26,34 +29,19 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
let stats = store.global_stats;
|
let stats = store.global_stats;
|
||||||
|
|
||||||
let initial_theme = if let Some(win) = web_sys::window() {
|
// Use leptos-use for reactive localStorage management
|
||||||
if let Some(doc) = win.document() {
|
let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
|
||||||
doc.document_element()
|
|
||||||
.and_then(|el| el.get_attribute("data-theme"))
|
// Initialize with default if empty
|
||||||
.unwrap_or_else(|| "dark".to_string())
|
if current_theme.get_untracked().is_empty() {
|
||||||
} else {
|
set_current_theme.set("dark".to_string());
|
||||||
"dark".to_string()
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
"dark".to_string()
|
|
||||||
};
|
|
||||||
|
|
||||||
let (current_theme, set_current_theme) = create_signal(initial_theme);
|
|
||||||
|
|
||||||
|
// Automatically sync theme to document attribute
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
if let Some(win) = web_sys::window() {
|
let theme = current_theme.get().to_lowercase();
|
||||||
if let Some(storage) = win.local_storage().ok().flatten() {
|
if let Some(doc) = document().document_element() {
|
||||||
if let Ok(Some(stored_theme)) = storage.get_item("vibetorrent_theme") {
|
let _ = doc.set_attribute("data-theme", &theme);
|
||||||
let theme = stored_theme.to_lowercase();
|
|
||||||
set_current_theme.set(theme.clone());
|
|
||||||
if let Some(doc) = win.document() {
|
|
||||||
let _ = doc
|
|
||||||
.document_element()
|
|
||||||
.unwrap()
|
|
||||||
.set_attribute("data-theme", &theme);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -127,19 +115,20 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
set_active_dropdown.set(0);
|
set_active_dropdown.set(0);
|
||||||
};
|
};
|
||||||
|
|
||||||
view! {
|
// Refs for click outside detection
|
||||||
// Transparent overlay to close dropdowns when clicking outside
|
let down_ref = create_node_ref::<html::Div>();
|
||||||
<Show when=move || active_dropdown.get() != 0>
|
let up_ref = create_node_ref::<html::Div>();
|
||||||
<div
|
let theme_ref = create_node_ref::<html::Div>();
|
||||||
class="fixed inset-0 z-[98] cursor-default"
|
|
||||||
on:pointerdown=move |_| close_all()
|
|
||||||
></div>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
|
let _ = on_click_outside(down_ref, move |_| if active_dropdown.get_untracked() == 1 { close_all() });
|
||||||
|
let _ = on_click_outside(up_ref, move |_| if active_dropdown.get_untracked() == 2 { close_all() });
|
||||||
|
let _ = on_click_outside(theme_ref, move |_| if active_dropdown.get_untracked() == 3 { close_all() });
|
||||||
|
|
||||||
|
view! {
|
||||||
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
|
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
|
||||||
|
|
||||||
// --- DOWNLOAD SPEED DROPDOWN ---
|
// --- DOWNLOAD SPEED DROPDOWN ---
|
||||||
<div class="relative">
|
<div class="relative" node_ref=down_ref>
|
||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
title="Global Download Speed - Click to Set Limit"
|
title="Global Download Speed - Click to Set Limit"
|
||||||
@@ -192,7 +181,7 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
// --- UPLOAD SPEED DROPDOWN ---
|
// --- UPLOAD SPEED DROPDOWN ---
|
||||||
<div class="relative">
|
<div class="relative" node_ref=up_ref>
|
||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
title="Global Upload Speed - Click to Set Limit"
|
title="Global Upload Speed - Click to Set Limit"
|
||||||
@@ -245,7 +234,7 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="ml-auto flex items-center gap-4">
|
<div class="ml-auto flex items-center gap-4">
|
||||||
<div class="relative">
|
<div class="relative" node_ref=theme_ref>
|
||||||
<div
|
<div
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
title="Change Theme"
|
title="Change Theme"
|
||||||
@@ -275,14 +264,6 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
on:pointerdown=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
set_current_theme.set(theme.to_string());
|
set_current_theme.set(theme.to_string());
|
||||||
if let Some(win) = web_sys::window() {
|
|
||||||
if let Some(doc) = win.document() {
|
|
||||||
let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
|
|
||||||
}
|
|
||||||
if let Some(storage) = win.local_storage().ok().flatten() {
|
|
||||||
let _ = storage.set_item("vibetorrent_theme", theme);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close_all();
|
close_all();
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use wasm_bindgen::closure::Closure;
|
use leptos_use::use_timeout_fn;
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
use crate::store::{get_action_messages, show_toast_with_signal};
|
use crate::store::{get_action_messages, show_toast_with_signal};
|
||||||
use shared::NotificationLevel;
|
use shared::NotificationLevel;
|
||||||
|
|
||||||
@@ -423,58 +422,45 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let _t_hash = t.hash.clone();
|
let _t_hash = t.hash.clone();
|
||||||
let t_hash_click = t.hash.clone();
|
let t_hash_click = t.hash.clone();
|
||||||
|
|
||||||
let (timer_id, set_timer_id) = create_signal(Option::<i32>::None);
|
|
||||||
let t_hash_long = t.hash.clone();
|
let t_hash_long = t.hash.clone();
|
||||||
|
let leptos_use::UseTimeoutFnReturn { start, stop, .. } = use_timeout_fn(
|
||||||
let clear_timer = move || {
|
move |pos: (i32, i32)| {
|
||||||
if let Some(id) = timer_id.get_untracked() {
|
set_menu_position.set(pos);
|
||||||
window().clear_timeout_with_handle(id);
|
set_selected_hash.set(Some(t_hash_long.clone()));
|
||||||
set_timer_id.set(None);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let handle_touchstart = {
|
|
||||||
let t_hash = t_hash_long.clone();
|
|
||||||
move |e: web_sys::TouchEvent| {
|
|
||||||
clear_timer();
|
|
||||||
if let Some(touch) = e.touches().get(0) {
|
|
||||||
let x = touch.client_x();
|
|
||||||
let y = touch.client_y();
|
|
||||||
let hash = t_hash.clone();
|
|
||||||
|
|
||||||
let closure = Closure::wrap(Box::new(move || {
|
|
||||||
set_menu_position.set((x, y));
|
|
||||||
set_selected_hash.set(Some(hash.clone()));
|
|
||||||
set_menu_visible.set(true);
|
set_menu_visible.set(true);
|
||||||
|
|
||||||
// Haptic feedback (iOS Safari doesn't support vibrate)
|
// Haptic feedback
|
||||||
let navigator = window().navigator();
|
let navigator = window().navigator();
|
||||||
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
|
||||||
|
if vibrate.is_function() {
|
||||||
let _ = navigator.vibrate_with_duration(50);
|
let _ = navigator.vibrate_with_duration(50);
|
||||||
}
|
}
|
||||||
}) as Box<dyn Fn()>);
|
}
|
||||||
|
},
|
||||||
|
600.0,
|
||||||
|
);
|
||||||
|
|
||||||
let id = window()
|
let handle_touchstart = {
|
||||||
.set_timeout_with_callback_and_timeout_and_arguments_0(
|
let start = start.clone();
|
||||||
closure.as_ref().unchecked_ref(),
|
move |e: web_sys::TouchEvent| {
|
||||||
600
|
if let Some(touch) = e.touches().get(0) {
|
||||||
)
|
start((touch.client_x(), touch.client_y()));
|
||||||
.unwrap_or(0);
|
|
||||||
|
|
||||||
closure.forget();
|
|
||||||
set_timer_id.set(Some(id));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let handle_touchmove = move |_| {
|
let handle_touchmove = {
|
||||||
clear_timer();
|
let stop = stop.clone();
|
||||||
|
move |_| stop()
|
||||||
};
|
};
|
||||||
|
|
||||||
let handle_touchend = move |_| {
|
let handle_touchend = {
|
||||||
clear_timer();
|
let stop = stop.clone();
|
||||||
|
move |_| stop()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let handle_touchcancel = move |_| stop();
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div
|
<div
|
||||||
class=move || {
|
class=move || {
|
||||||
@@ -492,7 +478,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
on:touchstart=handle_touchstart
|
on:touchstart=handle_touchstart
|
||||||
on:touchmove=handle_touchmove
|
on:touchmove=handle_touchmove
|
||||||
on:touchend=handle_touchend
|
on:touchend=handle_touchend
|
||||||
on:touchcancel=handle_touchend
|
on:touchcancel=handle_touchcancel
|
||||||
>
|
>
|
||||||
<div class="card-body gap-3">
|
<div class="card-body gap-3">
|
||||||
<div class="flex justify-between items-start gap-2">
|
<div class="flex justify-between items-start gap-2">
|
||||||
|
|||||||
@@ -328,68 +328,47 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
|
|
||||||
// First, request notification permission if not already granted
|
// First, request notification permission if not already granted
|
||||||
let window = web_sys::window().expect("window should exist");
|
let window = web_sys::window().expect("window should exist");
|
||||||
let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
|
|
||||||
if notification_class.is_undefined() {
|
|
||||||
log::error!("Notification API not available");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check current permission
|
// Notification.permission is a static property, but web_sys exposes it via the Notification class instance or we check it manually.
|
||||||
let current_permission = js_sys::Reflect::get(¬ification_class, &"permission".into())
|
// Actually, Notification::permission() is a static method in web_sys.
|
||||||
.ok()
|
match web_sys::Notification::permission() {
|
||||||
.and_then(|p| p.as_string())
|
web_sys::NotificationPermission::Granted => {
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
if current_permission == "granted" {
|
|
||||||
log::info!("Notification permission already granted");
|
log::info!("Notification permission already granted");
|
||||||
true
|
}
|
||||||
} else if current_permission == "denied" {
|
web_sys::NotificationPermission::Denied => {
|
||||||
log::warn!("Notification permission was denied");
|
log::warn!("Notification permission was denied");
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
// Permission is "default" - need to request
|
|
||||||
log::info!("Requesting notification permission...");
|
|
||||||
if let Ok(request_fn) = js_sys::Reflect::get(¬ification_class, &"requestPermission".into()) {
|
|
||||||
if request_fn.is_function() {
|
|
||||||
let request_fn_typed = js_sys::Function::from(request_fn);
|
|
||||||
match request_fn_typed.call0(¬ification_class) {
|
|
||||||
Ok(promise_val) => {
|
|
||||||
let request_future = wasm_bindgen_futures::JsFuture::from(
|
|
||||||
js_sys::Promise::from(promise_val)
|
|
||||||
);
|
|
||||||
match request_future.await {
|
|
||||||
Ok(result) => {
|
|
||||||
let result_str = result.as_string().unwrap_or_default();
|
|
||||||
log::info!("Permission request result: {}", result_str);
|
|
||||||
result_str == "granted"
|
|
||||||
}
|
}
|
||||||
|
web_sys::NotificationPermission::Default => {
|
||||||
|
log::info!("Requesting notification permission...");
|
||||||
|
let permission_promise = match web_sys::Notification::request_permission() {
|
||||||
|
Ok(p) => p,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to request notification permission: {:?}", e);
|
log::error!("Failed to request notification permission: {:?}", e);
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::error!("Failed to call requestPermission: {:?}", e);
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log::error!("Cannot access Notification class");
|
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if !permission_granted {
|
match wasm_bindgen_futures::JsFuture::from(permission_promise).await {
|
||||||
log::warn!("Notification permission not granted, cannot subscribe to push");
|
Ok(val) => {
|
||||||
|
let permission = val.as_string().unwrap_or_default();
|
||||||
|
if permission != "granted" {
|
||||||
|
log::warn!("Notification permission denied by user");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
log::info!("Notification permission granted by user");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Failed to await notification permission: {:?}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
log::warn!("Unknown notification permission status");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
log::info!("Notification permission granted! Proceeding with push subscription...");
|
log::info!("Notification permission granted! Proceeding with push subscription...");
|
||||||
|
|
||||||
@@ -433,7 +412,6 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Get service worker registration
|
// Get service worker registration
|
||||||
let window = web_sys::window().expect("window should exist");
|
|
||||||
let navigator = window.navigator();
|
let navigator = window.navigator();
|
||||||
let service_worker = navigator.service_worker();
|
let service_worker = navigator.service_worker();
|
||||||
|
|
||||||
@@ -494,12 +472,14 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
.dyn_into::<web_sys::PushSubscription>()
|
.dyn_into::<web_sys::PushSubscription>()
|
||||||
.expect("should be PushSubscription");
|
.expect("should be PushSubscription");
|
||||||
|
|
||||||
// Get subscription JSON using toJSON() method
|
// PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
|
||||||
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
// Or we can use Reflect to call toJSON if we want the object directly.
|
||||||
|
// Let's use the robust way: call toJSON via Reflect but handle it gracefully.
|
||||||
|
let json_val = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
||||||
Ok(func) if func.is_function() => {
|
Ok(func) if func.is_function() => {
|
||||||
let json_func = js_sys::Function::from(func);
|
let json_func = js_sys::Function::from(func);
|
||||||
match json_func.call0(&push_subscription) {
|
match json_func.call0(&push_subscription) {
|
||||||
Ok(result) => result,
|
Ok(res) => res,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to call toJSON: {:?}", e);
|
log::error!("Failed to call toJSON: {:?}", e);
|
||||||
return;
|
return;
|
||||||
@@ -507,25 +487,30 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
log::error!("toJSON method not found on PushSubscription");
|
// Fallback: try to stringify the object directly
|
||||||
return;
|
// log::warn!("toJSON not found, trying JSON.stringify");
|
||||||
}
|
let json_str = match js_sys::JSON::stringify(&push_subscription) {
|
||||||
};
|
Ok(s) => s,
|
||||||
|
|
||||||
let json_value = match js_sys::JSON::stringify(&json_result) {
|
|
||||||
Ok(val) => val,
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to stringify subscription: {:?}", e);
|
log::error!("Failed to stringify subscription: {:?}", e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// Parse back to object to match our expected flow (slightly inefficient but safe)
|
||||||
|
match js_sys::JSON::parse(&String::from(json_str)) {
|
||||||
|
Ok(v) => v,
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Failed to parse stringified subscription: {:?}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let subscription_json_str = json_value.as_string().expect("should be string");
|
// Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
|
||||||
|
// Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
|
||||||
log::info!("Push subscription: {}", subscription_json_str);
|
// but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
|
||||||
|
let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
|
||||||
// Parse and send to backend
|
|
||||||
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
|
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to parse subscription JSON: {:?}", e);
|
log::error!("Failed to parse subscription JSON: {:?}", e);
|
||||||
@@ -533,37 +518,9 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extract endpoint and keys
|
// Send to backend (subscription_data is already the struct we need)
|
||||||
let endpoint = subscription_data
|
|
||||||
.get("endpoint")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("endpoint should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let keys_obj = subscription_data
|
|
||||||
.get("keys")
|
|
||||||
.expect("keys should exist");
|
|
||||||
|
|
||||||
let p256dh = keys_obj
|
|
||||||
.get("p256dh")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("p256dh should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let auth = keys_obj
|
|
||||||
.get("auth")
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.expect("auth should exist")
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let push_data = PushSubscriptionData {
|
|
||||||
endpoint,
|
|
||||||
keys: PushKeys { p256dh, auth },
|
|
||||||
};
|
|
||||||
|
|
||||||
// Send to backend
|
|
||||||
let response = match Request::post("/api/push/subscribe")
|
let response = match Request::post("/api/push/subscribe")
|
||||||
.json(&push_data)
|
.json(&subscription_data)
|
||||||
.expect("serialization should succeed")
|
.expect("serialization should succeed")
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
|
|||||||
Reference in New Issue
Block a user