diff --git a/ext_model/src/lib.rs b/ext_model/src/lib.rs
index e228fb8..6579e29 100644
--- a/ext_model/src/lib.rs
+++ b/ext_model/src/lib.rs
@@ -1,3 +1,34 @@
+use std::future::Future;
+
+use chrono::Utc;
+use futures_util::{SinkExt, StreamExt};
+use redis::IntoConnectionInfo;
+pub use sea_orm;
+use sea_orm::{ActiveValue::Set, ConnectionTrait};
+use sea_orm::{
+ ColumnTrait, ConnectOptions, DatabaseConnection, DbErr, EntityTrait, QueryFilter,
+ TransactionTrait,
+};
+use serde::{Deserialize, Deserializer, Serialize};
+use serde::de::Error;
+use serde_json::Value;
+use strum::IntoStaticStr;
+use thiserror::Error;
+use tokio::select;
+use tokio_util::sync::CancellationToken;
+use tracing::{error, info, trace, warn};
+use tracing::log::LevelFilter;
+use url::Host;
+
+pub use ck;
+use ck::*;
+use ext_model_migration::{Migrator, MigratorTrait};
+use user_model::UserResolver;
+
+use crate::model_ext::IdShape;
+use crate::note_model::NoteResolver;
+use crate::notification_model::NotificationResolver;
+
pub mod emoji;
pub mod model_ext;
pub mod note_model;
@@ -5,35 +36,6 @@ pub mod notification_model;
pub mod poll;
pub mod user_model;
-pub use ck;
-use ck::*;
-pub use sea_orm;
-use url::Host;
-use user_model::UserResolver;
-
-use crate::model_ext::IdShape;
-use crate::note_model::NoteResolver;
-use crate::notification_model::NotificationResolver;
-use chrono::Utc;
-use ext_model_migration::{Migrator, MigratorTrait};
-use futures_util::StreamExt;
-use redis::IntoConnectionInfo;
-use sea_orm::{ActiveValue::Set, ConnectionTrait};
-use sea_orm::{
- ColumnTrait, ConnectOptions, DatabaseConnection, DbErr, EntityTrait, QueryFilter,
- TransactionTrait,
-};
-use serde::de::Error;
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::Value;
-use std::future::Future;
-use strum::IntoStaticStr;
-use thiserror::Error;
-use tokio::select;
-use tokio_util::sync::CancellationToken;
-use tracing::log::LevelFilter;
-use tracing::{error, info, trace, warn};
-
#[derive(Debug)]
pub struct ConnectorConfig {
pub url: String,
@@ -90,8 +92,8 @@ impl CalckeyModel {
.and(user::Column::Host.is_null()),
)
}
- .one(&self.0)
- .await?;
+ .one(&self.0)
+ .await?;
Ok(user)
}
@@ -120,6 +122,15 @@ impl CalckeyModel {
.await?)
}
+ pub async fn get_user_and_profile_by_id(&self, id: &str) -> Result