mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-22 15:09:31 +00:00
run clippy fix
This commit is contained in:
19
src/app.rs
19
src/app.rs
@@ -43,7 +43,7 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
|
||||
) -> Router<()> {
|
||||
let birthday_store = Arc::new(ContactBirthdayStore::new(addr_store.clone()));
|
||||
let combined_cal_store =
|
||||
Arc::new(CombinedCalendarStore::new(cal_store.clone()).with_store(birthday_store));
|
||||
Arc::new(CombinedCalendarStore::new(cal_store).with_store(birthday_store));
|
||||
|
||||
let mut router = Router::new()
|
||||
.merge(caldav_router(
|
||||
@@ -104,24 +104,19 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
|
||||
router = router.merge(frontend_router(
|
||||
"/frontend",
|
||||
auth_provider.clone(),
|
||||
combined_cal_store.clone(),
|
||||
addr_store.clone(),
|
||||
combined_cal_store,
|
||||
addr_store,
|
||||
frontend_config,
|
||||
oidc_config,
|
||||
));
|
||||
}
|
||||
|
||||
if nextcloud_login_config.enabled {
|
||||
router = router.nest(
|
||||
"/index.php/login/v2",
|
||||
nextcloud_login_router(auth_provider.clone()),
|
||||
);
|
||||
router = router.nest("/index.php/login/v2", nextcloud_login_router(auth_provider));
|
||||
}
|
||||
|
||||
if dav_push_enabled {
|
||||
router = router.merge(rustical_dav_push::subscription_service(
|
||||
subscription_store.clone(),
|
||||
));
|
||||
router = router.merge(rustical_dav_push::subscription_service(subscription_store));
|
||||
}
|
||||
|
||||
router
|
||||
@@ -178,11 +173,11 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
|
||||
tracing::error!("client error");
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
})
|
||||
.on_failure(
|
||||
|_error: ServerErrorsFailureClass, _latency: Duration, _span: &Span| {
|
||||
tracing::error!("something went wrong")
|
||||
tracing::error!("something went wrong");
|
||||
},
|
||||
),
|
||||
)
|
||||
|
||||
@@ -38,9 +38,9 @@ pub async fn handle_membership_command(
|
||||
MembershipArgs { command }: MembershipArgs,
|
||||
) -> anyhow::Result<()> {
|
||||
let id = match &command {
|
||||
MembershipCommand::Assign(AssignArgs { id, .. }) => id,
|
||||
MembershipCommand::Remove(RemoveArgs { id, .. }) => id,
|
||||
MembershipCommand::List(ListArgs { id }) => id,
|
||||
MembershipCommand::Assign(AssignArgs { id, .. })
|
||||
| MembershipCommand::Remove(RemoveArgs { id, .. })
|
||||
| MembershipCommand::List(ListArgs { id }) => id,
|
||||
};
|
||||
|
||||
match &command {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use crate::config::{
|
||||
Config, DataStoreConfig, DavPushConfig, HttpConfig, SqliteDataStoreConfig, TracingConfig,
|
||||
Config, DataStoreConfig, DavPushConfig, HttpConfig, NextcloudLoginConfig,
|
||||
SqliteDataStoreConfig, TracingConfig,
|
||||
};
|
||||
use clap::Parser;
|
||||
use rustical_frontend::FrontendConfig;
|
||||
@@ -23,7 +24,7 @@ pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
|
||||
},
|
||||
oidc: None,
|
||||
dav_push: DavPushConfig::default(),
|
||||
nextcloud_login: Default::default(),
|
||||
nextcloud_login: NextcloudLoginConfig::default(),
|
||||
};
|
||||
let generated_config = toml::to_string(&config)?;
|
||||
println!("{generated_config}");
|
||||
|
||||
@@ -140,7 +140,7 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
|
||||
.unwrap()
|
||||
.to_string()
|
||||
.into(),
|
||||
)
|
||||
);
|
||||
}
|
||||
if name.is_some() {
|
||||
principal.displayname = name;
|
||||
@@ -152,7 +152,7 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
|
||||
println!("Principal {id} updated");
|
||||
}
|
||||
Command::Membership(args) => {
|
||||
handle_membership_command(principal_store.as_ref(), args).await?
|
||||
handle_membership_command(principal_store.as_ref(), args).await?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
|
||||
@@ -41,7 +41,7 @@ pub struct TracingConfig {
|
||||
pub opentelemetry: bool,
|
||||
}
|
||||
|
||||
fn default_true() -> bool {
|
||||
const fn default_true() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ async fn get_data_stores(
|
||||
let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
|
||||
let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
|
||||
let subscription_store = Arc::new(SqliteStore::new(db.clone()));
|
||||
let principal_store = Arc::new(SqlitePrincipalStore::new(db.clone()));
|
||||
let principal_store = Arc::new(SqlitePrincipalStore::new(db));
|
||||
(
|
||||
addressbook_store,
|
||||
cal_store,
|
||||
@@ -128,7 +128,7 @@ async fn main() -> Result<()> {
|
||||
let listener = tokio::net::TcpListener::bind(&address).await?;
|
||||
tasks.push(tokio::spawn(async move {
|
||||
info!("RustiCal serving on http://{address}");
|
||||
axum::serve(listener, app).await.unwrap()
|
||||
axum::serve(listener, app).await.unwrap();
|
||||
}));
|
||||
|
||||
for task in tasks {
|
||||
|
||||
Reference in New Issue
Block a user