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

Prepend "Event" to event type names.

Browse Source
This commit is contained in:
Jimmy Cuadra 2015-11-29 06:17:14 -08:00
parent f700cdf8b7
commit df73d2815a
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/call.rs
View File

@ -3,15 +3,15 @@
use core::{Event, RoomEvent};
/// This event is sent by the callee when they wish to answer the call.
pub struct Answer<'a> {
content: AnswerContent<'a>,
pub struct AnswerEvent<'a> {
content: AnswerEventContent<'a>,
event_id: String,
room_id: String,
user_id: String,
}
impl<'a> Event<'a, AnswerContent<'a>> for Answer<'a> {
fn content(&'a self) -> &'a AnswerContent {
impl<'a> Event<'a, AnswerEventContent<'a>> for AnswerEvent<'a> {
fn content(&'a self) -> &'a AnswerEventContent {
&self.content
}
@ -20,7 +20,7 @@ impl<'a> Event<'a, AnswerContent<'a>> for Answer<'a> {
}
}
impl<'a> RoomEvent<'a, AnswerContent<'a>> for Answer<'a> {
impl<'a> RoomEvent<'a, AnswerEventContent<'a>> for AnswerEvent<'a> {
fn event_id(&'a self) -> &'a str {
&self.event_id
}
@ -34,8 +34,8 @@ impl<'a> RoomEvent<'a, AnswerContent<'a>> for Answer<'a> {
}
}
/// The payload of an `Answer` event.
pub struct AnswerContent<'a> {
/// The payload of an `AnswerEvent`.
pub struct AnswerEventContent<'a> {
/// The VoIP session description.
answer: SessionDescription<'a>,
/// The ID of the call this event relates to.
@ -62,15 +62,15 @@ pub enum SessionDescriptionType {
/// This event is sent by callers after sending an invite and by the callee after answering.
/// Its purpose is to give the other party additional ICE candidates to try using to communicate.
pub struct Candidates<'a> {
content: CandidatesContent<'a>,
pub struct CandidatesEvent<'a> {
content: CandidatesEventContent<'a>,
event_id: &'a str,
room_id: &'a str,
user_id: &'a str,
}
impl<'a> Event<'a, CandidatesContent<'a>> for Candidates<'a> {
fn content(&'a self) -> &'a CandidatesContent {
impl<'a> Event<'a, CandidatesEventContent<'a>> for CandidatesEvent<'a> {
fn content(&'a self) -> &'a CandidatesEventContent {
&self.content
}
@ -79,7 +79,7 @@ impl<'a> Event<'a, CandidatesContent<'a>> for Candidates<'a> {
}
}
impl<'a> RoomEvent<'a, CandidatesContent<'a>> for Candidates<'a> {
impl<'a> RoomEvent<'a, CandidatesEventContent<'a>> for CandidatesEvent<'a> {
fn event_id(&'a self) -> &'a str {
&self.event_id
}
@ -93,8 +93,8 @@ impl<'a> RoomEvent<'a, CandidatesContent<'a>> for Candidates<'a> {
}
}
/// The payload of a `Candidates` event.
pub struct CandidatesContent<'a> {
/// The payload of a `CandidatesEvent`.
pub struct CandidatesEventContent<'a> {
/// The ID of the call this event relates to.
call_id: &'a str,
/// A list of candidates.
@ -115,15 +115,15 @@ pub struct Candidate<'a> {
/// Sent by either party to signal their termination of the call. This can be sent either once the
/// call has has been established or before to abort the call.
pub struct Hangup<'a> {
content: HangupContent<'a>,
pub struct HangupEvent<'a> {
content: HangupEventContent<'a>,
event_id: &'a str,
room_id: &'a str,
user_id: &'a str,
}
impl<'a> Event<'a, HangupContent<'a>> for Hangup<'a> {
fn content(&'a self) -> &'a HangupContent {
impl<'a> Event<'a, HangupEventContent<'a>> for HangupEvent<'a> {
fn content(&'a self) -> &'a HangupEventContent {
&self.content
}
@ -132,7 +132,7 @@ impl<'a> Event<'a, HangupContent<'a>> for Hangup<'a> {
}
}
impl<'a> RoomEvent<'a, HangupContent<'a>> for Hangup<'a> {
impl<'a> RoomEvent<'a, HangupEventContent<'a>> for HangupEvent<'a> {
fn event_id(&'a self) -> &'a str {
&self.event_id
}
@ -146,8 +146,8 @@ impl<'a> RoomEvent<'a, HangupContent<'a>> for Hangup<'a> {
}
}
/// The payload of a `Hangup` event.
pub struct HangupContent<'a> {
/// The payload of a `HangupEvent`.
pub struct HangupEventContent<'a> {
/// The ID of the call this event relates to.
call_id: &'a str,
/// The version of the VoIP specification this messages adheres to.
@ -155,15 +155,15 @@ pub struct HangupContent<'a> {
}
/// This event is sent by the caller when they wish to establish a call.
pub struct Invite<'a> {
content: InviteContent<'a>,
pub struct InviteEvent<'a> {
content: InviteEventContent<'a>,
event_id: &'a str,
room_id: &'a str,
user_id: &'a str,
}
impl<'a> Event<'a, InviteContent<'a>> for Invite<'a> {
fn content(&'a self) -> &'a InviteContent {
impl<'a> Event<'a, InviteEventContent<'a>> for InviteEvent<'a> {
fn content(&'a self) -> &'a InviteEventContent {
&self.content
}
@ -172,7 +172,7 @@ impl<'a> Event<'a, InviteContent<'a>> for Invite<'a> {
}
}
impl<'a> RoomEvent<'a, InviteContent<'a>> for Invite<'a> {
impl<'a> RoomEvent<'a, InviteEventContent<'a>> for InviteEvent<'a> {
fn event_id(&'a self) -> &'a str {
&self.event_id
}
@ -186,8 +186,8 @@ impl<'a> RoomEvent<'a, InviteContent<'a>> for Invite<'a> {
}
}
/// The payload of an `Invite` event.
pub struct InviteContent<'a> {
/// The payload of an `InviteEvent`.
pub struct InviteEventContent<'a> {
/// A unique identifer for the call.
call_id: &'a str,
/// The time in milliseconds that the invite is valid for. Once the invite age exceeds this

12
src/presence.rs
View File

@ -3,13 +3,13 @@
use core::Event;
/// Informs the client of a user's presence state change.
pub struct Presence<'a> {
content: PresenceContent<'a>,
pub struct PresenceEvent<'a> {
content: PresenceEventContent<'a>,
event_id: &'a str,
}
impl<'a> Event<'a, PresenceContent<'a>> for Presence<'a> {
fn content(&'a self) -> &'a PresenceContent {
impl<'a> Event<'a, PresenceEventContent<'a>> for PresenceEvent<'a> {
fn content(&'a self) -> &'a PresenceEventContent {
&self.content
}
@ -18,8 +18,8 @@ impl<'a> Event<'a, PresenceContent<'a>> for Presence<'a> {
}
}
/// The payload of a `Presence` event.
pub struct PresenceContent<'a> {
/// The payload of a `PresenceEvent`.
pub struct PresenceEventContent<'a> {
/// The current avatar URL for this user.
avatar_url: Option<&'a str>,
/// The current display name for this user.

12
src/typing.rs
View File

@ -3,15 +3,15 @@
use core::Event;
/// Informs the client of the list of users currently typing.
pub struct Typing<'a> {
pub struct TypingEvent<'a> {
/// The payload.
content: TypingContent<'a>,
content: TypingEventContent<'a>,
/// The ID of the room associated with this event.
room_id: &'a str,
}
impl<'a> Event<'a, TypingContent<'a>> for Typing<'a> {
fn content(&'a self) -> &'a TypingContent<'a> {
impl<'a> Event<'a, TypingEventContent<'a>> for TypingEvent<'a> {
fn content(&'a self) -> &'a TypingEventContent<'a> {
&self.content
}
@ -20,8 +20,8 @@ impl<'a> Event<'a, TypingContent<'a>> for Typing<'a> {
}
}
/// The payload of a `Typing` event.
pub struct TypingContent<'a> {
/// The payload of a `TypingEvent`.
pub struct TypingEventContent<'a> {
/// The list of user IDs typing in this room, if any.
user_ids: &'a[&'a str],
}