mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-05 00:47:48 +08:00
Merge remote-tracking branch 'origin/pr/394' into aether-rust-pioneer
This commit is contained in:
@@ -1847,6 +1847,7 @@ impl<'a> AdminAppState<'a> {
|
||||
allowed_api_formats.clone(),
|
||||
user.contains_key("allowed_models"),
|
||||
allowed_models.clone(),
|
||||
user.contains_key("rate_limit"),
|
||||
rate_limit,
|
||||
Some(is_active),
|
||||
)
|
||||
|
||||
@@ -166,6 +166,7 @@ impl<'a> AdminAppState<'a> {
|
||||
allowed_api_formats: Option<Vec<String>>,
|
||||
allowed_models_present: bool,
|
||||
allowed_models: Option<Vec<String>>,
|
||||
rate_limit_present: bool,
|
||||
rate_limit: Option<i32>,
|
||||
is_active: Option<bool>,
|
||||
) -> Result<Option<aether_data::repository::users::StoredUserAuthRecord>, GatewayError> {
|
||||
@@ -179,6 +180,7 @@ impl<'a> AdminAppState<'a> {
|
||||
allowed_api_formats,
|
||||
allowed_models_present,
|
||||
allowed_models,
|
||||
rate_limit_present,
|
||||
rate_limit,
|
||||
is_active,
|
||||
)
|
||||
@@ -581,4 +583,10 @@ impl<'a> AdminAppState<'a> {
|
||||
) -> Result<Vec<aether_data::repository::users::StoredUserExportRow>, GatewayError> {
|
||||
self.app.list_non_admin_export_users().await
|
||||
}
|
||||
|
||||
pub(crate) async fn list_export_users(
|
||||
&self,
|
||||
) -> Result<Vec<aether_data::repository::users::StoredUserExportRow>, GatewayError> {
|
||||
self.app.list_export_users().await
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user