feat(postgres): persist outbox_url, implement get_following_outbox_url
This commit is contained in:
@@ -236,14 +236,15 @@ impl FederationRepository for PostgresFederationRepository {
|
|||||||
let now = Utc::now().naive_utc();
|
let now = Utc::now().naive_utc();
|
||||||
let fetched_at = datetime_to_str(&now);
|
let fetched_at = datetime_to_str(&now);
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO ap_remote_actors (url, handle, inbox_url, shared_inbox_url, display_name, avatar_url, fetched_at)
|
"INSERT INTO ap_remote_actors (url, handle, inbox_url, shared_inbox_url, display_name, avatar_url, outbox_url, fetched_at)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7::timestamptz)
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8::timestamptz)
|
||||||
ON CONFLICT(url) DO UPDATE SET
|
ON CONFLICT(url) DO UPDATE SET
|
||||||
handle = EXCLUDED.handle,
|
handle = EXCLUDED.handle,
|
||||||
inbox_url = EXCLUDED.inbox_url,
|
inbox_url = EXCLUDED.inbox_url,
|
||||||
shared_inbox_url = EXCLUDED.shared_inbox_url,
|
shared_inbox_url = EXCLUDED.shared_inbox_url,
|
||||||
display_name = EXCLUDED.display_name,
|
display_name = EXCLUDED.display_name,
|
||||||
avatar_url = EXCLUDED.avatar_url,
|
avatar_url = EXCLUDED.avatar_url,
|
||||||
|
outbox_url = COALESCE(EXCLUDED.outbox_url, ap_remote_actors.outbox_url),
|
||||||
fetched_at = EXCLUDED.fetched_at",
|
fetched_at = EXCLUDED.fetched_at",
|
||||||
)
|
)
|
||||||
.bind(&actor.url)
|
.bind(&actor.url)
|
||||||
@@ -252,6 +253,7 @@ impl FederationRepository for PostgresFederationRepository {
|
|||||||
.bind(&actor.shared_inbox_url)
|
.bind(&actor.shared_inbox_url)
|
||||||
.bind(&actor.display_name)
|
.bind(&actor.display_name)
|
||||||
.bind(&actor.avatar_url)
|
.bind(&actor.avatar_url)
|
||||||
|
.bind(&actor.outbox_url)
|
||||||
.bind(&fetched_at)
|
.bind(&fetched_at)
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -360,10 +362,21 @@ impl FederationRepository for PostgresFederationRepository {
|
|||||||
|
|
||||||
async fn get_following_outbox_url(
|
async fn get_following_outbox_url(
|
||||||
&self,
|
&self,
|
||||||
_local_user_id: uuid::Uuid,
|
local_user_id: uuid::Uuid,
|
||||||
_remote_actor_url: &str,
|
remote_actor_url: &str,
|
||||||
) -> Result<Option<String>> {
|
) -> Result<Option<String>> {
|
||||||
Ok(None)
|
let uid = local_user_id.to_string();
|
||||||
|
let row: Option<Option<String>> = sqlx::query_scalar(
|
||||||
|
"SELECT a.outbox_url
|
||||||
|
FROM ap_following f
|
||||||
|
INNER JOIN ap_remote_actors a ON a.url = f.remote_actor_url
|
||||||
|
WHERE f.local_user_id = $1 AND f.remote_actor_url = $2",
|
||||||
|
)
|
||||||
|
.bind(&uid)
|
||||||
|
.bind(remote_actor_url)
|
||||||
|
.fetch_optional(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(row.flatten())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn add_announce(
|
async fn add_announce(
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE ap_remote_actors ADD COLUMN outbox_url TEXT;
|
||||||
Reference in New Issue
Block a user