HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

Merge remote-tracking branch 'origin' into feat/livekit

Browse Source
This commit is contained in:
Zomatree
2025-09-07 05:39:51 +01:00
parent 1632e3dacf e635bc23ec
commit f422e8e917
23 changed files with 972 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/core/database/src/util/bridge/v0.rs
View File

@@ -688,6 +688,7 @@ impl From<crate::FieldsMember> for FieldsMember {
crate::FieldsMember::Timeout => FieldsMember::Timeout,
crate::FieldsMember::CanReceive => FieldsMember::CanReceive,
crate::FieldsMember::CanPublish => FieldsMember::CanPublish,
crate::FieldsMember::JoinedAt => FieldsMember::JoinedAt,
}
}
}
@@ -701,6 +702,7 @@ impl From<FieldsMember> for crate::FieldsMember {
FieldsMember::Timeout => crate::FieldsMember::Timeout,
FieldsMember::CanReceive => crate::FieldsMember::CanReceive,
FieldsMember::CanPublish => crate::FieldsMember::CanPublish,
FieldsMember::JoinedAt => crate::FieldsMember::JoinedAt,
}
}
}

4
crates/core/database/src/util/test_fixtures.rs
View File

@@ -39,7 +39,9 @@ pub async fn load_fixture(db: &Database, input: &str) -> HashMap<String, String>
LoadedFixture::User(user) => db.insert_user(&user).await.unwrap(),
LoadedFixture::Channel(channel) => db.insert_channel(&channel).await.unwrap(),
LoadedFixture::Server(server) => db.insert_server(&server).await.unwrap(),
LoadedFixture::ServerMember(member) => db.insert_member(&member).await.unwrap(),
LoadedFixture::ServerMember(member) => {
db.insert_or_merge_member(&member).await.unwrap();
}
}
}