upub/core/src/selector/query.rs

@@ -90,21 +90,6 @@ impl Query {
 		select
 	}
 
-	// TODO this double join is probably not the best way to query for this...
-	pub fn hashtags() -> Select<model::hashtag::Entity> {
-		let mut select =
-			model::hashtag::Entity::find()
-				.join(sea_orm::JoinType::InnerJoin, model::hashtag::Relation::Objects.def())
-				.join(sea_orm::JoinType::InnerJoin, model::object::Relation::Addressing.def())
-				.select_only();
-
-		for col in model::object::Column::iter() {
-			select = select.select_column_as(col, format!("{}{}", model::object::Entity.table_name(), col.to_string()));
-		}
-
-		select
-	}
-
 	pub fn notifications(user: i64, show_seen: bool) -> Select<model::notification::Entity> {
 		let mut select =
 			model::notification::Entity::find()

upub/routes/src/activitypub/mod.rs

@@ -5,7 +5,6 @@ pub mod object;
 pub mod activity;
 pub mod application;
 pub mod auth;
-pub mod tags;
 pub mod well_known;
 
 use axum::{http::StatusCode, response::IntoResponse, routing::{get, patch, post, put}, Router};
@@ -60,9 +59,6 @@ impl ActivityPubRouter for Router<upub::Context> {
 			// .route("/actors/:id/audience/page", get(ap::actor::audience::page))
 			// activities
 			.route("/activities/:id", get(ap::activity::view))
-			// hashtags
-			.route("/tags/:id", get(ap::tags::get))
-			.route("/tags/:id/page", get(ap::tags::page))
 			// specific object routes
 			.route("/objects/:id", get(ap::object::view))
 			.route("/objects/:id/replies", get(ap::object::replies::get))

upub/routes/src/activitypub/tags.rs

@@ -1,52 +0,0 @@
-use axum::extract::{Path, Query, State};
-use sea_orm::{QueryFilter, QuerySelect, ColumnTrait};
-
-use upub::{selector::{BatchFillable, RichActivity}, Context};
-
-use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity};
-
-pub async fn get(
-	State(ctx): State<Context>,
-	Path(id): Path<String>,
-) -> crate::ApiResult<JsonLD<serde_json::Value>> {
-	crate::builders::collection(
-		&upub::url!(ctx, "/tags/{id}"),
-		None,
-	)
-}
-
-pub async fn page(
-	State(ctx): State<Context>,
-	Path(id): Path<String>,
-	AuthIdentity(auth): AuthIdentity,
-	Query(page): Query<Pagination>,
-) -> crate::ApiResult<JsonLD<serde_json::Value>> {
-	let limit = page.batch.unwrap_or(20).min(50);
-	let offset = page.offset.unwrap_or(0);
-
-	let objects = upub::Query::hashtags()
-		.filter(auth.filter())
-		.filter(upub::model::hashtag::Column::Name.eq(&id))
-		.limit(limit)
-		.offset(offset)
-		.into_model::<RichActivity>()
-		.all(ctx.db())
-		.await?
-		.with_batched::<upub::model::attachment::Entity>(ctx.db())
-		.await?
-		.with_batched::<upub::model::mention::Entity>(ctx.db())
-		.await?
-		.with_batched::<upub::model::hashtag::Entity>(ctx.db())
-		.await?
-		.into_iter()
-		.map(|x| x.ap())
-		.collect();
-
-	crate::builders::collection_page(
-		&upub::url!(ctx, "/tags/{id}/page"),
-		offset,
-		limit,
-		objects,
-	)
-
-}

utils/uriproxy/lib.rs

@@ -5,7 +5,6 @@ pub enum UriClass {
 	Actor,
 	Object,
 	Activity,
-	Hashtag,
 }
 
 impl AsRef<str> for UriClass {
@@ -14,7 +13,6 @@ impl AsRef<str> for UriClass {
 			Self::Actor => "actors",
 			Self::Object => "objects",
 			Self::Activity => "activities",
-			Self::Hashtag => "tags",
 		}
 	}
 }

web/src/objects/item.rs

@@ -58,37 +58,23 @@ pub fn Object(
 		content = content.replace(&from, &to);
 	}
 
+
+
 	let audience_badge = object.audience().id().str()
 		.map(|x| view! {
-			<a class="clean dim" href={Uri::web(U::Actor, &x)}>
+			<a class="clean dim" href={Uri::web(U::Actor, &x)} rel="nofollow noreferrer">
-				<span class="border-button ml-1" title={x.clone()}>
+				<span
+					class="border-button"
+					title="this is a group: all interactions will be broadcasted to group members!"
+				>
 					<code class="color mr-s">&</code>
-					<small class="mr-s">
+					<small>
 						{Uri::pretty(&x, 30)}
 					</small>
 				</span>
 			</a>
 		});
 
-	let hashtag_badges = object.tag().filter_map(|x| {
-		if let Ok(apb::LinkType::Hashtag) = apb::Link::link_type(&x) {
-			let name = apb::Link::name(&x).unwrap_or_default().replace('#', "");
-			let href = Uri::web(U::Hashtag, &name);
-			Some(view! {
-				<a class="clean dim" href={href}>
-					<span class="border-button ml-1">
-						<code class="color mr-s">#</code>
-						<small class="mr-s">
-							{name}
-						</small>
-					</span>
-				</a>
-			})
-		} else {
-			None
-		}
-	}).collect_view();
-
 	let post_image = object.image().get().and_then(|x| x.url().id().str()).map(|x| {
 		let (expand, set_expand) = create_signal(false);
 		view! {
@@ -154,7 +140,6 @@ pub fn Object(
 		</table>
 		{post}
 		<div class="mt-s ml-1 rev">
-			{if !reply { Some(hashtag_badges) } else { None }}
 			{if !reply { audience_badge } else { None }}
 			<ReplyButton n=comments target=oid.clone() />
 			<LikeButton n=likes liked=already_liked target=oid.clone() author=author_id private=!public />

web/src/timeline/mod.rs

@@ -182,7 +182,6 @@ async fn fetch_and_update_with_user(kind: U, id: String, auth: Auth) {
 			U::Object => obj.attributed_to().id().str(),
 			U::Activity => obj.actor().id().str(),
 			U::Actor => None,
-			U::Hashtag => None,
 		} {
 			fetch_and_update(U::Actor, actor_id, auth).await;
 		}