thallada/BazaarRealmClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix transaction struct so trades don't crash

Browse Source
This commit is contained in:
Tyler Hallada 2020-11-18 23:27:37 -05:00
parent 9004b4378d
commit bcb8754057
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/transaction.rs
View File

@ -17,8 +17,8 @@ use crate::{
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct Transaction { pub struct Transaction {
pub id: Option<i32>,
pub shop_id: i32, pub shop_id: i32,
pub owner_id: Option<i32>,
pub mod_name: String, pub mod_name: String,
pub local_form_id: i32, pub local_form_id: i32,
pub name: String, pub name: String,
@ -51,11 +51,8 @@ pub struct SavedTransaction {
impl From<RawTransaction> for Transaction { impl From<RawTransaction> for Transaction {
fn from(raw_transaction: RawTransaction) -> Self { fn from(raw_transaction: RawTransaction) -> Self {
Self { Self {
id: match raw_transaction.id {
0 => None,
_ => Some(raw_transaction.id),
},
shop_id: raw_transaction.shop_id, shop_id: raw_transaction.shop_id,
owner_id: None,
mod_name: unsafe { CStr::from_ptr(raw_transaction.mod_name) } mod_name: unsafe { CStr::from_ptr(raw_transaction.mod_name) }
.to_string_lossy() .to_string_lossy()
.to_string(), .to_string(),