refactor: merge sqlite adapter family into one crate
This commit is contained in:
@@ -6,9 +6,8 @@ edition.workspace = true
|
||||
[dependencies]
|
||||
sqlx = { workspace = true }
|
||||
activitypub = { workspace = true }
|
||||
adapter-common = { workspace = true }
|
||||
k-ap = { version = "0.5.0", registry = "gitea" }
|
||||
sqlite-social = { workspace = true }
|
||||
sqlite = { workspace = true }
|
||||
domain = { workspace = true }
|
||||
anyhow = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
|
||||
@@ -4,7 +4,7 @@ use chrono::Utc;
|
||||
use k_ap::ActivityRepository;
|
||||
|
||||
use super::SqliteFederationRepository;
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl ActivityRepository for SqliteFederationRepository {
|
||||
|
||||
@@ -5,7 +5,7 @@ use k_ap::{AnnounceRepository, Keypair, KeypairRepository, RemoteActor, RemoteAc
|
||||
use sqlx::Row;
|
||||
|
||||
use super::{SqliteFederationRepository, remote_actor_from_row};
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl KeypairRepository for SqliteFederationRepository {
|
||||
|
||||
@@ -5,7 +5,7 @@ use k_ap::{ActorBlocklist, BlockedDomain, DomainBlocklist};
|
||||
use sqlx::Row;
|
||||
|
||||
use super::SqliteFederationRepository;
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl DomainBlocklist for SqliteFederationRepository {
|
||||
|
||||
@@ -5,7 +5,7 @@ use k_ap::{Follower, FollowerReader, FollowerStatus, FollowerWriter, RemoteActor
|
||||
use sqlx::Row;
|
||||
|
||||
use crate::{SqliteFederationRepository, remote_actor_from_row, status_to_str, str_to_status};
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl FollowerWriter for SqliteFederationRepository {
|
||||
|
||||
@@ -4,7 +4,7 @@ use chrono::Utc;
|
||||
use k_ap::{FollowingReader, FollowingStatus, FollowingWriter, RemoteActor, RemoteActorCache};
|
||||
|
||||
use crate::{SqliteFederationRepository, remote_actor_from_row};
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl FollowingWriter for SqliteFederationRepository {
|
||||
|
||||
@@ -79,7 +79,7 @@ pub fn wire(
|
||||
instance: domain::value_objects::InstanceIdentity,
|
||||
) -> activitypub::FederationRepos {
|
||||
let fed = std::sync::Arc::new(SqliteFederationRepository::new(pool.clone()));
|
||||
let social = std::sync::Arc::new(sqlite_social::SqliteSocialRepository::new(pool, instance));
|
||||
let social = std::sync::Arc::new(sqlite::SqliteSocialRepository::new(pool, instance));
|
||||
activitypub::FederationRepos {
|
||||
activity: std::sync::Arc::clone(&fed) as _,
|
||||
follow: std::sync::Arc::clone(&fed) as _,
|
||||
|
||||
@@ -4,7 +4,7 @@ use async_trait::async_trait;
|
||||
use domain::models::{Review, ReviewSource};
|
||||
|
||||
use super::SqliteFederationRepository;
|
||||
use adapter_common::datetime_to_str;
|
||||
use sqlite::persistence::datetime_to_str;
|
||||
|
||||
#[async_trait]
|
||||
impl RemoteReviewRepository for SqliteFederationRepository {
|
||||
|
||||
Reference in New Issue
Block a user