chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push-gateway-api: Use fine-grained event type enums

Browse Source
This commit is contained in:
Jonas Platte 2022-03-15 16:46:25 +01:00
parent 7e05351f58
commit 88477f2ad5
No known key found for this signature in database
GPG Key ID: BBA95679259D342F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ruma-push-gateway-api/src/send_event_notification.rs
View File

@ -11,7 +11,7 @@ pub mod v1 {
use js_int::UInt; use js_int::UInt;
use ruma_common::{ use ruma_common::{
api::ruma_api, api::ruma_api,
events::EventType, events::RoomEventType,
push::{PusherData, Tweak}, push::{PusherData, Tweak},
serde::{Outgoing, StringEnum}, serde::{Outgoing, StringEnum},
EventId, RoomAliasId, RoomId, RoomName, SecondsSinceUnixEpoch, UserId, EventId, RoomAliasId, RoomId, RoomName, SecondsSinceUnixEpoch, UserId,
@ -84,7 +84,7 @@ pub mod v1 {
/// The type of the event as in the event's `type` field. /// The type of the event as in the event's `type` field.
#[serde(rename = "type", skip_serializing_if = "Option::is_none")] #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
pub event_type: Option<&'a EventType>, pub event_type: Option<&'a RoomEventType>,
/// The sender of the event as in the corresponding event field. /// The sender of the event as in the corresponding event field.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -321,7 +321,7 @@ pub mod v1 {
mod tests { mod tests {
use js_int::uint; use js_int::uint;
use ruma_common::{ use ruma_common::{
event_id, events::EventType, room_alias_id, room_id, user_id, SecondsSinceUnixEpoch, event_id, events::RoomEventType, room_alias_id, room_id, user_id, SecondsSinceUnixEpoch,
}; };
use serde_json::{ use serde_json::{
from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue,
@ -384,7 +384,7 @@ pub mod v1 {
let notice = Notification { let notice = Notification {
event_id: Some(eid), event_id: Some(eid),
room_id: Some(rid), room_id: Some(rid),
event_type: Some(&EventType::RoomMessage), event_type: Some(&RoomEventType::RoomMessage),
sender: Some(uid), sender: Some(uid),
sender_display_name: Some("Major Tom"), sender_display_name: Some("Major Tom"),
room_alias: Some(alias), room_alias: Some(alias),