Skip to content

Commit 72b5416

Browse files
committed
Remove message event default constructors
1 parent 1605aee commit 72b5416

6 files changed

Lines changed: 17 additions & 105 deletions

File tree

src/models/message/event/audit.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,3 @@ pub struct MessageAudit {
2929
#[serde(skip)]
3030
pub event_id: Option<String>,
3131
}
32-
33-
impl MessageAudit {
34-
/// Creates a new message audit.
35-
pub fn new() -> Self {
36-
Self::default()
37-
}
38-
}

src/models/message/event/c2c.rs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use serde_json::Value;
66
use crate::models::message::C2CMessageParams;
77

88
/// Represents a C2C (client-to-client) message.
9-
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
9+
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
1010
pub struct C2CMessage {
1111
/// The message's unique ID
1212
pub id: Option<String>,
@@ -34,22 +34,6 @@ pub struct C2CMessage {
3434
}
3535

3636
impl C2CMessage {
37-
/// Creates a new C2C message.
38-
pub fn new() -> Self {
39-
Self {
40-
id: None,
41-
content: None,
42-
message_reference: None,
43-
mentions: Vec::new(),
44-
attachments: Vec::new(),
45-
msg_seq: None,
46-
timestamp: None,
47-
author: None,
48-
message_scene: None,
49-
event_id: None,
50-
}
51-
}
52-
5337
/// Reply to this C2C message
5438
pub async fn reply(
5539
&self,
@@ -76,9 +60,3 @@ impl C2CMessage {
7660
}
7761
}
7862
}
79-
80-
impl Default for C2CMessage {
81-
fn default() -> Self {
82-
Self::new()
83-
}
84-
}

src/models/message/event/direct.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,3 @@ impl DirectMessageToCreate {
3333
}
3434
}
3535
}
36-
impl DirectMessage {
37-
/// Creates a new direct-message session.
38-
pub fn new() -> Self {
39-
Self::default()
40-
}
41-
}

src/models/message/event/group.rs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
55
use crate::models::message::GroupMessageParams;
66

77
/// Represents a group message.
8-
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
8+
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
99
pub struct GroupMessage {
1010
/// The message's unique ID
1111
pub id: Option<Snowflake>,
@@ -33,22 +33,6 @@ pub struct GroupMessage {
3333
}
3434

3535
impl GroupMessage {
36-
/// Creates a new group message.
37-
pub fn new() -> Self {
38-
Self {
39-
id: None,
40-
content: None,
41-
message_reference: None,
42-
mentions: Vec::new(),
43-
attachments: Vec::new(),
44-
msg_seq: None,
45-
timestamp: None,
46-
author: None,
47-
group_openid: None,
48-
event_id: None,
49-
}
50-
}
51-
5236
/// Reply to this group message
5337
pub async fn reply(
5438
&self,
@@ -71,9 +55,3 @@ impl GroupMessage {
7155
}
7256
}
7357
}
74-
75-
impl Default for GroupMessage {
76-
fn default() -> Self {
77-
Self::new()
78-
}
79-
}

src/models/message/event/message.rs

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
55
use crate::models::message::{Ark, Embed, MessageParams};
66

77
/// Represents a message in a guild channel.
8-
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
8+
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
99
pub struct Message {
1010
/// The message's unique ID
1111
pub id: Option<Snowflake>,
@@ -60,35 +60,6 @@ pub struct Message {
6060
}
6161

6262
impl Message {
63-
/// Creates a new message.
64-
pub fn new() -> Self {
65-
Self {
66-
id: None,
67-
content: None,
68-
channel_id: None,
69-
guild_id: None,
70-
group_id: None,
71-
author: None,
72-
member: None,
73-
message_reference: None,
74-
mentions: Vec::new(),
75-
attachments: Vec::new(),
76-
embeds: Vec::new(),
77-
ark: None,
78-
direct_message: None,
79-
seq: None,
80-
seq_in_channel: None,
81-
timestamp: None,
82-
edited_timestamp: None,
83-
mention_everyone: None,
84-
src_guild_id: None,
85-
file_info: None,
86-
ttl: None,
87-
message_scene: None,
88-
event_id: None,
89-
}
90-
}
91-
9263
/// Reply to this message
9364
pub async fn reply(
9465
&self,
@@ -111,12 +82,6 @@ impl Message {
11182
}
11283
}
11384

114-
impl Default for Message {
115-
fn default() -> Self {
116-
Self::new()
117-
}
118-
}
119-
12085
impl HasId for Message {
12186
fn id(&self) -> Option<&Snowflake> {
12287
self.id.as_ref()

src/models/message/tests.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ fn messages_pager_omits_empty_query_params() {
516516

517517
#[test]
518518
fn test_message_creation() {
519-
let message = Message::new();
519+
let message = Message::default();
520520
assert!(message.id.is_none());
521521
assert!(message.content.is_none());
522522
assert!(message.attachments.is_empty());
@@ -568,8 +568,10 @@ fn direct_message_session_uses_required_zero_value_fields() {
568568

569569
#[test]
570570
fn test_message_with_content() {
571-
let mut message = Message::new();
572-
message.content = Some("Hello, world!".to_string());
571+
let message = Message {
572+
content: Some("Hello, world!".to_string()),
573+
..Default::default()
574+
};
573575
assert!(
574576
message
575577
.content
@@ -708,13 +710,15 @@ fn message_attachment_omits_go_zero_values() {
708710

709711
#[test]
710712
fn test_bot_detection() {
711-
let mut message = Message::new();
712-
message.author = Some(MessageUser {
713-
id: Some("123".to_string()),
714-
username: Some("Bot".to_string()),
715-
bot: Some(true),
716-
avatar: None,
717-
});
713+
let mut message = Message {
714+
author: Some(MessageUser {
715+
id: Some("123".to_string()),
716+
username: Some("Bot".to_string()),
717+
bot: Some(true),
718+
avatar: None,
719+
}),
720+
..Default::default()
721+
};
718722

719723
assert!(
720724
message

0 commit comments

Comments
 (0)