1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit 48a033b87f4fdc1ce14ff86cc019e1c703cd2741. * Revert "Add blank lines under each line with `conn =`" This reverts commit 773a6d3beba2cf89eac75913078b40c4f5190dd4. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commit d2c6263ea13710177d49b2791278db5ad115fca5. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit 2bf8574bc8333d8d34ca542d61a0a5b50039c24d. * Revert "Fix apub::api::resolve_object" This reverts commit 3e4059aabbe485b2ff060bdeced8ef958ff62832. * Revert "Fix apub::activities::block" This reverts commit 3b02389abd780a7b1b8a2c89e26febdaa6a12159. * Revert "Fix api_common::utils" This reverts commit 7dc73de613a5618fa57eb06450f3699bbcb41254. * Revert "Revert "Fix api_common::utils"" This reverts commit f740f115e5457e83e53cc223e48196a2c47a9975. * Revert "Revert "Fix apub::activities::block"" This reverts commit 2ee206af7c885c10092cf209bf4a5b1d60327866. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit 96ed8bf2e9dcadae760743929498312334e23d2e. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commit acc9ca1aed10c39efdd91cefece066e035a1fe80. * Revert "Revert "aaaa"" This reverts commit 443a2a00a56d152bb7eb429efd0d29a78e21b163. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commit ab4e94aea5bd9d34cbcddf017339131047e75344. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commit e4d1712646a52006b865a1fbe0dcf79976fdb027. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
98 lines
2.6 KiB
Rust
98 lines
2.6 KiB
Rust
use crate::{
|
|
newtypes::{DbUrl, SiteId},
|
|
schema::site::dsl::{actor_id, id, site},
|
|
source::{
|
|
actor_language::SiteLanguage,
|
|
site::{Site, SiteInsertForm, SiteUpdateForm},
|
|
},
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use url::Url;
|
|
|
|
#[async_trait]
|
|
impl Crud for Site {
|
|
type InsertForm = SiteInsertForm;
|
|
type UpdateForm = SiteUpdateForm;
|
|
type IdType = SiteId;
|
|
|
|
/// Use SiteView::read_local, or Site::read_from_apub_id instead
|
|
async fn read(_pool: &mut DbPool<'_>, _site_id: SiteId) -> Result<Self, Error> {
|
|
unimplemented!()
|
|
}
|
|
|
|
async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result<Self, Error> {
|
|
let is_new_site = match &form.actor_id {
|
|
Some(id_) => Site::read_from_apub_id(pool, id_).await?.is_none(),
|
|
None => true,
|
|
};
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
// Can't do separate insert/update commands because InsertForm/UpdateForm aren't convertible
|
|
let site_ = insert_into(site)
|
|
.values(form)
|
|
.on_conflict(actor_id)
|
|
.do_update()
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await?;
|
|
|
|
// initialize languages if site is newly created
|
|
if is_new_site {
|
|
// initialize with all languages
|
|
SiteLanguage::update(pool, vec![], &site_).await?;
|
|
}
|
|
Ok(site_)
|
|
}
|
|
|
|
async fn update(
|
|
pool: &mut DbPool<'_>,
|
|
site_id: SiteId,
|
|
new_site: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(site.find(site_id))
|
|
.set(new_site)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn delete(pool: &mut DbPool<'_>, site_id: SiteId) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(site.find(site_id)).execute(conn).await
|
|
}
|
|
}
|
|
|
|
impl Site {
|
|
pub async fn read_from_apub_id(
|
|
pool: &mut DbPool<'_>,
|
|
object_id: &DbUrl,
|
|
) -> Result<Option<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
Ok(
|
|
site
|
|
.filter(actor_id.eq(object_id))
|
|
.first::<Site>(conn)
|
|
.await
|
|
.ok()
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
|
|
// TODO this needs fixed
|
|
pub async fn read_remote_sites(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
site.order_by(id).offset(1).get_results::<Self>(conn).await
|
|
}
|
|
|
|
/// Instance actor is at the root path, so we simply need to clear the path and other unnecessary
|
|
/// parts of the url.
|
|
pub fn instance_actor_id_from_url(mut url: Url) -> Url {
|
|
url.set_fragment(None);
|
|
url.set_path("");
|
|
url.set_query(None);
|
|
url
|
|
}
|
|
}
|