tensamin/iota
Watch
6
0
Fork
You've already forked iota
 0
Code Issues Pull requests 3 Projects Releases 1 Packages Wiki Activity Actions

types

Browse source
This commit is contained in:
Alex Emmet 2026-07-06 23:50:10 +02:00
commit b9e0df1394
5 changed files with 95 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/src/client_connection.rs
View file

@ -622,6 +622,7 @@ impl ClientConnection {
.to_string(); .to_string();
let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64; let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64;
let reply_to = cv.get_data(DataType::ReplyId).as_number().map(|n| n as i64);
chat_files::add_message( chat_files::add_message(
timestamp as u128, timestamp as u128,
@ -630,6 +631,7 @@ impl ClientConnection {
*sender_id as i64, *sender_id as i64,
&content, &content,
height, height,
reply_to,
); );
// Build user_forward using the parsed numeric timestamp and safe content string // Build user_forward using the parsed numeric timestamp and safe content string
@ -642,14 +644,23 @@ impl ClientConnection {
) )
.add_typed_default( .add_typed_default(
DataType::Message, DataType::Message,
typed_container(vec![ {
(DataType::Content, DataValue::Str(content.clone())), let mut msg_fields = vec![
( (DataType::Content, DataValue::Str(content.clone())),
DataType::SendTime, (
DataValue::SignedNumber(timestamp as i128), DataType::SendTime,
), DataValue::SignedNumber(timestamp as i128),
(DataType::Height, DataValue::SignedNumber(height as i128)), ),
]), (DataType::Height, DataValue::SignedNumber(height as i128)),
];
if let Some(rt) = reply_to {
msg_fields.push((
DataType::ReplyId,
DataValue::UnsignedNumber(rt as u64 as u128),
));
}
typed_container(msg_fields)
},
); );
let user_resp = self let user_resp = self

20
iota-storage/src/util/chat_files.rs
View file

@ -58,6 +58,7 @@ pub fn add_message(
external_user: i64, external_user: i64,
message: &str, message: &str,
height: i64, height: i64,
reply_to: Option<i64>,
) { ) {
let message_time = match i64::try_from(send_time) { let message_time = match i64::try_from(send_time) {
Ok(v) => v, Ok(v) => v,
@ -78,8 +79,9 @@ pub fn add_message(
content, content,
sent_by_self, sent_by_self,
message_state, message_state,
height height,
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7) reply_to
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)
"#, "#,
params![ params![
storage_owner, storage_owner,
@ -93,6 +95,7 @@ pub fn add_message(
}, },
MessageState::Sending.as_str(), MessageState::Sending.as_str(),
height, height,
reply_to,
], ],
)?; )?;
Ok(()) Ok(())
@ -191,7 +194,8 @@ pub fn get_messages(
content, content,
sent_by_self, sent_by_self,
message_state, message_state,
height height,
reply_to
FROM messages FROM messages
WHERE storage_owner = ?1 WHERE storage_owner = ?1
AND external_user = ?2 AND external_user = ?2
@ -208,21 +212,25 @@ pub fn get_messages(
let sent_by_self: i64 = row.get(2)?; let sent_by_self: i64 = row.get(2)?;
let message_state: String = row.get(3)?; let message_state: String = row.get(3)?;
let height: i64 = row.get(4).unwrap_or(0); let height: i64 = row.get(4).unwrap_or(0);
Ok((message_time, content, sent_by_self, message_state, height)) let reply_to: Option<i64> = row.get(5).ok().flatten();
Ok((message_time, content, sent_by_self, message_state, height, reply_to))
}, },
)?; )?;
let mut out = array![]; let mut out = array![];
for row in rows { for row in rows {
match row { match row {
Ok((message_time, content, sent_by_self, message_state, height)) => { Ok((message_time, content, sent_by_self, message_state, height, reply_to)) => {
let msg = object! { let mut msg = object! {
"message_time" => message_time, "message_time" => message_time,
"content" => content, "content" => content,
"sent_by_self" => (sent_by_self != 0), "sent_by_self" => (sent_by_self != 0),
"message_state" => message_state, "message_state" => message_state,
"height" => height "height" => height
}; };
if let Some(rt) = reply_to {
let _ = msg.insert("reply_to", rt);
}
if let Err(e) = out.push(msg) { if let Err(e) = out.push(msg) {
// out.push returns a JsonError; log it instead of using `?` to avoid // out.push returns a JsonError; log it instead of using `?` to avoid
// incompatible error conversions inside the DB closure. // incompatible error conversions inside the DB closure.

9
iota-storage/src/util/db.rs
View file

@ -162,6 +162,15 @@ pub fn create_general_messages_db() -> Result<Arc<Mutex<Connection>>, String> {
); );
Ok(()) Ok(())
}); });
// Attempt to add the reply_to column for backwards compatibility.
// This will fail if the column already exists, which is expected.
let _ = with_conn(&shared_conn, |conn| {
let _ = conn.execute(
"ALTER TABLE messages ADD COLUMN reply_to INTEGER",
[],
);
Ok(())
});
Ok(shared_conn) Ok(shared_conn)
} }
Err(e) => Err(e), Err(e) => Err(e),

69
omikron-connector/src/omikron_connection.rs
View file

@ -1262,6 +1262,7 @@ impl OmikronConnection {
.to_string(); .to_string();
let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64; let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64;
let reply_to = cv.get_data(DataType::ReplyId).as_number().map(|n| n as i64);
let is_local = iota_storage::users::user_manager::get_user(receiver_id).is_some(); let is_local = iota_storage::users::user_manager::get_user(receiver_id).is_some();
@ -1274,6 +1275,7 @@ impl OmikronConnection {
sender_id as i64, sender_id as i64,
&content, &content,
height, height,
reply_to,
); );
} }
@ -1285,6 +1287,7 @@ impl OmikronConnection {
receiver_id as i64, receiver_id as i64,
&content, &content,
height, height,
reply_to,
); );
// send confirmation back to sender // send confirmation back to sender
@ -1294,7 +1297,7 @@ impl OmikronConnection {
self.send_message(&conf_msg).await; self.send_message(&conf_msg).await;
if !is_local { if !is_local {
let fw_msg = CommunicationValue::new(CommunicationType::MessageOtherIota) let mut fw_msg = CommunicationValue::new(CommunicationType::MessageOtherIota)
.with_id(cv.get_id()) .with_id(cv.get_id())
.with_receiver(receiver_id as u64) .with_receiver(receiver_id as u64)
.with_sender(sender_id as u64) .with_sender(sender_id as u64)
@ -1304,6 +1307,12 @@ impl OmikronConnection {
DataType::SendTime, DataType::SendTime,
DataValue::SignedNumber(timestamp_i64 as i128), DataValue::SignedNumber(timestamp_i64 as i128),
); );
if let Some(rt) = reply_to {
fw_msg = fw_msg.add_typed_default(
DataType::ReplyId,
DataValue::UnsignedNumber(rt as u64 as u128),
);
}
let other_iota_resp = self let other_iota_resp = self
.clone() .clone()
@ -1383,14 +1392,23 @@ impl OmikronConnection {
) )
.add_typed_default( .add_typed_default(
DataType::Message, DataType::Message,
typed_container(vec![ {
(DataType::Content, DataValue::Str(content.clone())), let mut msg_fields = vec![
( (DataType::Content, DataValue::Str(content.clone())),
DataType::SendTime, (
DataValue::SignedNumber(timestamp_i64 as i128), DataType::SendTime,
), DataValue::SignedNumber(timestamp_i64 as i128),
(DataType::Height, DataValue::SignedNumber(height as i128)), ),
]), (DataType::Height, DataValue::SignedNumber(height as i128)),
];
if let Some(rt) = reply_to {
msg_fields.push((
DataType::ReplyId,
DataValue::UnsignedNumber(rt as u64 as u128),
));
}
typed_container(msg_fields)
},
); );
// Attempt delivery and await a response from the local client // Attempt delivery and await a response from the local client
@ -1520,6 +1538,7 @@ impl OmikronConnection {
.to_string(); .to_string();
let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64; let height = cv.get_data(DataType::Height).as_number().unwrap_or(0) as i64;
let reply_to = cv.get_data(DataType::ReplyId).as_number().map(|n| n as i64);
chat_files::add_message( chat_files::add_message(
timestamp as u128, timestamp as u128,
@ -1528,6 +1547,7 @@ impl OmikronConnection {
*sender_id as i64, *sender_id as i64,
&content, &content,
height, height,
reply_to,
); );
// Build user_forward using the parsed numeric timestamp and safe content string // Build user_forward using the parsed numeric timestamp and safe content string
@ -1540,14 +1560,23 @@ impl OmikronConnection {
) )
.add_typed_default( .add_typed_default(
DataType::Message, DataType::Message,
typed_container(vec![ {
(DataType::Content, DataValue::Str(content.clone())), let mut msg_fields = vec![
( (DataType::Content, DataValue::Str(content.clone())),
DataType::SendTime, (
DataValue::SignedNumber(timestamp as i128), DataType::SendTime,
), DataValue::SignedNumber(timestamp as i128),
(DataType::Height, DataValue::SignedNumber(height as i128)), ),
]), (DataType::Height, DataValue::SignedNumber(height as i128)),
];
if let Some(rt) = reply_to {
msg_fields.push((
DataType::ReplyId,
DataValue::UnsignedNumber(rt as u64 as u128),
));
}
typed_container(msg_fields)
},
); );
let user_resp = self let user_resp = self
@ -1675,6 +1704,12 @@ impl OmikronConnection {
container.push((DataType::MessageState, DataValue::Str(message_state))); container.push((DataType::MessageState, DataValue::Str(message_state)));
container.push((DataType::Height, DataValue::SignedNumber(height as i128))); container.push((DataType::Height, DataValue::SignedNumber(height as i128)));
container.push((DataType::SentBySelf, DataValue::Bool(sent_by_self))); container.push((DataType::SentBySelf, DataValue::Bool(sent_by_self)));
if let Some(rt) = m["reply_to"].as_i64() {
container.push((
DataType::ReplyId,
DataValue::UnsignedNumber(rt as u64 as u128),
));
}
msg_array.push(typed_container(container)); msg_array.push(typed_container(container));
} }

1
type-maps.yaml
View file

@ -218,3 +218,4 @@ type_maps:
SenderUserId: 152 SenderUserId: 152
RecipientUserId: 153 RecipientUserId: 153
Recipients: 154 Recipients: 154
ReplyId: 155