Merge pull request #837 from johannescpk/appservice/refactor-cleanup

refactor(appservice)!: Improve API and cleanup docs

crates/matrix-sdk-appservice/examples/appservice_autojoin.rs

@@ -31,7 +31,7 @@ pub async fn handle_room_member(
             error_if_user_not_in_use(error)?;
         }
 
-        let client = appservice.virtual_user_client(user_id.localpart()).await?;
+        let client = appservice.virtual_user(Some(user_id.localpart())).await?;
         client.join_room_by_id(room.room_id()).await?;
     }
 
@@ -61,15 +61,17 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let appservice = AppService::new(homeserver_url, server_name, registration).await?;
     appservice.register_user_query(Box::new(|_, _| Box::pin(async { true }))).await;
     appservice
-        .register_event_handler_context(appservice.clone())?
+        .virtual_user(None)
+        .await?
+        .register_event_handler_context(appservice.clone())
         .register_event_handler(
             move |event: OriginalSyncRoomMemberEvent,
                   room: Room,
                   Ctx(appservice): Ctx<AppService>| {
                 handle_room_member(appservice, room, event)
             },
         )
-        .await?;
+        .await;
 
     let (host, port) = appservice.registration().get_host_and_port()?;
     appservice.run(host, port).await?;

crates/matrix-sdk-appservice/src/event_handler.rs

@@ -1,3 +1,17 @@
+// Copyright 2022 Famedly GmbH
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use std::{future::Future, pin::Pin, sync::Arc};
 
 use matrix_sdk::locks::Mutex;