amy/ferri
1
0
Fork 0
mirror of https://github.com/nullishamy/ferri.git synced 2025-06-27 16:44:18 +00:00
Code Issues 10 Projects Releases Packages Wiki Activity Actions

fix: small bits

Browse source
This commit is contained in:
nullishamy 2025-05-03 22:47:40 +01:00
parent ecb706e93f
commit f0e287c78d
Signed by: amy
SSH key fingerprint: SHA256:WmV0uk6WgAQvDJlM8Ld4mFPHZo02CLXXP5VkwQ5xtyk
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ferri-main/src/federation/inbox.rs
View file

@ -32,7 +32,7 @@ pub async fn handle_inbox_request(
) {
match req {
InboxRequest::Delete(_, _) => {
todo!()
warn!("unimplemented Delete");
},
InboxRequest::Follow { activity, followed, mut conn, outbound } => {
let kid = key_id(&followed);

29
ferri-main/src/federation/request_queue.rs
View file

@ -46,22 +46,27 @@ impl RequestQueue {
let fut = async move {
info!("using config {:#?}, queue is up", config);
let mut recv = self.recv;
let http = HttpClient::new();
while let Some(req) = recv.recv().await {
info!(?req, "got a message into the queue");
// Spawn up a new task so that we can run concurrently and also so we can not die if it panics
tokio::spawn(async {
let http = HttpClient::new();
match req {
QueueMessage::Heartbeat => {
info!("heartbeat on queue");
},
QueueMessage::Inbound(inbox_request) => {
handle_inbox_request(inbox_request, &http).await;
},
QueueMessage::Outbound(outbox_request) => {
handle_outbox_request(outbox_request, &http).await;
},
}
});
match req {
QueueMessage::Heartbeat => {
info!("heartbeat on queue");
},
QueueMessage::Inbound(inbox_request) => {
handle_inbox_request(inbox_request, &http).await;
},
QueueMessage::Outbound(outbox_request) => {
handle_outbox_request(outbox_request, &http).await;
},
}
}
}.instrument(span);

1
ferri-server/src/endpoints/api/user.rs
View file

@ -143,6 +143,7 @@ pub async fn statuses(
FROM post p
INNER JOIN user u on p.user_id = u.id
WHERE u.id = ?1
ORDER BY p.created_at DESC
"#, uid)
.fetch_all(&mut **db)
.await