rebase on current main

conduwuit-example.toml

@@ -58,7 +58,11 @@
 #
 #port = 8008
 
-# The UNIX socket continuwuity will listen on.
+# This item is undocumented. Please contribute documentation for it.
+#
+#auth =
+
+# The UNIX socket conduwuit will listen on.
 #
 # continuwuity cannot listen on both an IP address and a UNIX socket. If
 # listening on a UNIX socket, you MUST remove/comment the `address` key.

src/service/services.rs

@@ -13,7 +13,7 @@ use crate::{
 	manager::Manager,
 	media, moderation, presence, pusher, resolver, rooms, sending, server_keys, service,
 	service::{Args, Map, Service},
-	sync, transaction_ids, uiaa, users,
+	sync, transaction_ids, uiaa, users, oidc,
 };
 
 pub struct Services {
@@ -39,6 +39,7 @@ pub struct Services {
 	pub users: Arc<users::Service>,
 	pub moderation: Arc<moderation::Service>,
 	pub announcements: Arc<announcements::Service>,
+	pub oidc: Arc<oidc::Service>,
 
 	manager: Mutex<Option<Arc<Manager>>>,
 	pub(crate) service: Arc<Map>,