fix: oops uid not oid

honestly these fn names looked cool but were probably a bad choice

upub/routes/src/activitypub/actor/following.rs

@@ -16,7 +16,7 @@ pub async fn get<const OUTGOING: bool>(
 	// instance, but that's annoying because means running a COUNT every time, so likely this will
 	// keep answering 0
 
-	let count = match model::actor::Entity::find_by_ap_id(&ctx.oid(&id))
+	let count = match model::actor::Entity::find_by_ap_id(&ctx.uid(&id))
 		.find_also_related(model::config::Entity)
 		.one(ctx.db())
 		.await?
@@ -67,7 +67,7 @@ pub async fn page<const OUTGOING: bool>(
 
 	let hidden = {
 		// TODO i could avoid this query if ctx.uid(id) == Identity::Local { id }
-		match model::actor::Entity::find_by_ap_id(&ctx.oid(&id))
+		match model::actor::Entity::find_by_ap_id(&ctx.uid(&id))
 			.find_also_related(model::config::Entity)
 			.one(ctx.db())
 			.await?

web/src/app.rs

@@ -150,6 +150,9 @@ pub fn App() -> impl IntoView {
 									<Route path="/web/config/dev" view=DebugPage />
 
 									<Route path="/web/actors/:id" view=UserPage />
+									<Route path="/web/actors/:id/following" view=move || view! { <FollowPage outgoing=true /> } />
+									<Route path="/web/actors/:id/followers" view=move || view! { <FollowPage outgoing=false /> } />
+
 									<Route path="/web/objects/:id" view=ObjectPage />
 									// <Route path="/web/activities/:id" view=move || view! { <ActivityPage tl=context_tl /> } />
 

web/src/components/user.rs

@@ -103,3 +103,89 @@ async fn send_follow_response(kind: apb::ActivityType, target: String, to: Strin
 		tracing::error!("failed posting follow response: {e}");
 	}
 }
+
+#[component]
+pub fn ActorHeader(object: crate::Object) -> impl IntoView {
+	let auth = use_context::<Auth>().expect("missing auth context");
+	let avatar_url = object.icon().get().map(|x| x.url().id().str().unwrap_or(DEFAULT_AVATAR_URL.into())).unwrap_or(DEFAULT_AVATAR_URL.into());
+	let background_url = object.image().get().map(|x| x.url().id().str().unwrap_or(DEFAULT_AVATAR_URL.into())).unwrap_or(DEFAULT_AVATAR_URL.into());
+	let display_name = object.name().unwrap_or_default().to_string();
+	let username = object.preferred_username().unwrap_or_default().to_string();
+	let created = object.published().ok();
+	let following = object.following_count().unwrap_or(0);
+	let followers = object.followers_count().unwrap_or(0);
+	let statuses = object.statuses_count().unwrap_or(0);
+	let following_me = object.following_me().unwrap_or(false);
+	let followed_by_me = object.followed_by_me().unwrap_or(false);
+	let domain = object.id().unwrap_or_default().replace("https://", "").split('/').next().unwrap_or_default().to_string();
+	let actor_type = object.actor_type().unwrap_or(apb::ActorType::Person);
+	let actor_type_tag = if actor_type == apb::ActorType::Person { None } else {
+		Some(view! { <sup class="ml-s"><small>"["{actor_type.as_ref().to_lowercase()}"]"</small></sup> } )
+	};
+	let uid = object.id().unwrap_or_default().to_string();
+	let web_path = Uri::web(U::Actor, &uid);
+	let _uid = uid.clone();
+	view! {
+			<div 
+				class="banner"
+				style={format!("background: center / cover url({background_url});")}
+			>
+				<div style="height: 10em"></div> // TODO bad way to have it fixed height ewwww
+			</div>
+			<div class="overlap">
+				<table class="pl-2 pr-2 align w-100" style="table-layout: fixed">
+					<tr>
+						<td rowspan=4 style="width: 8em">
+							<img class="avatar avatar-border mr-s" src={avatar_url} style="height: 7em; width: 7em"/>
+						</td>
+						<td rowspan=2 class="bottom">
+							<b class="big">{display_name}</b>{actor_type_tag}
+						</td>
+						<td rowspan=2 class="bottom rev" title="statuses">{statuses}" "<span class="emoji">"\u{1f582}"</span></td>
+					</tr>
+					<tr></tr>
+					<tr>
+						<td class="top">
+							<small><a class="clean hover" href={uid.clone()} target="_blank">{username.clone()}@{domain}</a></small>
+						</td>
+						<td class="rev" title="following">
+							<a class="clean" href={format!("{web_path}/following")}>{following}" "<span class="emoji">"👥"</span></a>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<DateTime t=created />
+						</td>
+						<td class="rev" title="followers">
+							<a class="clean" href={format!("{web_path}/followers")}>{followers}" "<span class="emoji">"📢"</span></a>
+						</td>
+					</tr>
+				</table>
+				<div class="rev mr-1" class:hidden=move || !auth.present() || auth.user_id() == uid>
+					{if followed_by_me {
+						view! { <code class="color">following</code> }.into_view()
+					} else {
+						view! { <input type="submit" value="follow" on:click=move |_| send_follow_request(_uid.clone()) /> }.into_view()
+					}}
+					{if following_me {
+						Some(view! { <code class="ml-1 color">follows you</code> })
+					} else {
+						None
+					}}
+				</div>
+			</div>
+	}.into_view()
+}
+
+fn send_follow_request(target: String) {
+	let auth = use_context::<Auth>().expect("missing auth context");
+	spawn_local(async move {
+		let payload = serde_json::Value::Object(serde_json::Map::default())
+			.set_activity_type(Some(apb::ActivityType::Follow))
+			.set_object(apb::Node::link(target.clone()))
+			.set_to(apb::Node::links(vec![target]));
+		if let Err(e) = Http::post(&auth.outbox(), &payload, auth).await {
+			tracing::error!("failed sending follow request: {e}");
+		}
+	})
+}

web/src/page/actor/follow.rs

@@ -0,0 +1,64 @@
+use std::sync::Arc;
+
+use leptos::*;
+use leptos_router::*;
+use crate::prelude::*;
+
+use apb::Collection;
+
+#[component]
+pub fn FollowPage(outgoing: bool) -> impl IntoView {
+	let follow___ = if outgoing { "following" } else { "followers" };
+	let params = use_params_map();
+	let auth = use_context::<Auth>().expect("missing auth context");
+	let user = Signal::derive(move ||{
+		let id =params.get().get("id").cloned().unwrap_or_default(); 
+		CACHE.get(&Uri::full(U::Actor, &id))
+	});
+	let resource = create_local_resource(
+		move || params.get().get("id").cloned().unwrap_or_default(),
+		move |id| {
+			async move {
+				match Http::fetch::<crate::Object>(&format!("{URL_BASE}/actors/{id}/{follow___}/page"), auth).await {
+					Err(e) => {
+						tracing::error!("failed getting {follow___} for {id}: {e}");
+						None
+					},
+					Ok(x) => {
+						Some(x.ordered_items().all_ids())
+					},
+
+				}
+			}
+		}
+	);
+	view! {
+		<div>
+			<Breadcrumb back=true >
+				actors::view::{follow___}
+			</Breadcrumb>
+			<div>
+				{move || user.get().map(|x| view! { <ActorHeader object=x /> })}
+				{move || match resource.get() {
+					None => view! { <p>"loading "<span class="dots"></span></p> }.into_view(),
+					Some(None) => view! { <code>could not load following</code> }.into_view(),
+					Some(Some(arr)) => view! {
+						<For
+							each=move || arr.clone()
+							key=|id| id.clone()
+							children=move |id| {
+								let actor = match CACHE.get(&id) {
+									Some(x) => x,
+									None => Arc::new(serde_json::Value::String(id)),
+								};
+								view! {
+									<ActorBanner object=actor />
+								}.into_view()
+							}
+						/ >
+					},
+				}}
+			</div>
+		</div>
+	}
+}

web/src/page/actor/mod.rs

@@ -0,0 +1,3 @@
+pub mod activity;
+pub mod follow;
+pub mod view;

web/src/page/actor/view.rs

@@ -0,0 +1,75 @@
+use std::sync::Arc;
+
+use leptos::*;
+use leptos_router::*;
+use crate::prelude::*;
+
+use apb::Object;
+
+#[component]
+pub fn UserPage() -> impl IntoView {
+	let params = use_params_map();
+	let feeds = use_context::<Feeds>().expect("missing feeds context");
+	let auth = use_context::<Auth>().expect("missing auth context");
+	let id = params.get()
+		.get("id")
+		.cloned()
+		.unwrap_or_default();
+	let uid = uriproxy::uri(URL_BASE, uriproxy::UriClass::Actor, &id);
+	let actor = create_local_resource(
+		move || params.get().get("id").cloned().unwrap_or_default(),
+		move |id| {
+			async move {
+				let tl_url = format!("{}/outbox/page", Uri::api(U::Actor, &id, false));
+				if !feeds.user.next.get_untracked().starts_with(&tl_url) {
+					feeds.user.reset(Some(tl_url));
+				}
+				match CACHE.get(&Uri::full(U::Actor, &id)) {
+					Some(x) => Some(x.clone()),
+					None => {
+						let user : serde_json::Value = Http::fetch(&Uri::api(U::Actor, &id, true), auth).await.ok()?;
+						let user = Arc::new(user);
+						CACHE.put(Uri::full(U::Actor, &id), user.clone());
+						Some(user)
+					},
+				}
+			}
+		}
+	);
+	view! {
+		<div>
+			<Breadcrumb back=true >
+				actors::view
+				<a
+					class="clean ml-1" href="#"
+					class:hidden=move || feeds.user.is_empty()
+					on:click=move |_| {
+						feeds.user.reset(Some(feeds.user.next.get().split('?').next().unwrap_or_default().to_string()));
+						feeds.user.more(auth);
+				}><span class="emoji">
+					"\u{1f5d8}"
+				</span></a>
+			</Breadcrumb>
+			<div>
+				{move || {
+					let uid = uid.clone();
+					match actor.get() {
+						None => view! { <p class="center">loading...</p> }.into_view(),
+						Some(None) => {
+							view! { <p class="center"><code>loading failed</code><sup><small><a class="clean" href={uid} target="_blank">"↗"</a></small></sup></p> }.into_view()
+						},
+						Some(Some(object)) => {
+							view! {
+								<div class="ml-3 mr-3">
+									<ActorHeader object=object.clone() />
+									<p class="ml-2 mt-1 center" inner_html={mdhtml::safe_html(object.summary().unwrap_or_default())}></p>
+								</div>
+								<TimelineFeed tl=feeds.user />
+							}.into_view()
+						},
+					}
+				}}
+			</div>
+		</div>
+	}
+}

web/src/page/mod.rs

@@ -19,5 +19,6 @@ pub use search::SearchPage;
 mod timeline;
 pub use timeline::TimelinePage;
 
-mod user;
+mod actor;
-pub use user::UserPage;
+pub use actor::view::UserPage;
+pub use actor::follow::FollowPage;

web/src/page/user.rs

@@ -1,150 +0,0 @@
-use std::sync::Arc;
-
-use leptos::*;
-use leptos_router::*;
-use crate::{prelude::*, DEFAULT_AVATAR_URL};
-
-use apb::{field::OptionalString, ActivityMut, Actor, Base, Object, ObjectMut};
-
-fn send_follow_request(target: String) {
-	let auth = use_context::<Auth>().expect("missing auth context");
-	spawn_local(async move {
-		let payload = serde_json::Value::Object(serde_json::Map::default())
-			.set_activity_type(Some(apb::ActivityType::Follow))
-			.set_object(apb::Node::link(target.clone()))
-			.set_to(apb::Node::links(vec![target]));
-		if let Err(e) = Http::post(&auth.outbox(), &payload, auth).await {
-			tracing::error!("failed sending follow request: {e}");
-		}
-	})
-}
-
-#[component]
-pub fn UserPage() -> impl IntoView {
-	let params = use_params_map();
-	let feeds = use_context::<Feeds>().expect("missing feeds context");
-	let auth = use_context::<Auth>().expect("missing auth context");
-	let id = params.get()
-		.get("id")
-		.cloned()
-		.unwrap_or_default();
-	let uid = uriproxy::uri(URL_BASE, uriproxy::UriClass::Actor, &id);
-	let actor = create_local_resource(
-		move || params.get().get("id").cloned().unwrap_or_default(),
-		move |id| {
-			async move {
-				let tl_url = format!("{}/outbox/page", Uri::api(U::Actor, &id, false));
-				if !feeds.user.next.get_untracked().starts_with(&tl_url) {
-					feeds.user.reset(Some(tl_url));
-				}
-				match CACHE.get(&Uri::full(U::Actor, &id)) {
-					Some(x) => Some(x.clone()),
-					None => {
-						let user : serde_json::Value = Http::fetch(&Uri::api(U::Actor, &id, true), auth).await.ok()?;
-						let user = Arc::new(user);
-						CACHE.put(Uri::full(U::Actor, &id), user.clone());
-						Some(user)
-					},
-				}
-			}
-		}
-	);
-	view! {
-		<div>
-			<Breadcrumb back=true >
-				users::view
-				<a
-					class="clean ml-1" href="#"
-					class:hidden=move || feeds.user.is_empty()
-					on:click=move |_| {
-						feeds.user.reset(Some(feeds.user.next.get().split('?').next().unwrap_or_default().to_string()));
-						feeds.user.more(auth);
-				}><span class="emoji">
-					"\u{1f5d8}"
-				</span></a>
-			</Breadcrumb>
-			<div>
-				{move || {
-					let uid = uid.clone();
-					match actor.get() {
-						None => view! { <p class="center">loading...</p> }.into_view(),
-						Some(None) => {
-							view! { <p class="center"><code>loading failed</code><sup><small><a class="clean" href={uid} target="_blank">"↗"</a></small></sup></p> }.into_view()
-						},
-						Some(Some(object)) => {
-							let uid = object.id().unwrap_or_default().to_string();
-							let avatar_url = object.icon().get().map(|x| x.url().id().str().unwrap_or(DEFAULT_AVATAR_URL.into())).unwrap_or(DEFAULT_AVATAR_URL.into());
-							let background_url = object.image().get().map(|x| x.url().id().str().unwrap_or(DEFAULT_AVATAR_URL.into())).unwrap_or(DEFAULT_AVATAR_URL.into());
-							let display_name = object.name().unwrap_or_default().to_string();
-							let username = object.preferred_username().unwrap_or_default().to_string();
-							let summary = object.summary().unwrap_or_default().to_string();
-							let domain = object.id().unwrap_or_default().replace("https://", "").split('/').next().unwrap_or_default().to_string();
-							let actor_type = object.actor_type().unwrap_or(apb::ActorType::Person);
-							let actor_type_tag = if actor_type == apb::ActorType::Person { None } else {
-								Some(view! { <sup class="ml-s"><small>"["{actor_type.as_ref().to_lowercase()}"]"</small></sup> } )
-							};
-							let created = object.published().ok();
-							let following = object.following_count().unwrap_or(0);
-							let followers = object.followers_count().unwrap_or(0);
-							let statuses = object.statuses_count().unwrap_or(0);
-							let following_me = object.following_me().unwrap_or(false);
-							let followed_by_me = object.followed_by_me().unwrap_or(false);
-							let _uid = uid.clone();
-
-							view! {
-								<div class="ml-3 mr-3">
-									<div 
-										class="banner"
-										style={format!("background: center / cover url({background_url});")}
-									>
-										<div style="height: 10em"></div> // TODO bad way to have it fixed height ewwww
-									</div>
-									<div class="overlap">
-										<table class="pl-2 pr-2 align w-100" style="table-layout: fixed">
-											<tr>
-												<td rowspan=4 style="width: 8em">
-													<img class="avatar avatar-border mr-s" src={avatar_url} style="height: 7em; width: 7em"/>
-												</td>
-												<td rowspan=2 class="bottom">
-													<b class="big">{display_name}</b>{actor_type_tag}
-												</td>
-												<td rowspan=2 class="bottom rev" title="statuses">{statuses}" "<span class="emoji">"\u{1f582}"</span></td>
-											</tr>
-											<tr></tr>
-											<tr>
-												<td class="top">
-													<small><a class="clean hover" href={uid.clone()} target="_blank">{username.clone()}@{domain}</a></small>
-												</td>
-												<td class="rev" title="following">{following}" "<span class="emoji">"👥"</span></td>
-											</tr>
-											<tr>
-												<td>
-													<DateTime t=created />
-												</td>
-												<td class="rev" title="followers">{followers}" "<span class="emoji">"📢"</span></td>
-											</tr>
-										</table>
-										<div class="rev mr-1" class:hidden=move || !auth.present() || auth.user_id() == uid>
-											{if followed_by_me {
-												view! { <code class="color">following</code> }.into_view()
-											} else {
-												view! { <input type="submit" value="follow" on:click=move |_| send_follow_request(_uid.clone()) /> }.into_view()
-											}}
-											{if following_me {
-												Some(view! { <code class="ml-1 color">follows you</code> })
-											} else {
-												None
-											}}
-										</div>
-										<p class="ml-2 mt-1 center" inner_html={mdhtml::safe_html(&summary)}></p>
-									</div>
-								</div>
-								<TimelineFeed tl=feeds.user />
-							}.into_view()
-						},
-					}
-				}}
-			</div>
-		</div>
-	}
-}