Skip to content
This repository has been archived by the owner on Jun 2, 2023. It is now read-only.

Commit

Permalink
fix derive errors
Browse files Browse the repository at this point in the history
  • Loading branch information
HTGAzureX1212 committed Mar 23, 2022
1 parent 3ab149a commit 22e304b
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions model/src/docs/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The document object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::{
datetime::Timestamp,
Expand All @@ -11,8 +11,8 @@ use crate::{
};

/// Represents a forum thread.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct Document {
channel_id: Id<ChannelMarker>,
content: String,
Expand Down
4 changes: 2 additions & 2 deletions model/src/forum/thread.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The forum thread object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::{
datetime::Timestamp,
Expand All @@ -11,8 +11,8 @@ use crate::{
};

/// Represents a forum thread.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct ForumThread {
channel_id: Id<ChannelMarker>,
content: Option<String>,
Expand Down
4 changes: 2 additions & 2 deletions model/src/list/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The list item object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::{
datetime::Timestamp,
Expand All @@ -11,8 +11,8 @@ use crate::{
};

/// Represents a list item.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct ListItem {
channel_id: Id<ChannelMarker>,
created_at: Timestamp,
Expand Down
6 changes: 3 additions & 3 deletions model/src/messaging/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The chat message model.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::{
datetime::Timestamp,
Expand All @@ -11,8 +11,8 @@ use crate::{
};

/// Represents a chat message.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct ChatMessage {
channel_id: Id<ChannelMarker>,
content: String,
Expand Down Expand Up @@ -74,8 +74,8 @@ impl ChatMessage {
}

/// Represents the type of a chat message.
#[serde(rename_all = "lowercase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
pub enum ChatMessageType {
/// A message sent by a user or a bot.
Default,
Expand Down
4 changes: 2 additions & 2 deletions model/src/reactions/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The content reaction object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::{
datetime::Timestamp,
Expand All @@ -11,8 +11,8 @@ use crate::{
};

/// Represents a reaction object.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct Reaction {
created_at: Timestamp,
created_by: Id<UserMarker>,
Expand Down
4 changes: 2 additions & 2 deletions model/src/server/member/mod.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//! The member object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::datetime::Timestamp;
use crate::id::{marker::RoleMarker, Id};
use crate::user::User;

/// Represents a server member.
#[serde(rename_all = "camelCase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct Member {
user: User,
role_ids: Vec<Id<RoleMarker>>,
Expand Down
7 changes: 4 additions & 3 deletions model/src/user/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
//! The user object.
extern crate serde;
use serde::{Deserialize, Serialize};

use crate::datetime::Timestamp;
use crate::id::{marker::UserMarker, Id};

#[serde(rename_all = "camelCase")]
/// Represents a user.
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct User {
id: Id<UserMarker>,
r#type: UserType,
Expand All @@ -33,8 +34,8 @@ impl User {
}

/// Represents the type of a user.
#[serde(rename_all = "lowercase")]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
pub enum UserType {
Bot,
User,
Expand Down

0 comments on commit 22e304b

Please sign in to comment.