refactor(widget): Remove 'Matrix' from some identifiers

Just making these a bit less verbose and more consistent with surrounding identifiers.

Author: robintown

crates/matrix-sdk/src/widget/machine/driver_req.rs

@@ -50,7 +50,7 @@ pub(crate) enum MatrixDriverRequestData {
     ReadStateEvent(ReadStateEventRequest),
 
     /// Send matrix event that corresponds to the given description.
-    SendMatrixEvent(SendEventRequest),
+    SendEvent(SendEventRequest),
 
     /// Data for sending a UpdateDelayedEvent client server api request.
     UpdateDelayedEvent(UpdateDelayedEventRequest),
@@ -178,7 +178,7 @@ impl MatrixDriverRequest for ReadMessageLikeEventRequest {
 impl FromMatrixDriverResponse for Vec<Raw<AnyTimelineEvent>> {
     fn from_response(ev: MatrixDriverResponse) -> Option<Self> {
         match ev {
-            MatrixDriverResponse::MatrixEventRead(response) => Some(response),
+            MatrixDriverResponse::EventsRead(response) => Some(response),
             _ => {
                 error!("bug in MatrixDriver, received wrong event response");
                 None
@@ -233,7 +233,7 @@ pub(crate) struct SendEventRequest {
 
 impl From<SendEventRequest> for MatrixDriverRequestData {
     fn from(value: SendEventRequest) -> Self {
-        MatrixDriverRequestData::SendMatrixEvent(value)
+        MatrixDriverRequestData::SendEvent(value)
     }
 }
 
@@ -244,7 +244,7 @@ impl MatrixDriverRequest for SendEventRequest {
 impl FromMatrixDriverResponse for SendEventResponse {
     fn from_response(ev: MatrixDriverResponse) -> Option<Self> {
         match ev {
-            MatrixDriverResponse::MatrixEventSent(response) => Some(response),
+            MatrixDriverResponse::EventSent(response) => Some(response),
             _ => {
                 error!("bug in MatrixDriver, received wrong event response");
                 None
@@ -274,7 +274,7 @@ impl MatrixDriverRequest for UpdateDelayedEventRequest {
 impl FromMatrixDriverResponse for update_delayed_event::unstable::Response {
     fn from_response(ev: MatrixDriverResponse) -> Option<Self> {
         match ev {
-            MatrixDriverResponse::MatrixDelayedEventUpdate(response) => Some(response),
+            MatrixDriverResponse::DelayedEventUpdated(response) => Some(response),
             _ => {
                 error!("bug in MatrixDriver, received wrong event response");
                 None

crates/matrix-sdk/src/widget/machine/from_widget.rs

@@ -175,7 +175,7 @@ pub(super) enum ApiVersion {
 
 #[derive(Deserialize, Debug)]
 #[serde(untagged)]
-pub(super) enum ReadEventRequest {
+pub(super) enum ReadEventsRequest {
     ReadStateEvent {
         #[serde(rename = "type")]
         event_type: String,

crates/matrix-sdk/src/widget/machine/incoming.rs

@@ -60,12 +60,14 @@ pub(crate) enum MatrixDriverResponse {
     /// A response to an `Action::GetOpenId` command.
     OpenIdReceived(request_openid_token::v3::Response),
     /// Client read some matrix event(s).
-    /// A response to an `Action::ReadMatrixEvent` commands.
-    MatrixEventRead(Vec<Raw<AnyTimelineEvent>>),
+    /// A response to a `Action::ReadEvent` command.
+    EventsRead(Vec<Raw<AnyTimelineEvent>>),
     /// Client sent some matrix event. The response contains the event ID.
-    /// A response to an `Action::SendMatrixEvent` command.
-    MatrixEventSent(SendEventResponse),
-    MatrixDelayedEventUpdate(delayed_events::update_delayed_event::unstable::Response),
+    /// A response to a `Action::SendEvent` command.
+    EventSent(SendEventResponse),
+    /// Client updated a delayed event.
+    /// A response to a `Action::UpdateDelayedEvent` command.
+    DelayedEventUpdated(delayed_events::update_delayed_event::unstable::Response),
 }
 
 pub(super) struct IncomingWidgetMessage {

crates/matrix-sdk/src/widget/mod.rs

@@ -210,14 +210,14 @@ impl WidgetDriver {
                     MatrixDriverRequestData::ReadMessageLikeEvent(cmd) => matrix_driver
                         .read_message_like_events(cmd.event_type.into(), cmd.limit)
                         .await
-                        .map(MatrixDriverResponse::MatrixEventRead),
+                        .map(MatrixDriverResponse::EventsRead),
 
                     MatrixDriverRequestData::ReadStateEvent(cmd) => matrix_driver
                         .read_state_events(cmd.event_type.into(), &cmd.state_key)
                         .await
-                        .map(MatrixDriverResponse::MatrixEventRead),
+                        .map(MatrixDriverResponse::StateRead),
 
-                    MatrixDriverRequestData::SendMatrixEvent(req) => {
+                    MatrixDriverRequestData::SendEvent(req) => {
                         let SendEventRequest { event_type, state_key, content, delay } = req;
                         // The widget api action does not use the unstable prefix:
                         // `org.matrix.msc4140.delay` so we
@@ -229,13 +229,13 @@ impl WidgetDriver {
                         matrix_driver
                             .send(event_type.into(), state_key, content, delay_event_parameter)
                             .await
-                            .map(MatrixDriverResponse::MatrixEventSent)
+                            .map(MatrixDriverResponse::EventSent)
                     }
 
                     MatrixDriverRequestData::UpdateDelayedEvent(req) => matrix_driver
                         .update_delayed_event(req.delay_id, req.action)
                         .await
-                        .map(MatrixDriverResponse::MatrixDelayedEventUpdate),
+                        .map(MatrixDriverResponse::DelayedEventUpdated),
                 };
 
                 // Forward the matrix driver response to the incoming message stream.