GKaszewski/thoughts
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor handlers and OpenAPI documentation for improved readability and consistency
Some checks failed
lint / lint (push) Has been cancelled
Details
test / unit (push) Has been cancelled
Details
test / integration (push) Has been cancelled
Details
lint / lint (pull_request) Failing after 6m49s
Details
test / unit (pull_request) Successful in 16m24s
Details
test / integration (pull_request) Failing after 17m7s
Details

Browse Source 
- Reorganized imports in health, notifications, social, thoughts, and users handlers for clarity.
- Updated function signatures in handlers to improve readability by aligning parameters.
- Enhanced JSON response formatting in notifications and thoughts handlers.
- Improved error handling in user-related functions.
- Refactored OpenAPI documentation to maintain consistent formatting and structure.
- Cleaned up unnecessary code and comments across various files.
- Ensured consistent use of `Arc` for shared state in AppState and WorkerHandlers.
This commit is contained in:
Gabriel Kaszewski
2026-05-14 16:28:57 +02:00
parent 004bfb427b
commit 10c4a66de5
47 changed files with 2406 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
crates/application/src/services/federation_event.rs
View File

@@ -1,4 +1,3 @@
use std::sync::Arc;
use domain::{
errors::DomainError,
events::DomainEvent,
@@ -6,55 +5,91 @@ use domain::{
ports::{OutboundFederationPort, ThoughtRepository, UserRepository},
value_objects::ThoughtId,
};
use std::sync::Arc;
pub struct FederationEventService {
pub thoughts: Arc<dyn ThoughtRepository>,
pub users: Arc<dyn UserRepository>,
pub ap: Arc<dyn OutboundFederationPort>,
pub base_url: String,
pub thoughts: Arc<dyn ThoughtRepository>,
pub users: Arc<dyn UserRepository>,
pub ap: Arc<dyn OutboundFederationPort>,
pub base_url: String,
}
impl FederationEventService {
fn object_ap_id(&self, thought: &Thought, thought_id: &ThoughtId) -> String {
thought.ap_id.clone().unwrap_or_else(|| {
format!("{}/thoughts/{}", self.base_url, thought_id)
})
thought
.ap_id
.clone()
.unwrap_or_else(|| format!("{}/thoughts/{}", self.base_url, thought_id))
}
pub async fn process(&self, event: &DomainEvent) -> Result<(), DomainError> {
match event {
DomainEvent::ThoughtCreated { thought_id, user_id, .. } => {
DomainEvent::ThoughtCreated {
thought_id,
user_id,
..
} => {
let thought = match self.thoughts.find_by_id(thought_id).await? {
Some(t) if t.local && matches!(t.visibility, Visibility::Public | Visibility::Unlisted) => t,
Some(t)
if t.local
&& matches!(
t.visibility,
Visibility::Public | Visibility::Unlisted
) =>
{
t
}
_ => return Ok(()),
};
let user = match self.users.find_by_id(user_id).await? {
Some(u) => u,
None => return Ok(()),
};
self.ap.broadcast_create(user_id, &thought, user.username.as_str()).await
self.ap
.broadcast_create(user_id, &thought, user.username.as_str())
.await
}
DomainEvent::ThoughtDeleted { thought_id, user_id } => {
DomainEvent::ThoughtDeleted {
thought_id,
user_id,
} => {
// No DB lookup — thought is already deleted when this event fires.
// No locality guard: delete commands only reach local thoughts via the use case.
let ap_id = format!("{}/thoughts/{}", self.base_url, thought_id);
self.ap.broadcast_delete(user_id, &ap_id).await
}
DomainEvent::ThoughtUpdated { thought_id, user_id } => {
DomainEvent::ThoughtUpdated {
thought_id,
user_id,
} => {
let thought = match self.thoughts.find_by_id(thought_id).await? {
Some(t) if t.local && matches!(t.visibility, Visibility::Public | Visibility::Unlisted) => t,
Some(t)
if t.local
&& matches!(
t.visibility,
Visibility::Public | Visibility::Unlisted
) =>
{
t
}
_ => return Ok(()),
};
let user = match self.users.find_by_id(user_id).await? {
Some(u) => u,
None => return Ok(()),
};
self.ap.broadcast_update(user_id, &thought, user.username.as_str()).await
self.ap
.broadcast_update(user_id, &thought, user.username.as_str())
.await
}
DomainEvent::BoostAdded { boost_id: _, user_id, thought_id } => {
DomainEvent::BoostAdded {
boost_id: _,
user_id,
thought_id,
} => {
let thought = match self.thoughts.find_by_id(thought_id).await? {
Some(t) => t,
None => return Ok(()),
@@ -63,13 +98,18 @@ impl FederationEventService {
self.ap.broadcast_announce(user_id, &object_ap_id).await
}
DomainEvent::BoostRemoved { user_id, thought_id } => {
DomainEvent::BoostRemoved {
user_id,
thought_id,
} => {
let thought = match self.thoughts.find_by_id(thought_id).await? {
Some(t) => t,
None => return Ok(()),
};
let object_ap_id = self.object_ap_id(&thought, thought_id);
self.ap.broadcast_undo_announce(user_id, &object_ap_id).await
self.ap
.broadcast_undo_announce(user_id, &object_ap_id)
.await
}
_ => Ok(()),
@@ -96,16 +136,21 @@ mod tests {
#[derive(Default)]
struct SpyPort {
created: Mutex<Vec<ThoughtId>>,
deleted: Mutex<Vec<String>>,
updated: Mutex<Vec<ThoughtId>>,
announced: Mutex<Vec<String>>,
created: Mutex<Vec<ThoughtId>>,
deleted: Mutex<Vec<String>>,
updated: Mutex<Vec<ThoughtId>>,
announced: Mutex<Vec<String>>,
undo_announced: Mutex<Vec<String>>,
}
#[async_trait]
impl OutboundFederationPort for SpyPort {
async fn broadcast_create(&self, _: &UserId, thought: &Thought, _: &str) -> Result<(), DomainError> {
async fn broadcast_create(
&self,
_: &UserId,
thought: &Thought,
_: &str,
) -> Result<(), DomainError> {
self.created.lock().unwrap().push(thought.id.clone());
Ok(())
}
@@ -113,7 +158,12 @@ mod tests {
self.deleted.lock().unwrap().push(ap_id.to_string());
Ok(())
}
async fn broadcast_update(&self, _: &UserId, thought: &Thought, _: &str) -> Result<(), DomainError> {
async fn broadcast_update(
&self,
_: &UserId,
thought: &Thought,
_: &str,
) -> Result<(), DomainError> {
self.updated.lock().unwrap().push(thought.id.clone());
Ok(())
}
@@ -121,7 +171,11 @@ mod tests {
self.announced.lock().unwrap().push(ap_id.to_string());
Ok(())
}
async fn broadcast_undo_announce(&self, _: &UserId, ap_id: &str) -> Result<(), DomainError> {
async fn broadcast_undo_announce(
&self,
_: &UserId,
ap_id: &str,
) -> Result<(), DomainError> {
self.undo_announced.lock().unwrap().push(ap_id.to_string());
Ok(())
}
@@ -138,9 +192,13 @@ mod tests {
fn local_thought(author_id: UserId) -> Thought {
Thought::new_local(
ThoughtId::new(), author_id,
ThoughtId::new(),
author_id,
Content::new_local("hello").unwrap(),
None, Visibility::Public, None, false,
None,
Visibility::Public,
None,
false,
)
}
@@ -259,7 +317,10 @@ mod tests {
let announced = spy.announced.lock().unwrap();
assert_eq!(announced.len(), 1);
assert_eq!(announced[0], format!("https://example.com/thoughts/{}", thought.id));
assert_eq!(
announced[0],
format!("https://example.com/thoughts/{}", thought.id)
);
}
#[tokio::test]
@@ -282,7 +343,10 @@ mod tests {
.unwrap();
let announced = spy.announced.lock().unwrap();
assert_eq!(announced[0], "https://mastodon.social/users/bob/statuses/123");
assert_eq!(
announced[0],
"https://mastodon.social/users/bob/statuses/123"
);
}
#[tokio::test]
@@ -290,9 +354,13 @@ mod tests {
let store = TestStore::default();
let alice = alice();
let thought = Thought::new_local(
ThoughtId::new(), alice.id.clone(),
ThoughtId::new(),
alice.id.clone(),
Content::new_local("private").unwrap(),
None, Visibility::Direct, None, false,
None,
Visibility::Direct,
None,
false,
);
store.users.lock().unwrap().push(alice.clone());
store.thoughts.lock().unwrap().push(thought.clone());
@@ -315,9 +383,13 @@ mod tests {
let store = TestStore::default();
let alice = alice();
let thought = Thought::new_local(
ThoughtId::new(), alice.id.clone(),
ThoughtId::new(),
alice.id.clone(),
Content::new_local("for followers").unwrap(),
None, Visibility::Followers, None, false,
None,
Visibility::Followers,
None,
false,
);
store.users.lock().unwrap().push(alice.clone());
store.thoughts.lock().unwrap().push(thought.clone());
@@ -344,7 +416,9 @@ mod tests {
svc.process(&DomainEvent::UserBlocked {
blocker_id: UserId::new(),
blocked_id: UserId::new(),
}).await.unwrap();
})
.await
.unwrap();
assert!(spy.created.lock().unwrap().is_empty());
assert!(spy.deleted.lock().unwrap().is_empty());
@@ -391,7 +465,10 @@ mod tests {
let undo_announced = spy.undo_announced.lock().unwrap();
assert_eq!(undo_announced.len(), 1);
assert_eq!(undo_announced[0], format!("https://example.com/thoughts/{}", thought.id));
assert_eq!(
undo_announced[0],
format!("https://example.com/thoughts/{}", thought.id)
);
}
#[tokio::test]
@@ -414,7 +491,10 @@ mod tests {
let undo_announced = spy.undo_announced.lock().unwrap();
assert_eq!(undo_announced.len(), 1);
assert_eq!(undo_announced[0], "https://mastodon.social/users/bob/statuses/456");
assert_eq!(
undo_announced[0],
"https://mastodon.social/users/bob/statuses/456"
);
}
#[tokio::test]