Fix and simplify packets

This commit is contained in:
Joscha 2022-02-11 22:11:20 +01:00
parent 7458eac931
commit 0e6acdbff4
4 changed files with 173 additions and 24 deletions

View file

@ -1,10 +1,10 @@
use serde::{Deserialize, Serialize};
use crate::{ Identity, MessageId};
use crate::{Identity, MessageId};
#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct Message {
pub pred: Option<MessageId>,
pub pred: MessageId,
pub parent: Option<MessageId>,
pub identity: Identity,
pub nick: String,
@ -13,10 +13,7 @@ pub struct Message {
impl Message {
pub fn id(&self) -> MessageId {
let pred = match self.pred {
Some(id) => format!("{id}"),
None => "none".to_string(),
};
let pred = self.pred;
let parent = match self.parent {
Some(id) => format!("{id}"),
None => "none".to_string(),