buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

cargo fmt

Browse Source
This commit is contained in:
James Magahern
2025-06-06 16:39:31 -07:00
parent 8cd72d9417
commit 1d3b2f25ba
44 changed files with 758 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kordophone-db/src/models/conversation.rs
View File

@@ -1,6 +1,6 @@
use crate::models::participant::Participant;
use chrono::{DateTime, NaiveDateTime};
use uuid::Uuid;
use crate::models::participant::Participant;
#[derive(Clone, Debug)]
pub struct Conversation {
@@ -33,18 +33,17 @@ impl From<kordophone::model::Conversation> for Conversation {
fn from(value: kordophone::model::Conversation) -> Self {
Self {
guid: value.guid,
unread_count: u16::try_from(value.unread_count).unwrap(),
unread_count: u16::try_from(value.unread_count).unwrap(),
display_name: value.display_name,
last_message_preview: value.last_message_preview,
date: DateTime::from_timestamp(
value.date.unix_timestamp(),
value.date.unix_timestamp_nanos()
.try_into()
.unwrap_or(0),
)
.unwrap()
.naive_local(),
participants: value.participant_display_names
value.date.unix_timestamp_nanos().try_into().unwrap_or(0),
)
.unwrap()
.naive_local(),
participants: value
.participant_display_names
.into_iter()
.map(|p| p.into())
.collect(),

15
kordophone-db/src/models/db/conversation.rs
View File

@@ -1,9 +1,6 @@
use diesel::prelude::*;
use crate::models::{db::participant::InsertableRecord as InsertableParticipant, Conversation};
use chrono::NaiveDateTime;
use crate::models::{
Conversation,
db::participant::InsertableRecord as InsertableParticipant,
};
use diesel::prelude::*;
#[derive(Queryable, Selectable, Insertable, AsChangeset, Clone, Identifiable)]
#[diesel(table_name = crate::schema::conversations)]
@@ -33,11 +30,11 @@ impl From<Conversation> for (Record, Vec<InsertableParticipant>) {
fn from(conversation: Conversation) -> Self {
(
Record::from(conversation.clone()),
conversation.participants
conversation
.participants
.into_iter()
.map(InsertableParticipant::from)
.collect()
.collect(),
)
}
}
@@ -53,4 +50,4 @@ impl From<Record> for Conversation {
participants: vec![],
}
}
}
}

22
kordophone-db/src/models/db/message.rs
View File

@@ -1,6 +1,6 @@
use diesel::prelude::*;
use chrono::NaiveDateTime;
use crate::models::{Message, Participant};
use chrono::NaiveDateTime;
use diesel::prelude::*;
#[derive(Queryable, Selectable, Insertable, AsChangeset, Clone, Identifiable, Debug)]
#[diesel(table_name = crate::schema::messages)]
@@ -21,10 +21,11 @@ impl From<Message> for Record {
} else {
Some(serde_json::to_string(&message.file_transfer_guids).unwrap_or_default())
};
let attachment_metadata = message.attachment_metadata
let attachment_metadata = message
.attachment_metadata
.map(|metadata| serde_json::to_string(&metadata).unwrap_or_default());
Self {
id: message.id,
sender_participant_id: match message.sender {
@@ -41,13 +42,15 @@ impl From<Message> for Record {
impl From<Record> for Message {
fn from(record: Record) -> Self {
let file_transfer_guids = record.file_transfer_guids
let file_transfer_guids = record
.file_transfer_guids
.and_then(|json| serde_json::from_str(&json).ok())
.unwrap_or_default();
let attachment_metadata = record.attachment_metadata
let attachment_metadata = record
.attachment_metadata
.and_then(|json| serde_json::from_str(&json).ok());
Self {
id: record.id,
// We'll set the proper sender later when loading participant info
@@ -59,4 +62,3 @@ impl From<Record> for Message {
}
}
}

2
kordophone-db/src/models/db/mod.rs
View File

@@ -1,3 +1,3 @@
pub mod conversation;
pub mod message;
pub mod participant;
pub mod message;

8
kordophone-db/src/models/db/participant.rs
View File

@@ -1,6 +1,6 @@
use diesel::prelude::*;
use crate::models::Participant;
use crate::schema::conversation_participants;
use diesel::prelude::*;
#[derive(Queryable, Selectable, AsChangeset, Identifiable)]
#[diesel(table_name = crate::schema::participants)]
@@ -27,7 +27,7 @@ impl From<Participant> for InsertableRecord {
Participant::Remote { display_name, .. } => InsertableRecord {
display_name: Some(display_name),
is_me: false,
}
},
}
}
}
@@ -67,7 +67,7 @@ impl From<Participant> for Record {
id: 0, // This will be set by the database
display_name: Some(display_name),
is_me: false,
}
},
}
}
}
}

24
kordophone-db/src/models/message.rs
View File

@@ -1,11 +1,11 @@
use crate::models::participant::Participant;
use chrono::{DateTime, NaiveDateTime};
use kordophone::model::message::AttachmentMetadata;
use kordophone::model::outgoing_message::OutgoingMessage;
use std::collections::HashMap;
use uuid::Uuid;
use crate::models::participant::Participant;
use kordophone::model::outgoing_message::OutgoingMessage;
use kordophone::model::message::AttachmentMetadata;
#[derive(Clone, Debug)]
#[derive(Clone, Debug)]
pub struct Message {
pub id: String,
pub sender: Participant,
@@ -35,12 +35,10 @@ impl From<kordophone::model::Message> for Message {
text: value.text,
date: DateTime::from_timestamp(
value.date.unix_timestamp(),
value.date.unix_timestamp_nanos()
.try_into()
.unwrap_or(0),
)
.unwrap()
.naive_local(),
value.date.unix_timestamp_nanos().try_into().unwrap_or(0),
)
.unwrap()
.naive_local(),
file_transfer_guids: value.file_transfer_guids,
attachment_metadata: value.attachment_metadata,
}
@@ -107,7 +105,10 @@ impl MessageBuilder {
self
}
pub fn attachment_metadata(mut self, attachment_metadata: HashMap<String, AttachmentMetadata>) -> Self {
pub fn attachment_metadata(
mut self,
attachment_metadata: HashMap<String, AttachmentMetadata>,
) -> Self {
self.attachment_metadata = Some(attachment_metadata);
self
}
@@ -123,4 +124,3 @@ impl MessageBuilder {
}
}
}

6
kordophone-db/src/models/mod.rs
View File

@@ -1,8 +1,8 @@
pub mod conversation;
pub mod participant;
pub mod message;
pub mod db;
pub mod message;
pub mod participant;
pub use conversation::Conversation;
pub use message::Message;
pub use participant::Participant;
pub use message::Message;