added ability to set media class of items

AobaClient/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus = { version = "0.7.2", features = ["router"] }
+dioxus = { version = "0.7.3", features = ["router"] }
-serde = "1.0.219"
+serde = "1.0.228"
 serde_repr = "0.1.20"
 tonic = { version = "*", default-features = false, features = [
 	"codegen",
@@ -15,7 +15,8 @@ tonic = { version = "*", default-features = false, features = [
 ] }
 prost = "0.13"
 tonic-web-wasm-client = "0.7"
-web-sys = { version = "0.3.77", features = ["Storage", "Window"] }
+web-sys = { version = "0.3.91", features = ["Storage", "Window"] }
+dioxus-primitives = { git = "https://github.com/DioxusLabs/components", version = "0.0.1", default-features = false }
 
 [build-dependencies]
 tonic-build = { version = "*", default-features = false, features = ["prost"] }

AobaClient/assets/dx-components-theme.css

@@ -0,0 +1,83 @@
+/* This file contains the global styles for the styled dioxus components. You only
+ * need to import this file once in your project root.
+ */
+@import url("https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap");
+
+body {
+  padding: 0;
+  margin: 0;
+  background-color: var(--primary-color);
+  color: var(--secondary-color-4);
+  font-family: Inter, sans-serif;
+  font-optical-sizing: auto;
+  font-style: normal;
+  font-weight: 400;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --dark: initial;
+    --light: ;
+  }
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    --dark: ;
+    --light: initial;
+  }
+}
+
+:root {
+  /* Primary colors */
+  --primary-color: var(--dark, #000) var(--light, #fff);
+  --primary-color-1: var(--dark, #0e0e0e) var(--light, #fbfbfb);
+  --primary-color-2: var(--dark, #0a0a0a) var(--light, #fff);
+  --primary-color-3: var(--dark, #141313) var(--light, #f8f8f8);
+  --primary-color-4: var(--dark, #1a1a1a) var(--light, #f8f8f8);
+  --primary-color-5: var(--dark, #262626) var(--light, #f5f5f5);
+  --primary-color-6: var(--dark, #232323) var(--light, #e5e5e5);
+  --primary-color-7: var(--dark, #3e3e3e) var(--light, #b0b0b0);
+
+  /* Secondary colors */
+  --secondary-color: var(--dark, #fff) var(--light, #000);
+  --secondary-color-1: var(--dark, #fafafa) var(--light, #000);
+  --secondary-color-2: var(--dark, #e6e6e6) var(--light, #0d0d0d);
+  --secondary-color-3: var(--dark, #dcdcdc) var(--light, #2b2b2b);
+  --secondary-color-4: var(--dark, #d4d4d4) var(--light, #111);
+  --secondary-color-5: var(--dark, #a1a1a1) var(--light, #848484);
+  --secondary-color-6: var(--dark, #5d5d5d) var(--light, #d0d0d0);
+
+  /* Highlight colors */
+  --focused-border-color: var(--dark, #2b7fff) var(--light, #2b7fff);
+  --primary-success-color: var(--dark, #02271c) var(--light, #ecfdf5);
+  --secondary-success-color: var(--dark, #b6fae3) var(--light, #10b981);
+  --primary-warning-color: var(--dark, #342203) var(--light, #fffbeb);
+  --secondary-warning-color: var(--dark, #feeac7) var(--light, #f59e0b);
+  --primary-error-color: var(--dark, #a22e2e) var(--light, #dc2626);
+  --secondary-error-color: var(--dark, #9b1c1c) var(--light, #ef4444);
+  --contrast-error-color: var(--dark, var(--secondary-color-3))
+    var(--light, var(--primary-color));
+  --primary-info-color: var(--dark, var(--primary-color-5))
+    var(--light, var(--primary-color));
+  --secondary-info-color: var(--dark, var(--primary-color-7))
+    var(--light, var(--secondary-color-3));
+}
+
+/* Modern browsers with `scrollbar-*` support */
+@supports (scrollbar-width: auto) {
+  :not(:hover) {
+    scrollbar-color: rgb(0 0 0 / 0%) rgb(0 0 0 / 0%);
+  }
+
+  :hover {
+    scrollbar-color: var(--secondary-color-2) rgb(0 0 0 / 0%);
+  }
+}
+
+/* Legacy browsers with `::-webkit-scrollbar-*` support */
+@supports selector(::-webkit-scrollbar) {
+  :root::-webkit-scrollbar-track {
+    background: transparent;
+  }
+}

AobaClient/assets/style/dx-components.scss

@@ -0,0 +1,10 @@
+@import "colors";
+div[role="menu"] {
+	backdrop-filter: blur(10px) brightness(0.5) grayscale(1);
+	display: flex;
+	flex-direction: column;
+	max-width: 300px;
+	width: auto;
+	outline: none;
+	width: max-content;
+}

AobaClient/assets/style/main.scss

@@ -21,6 +21,8 @@
 	top: 0;
 	position: sticky;
 	z-index: 100;
+	backdrop-filter: blur(20px);
+	box-shadow: 0 3px 10px $mainBGColor;
 }
 
 body {
@@ -110,6 +112,14 @@ $mediaItemSize: 300px;
 
 		&.placeholder {
 		}
+
+		&.nsfw img {
+			filter: blur(20px);
+			transition: filter 0.25s ease-out;
+		}
+		&.nsfw:hover img {
+			filter: blur(0px);
+		}
 	}
 }
 
@@ -168,40 +178,48 @@ form {
 		flex-direction: column;
 		max-width: 300px;
 	}
-
+}
-	.contextItem {
+.contextItem {
 	border-left: 4px solid $featureColor;
 	$size: 30px;
 	display: grid;
-		grid-template-columns: $size 1fr auto;
+	grid-template-columns: $size 1fr;
+	grid-template-areas: "Icon Label";
 	height: $size;
 	transition: border 0.1s ease-out;
 	cursor: default;
+	width: 100%;
 
 	&.clickable {
 		cursor: pointer;
 	}
 
 	.label {
+		grid-area: Label;
 		display: flex;
 		align-items: center;
 		padding: 5px 10px;
 	}
 
+	.icon {
+		grid-area: Icon;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
 	&:hover {
 		background-color: $accentColor;
 		color: $invertTextColor;
 		border-left: 10px solid $focusColor;
 	}
-	}
 }
-
 .pagination {
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	gap: 5;
-	padding: 2px;
+	padding: 10px;
 
 	a {
 		transition: all 0.25s ease-out;

AobaClient/src/components/context_menu.rs

@@ -1,97 +0,0 @@
-use core::str;
-
-use dioxus::prelude::*;
-
-mod props {
-	use dioxus::prelude::*;
-
-	#[derive(PartialEq, Clone, Props)]
-	pub struct ContextMenu {
-		pub top: f64,
-		pub left: f64,
-		pub items: Element,
-	}
-
-	#[derive(PartialEq, Clone, Props, Default)]
-	pub struct ContextMenuItem {
-		pub name: String,
-		pub sub_items: Option<Element>,
-		pub onclick: Option<EventHandler<MouseEvent>>,
-	}
-}
-
-#[derive(Clone, Copy, Default)]
-pub struct ContextMenuRenderer {
-	pub menu: Signal<Option<Element>>,
-}
-
-impl ContextMenuRenderer {
-	pub fn close(&mut self) {
-		self.menu.set(None);
-	}
-
-	pub fn render(&self) -> Element {
-		if let Some(menu) = self.menu.cloned() {
-			rsx! {
-				{menu}
-			}
-		} else {
-			rsx! {}
-		}
-	}
-}
-
-#[component]
-pub fn ContextMenuRoot() -> Element {
-	let renderer = use_context::<ContextMenuRenderer>();
-	rsx! {
-		{renderer.render()}
-	}
-}
-
-#[component]
-pub fn ContextMenu(props: props::ContextMenu) -> Element {
-	rsx! {
-		div {
-			class: "contextMenu",
-			style: "left: {props.left}px; top: {props.top}px;",
-			ItemList { items: props.items }
-		}
-	}
-}
-
-#[component]
-fn ItemList(items: Element) -> Element {
-	rsx! {
-		div{
-			class: "itemList",
-			{items}
-		}
-	}
-}
-
-#[component]
-pub fn ContextMenuItem(props: props::ContextMenuItem) -> Element {
-	let mut renderer = use_context::<ContextMenuRenderer>();
-	if let Some(_sub) = props.sub_items {
-		todo!("Sub Menu");
-	}
-	rsx! {
-		div{
-			onclick: move |e|{
-				if let Some(handler) = props.onclick{
-					handler.call(e);
-				}
-				renderer.close();
-			},
-			class: "contextItem",
-			div {
-				class: "icon"
-			},
-			div {
-				class: "label",
-				{props.name}
-			}
-		}
-	}
-}

AobaClient/src/components/context_menu/component.rs

@@ -0,0 +1,64 @@
+use dioxus::prelude::*;
+use dioxus_primitives::context_menu::{
+    self, ContextMenuContentProps, ContextMenuItemProps, ContextMenuProps, ContextMenuTriggerProps,
+};
+
+#[component]
+pub fn ContextMenu(props: ContextMenuProps) -> Element {
+    rsx! {
+        document::Link { rel: "stylesheet", href: asset!("./style.css") }
+        context_menu::ContextMenu {
+            disabled: props.disabled,
+            open: props.open,
+            default_open: props.default_open,
+            on_open_change: props.on_open_change,
+            roving_loop: props.roving_loop,
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}
+
+#[component]
+pub fn ContextMenuTrigger(props: ContextMenuTriggerProps) -> Element {
+    rsx! {
+        context_menu::ContextMenuTrigger {
+            padding: "20px",
+            background: "var(--primary-color)",
+            border: "1px dashed var(--primary-color-6)",
+            border_radius: ".5rem",
+            cursor: "context-menu",
+            user_select: "none",
+            text_align: "center",
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}
+
+#[component]
+pub fn ContextMenuContent(props: ContextMenuContentProps) -> Element {
+    rsx! {
+        context_menu::ContextMenuContent {
+            class: "context-menu-content",
+            id: props.id,
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}
+
+#[component]
+pub fn ContextMenuItem(props: ContextMenuItemProps) -> Element {
+    rsx! {
+        context_menu::ContextMenuItem {
+            class: "context-menu-item",
+            disabled: props.disabled,
+            value: props.value,
+            index: props.index,
+            on_select: props.on_select,
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}

AobaClient/src/components/context_menu/mod.rs

@@ -0,0 +1,2 @@
+mod component;
+pub use component::*;

AobaClient/src/components/context_menu/style.css

@@ -0,0 +1,71 @@
+.context-menu-content {
+  z-index: 1000;
+  min-width: 220px;
+  padding: 0.25rem;
+  border-radius: 0.5rem;
+  background: var(--dark, var(--primary-color-5))
+    var(--light, var(--primary-color));
+  box-shadow: inset 0 0 0 1px var(--dark, var(--primary-color-7))
+    var(--light, var(--primary-color-6));
+  opacity: 0;
+  pointer-events: none;
+  will-change: transform, opacity;
+}
+
+.context-menu-content[data-state="closed"] {
+  animation: context-menu-animate-out 150ms ease-in forwards;
+}
+
+@keyframes context-menu-animate-out {
+  0% {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+
+  100% {
+    opacity: 0;
+    transform: scale(0.95) translateY(-2px);
+  }
+}
+
+.context-menu-content[data-state="open"] {
+  animation: context-menu-animate-in 150ms ease-out forwards;
+}
+
+@keyframes context-menu-animate-in {
+  0% {
+    opacity: 0;
+    transform: scale(0.95) translateY(-2px);
+  }
+
+  100% {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+.context-menu-item {
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  border-radius: calc(0.5rem - 0.25rem);
+  color: var(--secondary-color-4);
+  cursor: pointer;
+  font-size: 14px;
+  outline: none;
+  transition: background-color 100ms ease-out;
+  user-select: none;
+}
+
+.context-menu-item[data-disabled="true"] {
+  color: var(--secondary-color-5);
+  cursor: not-allowed;
+}
+
+.context-menu-item:hover:not([data-disabled="true"]),
+.context-menu-item:focus-visible {
+  background: var(--light, var(--primary-color-4))
+    var(--dark, var(--primary-color-7));
+  color: var(--light, var(--secondary-color-1))
+    var(--dark, var(--secondary-color-4));
+}

AobaClient/src/components/media_item.rs

@@ -1,73 +1,53 @@
 use dioxus::prelude::*;
+use dioxus_primitives::context_menu::{ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger};
+use tonic::{Response, Status};
 use web_sys::window;
 
 use crate::{
 	HOST,
-	components::{ContextMenu, ContextMenuItem, ContextMenuRenderer},
+	route::Route,
-	rpc::aoba::MediaModel,
+	rpc::{
+		aoba::{Id, MediaClass, MediaModel, SetMediaClassRequest},
+		get_rpc_client,
+	},
 };
 
 #[derive(PartialEq, Clone, Props)]
-pub struct MediaItemProps {
+pub struct MediaItemProps
+{
 	pub item: Option<MediaModel>,
 	// pub oncontextmenu: Option<EventHandler<Event<MouseData>>>,
 }
 
 #[component]
-pub fn MediaItem(props: MediaItemProps) -> Element {
+pub fn MediaItem(props: MediaItemProps) -> Element
-	let mut ct_renderer = use_context::<ContextMenuRenderer>();
+{
-
+	let mut class_signal = use_signal(|| "");
-	if let Some(item) = props.item {
+	if let Some(item) = props.item
+	{
 		let mtype = item.media_type().as_str_name();
 		let filename = item.file_name;
 		let id = item.id.unwrap().value;
 		let thumb = item.thumb_url;
+		let class = item.class;
 		let url = item.media_url;
 		let download = format!("{HOST}{url}");
 
-		let oncontext = move |event: Event<MouseData>| {
+		match class
-			println!("ContextMenu");
+		{
-			event.prevent_default();
+			1 => class_signal.set("nsfw"),
-			event.stop_propagation();
+			2 => class_signal.set("secret"),
-			let data = event.data();
+			_ => class_signal.set(""),
-			if data.modifiers().ctrl() {
-				return;
-			}
-			let pos = data.coordinates().client();
-			let left = pos.x;
-			let top = pos.y;
-			let download = download.clone();
-
-			let menu: Element = rsx! {
-				ContextMenu {
-					left: left,
-					top: top,
-					items: rsx! {
-						ContextMenuItem {
-							name: "Details",
-						},
-						ContextMenuItem {
-							name: "Download",
-							onclick: move |_|{
-								_ = window().unwrap().open_with_url_and_target(&download, "_blank");
-							}
-						},
-						ContextMenuItem {
-							name: "Delete",
-						},
-					},
-				}
-			};
-			ct_renderer.menu.set(Some(menu));
 		};
 
 		return rsx! {
+			ContextMenu{
+				ContextMenuTrigger{
 					a {
-				class: "mediaItem",
+						class: "mediaItem {class_signal()}",
 						href: "{HOST}{url}",
 						target: "_blank",
-				oncontextmenu: oncontext,
+						"data-id" : id.clone(),
-				"data-id" : id,
 						img { src: "{HOST}{thumb}" }
 						span { class: "info",
 							span { class: "name", "{filename}" }
@@ -77,8 +57,115 @@ pub fn MediaItem(props: MediaItemProps) -> Element {
 							}
 						}
 					},
+				},
+				ContextMenuContent{
+					ContextMenuItem {
+						index: 0 as usize,
+						value: id.clone(),
+						on_select: move |id: String|{
+							window().expect("Failed to get window")
+								.location().set_href(&format!("/media/{}", id))
+								.expect("Failed to open Url");
+						},
+						div{
+							class: "contextItem",
+							div{
+								class: "label",
+								"Details"
+							}
+						}
+					},
+					ContextMenuItem {
+						index: 1 as usize,
+						value: "{download}",
+						on_select: move |url: String|{
+							window().expect("Failed to get window").open_with_url_and_target(&url, "_blank").expect("Failed to open url");
+						},
+						div{
+							class: "contextItem",
+							div{
+								class: "label",
+								"Download"
+							}
+						}
+					},
+					{
+						if class != 0 {
+							rsx!{ContextMenuItem {
+								index: 2 as usize,
+								value: "{id}",
+								on_select: async |id: String|{
+									_ = set_class(id, 0).await;
+								},
+								div{
+									class: "contextItem",
+									div{
+										class: "label",
+										"Mark Standard"
+									}
+								}
+							}}
+						}else{
+							rsx!{}
+						}
+					}
+					{
+						if class != 1 {
+							rsx!{ContextMenuItem {
+								index: 2 as usize,
+								value: "{id}",
+								on_select: async |id: String|{
+									_ = set_class(id, 1).await;
+								},
+								div{
+									class: "contextItem",
+									div{
+										class: "label",
+										"Mark NSFW"
+									}
+								}
+							}}
+						}else{
+							rsx!{}
+						}
+					}
+					{
+						if class != 1 {
+							rsx!{ContextMenuItem {
+								index: 2 as usize,
+								value: "{id}",
+								on_select: async |id: String|{
+									_ = set_class(id, 2).await;
+								},
+								div{
+									class: "contextItem",
+									div{
+										class: "label",
+										"Mark Secret"
+									}
+								}
+							}}
+						}else{
+							rsx!{}
+						}
+					}
+					ContextMenuItem {
+						index: 2 as usize,
+						value: "",
+						div{
+							class: "contextItem",
+							div{
+								class: "label",
+								"Delete"
+							}
+						}
+					},
+				}
+			}
 		};
-	} else {
+	}
+	else
+	{
 		return rsx! {
 			div { class: "mediaItem placeholder",
 				img { },
@@ -93,3 +180,14 @@ pub fn MediaItem(props: MediaItemProps) -> Element {
 		};
 	}
 }
+
+async fn set_class(id: String, class: i32) -> Result<Response<()>, Status>
+{
+	let mut client = get_rpc_client();
+	return client
+		.set_media_class(SetMediaClassRequest {
+			class: class,
+			id: Some(Id { value: id }),
+		})
+		.await;
+}

AobaClient/src/components/mod.rs

@@ -1,18 +1,21 @@
 pub mod basic;
-mod context_menu;
+// mod context_menu;
+mod icons;
 mod media_grid;
 mod media_item;
 mod metrics_token;
 mod navbar;
 mod notif;
 mod pagination;
+mod passkey;
 mod search;
-pub use context_menu::*;
+// pub use context_menu::*;
 pub use media_grid::*;
 pub use media_item::*;
 pub use metrics_token::*;
 pub use navbar::*;
 pub use notif::*;
 pub use pagination::*;
+pub use passkey::*;
 pub use search::*;
-mod icons;
+pub mod radio_group;

AobaClient/src/components/pagination.rs

@@ -1,7 +1,9 @@
 use dioxus::prelude::*;
+use web_sys::window;
 
 #[component]
-pub fn Pagination(page: Signal<i32>, max_page: Signal<i32>, item_count: Signal<i32>) -> Element {
+pub fn Pagination(page: Signal<i32>, max_page: Signal<i32>, item_count: Signal<i32>) -> Element
+{
 	let cur_page_val = page.cloned();
 	let max_page_val = max_page.cloned();
 	let item_count_val = item_count.cloned();
@@ -9,22 +11,47 @@ pub fn Pagination(page: Signal<i32>, max_page: Signal<i32>, item_count: Signal<i
 		div {
 			class: "pagination",
 			a {
-				onclick: move|_| page.set(1),
+				onclick: move|_| {
+					page.set(1);
+					on_page_change();
+				},
 				"First"
 			}
 			a {
-				onclick: move|_| page.set((cur_page_val - 1).max(1)),
+				onclick: move|_| {
+					let p = (cur_page_val - 1).max(1);
+					page.set(p);
+					on_page_change();
+				},
 				"Prev"
 			}
 			div { "Page {cur_page_val} of {max_page_val} ({item_count_val} Media Items)" }
 			a {
-				onclick: move|_| page.set((cur_page_val + 1).min(max_page_val)),
+				onclick: move|_| {
+					let p = (cur_page_val + 1).min(max_page_val);
+					page.set(p);
+					on_page_change();
+				},
 				"Next"
 			}
 			a {
-				onclick: move|_| page.set(max_page_val),
+				onclick: move|_| {
+					page.set(max_page_val);
+					on_page_change();
+				},
 				"Last"
 			}
 		}
 	}
 }
+
+fn on_page_change()
+{
+	let window = window().expect("Failed to get window");
+	let document = window.document().expect("Failed to get document");
+	document
+		.query_selector("#content")
+		.expect("Failed to find content")
+		.expect("Failed to find content")
+		.scroll_to_with_x_and_y(0.0, 0.0);
+}

AobaClient/src/components/passkey.rs

@@ -0,0 +1,30 @@
+use dioxus::prelude::*;
+
+use crate::components::basic::Button;
+
+#[component]
+pub fn PasskeyRegistrationButton() -> Element
+{
+	rsx! {
+		Button{
+			text: "Register Passkey",
+			onclick: move |e| {
+
+			}
+		}
+	}
+}
+
+fn start_passkey_registration() {}
+
+fn create_credential() {}
+
+#[component]
+pub fn PasskeyLoginButton() -> Element
+{
+	rsx! {
+		Button{
+			text: "Login with Passkey"
+		}
+	}
+}

AobaClient/src/components/radio_group/component.rs

@@ -0,0 +1,36 @@
+use dioxus::prelude::*;
+use dioxus_primitives::radio_group::{self, RadioGroupProps, RadioItemProps};
+
+#[component]
+pub fn RadioGroup(props: RadioGroupProps) -> Element {
+    rsx! {
+        document::Link { rel: "stylesheet", href: asset!("./style.css") }
+        radio_group::RadioGroup {
+            class: "radio-group",
+            value: props.value,
+            default_value: props.default_value,
+            on_value_change: props.on_value_change,
+            disabled: props.disabled,
+            required: props.required,
+            name: props.name,
+            horizontal: props.horizontal,
+            roving_loop: props.roving_loop,
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}
+
+#[component]
+pub fn RadioItem(props: RadioItemProps) -> Element {
+    rsx! {
+        radio_group::RadioItem {
+            class: "radio-item",
+            value: props.value,
+            index: props.index,
+            disabled: props.disabled,
+            attributes: props.attributes,
+            {props.children}
+        }
+    }
+}

AobaClient/src/components/radio_group/mod.rs

@@ -0,0 +1,2 @@
+mod component;
+pub use component::*;

AobaClient/src/components/radio_group/style.css

@@ -0,0 +1,48 @@
+.radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: .75rem;
+}
+
+.radio-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  color: var(--secondary-color-4);
+  font-size: 14px;
+  gap: .75rem;
+
+  &::before {
+    display: block;
+    width: 1rem;
+    height: 1rem;
+    box-sizing: border-box;
+    border-radius: 1.5rem;
+    background: var(--light, var(--primary-color)) var(--dark, var(--primary-color-3));
+    box-shadow: 0 0 0 1px var(--light, var(--primary-color-6)) 
+      var(--dark, var(--primary-color-7));
+    content: "";
+    cursor: pointer;
+  }
+
+  &:focus-visible {
+    outline: none;
+  }
+
+  &:focus-visible::before {
+    box-shadow: 0 0 0 2px var(--focused-border-color);
+  }
+
+  &[data-state="checked"]::before {
+    border: 0.25rem solid var(--light, var(--primary-color)) var(--dark, var(--primary-color-3));
+    background: var(--secondary-color-4);
+  }
+
+  &[data-disabled="true"]::before {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+}

AobaClient/src/components/search.rs

@@ -3,7 +3,7 @@ use dioxus::prelude::*;
 #[component]
 pub fn Search(query: Signal<String>, page: Signal<i32>) -> Element {
 	rsx! {
-		div { class: "searchBar stickyTop",
+		div { class: "searchBar",
 			input {
 				r#type: "search",
 				placeholder: "Search Files",

AobaClient/src/layouts/main_layout.rs

@@ -1,35 +1,32 @@
 use dioxus::prelude::*;
 
-use crate::{
+use crate::{Route, components::Navbar, contexts::AuthContext, views::Login};
-	Route,
-	components::{ContextMenuRenderer, ContextMenuRoot, Navbar},
-	contexts::AuthContext,
-	views::Login,
-};
 
 #[component]
-pub fn MainLayout() -> Element {
+pub fn MainLayout() -> Element
+{
 	let auth_context = use_context::<AuthContext>();
 
-	if auth_context.jwt.cloned().is_none() {
+	if auth_context.jwt.cloned().is_none()
+	{
 		return rsx! {
 			Login { }
 		};
 	}
 
-	let mut ct_renderer = use_context::<ContextMenuRenderer>();
+	// let mut ct_renderer = use_context::<ContextMenuRenderer>();
 
 	return rsx! {
-		ContextMenuRoot {  }
+		// ContextMenuRoot {  }
 		Navbar { }
 		div {
 			id: "content",
-			onclick: move |_| {
+			// onclick: move |_| {
-				ct_renderer.close();
+			// 	ct_renderer.close();
-			},
+			// },
-			oncontextmenu: move |_| {
+			// oncontextmenu: move |_| {
-				ct_renderer.close();
+			// 	ct_renderer.close();
-			},
+			// },
 			Outlet::<Route> { }
 		}
 	};

AobaClient/src/main.rs

@@ -11,8 +11,6 @@ use contexts::AuthContext;
 use dioxus::prelude::*;
 use route::Route;
 
-use crate::components::ContextMenuRenderer;
-
 #[cfg(debug_assertions)]
 pub const HOST: &'static str = "http://localhost:8081";
 #[cfg(debug_assertions)]
@@ -25,21 +23,25 @@ pub const HOST: &'static str = "https://aoba.app";
 const FAVICON: Asset = asset!("/assets/favicon.ico");
 const MAIN_CSS: Asset = asset!("/assets/style/main.scss");
 const INPUT_CSS: Asset = asset!("/assets/style/inputs.scss");
+const DX_COMPONENTS: Asset = asset!("/assets/style/dx-components.scss");
 
-fn main() {
+fn main()
+{
 	dioxus::launch(App);
 }
 
 #[component]
-fn App() -> Element {
+fn App() -> Element
+{
 	use_context_provider(|| AuthContext::new());
-	use_context_provider(|| ContextMenuRenderer::default());
+	// use_context_provider(|| ContextMenuRenderer::default());
 	rsx! {
 		document::Link { rel: "icon", href: FAVICON }
 		document::Link { rel: "preconnect", href: "https://fonts.googleapis.com" }
 		document::Link { rel: "preconnect", href: "https://fonts.gstatic.com" }
 		document::Link { rel: "stylesheet", href: MAIN_CSS }
 		document::Link { rel: "stylesheet", href: INPUT_CSS }
+		document::Link { rel: "stylesheet", href: DX_COMPONENTS }
 		document::Link {
 			rel: "stylesheet",
 			href: "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap",

AobaClient/src/route.rs

@@ -1,6 +1,6 @@
 use crate::{
 	layouts::MainLayout,
-	views::{Home, Media, Settings},
+	views::{Home, HomePaged, Media, Settings},
 };
 use dioxus::prelude::*;
 
@@ -11,6 +11,8 @@ pub enum Route {
 
 		#[route("/")]
 		Home { },
+		#[route("/?:page&:q")]
+		HomePaged { page: i32, q: String },
 		#[route("/media/:id")]
 		Media { id: String },
 		#[route("/settings")]

AobaClient/src/rpc.rs

@@ -9,7 +9,8 @@ use crate::{
 	rpc::aoba::{auth_rpc_client::AuthRpcClient, metrics_rpc_client::MetricsRpcClient},
 };
 
-pub mod aoba {
+pub mod aoba
+{
 	tonic::include_proto!("aoba");
 }
 
@@ -21,31 +22,38 @@ static RPC_CLIENT: RpcConnection = RpcConnection {
 };
 
 #[derive(Default)]
-pub struct RpcConnection {
+pub struct RpcConnection
+{
 	aoba: RwLock<Option<AobaRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
 	auth: RwLock<Option<AuthRpcClient<Client>>>,
 	metrics: RwLock<Option<MetricsRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
 	jwt: RwLock<Option<String>>,
 }
 
-impl RpcConnection {
+impl RpcConnection
-	pub fn get_client(&self) -> AobaRpcClient<InterceptedService<Client, AuthInterceptor>> {
+{
+	pub fn get_client(&self) -> AobaRpcClient<InterceptedService<Client, AuthInterceptor>>
+	{
 		self.ensure_client();
 		return self.aoba.read().unwrap().clone().unwrap();
 	}
 
-	pub fn get_auth_client(&self) -> AuthRpcClient<Client> {
+	pub fn get_auth_client(&self) -> AuthRpcClient<Client>
+	{
 		self.ensure_client();
 		return self.auth.read().unwrap().clone().unwrap();
 	}
 
-	pub fn get_metrics_client(&self) -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>> {
+	pub fn get_metrics_client(&self) -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>>
+	{
 		self.ensure_client();
 		return self.metrics.read().unwrap().clone().unwrap();
 	}
 
-	fn ensure_client(&self) {
+	fn ensure_client(&self)
-		if self.aoba.read().unwrap().is_none() {
+	{
+		if self.aoba.read().unwrap().is_none()
+		{
 			let wasm_client = Client::new(RPC_HOST.into());
 			let aoba_client = AobaRpcClient::with_interceptor(wasm_client.clone(), AuthInterceptor);
 			*self.aoba.write().unwrap() = Some(aoba_client);
@@ -58,9 +66,12 @@ impl RpcConnection {
 
 #[derive(Clone)]
 pub struct AuthInterceptor;
-impl Interceptor for AuthInterceptor {
+impl Interceptor for AuthInterceptor
-	fn call(&mut self, mut request: tonic::Request<()>) -> Result<tonic::Request<()>, tonic::Status> {
+{
-		if let Some(jwt) = RPC_CLIENT.jwt.read().unwrap().clone() {
+	fn call(&mut self, mut request: tonic::Request<()>) -> Result<tonic::Request<()>, tonic::Status>
+	{
+		if let Some(jwt) = RPC_CLIENT.jwt.read().unwrap().clone()
+		{
 			request
 				.metadata_mut()
 				.insert("authorization", format!("Bearer {jwt}").parse().unwrap());
@@ -69,21 +80,26 @@ impl Interceptor for AuthInterceptor {
 	}
 }
 
-pub fn get_rpc_client() -> AobaRpcClient<InterceptedService<Client, AuthInterceptor>> {
+pub fn get_rpc_client() -> AobaRpcClient<InterceptedService<Client, AuthInterceptor>>
+{
 	return RPC_CLIENT.get_client();
 }
 
-pub fn get_auth_rpc_client() -> AuthRpcClient<Client> {
+pub fn get_auth_rpc_client() -> AuthRpcClient<Client>
+{
 	return RPC_CLIENT.get_auth_client();
 }
 
-pub fn get_metrics_rpc_client() -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>> {
+pub fn get_metrics_rpc_client() -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>>
+{
 	return RPC_CLIENT.get_metrics_client();
 }
-pub fn login(jwt: String) {
+pub fn login(jwt: String)
+{
 	*RPC_CLIENT.jwt.write().unwrap() = Some(jwt);
 }
 
-pub fn logout() {
+pub fn logout()
+{
 	*RPC_CLIENT.jwt.write().unwrap() = None;
 }

AobaClient/src/views/home.rs

@@ -2,14 +2,35 @@ use crate::components::{MediaGrid, Pagination, Search};
 use dioxus::prelude::*;
 
 #[component]
-pub fn Home() -> Element {
+pub fn Home() -> Element
+{
 	let query = use_signal(|| "".to_string());
 	let page = use_signal(|| 1 as i32);
 	let max_page = use_signal(|| 1 as i32);
 	let item_count = use_signal(|| 0 as i32);
 	rsx! {
+		div	{
+			class: "stickyTop",
 			Search { query, page },
 			Pagination { page, max_page, item_count },
+		}
+		MediaGrid { query: query.cloned(), page: page.cloned(), max_page, total_items: item_count }
+	}
+}
+
+#[component]
+pub fn HomePaged(page: i32, q: String) -> Element
+{
+	let query = use_signal(|| q);
+	let page = use_signal(|| page);
+	let max_page = use_signal(|| 1 as i32);
+	let item_count = use_signal(|| 0 as i32);
+	rsx! {
+		div	{
+			class: "stickyTop",
+			Search { query, page },
+			Pagination { page, max_page, item_count },
+		}
 		MediaGrid { query: query.cloned(), page: page.cloned(), max_page, total_items: item_count }
 	}
 }

AobaClient/src/views/media.rs

@@ -1,8 +1,54 @@
+use crate::HOST;
+use crate::components::radio_group::{RadioGroup, RadioItem};
+use crate::rpc::aoba::SetMediaClassRequest;
+use crate::rpc::{
+	aoba::{Id, MediaModel},
+	get_rpc_client,
+};
 use dioxus::prelude::*;
 
 #[component]
-pub fn Media(id: String) -> Element {
+pub fn Media(id: String) -> Element
+{
+	let media_result = use_resource(use_reactive!(|(id)| async move {
+		let mut client = get_rpc_client();
+		let result = client.get_media(Id { value: id.clone() }).await;
+		if let Ok(item) = result
+		{
+			let res = item.into_inner();
+			return res.value;
+		}
+		else
+		{
+			return None;
+		}
+	}));
+
+	return match media_result.cloned().unwrap_or(None)
+	{
+		Some(media) =>
+		{
+			return rsx! {MediaPage{media: media}};
+		}
+		None => rsx! {"Not Found"},
+	};
+}
+
+#[component]
+fn MediaPage(media: MediaModel) -> Element
+{
+	let url = media.thumb_url;
+	let id = media.id.expect("Media has no id").value.clone();
+	let cur_class = match media.class
+	{
+		0 => "Standard",
+		1 => "NSFW",
+		2 => "Secret",
+		_ => "Unkown",
+	};
 	rsx! {
-		{id}
+		img { src: "{HOST}{url}",  }
+		label { "Media Class: {cur_class}" }
+
 	}
 }

AobaClient/src/views/settings.rs

@@ -1,14 +1,21 @@
 use dioxus::prelude::*;
 
-use crate::{components::MetricsToken, rpc::get_rpc_client};
+use crate::{
+	components::{MetricsToken, PasskeyRegistrationButton},
+	rpc::get_rpc_client,
+};
 
 #[component]
-pub fn Settings() -> Element {
+pub fn Settings() -> Element
+{
 	let dst = use_resource(async move || {
 		let result = get_rpc_client().get_share_x_destination(()).await;
-		if let Ok(d) = result {
+		if let Ok(d) = result
-			if let Some(r) = d.into_inner().dst_result {
+		{
-				return match r {
+			if let Some(r) = d.into_inner().dst_result
+			{
+				return match r
+				{
 					crate::rpc::aoba::share_x_response::DstResult::Destination(json) => json,
 					crate::rpc::aoba::share_x_response::DstResult::Error(err) => err,
 				};
@@ -28,5 +35,6 @@ pub fn Settings() -> Element {
 			pre { class: "codeSelect", "{d}" }
 		}
 		MetricsToken {  }
+		PasskeyRegistrationButton { }
 	}
 }

AobaCore/AobaCore.csproj

@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FFMpegCore" Version="5.2.0" />
+		<PackageReference Include="FFMpegCore" Version="5.4.0" />
 		<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
-		<PackageReference Include="MaybeError" Version="1.1.0" />
+		<PackageReference Include="MaybeError" Version="1.2.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
-		<PackageReference Include="MongoDB.Driver" Version="3.4.1" />
+		<PackageReference Include="MongoDB.Driver" Version="3.6.0" />
-		<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
+		<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="3.0.0" />
-		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
+		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
-		<PackageReference Include="ZLinq" Version="1.5.1" />
+		<PackageReference Include="ZLinq" Version="1.5.5" />
 	</ItemGroup>
 
 </Project>

AobaCore/Models/Media.cs

@@ -20,6 +20,7 @@ public class Media
 	public string[] Tags { get; set; } = [];
 	public Size? Dimensions { get; set; }
 	public Dictionary<ThumbnailSize, ObjectId> Thumbnails { get; set; } = [];
+	public MediaClass Class { get; set; }
 
 
 	public static readonly Dictionary<string, MediaType> KnownTypes = new()
@@ -117,3 +118,10 @@ public enum MediaType
 	Code,
 	Raw
 }
+
+public enum MediaClass
+{
+	Standard,
+	NSFW,
+	Secret
+}

AobaCore/Services/AobaService.cs

@@ -20,30 +20,33 @@ public class AobaService(IMongoDatabase db)
 		return await _media.Find(m => m.LegacyId == id).FirstOrDefaultAsync(cancellationToken);
 	}
 
-	public async Task<Media?> GetMediaFromFileAsync(ObjectId id, CancellationToken cancellationToken = default)
+	public async Task<Media?> GetMediaAsync(ObjectId id, CancellationToken cancellationToken = default)
 	{
 		return await _media.Find(m => m.MediaId == id).FirstOrDefaultAsync(cancellationToken);
 	}
 
-	public async Task<PagedResult<Media>> FindMediaAsync(string? query, ObjectId userId, int page = 1, int pageSize = 100)
+	public async Task<PagedResult<Media>> FindMediaAsync(string? query, ObjectId userId, int page = 1, int pageSize = 100, CancellationToken cancellationToken = default)
+	{
+		var filters = new List<FilterDefinition<Media>>()
 		{
-		var filter = Builders<Media>.Filter.And([
 			string.IsNullOrWhiteSpace(query) ? "{}" : Builders<Media>.Filter.Text(query),
 			Builders<Media>.Filter.Eq(m => m.Owner, userId)
-		]);
+		};
+		if (string.IsNullOrWhiteSpace(query))
+			filters.Add(Builders<Media>.Filter.Ne(m => m.Class, MediaClass.Secret));
 		var sort = Builders<Media>.Sort.Descending(m => m.UploadDate);
-		var find = _media.Find(filter);
+		var find = _media.Find(Builders<Media>.Filter.And(filters));
 
-		var total = await find.CountDocumentsAsync();
+		var total = await find.CountDocumentsAsync(cancellationToken);
 		page -= 1;
-		var items = await find.Sort(sort).Skip(page * pageSize).Limit(pageSize).ToListAsync();
+		var items = await find.Sort(sort).Skip(page * pageSize).Limit(pageSize).ToListAsync(cancellationToken);
 		return new PagedResult<Media>(items, page, pageSize, (int)total);
 	}
 
 	public async Task<List<Media>> FindMediaWithExtAsync(string ext, CancellationToken cancellationToken = default)
 	{
 		var filter = Builders<Media>.Filter.Eq(m => m.Ext, ext);
-		return await _media.Find(filter).ToListAsync();
+		return await _media.Find(filter).ToListAsync(cancellationToken);
 	}
 
 	public Task AddMediaAsync(Media media, CancellationToken cancellationToken = default)
@@ -51,6 +54,13 @@ public class AobaService(IMongoDatabase db)
 		return _media.InsertOneAsync(media, null, cancellationToken);
 	}
 
+	public async Task SetMediaClassAsync(ObjectId mediaId, MediaClass mediaClass, CancellationToken cancellationToken = default)
+	{
+		var update = Builders<Media>.Update
+			.Set(m => m.Class, mediaClass);
+		await _media.UpdateOneAsync(m => m.MediaId == mediaId, update, cancellationToken: cancellationToken);
+	}
+
 	public async Task AddThumbnailAsync(ObjectId mediaId, ObjectId thumbId, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		var upate = Builders<Media>.Update.Set(m => m.Thumbnails[size], thumbId);

AobaCore/Services/ThumbnailService.cs

@@ -64,7 +64,7 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		if (existingThumb != null)
 			return existingThumb;
 
-		var media = await aobaService.GetMediaFromFileAsync(mediaId, cancellationToken);
+		var media = await aobaService.GetMediaAsync(mediaId, cancellationToken);
 
 		if (media == null)
 			return new Error("Media does not exist");

AobaServer/AobaServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>9ffcc706-7f1b-48e3-bf30-eab69a90fded</UserSecretsId>
@@ -9,22 +9,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
+    <PackageReference Include="Fido2" Version="4.0.0" />
-    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.71.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.76.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.72.0">
+    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.76.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.78.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="MimeTypesMap" Version="1.0.9" />
-	<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
+	<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
 	<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
-	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
+	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
-	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
+	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,6 +34,7 @@
 
   <ItemGroup>
 	  <Protobuf Include="Proto\Aoba.proto"></Protobuf>
+	  <Protobuf Include="Proto\Account.proto" />
 	  <Protobuf Include="Proto\Auth.proto"></Protobuf>
 	  <Protobuf Include="Proto\Metrics.proto"></Protobuf>
 	  <Protobuf Include="Proto\Types.proto"></Protobuf>

AobaServer/Dockerfile

@@ -1,5 +1,8 @@
+ARG NET_VERSION="10.0"
+ARG DX_VERSION="0.7.3"
+
 # Client Side build - prep deps
-FROM rust:1 AS chef
+FROM rust:1-trixie AS chef
 RUN rustup target add wasm32-unknown-unknown
 RUN cargo install cargo-chef
 WORKDIR /app
@@ -22,7 +25,8 @@ RUN apt install -y protobuf-compiler libprotobuf-dev ffmpeg
 
 # Install `dx`
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-RUN cargo binstall dioxus-cli@0.7.2 --root /.cargo -y --force
+ARG DX_VERSION
+RUN cargo binstall dioxus-cli@${DX_VERSION} --root /.cargo -y --force
 ENV PATH="/.cargo/bin:$PATH"
 ARG VERSION
 ENV APP_VERSION=$VERSION
@@ -31,7 +35,7 @@ RUN dx bundle --release --platform web
 
 # Server Build
 # This stage is used when running from VS in fast mode (Default for Debug configuration)
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:${NET_VERSION} AS base
 RUN apt-get update && apt-get install -y ffmpeg #libvips libvips-tools
 USER $APP_UID
 WORKDIR /app
@@ -39,11 +43,11 @@ EXPOSE 8080
 EXPOSE 8081
 
 # This stage is used to build the service project
-FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
+FROM mcr.microsoft.com/dotnet/sdk:${NET_VERSION}-noble AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
-RUN dotnet restore "./AobaServer/AobaServer.csproj"
+RUN dotnet restore "/src/AobaServer/AobaServer.csproj"
 COPY . .
 # Copy Built bundle from client builder
 COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot

AobaServer/Proto/Account.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option csharp_namespace = "Aoba.RPC.Account";
+package aoba;
+
+import "google/protobuf/empty.proto";
+import "Proto/Types.proto";
+
+service AccountRpc {
+	rpc RegisterPasskey(google.protobuf.Empty) returns (PasskeyRegistrationCreds);
+	rpc CompletePasskeyRegistration(PasskeyPublicKey) returns (google.protobuf.Empty);
+}
+

AobaServer/Proto/Aoba.proto

@@ -12,5 +12,6 @@ service AobaRpc {
   rpc ListMedia(PageFilter) returns (ListResponse);
   rpc GetUser(Id) returns (UserResponse);
   rpc GetShareXDestination(google.protobuf.Empty) returns (ShareXResponse);
+  rpc SetMediaClass(SetMediaClassRequest) returns(google.protobuf.Empty);
 }
 

AobaServer/Proto/Auth.proto

@@ -7,6 +7,6 @@ import "Proto/Types.proto";
 
 service AuthRpc {
 	rpc Login(Credentials) returns (LoginResponse);
-	rpc LoginPasskey(PassKeyPayload) returns (LoginResponse);
+	rpc LoginPasskey(PasskeyPayload) returns (LoginResponse);
 }
 

AobaServer/Proto/Types.proto

@@ -9,8 +9,9 @@ message Credentials{
 	string password = 2;
 }
 
-message PassKeyPayload {
+message SetMediaClassRequest{
-
+	Id id = 1;
+	MediaClass class = 2;
 }
 
 
@@ -40,10 +41,7 @@ message Id {
 }
 
 message MediaResponse {
-	oneof result {
+	optional MediaModel value = 1;
-		MediaModel value = 1;
-		google.protobuf.Empty empty = 2;
-	}
 }
 
 message ListResponse {
@@ -83,6 +81,7 @@ message MediaModel {
 	Id owner = 6;
 	string thumbUrl = 7;
 	string mediaUrl = 8;
+	MediaClass class = 9;
 }
 
 enum MediaType {
@@ -94,6 +93,12 @@ enum MediaType {
 	Raw = 5;
 }
 
+enum MediaClass {
+	Standard = 0;
+	NSFW = 1;
+	Secret = 2;
+}
+
 message ShareXResponse {
 	oneof dstResult {
 		string destination = 1;
@@ -111,3 +116,14 @@ message Filter {
 	string key = 1;
 	repeated string values = 2;
 }
+
+message PasskeyPayload {
+
+}
+
+message PasskeyRegistrationCreds{
+
+}
+message PasskeyPublicKey{
+
+}

AobaServer/Services/AccountRpcService.cs

@@ -0,0 +1,22 @@
+using Aoba.RPC;
+using Aoba.RPC.Account;
+
+using Google.Protobuf.WellKnownTypes;
+
+using Grpc.Core;
+
+namespace AobaServer.Services;
+
+public class AccountRpcService : AccountRpc.AccountRpcBase
+{
+	public override Task<PasskeyRegistrationCreds> RegisterPasskey(Empty request, ServerCallContext context)
+	{
+		return base.RegisterPasskey(request, context);
+	}
+
+	public override Task<Empty> CompletePasskeyRegistration(PasskeyPublicKey request, ServerCallContext context)
+	{
+		return base.CompletePasskeyRegistration(request, context);
+	}
+
+}

AobaServer/Services/AobaRpcService.cs

@@ -9,10 +9,7 @@ using Google.Protobuf.WellKnownTypes;
 
 using Grpc.Core;
 
-using MongoDB.Bson.IO;
-
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 namespace AobaServer.Services;
 
@@ -20,7 +17,7 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 {
 	public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
 	{
-		var media = await aobaService.GetMediaFromLegacyIdAsync(request.ToObjectId());
+		var media = await aobaService.GetMediaAsync(request.ToObjectId(), context.CancellationToken);
 		return media.ToResponse();
 	}
 
@@ -31,6 +28,12 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 		return result.ToResponse();
 	}
 
+	public override async Task<Empty> SetMediaClass(SetMediaClassRequest request, ServerCallContext context)
+	{
+		await aobaService.SetMediaClassAsync(request.Id.ToObjectId(), (AobaCore.Models.MediaClass)request.Class, context.CancellationToken);
+		return new Empty();
+	}
+
 	public override async Task<ShareXResponse> GetShareXDestination(Empty request, ServerCallContext context)
 	{
 		var userId = context.GetHttpContext().User.GetId();
@@ -50,10 +53,7 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 		};
 		return new ShareXResponse
 		{
-			Destination = JsonSerializer.Serialize(dest, new JsonSerializerOptions
+			Destination = JsonSerializer.Serialize(dest)
-			{
-				WriteIndented = true
-			})
 		};
 	}
 

AobaServer/Utils/ProtoExtensions.cs

@@ -35,7 +35,7 @@ public static class ProtoExtensions
 	public static MediaResponse ToResponse(this Media? media)
 	{
 		if(media == null) 
-			return new MediaResponse() { Empty = new Empty() };
+			return new MediaResponse() {};
 		return new MediaResponse()
 		{
 			Value = media.ToMediaModel()
@@ -56,7 +56,8 @@ public static class ProtoExtensions
 			Owner = media.Owner.ToId(),
 			ViewCount = media.ViewCount,
 			ThumbUrl = thumbUrl,
-			MediaUrl = media.GetMediaUrl()
+			MediaUrl = media.GetMediaUrl(),
+			Class = (Aoba.RPC.MediaClass)media.Class,
 		};
 	}