Merge branch 'timestamped-messaging' into 'next'

feat(appservice): support timestamped messaging See merge request famedly/conduit!703
2024-07-01 09:36:14 +00:00 · 2024-07-01 09:36:14 +00:00 · e70d27af98
commit e70d27af98
parent 7a4d0f6fe8 62f1da053f
11 changed files with 68 additions and 6 deletions
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@ -1448,6 +1448,7 @@ pub async fn create_join_event_template_route(
            unsigned: None,
            state_key: Some(body.user_id.to_string()),
            redacts: None,
+            timestamp: None,
        },
        &body.user_id,
        &body.room_id,