feat(conference): add Conference enum entry

Author: NamsooCho

src/toxcore/messenger/conference/mod.rs

@@ -1,4 +1,4 @@
-/*! Conference Packets
+/*! The implementation of conference
 */
 
 pub mod packet;

…ore/messenger/packet/group/chane_name.rs …essenger/conference/packet/chane_name.rssrc/toxcore/messenger/packet/group/chane_name.rs renamed to src/toxcore/messenger/conference/packet/chane_name.rs src/toxcore/messenger/packet/group/chane_name.rs renamed to src/toxcore/messenger/conference/packet/chane_name.rs

@@ -5,18 +5,18 @@ use std::str;
 use nom::{be_u16, be_u32, rest};
 
 use crate::toxcore::binary_io::*;
-use super::MAX_NAME_LENGTH_IN_GROUP;
+use super::MAX_NAME_LENGTH_IN_CONFERENCE;
 
-/** ChangeName is the struct that holds info to notify changing name of a peer to a group chat.
+/** ChangeName is the struct that holds info to notify changing name of a peer to a conference.
 
-Sent by a peer who wants to change its name or by a joining peer to notify its name to members of group chat.
+Sent by a peer who wants to change its name or by a joining peer to notify its name to members of conference.
 
 Serialized form:
 
 Length    | Content
 --------- | ------
 `1`       | `0x63`
-`2`       | `group number`
+`2`       | `conference number`
 `2`       | `peer number`
 `4`       | `message number`
 `1`       | `0x30`
@@ -25,7 +25,7 @@ variable  | `name`(UTF-8 C String)
 */
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ChangeName {
-    group_number: u16,
+    conference_number: u16,
     peer_number: u16,
     message_number: u32,
     name: String,
@@ -34,14 +34,14 @@ pub struct ChangeName {
 impl FromBytes for ChangeName {
     named!(from_bytes<ChangeName>, do_parse!(
         tag!("\x63") >>
-        group_number: be_u16 >>
+        conference_number: be_u16 >>
         peer_number: be_u16 >>
         message_number: be_u32 >>
         tag!("\x30") >>
-        name: map_res!(verify!(rest, |name: &[u8]| name.len() <= MAX_NAME_LENGTH_IN_GROUP),
+        name: map_res!(verify!(rest, |name: &[u8]| name.len() <= MAX_NAME_LENGTH_IN_CONFERENCE),
             str::from_utf8) >>
         (ChangeName {
-            group_number,
+            conference_number,
             peer_number,
             message_number,
             name: name.to_string(),
@@ -53,21 +53,21 @@ impl ToBytes for ChangeName {
     fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
         do_gen!(buf,
             gen_be_u8!(0x63) >>
-            gen_be_u16!(self.group_number) >>
+            gen_be_u16!(self.conference_number) >>
             gen_be_u16!(self.peer_number) >>
             gen_be_u32!(self.message_number) >>
             gen_be_u8!(0x30) >>
-            gen_cond!(self.name.len() > MAX_NAME_LENGTH_IN_GROUP, |buf| gen_error(buf, 0)) >>
+            gen_cond!(self.name.len() > MAX_NAME_LENGTH_IN_CONFERENCE, |buf| gen_error(buf, 0)) >>
             gen_slice!(self.name.as_bytes())
         )
     }
 }
 
 impl ChangeName {
     /// Create new ChangeName object.
-    pub fn new(group_number: u16, peer_number: u16, message_number: u32, name: String) -> Self {
+    pub fn new(conference_number: u16, peer_number: u16, message_number: u32, name: String) -> Self {
         ChangeName {
-            group_number,
+            conference_number,
             peer_number,
             message_number,
             name,
@@ -94,17 +94,17 @@ mod tests {
 
     #[test]
     fn change_name_from_bytes_overflow() {
-        let large_string = vec![32; MAX_NAME_LENGTH_IN_GROUP + 1];
+        let large_string = vec![32; MAX_NAME_LENGTH_IN_CONFERENCE + 1];
         let mut buf = vec![0x63, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30];
         buf.extend_from_slice(&large_string);
         assert!(ChangeName::from_bytes(&buf).is_err());
     }
 
     #[test]
     fn change_name_to_bytes_overflow() {
-        let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_GROUP + 1]).unwrap();
+        let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_CONFERENCE + 1]).unwrap();
         let large_name = ChangeName::new(1,2, 3, large_string);
-        let mut buf = [0; MAX_NAME_LENGTH_IN_GROUP + 1 + 2 + 2 + 4 + 1]; // packet id + group number + peer number + message number + message kind.
+        let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference number + peer number + message number + message kind.
         assert!(large_name.to_bytes((&mut buf, 0)).is_err());
     }
 }

…e/messenger/packet/group/change_title.rs …senger/conference/packet/change_title.rssrc/toxcore/messenger/packet/group/change_title.rs renamed to src/toxcore/messenger/conference/packet/change_title.rs src/toxcore/messenger/packet/group/change_title.rs renamed to src/toxcore/messenger/conference/packet/change_title.rs

@@ -5,19 +5,19 @@ use std::str;
 use nom::{be_u16, be_u32, rest};
 
 use crate::toxcore::binary_io::*;
-use super::MAX_NAME_LENGTH_IN_GROUP;
+use super::MAX_NAME_LENGTH_IN_CONFERENCE;
 
-/** ChangeTitle is the struct that holds info to change title of a group chat.
+/** ChangeTitle is the struct that holds info to change title of a conference.
 
-Sent by anyone who is member of group.
-This packet is used to change the title of group chat.
+Sent by anyone who is member of conference.
+This packet is used to change the title of conference.
 
 Serialized form:
 
 Length    | Content
 --------- | ------
 `1`       | `0x63`
-`2`       | `group number`
+`2`       | `conference number`
 `2`       | `peer number`
 `4`       | `message number`
 `1`       | `0x31`
@@ -26,7 +26,7 @@ variable  | `title`(UTF-8 C String)
 */
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ChangeTitle {
-    group_number: u16,
+    conference_number: u16,
     peer_number: u16,
     message_number: u32,
     title: String,
@@ -35,14 +35,14 @@ pub struct ChangeTitle {
 impl FromBytes for ChangeTitle {
     named!(from_bytes<ChangeTitle>, do_parse!(
         tag!("\x63") >>
-        group_number: be_u16 >>
+        conference_number: be_u16 >>
         peer_number: be_u16 >>
         message_number: be_u32 >>
         tag!("\x31") >>
-        title: map_res!(verify!(rest, |title: &[u8]| title.len() <= MAX_NAME_LENGTH_IN_GROUP),
+        title: map_res!(verify!(rest, |title: &[u8]| title.len() <= MAX_NAME_LENGTH_IN_CONFERENCE),
             str::from_utf8) >>
         (ChangeTitle {
-            group_number,
+            conference_number,
             peer_number,
             message_number,
             title: title.to_string(),
@@ -54,21 +54,21 @@ impl ToBytes for ChangeTitle {
     fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
         do_gen!(buf,
             gen_be_u8!(0x63) >>
-            gen_be_u16!(self.group_number) >>
+            gen_be_u16!(self.conference_number) >>
             gen_be_u16!(self.peer_number) >>
             gen_be_u32!(self.message_number) >>
             gen_be_u8!(0x31) >>
-            gen_cond!(self.title.len() > MAX_NAME_LENGTH_IN_GROUP, |buf| gen_error(buf, 0)) >>
+            gen_cond!(self.title.len() > MAX_NAME_LENGTH_IN_CONFERENCE, |buf| gen_error(buf, 0)) >>
             gen_slice!(self.title.as_bytes())
         )
     }
 }
 
 impl ChangeTitle {
     /// Create new ChangeTitle object.
-    pub fn new(group_number: u16, peer_number: u16, message_number: u32, title: String) -> Self {
+    pub fn new(conference_number: u16, peer_number: u16, message_number: u32, title: String) -> Self {
         ChangeTitle {
-            group_number,
+            conference_number,
             peer_number,
             message_number,
             title,
@@ -95,17 +95,17 @@ mod tests {
 
     #[test]
     fn change_title_from_bytes_overflow() {
-        let large_string = vec![32; MAX_NAME_LENGTH_IN_GROUP + 1];
+        let large_string = vec![32; MAX_NAME_LENGTH_IN_CONFERENCE + 1];
         let mut buf = vec![0x63, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31];
         buf.extend_from_slice(&large_string);
         assert!(ChangeTitle::from_bytes(&buf).is_err());
     }
 
     #[test]
     fn change_title_to_bytes_overflow() {
-        let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_GROUP + 1]).unwrap();
+        let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_CONFERENCE + 1]).unwrap();
         let large_title = ChangeTitle::new(1,2, 3, large_string);
-        let mut buf = [0; MAX_NAME_LENGTH_IN_GROUP + 1 + 2 + 2 + 4 + 1]; // packet id + group number + peer number + message number + message kind.
+        let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference number + peer number + message number + message kind.
         assert!(large_title.to_bytes((&mut buf, 0)).is_err());
     }
 }

…e/messenger/packet/group/group_action.rs …r/conference/packet/conference_action.rssrc/toxcore/messenger/packet/group/group_action.rs renamed to src/toxcore/messenger/conference/packet/conference_action.rs src/toxcore/messenger/packet/group/group_action.rs renamed to src/toxcore/messenger/conference/packet/conference_action.rs

@@ -1,59 +1,59 @@
-/*! Group action action struct.
+/*! Conference action action struct.
 */
 
 use std::str;
 use nom::{be_u16, be_u32, rest};
 
 use crate::toxcore::binary_io::*;
 
-/** GroupAction is the struct that holds info to send action to a group chat.
+/** ConferenceAction is the struct that holds info to send action to a conference.
 
-Sent to notify action to all member of group chat.
+Sent to notify action to all member of conference.
 
 Serialized form:
 
 Length    | Content
 --------- | ------
 `1`       | `0x63`
-`2`       | `group number`
+`2`       | `conference number`
 `2`       | `peer number`
 `4`       | `action number`
 `1`       | `0x41`
 variable  | `action`(UTF-8 C String)
 
 */
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct GroupAction {
-    group_number: u16,
+pub struct ConferenceAction {
+    conference_number: u16,
     peer_number: u16,
     message_number: u32,
     /// Maximum length of action is the limit of NetCrypto packet.
     /// Do not check the length here.
     action: String,
 }
 
-impl FromBytes for GroupAction {
-    named!(from_bytes<GroupAction>, do_parse!(
+impl FromBytes for ConferenceAction {
+    named!(from_bytes<ConferenceAction>, do_parse!(
         tag!("\x63") >>
-        group_number: be_u16 >>
+        conference_number: be_u16 >>
         peer_number: be_u16 >>
         message_number: be_u32 >>
         tag!("\x41") >>
         action: map_res!(rest, str::from_utf8) >>
-        (GroupAction {
-            group_number,
+        (ConferenceAction {
+            conference_number,
             peer_number,
             message_number,
             action: action.to_string(),
         })
     ));
 }
 
-impl ToBytes for GroupAction {
+impl ToBytes for ConferenceAction {
     fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
         do_gen!(buf,
             gen_be_u8!(0x63) >>
-            gen_be_u16!(self.group_number) >>
+            gen_be_u16!(self.conference_number) >>
             gen_be_u16!(self.peer_number) >>
             gen_be_u32!(self.message_number) >>
             gen_be_u8!(0x41) >>
@@ -62,11 +62,11 @@ impl ToBytes for GroupAction {
     }
 }
 
-impl GroupAction {
-    /// Create new GroupAction object.
-    pub fn new(group_number: u16, peer_number: u16, message_number: u32, action: String) -> Self {
-        GroupAction {
-            group_number,
+impl ConferenceAction {
+    /// Create new ConferenceAction object.
+    pub fn new(conference_number: u16, peer_number: u16, message_number: u32, action: String) -> Self {
+        ConferenceAction {
+            conference_number,
             peer_number,
             message_number,
             action,
@@ -79,15 +79,15 @@ mod tests {
     use super::*;
 
     encode_decode_test!(
-        group_action_encode_decode,
-        GroupAction::new(1, 2, 3, "1234".to_owned())
+        conference_action_encode_decode,
+        ConferenceAction::new(1, 2, 3, "1234".to_owned())
     );
 
     #[test]
-    fn group_action_from_bytes_encoding_error() {
+    fn conference_action_from_bytes_encoding_error() {
         let err_string = vec![0, 159, 146, 150]; // not UTF8 bytes.
         let mut buf = vec![0x63, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x41];
         buf.extend_from_slice(&err_string);
-        assert!(GroupAction::from_bytes(&buf).is_err());
+        assert!(ConferenceAction::from_bytes(&buf).is_err());
     }
 }