majjo/stoatchat
1
0
Fork 0
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-08-31 02:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make amqp required

Browse Source 
Signed-off-by: Zomatree <me@zomatree.live>
This commit is contained in:
Zomatree
2026-08-03 04:56:22 +01:00
parent 1654f8a276
commit 7cf833948e
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/core/database/src/models/users/model.rs
View File

@@ -542,7 +542,7 @@ impl User {
pub async fn add_friend(
&mut self,
db: &Database,
amqp: Option<&AMQP>,
amqp: &AMQP,
target: &mut User,
) -> Result<()> {
match self.relationship_with(&target.id) {
@@ -552,10 +552,8 @@ impl User {
RelationshipStatus::Blocked => Err(create_error!(Blocked)),
RelationshipStatus::BlockedOther => Err(create_error!(BlockedByOther)),
RelationshipStatus::Incoming => {
if let Some(amqp) = amqp {
// Accept incoming friend request
_ = amqp.friend_request_accepted(self, target).await;
};
// Accept incoming friend request
_ = amqp.friend_request_accepted(self, target).await;
self.apply_relationship(
db,
@@ -585,9 +583,7 @@ impl User {
}));
}
if let Some(amqp) = amqp {
_ = amqp.friend_request_received(target, self).await;
};
_ = amqp.friend_request_received(target, self).await;
// Send the friend request
self.apply_relationship(

1
crates/daemons/voice-ingress/src/api.rs
View File

@@ -255,6 +255,7 @@ pub async fn ingress(
message
.update(
db,
Some(amqp),
PartialMessage {
system: message.system.clone(),
..Default::default()

2
crates/delta/src/routes/users/add_friend.rs
View File

@@ -22,6 +22,6 @@ pub async fn add(
return Err(create_error!(IsBot));
}
user.add_friend(db, Some(amqp), &mut target).await?;
user.add_friend(db, amqp, &mut target).await?;
Ok(Json(target.into(db, &user).await))
}

2
crates/delta/src/routes/users/send_friend_request.rs
View File

@@ -23,7 +23,7 @@ pub async fn send_friend_request(
return Err(create_error!(IsBot));
}
user.add_friend(db, Some(amqp), &mut target).await?;
user.add_friend(db, amqp, &mut target).await?;
Ok(Json(target.into(db, &user).await))
} else {
Err(create_error!(InvalidProperty))