upub/core/src/selector.rs

@@ -343,19 +343,19 @@ mod hell {
 
 	impl BatchFillableKey for crate::model::attachment::Model {
 		fn key(&self) -> i64 {
-			self.object
+			self.internal
 		}
 	}
 
 	impl BatchFillableKey for crate::model::mention::Model {
 		fn key(&self) -> i64 {
-			self.object
+			self.internal
 		}
 	}
 
 	impl BatchFillableKey for crate::model::hashtag::Model {
 		fn key(&self) -> i64 {
-			self.object
+			self.internal
 		}
 	}
 	

upub/core/src/traits/process.rs

@@ -389,13 +389,13 @@ pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &D
 			}
 		}
 	} {
-		crate::context::Internal::Activity(_) => unreachable!(),
 		crate::context::Internal::Actor(_) => Err(ProcessorError::Unprocessable(activity.id()?.to_string())),
+		crate::context::Internal::Activity(_) => Err(ProcessorError::AlreadyProcessed), // ???
 		crate::context::Internal::Object(internal) => {
 			let actor = ctx.fetch_user(activity.actor().id()?, tx).await?;
 
-			// we only care about announces produced by "Person" actors, because there's intention
-			// anything shared by groups, services or applications is automated: fetch it and be done
+			// we only care about "organic" announces, as in those produced by people
+			// anything shared by groups, services or applications is just mirroring: fetch it and be done
 			if actor.actor_type == apb::ActorType::Person {
 				let share = crate::model::announce::ActiveModel {
 					internal: NotSet,

upub/routes/src/activitypub/mod.rs

@@ -71,9 +71,6 @@ impl ActivityPubRouter for Router<upub::Context> {
 			//.route("/objects/:id/likes/page", get(ap::object::likes::page))
 			//.route("/objects/:id/shares", get(ap::object::announces::get))
 			//.route("/objects/:id/shares/page", get(ap::object::announces::page))
-			// hashtags routes
-			//.route("/hashtags/:name", get(ap::hashtags::get))
-			//.route("/hashtags/:name/page", get(ap::hashtags::page))
 	}
 }