bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Prefix all crates with oj_ and use release version of dependencies

Browse Source
This commit is contained in:
NG (Graham)
2025-06-03 21:09:03 -04:00
parent d0c2b1ec03
commit f678426e10
85 changed files with 773 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rc_core/src/data/crf.rs
View File

@@ -140,8 +140,8 @@ fn ticks_from_now(time: &chrono::DateTime<chrono::Utc>) -> i64 {
.unwrap_or_else(|| dur.num_milliseconds() * 1_000_000 / 100)
}
impl std::convert::From<rc_factory::VehicleQueryInfo> for ItemResult {
fn from(value: rc_factory::VehicleQueryInfo) -> Self {
impl std::convert::From<oj_rc_factory::VehicleQueryInfo> for ItemResult {
fn from(value: oj_rc_factory::VehicleQueryInfo) -> Self {
Self {
id: value.id,
name: value.name,
@@ -182,8 +182,8 @@ impl ItemData {
}
}
impl std::convert::From<rc_factory::VehicleInfo> for ItemData {
fn from(value: rc_factory::VehicleInfo) -> Self {
impl std::convert::From<oj_rc_factory::VehicleInfo> for ItemData {
fn from(value: oj_rc_factory::VehicleInfo) -> Self {
Self {
index: value.id,
cube_data: value.cube_data,

24
rc_core/src/data/sanction.rs
View File

@@ -40,23 +40,23 @@ pub enum SanctionType {
}
impl SanctionType {
pub(crate) fn from_db(t: rc_database::schema::sanction::Descriptor) -> Self {
pub(crate) fn from_db(t: oj_rc_database::schema::sanction::Descriptor) -> Self {
match t {
rc_database::schema::sanction::Descriptor::Warn => Self::Warning,
rc_database::schema::sanction::Descriptor::Mute => Self::Mute,
rc_database::schema::sanction::Descriptor::Ban => Self::Suspension,
rc_database::schema::sanction::Descriptor::Note => Self::Note,
rc_database::schema::sanction::Descriptor::Kick => Self::Kick,
oj_rc_database::schema::sanction::Descriptor::Warn => Self::Warning,
oj_rc_database::schema::sanction::Descriptor::Mute => Self::Mute,
oj_rc_database::schema::sanction::Descriptor::Ban => Self::Suspension,
oj_rc_database::schema::sanction::Descriptor::Note => Self::Note,
oj_rc_database::schema::sanction::Descriptor::Kick => Self::Kick,
}
}
pub(crate) fn to_db(self) -> rc_database::schema::sanction::Descriptor {
pub(crate) fn to_db(self) -> oj_rc_database::schema::sanction::Descriptor {
match self {
Self::Warning => rc_database::schema::sanction::Descriptor::Warn,
Self::Mute => rc_database::schema::sanction::Descriptor::Mute,
Self::Suspension => rc_database::schema::sanction::Descriptor::Ban,
Self::Note => rc_database::schema::sanction::Descriptor::Note,
Self::Kick => rc_database::schema::sanction::Descriptor::Kick,
Self::Warning => oj_rc_database::schema::sanction::Descriptor::Warn,
Self::Mute => oj_rc_database::schema::sanction::Descriptor::Mute,
Self::Suspension => oj_rc_database::schema::sanction::Descriptor::Ban,
Self::Note => oj_rc_database::schema::sanction::Descriptor::Note,
Self::Kick => oj_rc_database::schema::sanction::Descriptor::Kick,
}
}

14
rc_core/src/factory/adapter_enum.rs
View File

@@ -1,12 +1,12 @@
pub enum Factory {
Arc(rc_factory::arc::ArcAdapter),
Custom(Box<dyn rc_factory::VehicleFactoryAdapter + Send + Sync + 'static>),
Arc(oj_rc_factory::arc::ArcAdapter),
Custom(Box<dyn oj_rc_factory::VehicleFactoryAdapter + Send + Sync + 'static>),
None,
}
#[async_trait::async_trait]
impl rc_factory::VehicleFactoryAdapter for Factory {
async fn vehicle(&self, id: u32) -> Result<Option<(rc_factory::VehicleInfo, rc_factory::VehicleQueryInfo)>, Box<dyn std::error::Error>> {
impl oj_rc_factory::VehicleFactoryAdapter for Factory {
async fn vehicle(&self, id: u32) -> Result<Option<(oj_rc_factory::VehicleInfo, oj_rc_factory::VehicleQueryInfo)>, Box<dyn std::error::Error>> {
match self {
Self::Arc(x) => x.vehicle(id).await,
Self::Custom(x) => x.vehicle(id).await,
@@ -14,7 +14,7 @@ impl rc_factory::VehicleFactoryAdapter for Factory {
}
}
async fn list(&self, query: libfj::robocraft::ListQuery) -> Result<Vec<rc_factory::VehicleQueryInfo>, Box<dyn std::error::Error>> {
async fn list(&self, query: libfj::robocraft::ListQuery) -> Result<Vec<oj_rc_factory::VehicleQueryInfo>, Box<dyn std::error::Error>> {
match self {
Self::Arc(x) => x.list(query).await,
Self::Custom(x) => x.list(query).await,
@@ -22,7 +22,7 @@ impl rc_factory::VehicleFactoryAdapter for Factory {
}
}
async fn upload(&self, vehicle: rc_factory::VehicleUploadInfo) -> Result<bool, Box<dyn std::error::Error>> {
async fn upload(&self, vehicle: oj_rc_factory::VehicleUploadInfo) -> Result<bool, Box<dyn std::error::Error>> {
match self {
Self::Arc(x) => x.upload(vehicle).await,
Self::Custom(x) => x.upload(vehicle).await,
@@ -34,7 +34,7 @@ impl rc_factory::VehicleFactoryAdapter for Factory {
impl Factory {
pub async fn from_config(conf: &crate::persist::FactoryConfig) -> Result<Self, Box<dyn std::error::Error + 'static>> {
Ok(match &conf.adapter {
crate::persist::AdapterSettings::Arc(x) => Self::Arc(rc_factory::arc::ArcAdapter::init(&x.uri, x.show_expired, x.override_cdn.clone()).await?),
crate::persist::AdapterSettings::Arc(x) => Self::Arc(oj_rc_factory::arc::ArcAdapter::init(&x.uri, x.show_expired, x.override_cdn.clone()).await?),
crate::persist::AdapterSettings::None => Self::None,
})
}

2
rc_core/src/persist/config/cubes_json.rs
View File

@@ -318,7 +318,7 @@ impl <C: Clone + Send> super::ConfigProvider<C> for CubeConfig {
let uuid_str = crate::persist::user::i64_as_uuid_str(uuid_i64);
let prebuilt = match &vehicle.id {
crate::persist::PrefabId::Factory { factory: factory_id } => {
use rc_factory::VehicleFactoryAdapter;
use oj_rc_factory::VehicleFactoryAdapter;
let factory_vehicle = factory.vehicle(*factory_id).await
.expect("Failed to retrieve prefab vehicle from factory") // result
.expect("Prefab vehicle does not exist in factory"); // option

14
rc_core/src/persist/garage.rs
View File

@@ -99,7 +99,7 @@ impl std::convert::Into<crate::data::garage_bay::GarageSlotInfo> for GarageSlot
}
}
pub fn db_into_data(garage: rc_database::schema::garage::Model) -> crate::data::garage_bay::GarageSlotInfo {
pub fn db_into_data(garage: oj_rc_database::schema::garage::Model) -> crate::data::garage_bay::GarageSlotInfo {
let cube_count = garage.cube_count();
crate::data::garage_bay::GarageSlotInfo {
name: garage.name,
@@ -123,22 +123,22 @@ pub fn db_into_data(garage: rc_database::schema::garage::Model) -> crate::data::
},
mastery_level: garage.mastery_level as i32,
bay_skin_id: garage.bay_skin_id,
weapon_order: rc_database::schema::parse_int_csv(&garage.weapon_order).into_iter().map(|x| x as i32).collect(),
weapon_order: oj_rc_database::schema::parse_int_csv(&garage.weapon_order).into_iter().map(|x| x as i32).collect(),
}
}
fn movement_category_into_data(mov_cat: &str) -> Vec<crate::data::weapon_list::ItemCategory> {
rc_database::schema::parse_int_csv(mov_cat)
oj_rc_database::schema::parse_int_csv(mov_cat)
.into_iter()
.filter_map(|num| crate::data::weapon_list::ItemCategory::from_bigger(num as _))
.collect()
}
pub fn control_ty_into_data(control_ty: rc_database::schema::garage::ControlType) -> crate::data::garage_bay::ControlType {
pub fn control_ty_into_data(control_ty: oj_rc_database::schema::garage::ControlType) -> crate::data::garage_bay::ControlType {
match control_ty {
rc_database::schema::garage::ControlType::Camera => crate::data::garage_bay::ControlType::Camera,
rc_database::schema::garage::ControlType::Keyboard => crate::data::garage_bay::ControlType::Keyboard,
rc_database::schema::garage::ControlType::Count => crate::data::garage_bay::ControlType::Count,
oj_rc_database::schema::garage::ControlType::Camera => crate::data::garage_bay::ControlType::Camera,
oj_rc_database::schema::garage::ControlType::Keyboard => crate::data::garage_bay::ControlType::Keyboard,
oj_rc_database::schema::garage::ControlType::Count => crate::data::garage_bay::ControlType::Count,
}
}

206
rc_core/src/persist/user/account_json.rs
View File

@@ -7,7 +7,7 @@ pub struct AccountProvider {
garage_upgrades: std::sync::Arc<crate::persist::config::GarageUpgrades>,
auto_signups: bool,
secret: Vec<u8>,
db: std::sync::Arc<rc_database::Database>,
db: std::sync::Arc<oj_rc_database::Database>,
}
impl AccountProvider {
@@ -16,7 +16,7 @@ impl AccountProvider {
let server_settings = <crate::persist::config::ConfigImpl as ConfigProvider<()>>::server_config(conf);
let database_uri = server_settings.database;
log::debug!("Connecting to user database URI: {}", database_uri);
let db = rc_database::Database::init(&database_uri).await
let db = oj_rc_database::Database::init(&database_uri).await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::NotConnected, e))?;
Ok(Self {
cubes: std::sync::Arc::new(<crate::persist::config::ConfigImpl as ConfigProvider<()>>::ids(conf)),
@@ -30,7 +30,7 @@ impl AccountProvider {
/*pub fn fake_user<C: Clone>(&self) -> Box<dyn super::User<C> + Send + Sync> {
Box::new(UserData {
token: super::UserToken { uuid: "fake user!".to_owned(), token: "".to_owned(), refresh_token: "".to_owned() },
account: rc_database::schema::user::Model {
account: oj_rc_database::schema::user::Model {
id: 0,
creation_time: 0,
public_id: "".to_owned(),
@@ -39,7 +39,7 @@ impl AccountProvider {
email: "".to_owned(),
steam_id: None,
},
perms: rc_database::schema::permissions::Model {
perms: oj_rc_database::schema::permissions::Model {
id: 0,
user_id: 0,
moderator: true,
@@ -188,31 +188,31 @@ impl super::UserAuthenticator for AccountProvider {
#[allow(dead_code)]
struct UserData {
token: super::UserToken,
account: rc_database::schema::user::Model,
perms: rc_database::schema::permissions::Model,
account: oj_rc_database::schema::user::Model,
perms: oj_rc_database::schema::permissions::Model,
cubes: std::sync::Arc<Vec<u32>>,
garage_upgrades: std::sync::Arc<crate::persist::config::GarageUpgrades>,
extensions: std::collections::HashMap<std::any::TypeId, Box<dyn std::any::Any + Send + Sync + 'static>>,
db: std::sync::Arc<rc_database::Database>,
db: std::sync::Arc<oj_rc_database::Database>,
}
impl UserData {
async fn load_garage_by_slot(&self, slot: u32) -> Result<Option<rc_database::schema::garage::Model>, rc_database::sea_orm::DbErr> {
async fn load_garage_by_slot(&self, slot: u32) -> Result<Option<oj_rc_database::schema::garage::Model>, oj_rc_database::sea_orm::DbErr> {
//let path = self.root.join(super::GARAGE_DIR).join(format!("{}.json", id));
//crate::persist::GarageSlot::load(&path)
self.db.garage_by_user_id_and_slot(self.account.id, slot).await
}
async fn save_garage_by_slot(&self, data: rc_database::schema::garage::ActiveModel, slot: u32) -> Result<(), rc_database::sea_orm::DbErr> {
async fn save_garage_by_slot(&self, data: oj_rc_database::schema::garage::ActiveModel, slot: u32) -> Result<(), oj_rc_database::sea_orm::DbErr> {
self.db.update_garage_by_user_id_and_slot(data, self.account.id, slot).await?;
Ok(())
}
async fn all_vehicles(&self) -> Result<Vec<rc_database::schema::garage::Model>, rc_database::sea_orm::DbErr> {
async fn all_vehicles(&self) -> Result<Vec<oj_rc_database::schema::garage::Model>, oj_rc_database::sea_orm::DbErr> {
self.db.garages_by_user_id(self.account.id).await
}
async fn double_check_permissions(&self) -> Result<rc_database::schema::permissions::Model, rc_database::sea_orm::DbErr> {
async fn double_check_permissions(&self) -> Result<oj_rc_database::schema::permissions::Model, oj_rc_database::sea_orm::DbErr> {
Ok(self.db.perms_by_user_id(self.account.id).await?.unwrap())
}
@@ -255,7 +255,7 @@ impl UserData {
self.perms.administrator | self.perms.developer
}
async fn resolve_some_singleplayer_vehicles(&self, factory: &dyn rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<Vec<crate::data::player_data::PlayerData>, i16> {
async fn resolve_some_singleplayer_vehicles(&self, factory: &dyn oj_rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<Vec<crate::data::player_data::PlayerData>, i16> {
use rand::seq::IndexedRandom;
let mut players = Vec::with_capacity((singleplayer_config.max_enemies + singleplayer_config.max_teammates + 1) as usize);
let mut next_id = 0;
@@ -279,7 +279,7 @@ impl UserData {
let team_num = if i < singleplayer_config.max_enemies { 1 } else { 0 };
let enemy = match &vehicle.id {
crate::persist::config::VehicleDescriptor::Factory { factory: factory_id } => {
//use rc_factory::VehicleFactoryAdapter;
//use oj_rc_factory::VehicleFactoryAdapter;
match factory.vehicle(*factory_id).await {
Ok(Some(factory_vehicle)) => {
let weapons_guess = weapon_order.guess_weapons(&mut std::io::Cursor::new(&factory_vehicle.0.cube_data));
@@ -329,13 +329,13 @@ impl UserData {
has_premium: false,
robot_uuid: uuid_str,
cpu: db_vehicle.total_robot_cpu as i32,
weapon_order: rc_database::schema::parse_int_csv(&db_vehicle.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>(),
weapon_order: oj_rc_database::schema::parse_int_csv(&db_vehicle.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>(),
colour_map: db_vehicle.colour_data,
is_ai: true,
spawn_effect: "Spawn".to_owned(),
death_effect: "Explosion".to_owned(),
player_rank: 1,
weapon_rank: rc_database::schema::parse_int_csv(&db_vehicle.weapon_order).into_iter().map(|x| (x as i32, if x == 0 { 0 } else { 1 })).collect(),
weapon_rank: oj_rc_database::schema::parse_int_csv(&db_vehicle.weapon_order).into_iter().map(|x| (x as i32, if x == 0 { 0 } else { 1 })).collect(),
}
},
Ok(None) => {
@@ -410,7 +410,7 @@ impl <C: Clone> super::User<C> for UserData {
}
async fn unlocked_parts(&self) -> Vec<u32> {
match self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::UnlockedParts).await {
match self.db.user_aux_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::user_aux::Descriptor::UnlockedParts).await {
Ok(Some(parts)) => {
match serde_json::from_str::<super::inventory::UnlockedParts>(&parts.data) {
Ok(json) => {
@@ -464,7 +464,7 @@ impl <C: Clone> super::User<C> for UserData {
Vec::default()
}
};
let slot_order = match self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::GarageSlotOrder).await{
let slot_order = match self.db.user_aux_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::user_aux::Descriptor::GarageSlotOrder).await{
Ok(Some(slot_order_db)) => {
let slots = serde_json::from_str::<Vec<u32>>(&slot_order_db.data).unwrap_or_default();
polariton::operation::Typed::ObjArr(slots.iter().map(|slot| polariton::operation::Typed::Int(*slot as _)).collect::<Vec<_>>().into())
@@ -508,8 +508,8 @@ impl <C: Clone> super::User<C> for UserData {
data: polariton::operation::Typed::Bytes(slot.robot_data.into()),
colour_data: polariton::operation::Typed::Bytes(slot.colour_data.into()),
cube_count: polariton::operation::Typed::Int(cube_count),
weapon_order: polariton::operation::Typed::IntArr(rc_database::schema::parse_int_csv(&slot.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>().into()),
movement_categories: polariton::operation::Typed::IntArr(rc_database::schema::parse_int_csv(&slot.movement_categories).into_iter().map(|x| x as i32).collect::<Vec<_>>().into()),
weapon_order: polariton::operation::Typed::IntArr(oj_rc_database::schema::parse_int_csv(&slot.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>().into()),
movement_categories: polariton::operation::Typed::IntArr(oj_rc_database::schema::parse_int_csv(&slot.movement_categories).into_iter().map(|x| x as i32).collect::<Vec<_>>().into()),
control_type: polariton::operation::Typed::Int(control_ty as _),
control_options: control_options.as_transmissible(),
mastery_level: polariton::operation::Typed::Int(slot.mastery_level as i32),
@@ -532,12 +532,12 @@ impl <C: Clone> super::User<C> for UserData {
async fn save_slot(&self, vehicle: crate::persist::user::VehicleData) -> Result<(), i16> {
self.err_on_banned().await?;
let entity = rc_database::schema::garage::ActiveModel {
weapon_order: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::dump_csv(&vehicle.weapon_order)),
robot_data: rc_database::sea_orm::ActiveValue::Set(vehicle.robot_data),
colour_data: rc_database::sea_orm::ActiveValue::Set(vehicle.colour_data),
crf_id: if let Some(crf_id) = vehicle.crf_id { rc_database::sea_orm::ActiveValue::Set(Some(crf_id as u32)) } else { Default::default() },
name: if let Some(new_name) = vehicle.name { rc_database::sea_orm::ActiveValue::Set(new_name) } else { Default::default() },
let entity = oj_rc_database::schema::garage::ActiveModel {
weapon_order: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::dump_csv(&vehicle.weapon_order)),
robot_data: oj_rc_database::sea_orm::ActiveValue::Set(vehicle.robot_data),
colour_data: oj_rc_database::sea_orm::ActiveValue::Set(vehicle.colour_data),
crf_id: if let Some(crf_id) = vehicle.crf_id { oj_rc_database::sea_orm::ActiveValue::Set(Some(crf_id as u32)) } else { Default::default() },
name: if let Some(new_name) = vehicle.name { oj_rc_database::sea_orm::ActiveValue::Set(new_name) } else { Default::default() },
..Default::default()
};
self.save_garage_by_slot(entity, vehicle.slot as u32).await.map_err(|e| {
@@ -550,11 +550,11 @@ impl <C: Clone> super::User<C> for UserData {
async fn save_slot_order(&self, slots: Vec<i32>) -> Result<(), i16> {
self.err_on_banned().await?;
let slots: Vec<u32> = slots.into_iter().map(|x| x as u32).collect();
let entity = rc_database::schema::user_aux::ActiveModel {
data: rc_database::sea_orm::ActiveValue::Set(serde_json::to_string_pretty(&slots).unwrap()),
let entity = oj_rc_database::schema::user_aux::ActiveModel {
data: oj_rc_database::sea_orm::ActiveValue::Set(serde_json::to_string_pretty(&slots).unwrap()),
..Default::default()
};
self.db.update_user_aux_by_user_id_and_descriptor(entity, self.account.id, rc_database::schema::user_aux::Descriptor::GarageSlotOrder).await.map_err(|e| {
self.db.update_user_aux_by_user_id_and_descriptor(entity, self.account.id, oj_rc_database::schema::user_aux::Descriptor::GarageSlotOrder).await.map_err(|e| {
log::error!("Failed to update garage slot order for user_id {}: {}", self.account.id, e);
DATABASE_ERR
})?;
@@ -613,28 +613,28 @@ impl <C: Clone> super::User<C> for UserData {
log::error!("Failed to retrieve vehicle slot {} for user_id {}: {}", slot, self.account.id, e);
DATABASE_ERR
})? {
use rc_database::sea_orm::IntoActiveModel;
use oj_rc_database::sea_orm::IntoActiveModel;
let mut to_update = existing_g.into_active_model();
// copy everything except id, user_id, creation_time, slot, was_rated, bay_cpu, mastery_level, selected
to_update.name = rc_database::sea_orm::ActiveValue::Set(new_name);
to_update.crf_id = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.crf_id);
to_update.movement_categories = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.movement_categories);
to_update.thumbnail_version = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.thumbnail_version);
to_update.total_robot_cpu = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_robot_cpu);
to_update.total_cosmetic_cpu = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_cosmetic_cpu);
to_update.total_robot_ranking = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_robot_ranking);
to_update.tutorial_robot = rc_database::sea_orm::ActiveValue::Set(false);
to_update.starter_robot_index = rc_database::sea_orm::ActiveValue::Set(None);
to_update.control_type = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.control_type);
to_update.vertical_strafing = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.vertical_strafing);
to_update.sideways_driving = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.sideways_driving);
to_update.tracks_turn_on_spot = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.tracks_turn_on_spot);
to_update.bay_skin_id = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.bay_skin_id);
to_update.death_animation_id = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.death_animation_id);
to_update.spawn_animation_id = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.spawn_animation_id);
to_update.weapon_order = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.weapon_order);
to_update.robot_data = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.robot_data);
to_update.colour_data = rc_database::sea_orm::ActiveValue::Set(slot_to_copy.colour_data);
to_update.name = oj_rc_database::sea_orm::ActiveValue::Set(new_name);
to_update.crf_id = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.crf_id);
to_update.movement_categories = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.movement_categories);
to_update.thumbnail_version = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.thumbnail_version);
to_update.total_robot_cpu = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_robot_cpu);
to_update.total_cosmetic_cpu = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_cosmetic_cpu);
to_update.total_robot_ranking = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.total_robot_ranking);
to_update.tutorial_robot = oj_rc_database::sea_orm::ActiveValue::Set(false);
to_update.starter_robot_index = oj_rc_database::sea_orm::ActiveValue::Set(None);
to_update.control_type = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.control_type);
to_update.vertical_strafing = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.vertical_strafing);
to_update.sideways_driving = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.sideways_driving);
to_update.tracks_turn_on_spot = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.tracks_turn_on_spot);
to_update.bay_skin_id = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.bay_skin_id);
to_update.death_animation_id = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.death_animation_id);
to_update.spawn_animation_id = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.spawn_animation_id);
to_update.weapon_order = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.weapon_order);
to_update.robot_data = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.robot_data);
to_update.colour_data = oj_rc_database::sea_orm::ActiveValue::Set(slot_to_copy.colour_data);
self.db.update_garage(to_update).await.map_err(|e| {
log::error!("Failed to update garage slot {} copied from {} for user_id {}: {}", existing_slot, slot, self.account.id, e);
DATABASE_ERR
@@ -646,7 +646,7 @@ impl <C: Clone> super::User<C> for UserData {
}
} else {
log::info!("Copy slot {} -> <new slot> as `{}`", slot, new_name);
use rc_database::sea_orm::IntoActiveModel;
use oj_rc_database::sea_orm::IntoActiveModel;
let mut to_insert = slot_to_copy.into_active_model();
let max_slot = self.db.garage_max_slot_by_user_id(self.account.id).await.map_err(|e| {
log::error!("Failed to get max garage slot during copy for user_id {}: {}", self.account.id, e);
@@ -655,10 +655,10 @@ impl <C: Clone> super::User<C> for UserData {
let now = chrono::Utc::now().timestamp();
let uuid = super::uuid_sanitize(now);
to_insert.id = Default::default();
to_insert.creation_time = rc_database::sea_orm::ActiveValue::Set(now);
to_insert.uuid = rc_database::sea_orm::ActiveValue::Set(uuid);
to_insert.slot = rc_database::sea_orm::ActiveValue::Set(max_slot + 1);
to_insert.name = rc_database::sea_orm::ActiveValue::Set(new_name);
to_insert.creation_time = oj_rc_database::sea_orm::ActiveValue::Set(now);
to_insert.uuid = oj_rc_database::sea_orm::ActiveValue::Set(uuid);
to_insert.slot = oj_rc_database::sea_orm::ActiveValue::Set(max_slot + 1);
to_insert.name = oj_rc_database::sea_orm::ActiveValue::Set(new_name);
self.db.insert_garage(to_insert).await.map_err(|e| {
log::error!("Failed to insert garage slot copied from {} for user_id {}: {}", slot, self.account.id, e);
DATABASE_ERR
@@ -694,8 +694,8 @@ impl <C: Clone> super::User<C> for UserData {
Ok(polariton::operation::Typed::Bool(false))
} else {
let upgrade_to_cpu = self.garage_upgrades.increments[upgrade_to].cpu;
let entity = rc_database::schema::garage::ActiveModel {
bay_cpu: rc_database::sea_orm::ActiveValue::Set(upgrade_to_cpu),
let entity = oj_rc_database::schema::garage::ActiveModel {
bay_cpu: oj_rc_database::sea_orm::ActiveValue::Set(upgrade_to_cpu),
..Default::default()
};
self.db.update_garage_by_user_id_and_slot(entity, self.account.id, selected_slot.slot).await.map_err(|e| {
@@ -714,11 +714,11 @@ impl <C: Clone> super::User<C> for UserData {
async fn save_slot_controls(&self, controls: super::ControlData) -> Result<(), i16> {
self.err_on_banned().await?;
let entity = rc_database::schema::garage::ActiveModel {
control_type: rc_database::sea_orm::ActiveValue::Set(controls.control_ty.into_db()),
vertical_strafing: rc_database::sea_orm::ActiveValue::Set(controls.vertical_strafing),
sideways_driving: rc_database::sea_orm::ActiveValue::Set(controls.sideways_driving),
tracks_turn_on_spot: rc_database::sea_orm::ActiveValue::Set(controls.tracks_turn_on_spot),
let entity = oj_rc_database::schema::garage::ActiveModel {
control_type: oj_rc_database::sea_orm::ActiveValue::Set(controls.control_ty.into_db()),
vertical_strafing: oj_rc_database::sea_orm::ActiveValue::Set(controls.vertical_strafing),
sideways_driving: oj_rc_database::sea_orm::ActiveValue::Set(controls.sideways_driving),
tracks_turn_on_spot: oj_rc_database::sea_orm::ActiveValue::Set(controls.tracks_turn_on_spot),
..Default::default()
};
self.save_garage_by_slot(entity, controls.slot as u32).await.map_err(|e| {
@@ -731,10 +731,10 @@ impl <C: Clone> super::User<C> for UserData {
async fn save_slot_customisations(&self, customs: super::CustomisationData) -> Result<(), i16> {
self.err_on_banned().await?;
if let Some(uuid) = super::str_to_i64(&customs.uuid) {
let entity = rc_database::schema::garage::ActiveModel {
bay_skin_id: rc_database::sea_orm::ActiveValue::Set(customs.bay),
spawn_animation_id: rc_database::sea_orm::ActiveValue::Set(customs.spawn),
death_animation_id: rc_database::sea_orm::ActiveValue::Set(customs.death),
let entity = oj_rc_database::schema::garage::ActiveModel {
bay_skin_id: oj_rc_database::sea_orm::ActiveValue::Set(customs.bay),
spawn_animation_id: oj_rc_database::sea_orm::ActiveValue::Set(customs.spawn),
death_animation_id: oj_rc_database::sea_orm::ActiveValue::Set(customs.death),
..Default::default()
};
self.db.update_garage_by_uuid(entity, uuid).await.map_err(|e| {
@@ -766,8 +766,8 @@ impl <C: Clone> super::User<C> for UserData {
}
async fn set_slot_name(&self, slot: i32, name: String) -> Result<(), i16> {
let to_save = rc_database::schema::garage::ActiveModel {
name: rc_database::sea_orm::ActiveValue::Set(name),
let to_save = oj_rc_database::schema::garage::ActiveModel {
name: oj_rc_database::sea_orm::ActiveValue::Set(name),
..Default::default()
};
self.db.update_garage_by_user_id_and_slot(to_save, self.account.id, slot as u32).await.map_err(|e| {
@@ -781,7 +781,7 @@ impl <C: Clone> super::User<C> for UserData {
super::since_windows_epoch(self.account.creation_time)
}
async fn singleplayer_robots(&self, factory: &dyn rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<polariton::operation::Typed<C>, i16> {
async fn singleplayer_robots(&self, factory: &dyn oj_rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<polariton::operation::Typed<C>, i16> {
//self.err_on_banned().await?;
let mut vehicles = self.resolve_some_singleplayer_vehicles(factory, weapon_order, singleplayer_config).await?;
let current_slot = self.db.garage_selected(self.account.id).await.map_err(|e| {
@@ -793,7 +793,7 @@ impl <C: Clone> super::User<C> for UserData {
INVALID_ROBOT_ERR
})?;
let user_uuid = self.token.uuid.clone();
let weapon_order = rc_database::schema::parse_int_csv(&current_slot.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>();
let weapon_order = oj_rc_database::schema::parse_int_csv(&current_slot.weapon_order).into_iter().map(|x| x as i32).collect::<Vec<_>>();
// real user MUST be last
vehicles.push(crate::data::player_data::PlayerData {
@@ -813,14 +813,14 @@ impl <C: Clone> super::User<C> for UserData {
spawn_effect: "Spawn_Warp".to_owned(), // FIXME
death_effect: "Explosion_Warp".to_owned(), // FIXME
player_rank: 1, // FIXME
weapon_rank: rc_database::schema::parse_int_csv(&current_slot.weapon_order).into_iter().map(|x| (x as i32, if x == 0 { 0 } else { 1 })).collect(),
weapon_rank: oj_rc_database::schema::parse_int_csv(&current_slot.weapon_order).into_iter().map(|x| (x as i32, if x == 0 { 0 } else { 1 })).collect(),
});
Ok(crate::data::player_data::PlayerDatas {
players: vehicles,
}.as_transmissible())
}
async fn prepare_factory_upload(&self, vehicle: super::VehicleUploadData) -> Result<rc_factory::VehicleUploadInfo, i16> {
async fn prepare_factory_upload(&self, vehicle: super::VehicleUploadData) -> Result<oj_rc_factory::VehicleUploadInfo, i16> {
self.err_on_banned().await?;
let slot = self.load_garage_by_slot(vehicle.slot as u32).await.map_err(|e| {
log::error!("Failed to retrieve vehicle slot {} for user_id {} (prepare_factory_upload): {}", vehicle.slot, self.account.id, e);
@@ -829,7 +829,7 @@ impl <C: Clone> super::User<C> for UserData {
log::error!("Failed to find vehicle slot {} for user_id {} (prepare_factory_upload)", vehicle.slot, self.account.id);
INVALID_ROBOT_ERR
})?;
Ok(rc_factory::VehicleUploadInfo {
Ok(oj_rc_factory::VehicleUploadInfo {
name: vehicle.name,
description: vehicle.description,
thumbnail: vehicle.thumbnail,
@@ -845,29 +845,29 @@ impl <C: Clone> super::User<C> for UserData {
async fn last_seen(&self) -> Result<u64, i16> {
self.err_on_banned().await?;
let last_seen_aux_opt = self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::LastSeen).await
let last_seen_aux_opt = self.db.user_aux_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::user_aux::Descriptor::LastSeen).await
.map_err(|e| {
log::error!("Failed to retrieve LastSeen (user_aux) for user_id {}: {}", self.account.id, e);
DATABASE_ERR
})?;
let now = chrono::Utc::now().timestamp();
if let Some(last_seen) = last_seen_aux_opt {
let to_update = rc_database::schema::user_aux::ActiveModel {
data: rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()),
let to_update = oj_rc_database::schema::user_aux::ActiveModel {
data: oj_rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()),
..Default::default()
};
self.db.update_user_aux_by_user_id_and_descriptor(to_update, self.account.id, rc_database::schema::user_aux::Descriptor::LastSeen).await
self.db.update_user_aux_by_user_id_and_descriptor(to_update, self.account.id, oj_rc_database::schema::user_aux::Descriptor::LastSeen).await
.map_err(|e| {
log::error!("Failed to update LastSeen (user_aux) for user_id {}: {}", self.account.id, e);
DATABASE_ERR
})?;
Ok(last_seen.data.parse().unwrap_or_default())
} else {
let to_insert = rc_database::schema::user_aux::ActiveModel {
user_id: rc_database::sea_orm::ActiveValue::Set(self.account.id),
creation_time: rc_database::sea_orm::ActiveValue::Set(now),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::LastSeen),
data: rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()),
let to_insert = oj_rc_database::schema::user_aux::ActiveModel {
user_id: oj_rc_database::sea_orm::ActiveValue::Set(self.account.id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(now),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::LastSeen),
data: oj_rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()),
..Default::default()
};
self.db.insert_user_aux(vec![to_insert]).await.map_err(|e| {
@@ -880,7 +880,7 @@ impl <C: Clone> super::User<C> for UserData {
async fn get_avatar_info(&self) -> Result<super::GetAvatarInfo<C>, i16> {
self.err_on_banned().await?;
let avatar_id_aux = self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::AvatarId).await
let avatar_id_aux = self.db.user_aux_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::user_aux::Descriptor::AvatarId).await
.map_err(|e| {
log::error!("Failed to retrieve AvatarId (user_aux) for user_id {}: {}", self.account.id, e);
DATABASE_ERR
@@ -902,11 +902,11 @@ impl <C: Clone> super::User<C> for UserData {
async fn set_avatar_info(&self, info: super::AvatarInfo) -> Result<(), i16> {
self.err_on_banned().await?;
let to_update = rc_database::schema::user_aux::ActiveModel {
data: rc_database::sea_orm::ActiveValue::Set(if info.use_custom { u32::MAX } else { info.avatar_id as u32 }.to_string()),
let to_update = oj_rc_database::schema::user_aux::ActiveModel {
data: oj_rc_database::sea_orm::ActiveValue::Set(if info.use_custom { u32::MAX } else { info.avatar_id as u32 }.to_string()),
..Default::default()
};
self.db.update_user_aux_by_user_id_and_descriptor(to_update, self.account.id, rc_database::schema::user_aux::Descriptor::AvatarId).await
self.db.update_user_aux_by_user_id_and_descriptor(to_update, self.account.id, oj_rc_database::schema::user_aux::Descriptor::AvatarId).await
.map_err(|e| {
log::error!("Failed to update AvatarId (user_aux) for user_id {}: {}", self.account.id, e);
DATABASE_ERR
@@ -930,7 +930,7 @@ impl super::ChatUser for UserData {
}
async fn subscribed_channels_strings(&self) -> Result<Vec<String>, i16> {
let channels = self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
let channels = self.db.user_aux_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
log::error!("Failed to retrieve SubscribedChannels (user_aux) for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?.ok_or_else(|| {
@@ -952,10 +952,10 @@ impl super::ChatUser for UserData {
log::error!("Failed to convert to JSON SubscribedChannels (user_aux) for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?;
self.db.update_user_aux_by_user_id_and_descriptor(rc_database::schema::user_aux::ActiveModel {
data: rc_database::sea_orm::ActiveValue::Set(new_data),
self.db.update_user_aux_by_user_id_and_descriptor(oj_rc_database::schema::user_aux::ActiveModel {
data: oj_rc_database::sea_orm::ActiveValue::Set(new_data),
..Default::default()
}, self.account.id, rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
}, self.account.id, oj_rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
log::error!("Failed to update SubscribedChannels (user_aux) for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?;
@@ -977,10 +977,10 @@ impl super::ChatUser for UserData {
log::error!("Failed to convert to JSON SubscribedChannels (user_aux) for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?;
self.db.update_user_aux_by_user_id_and_descriptor(rc_database::schema::user_aux::ActiveModel {
data: rc_database::sea_orm::ActiveValue::Set(new_data),
self.db.update_user_aux_by_user_id_and_descriptor(oj_rc_database::schema::user_aux::ActiveModel {
data: oj_rc_database::sea_orm::ActiveValue::Set(new_data),
..Default::default()
}, self.account.id, rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
}, self.account.id, oj_rc_database::schema::user_aux::Descriptor::SubscribedChannels).await.map_err(|e| {
log::error!("Failed to update SubscribedChannels (user_aux) for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?;
@@ -990,7 +990,7 @@ impl super::ChatUser for UserData {
}
/*async fn has_pending_sanctions(&self) -> Result<bool, i16> {
let count = self.db.count_sanctions_to_ack_by_user_id_and_descriptor(self.account.id, rc_database::schema::sanction::Descriptor::Warn).await.map_err(|e| {
let count = self.db.count_sanctions_to_ack_by_user_id_and_descriptor(self.account.id, oj_rc_database::schema::sanction::Descriptor::Warn).await.map_err(|e| {
log::error!("Failed to count pending sanctions for user_id {}: {}", self.account.id, e);
crate::data::error_codes::ChatErrorCodes::UnexpectedError as i16
})?;
@@ -1034,19 +1034,19 @@ impl super::ChatUser for UserData {
if sanction.is_adding {
let now = chrono::Utc::now().timestamp();
let sanction_ty = crate::data::sanction::SanctionType::from_persist(sanction.type_).to_db();
let to_add = rc_database::schema::sanction::ActiveModel {
user_id: rc_database::sea_orm::ActiveValue::Set(user.id),
creation_time: rc_database::sea_orm::ActiveValue::Set(now),
issuer_id: rc_database::sea_orm::ActiveValue::Set(self.account.id),
issuer_name: rc_database::sea_orm::ActiveValue::Set(self.account.display_name.clone()),
descriptor: rc_database::sea_orm::ActiveValue::Set(sanction_ty.clone()),
reason: rc_database::sea_orm::ActiveValue::Set(sanction.reason),
duration: rc_database::sea_orm::ActiveValue::Set(if sanction.duration <= 0 { None } else { Some(sanction.duration as i64) }),
let to_add = oj_rc_database::schema::sanction::ActiveModel {
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user.id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(now),
issuer_id: oj_rc_database::sea_orm::ActiveValue::Set(self.account.id),
issuer_name: oj_rc_database::sea_orm::ActiveValue::Set(self.account.display_name.clone()),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(sanction_ty.clone()),
reason: oj_rc_database::sea_orm::ActiveValue::Set(sanction.reason),
duration: oj_rc_database::sea_orm::ActiveValue::Set(if sanction.duration <= 0 { None } else { Some(sanction.duration as i64) }),
..Default::default()
};
if matches!(sanction_ty, rc_database::schema::sanction::Descriptor::Ban) {
self.db.update_perms_by_user_id(rc_database::schema::permissions::ActiveModel {
banned: rc_database::sea_orm::ActiveValue::Set(true),
if matches!(sanction_ty, oj_rc_database::schema::sanction::Descriptor::Ban) {
self.db.update_perms_by_user_id(oj_rc_database::schema::permissions::ActiveModel {
banned: oj_rc_database::sea_orm::ActiveValue::Set(true),
..Default::default()
}, user.id).await.map_err(|e| {
log::error!("Failed to update permissions (to ban) for user_id {} by user_id {}: {}", user.id, self.account.id, e);

298
rc_core/src/persist/user/initial_data.rs
View File

@@ -4,7 +4,7 @@ fn current_unix_time() -> i64 {
chrono::Utc::now().timestamp()
}
async fn build_new_account_data(user: &super::UserInfo, db: &rc_database::Database) -> Result<(), rc_database::sea_orm::DbErr> {
async fn build_new_account_data(user: &super::UserInfo, db: &oj_rc_database::Database) -> Result<(), oj_rc_database::sea_orm::DbErr> {
let reg_info = super::RegistrationInfo {
display_name: user.payload.display_name.clone(),
password: if let super::ExtraUserInfo::Email { password } | super::ExtraUserInfo::Username { password } = &user.extra {
@@ -19,7 +19,7 @@ async fn build_new_account_data(user: &super::UserInfo, db: &rc_database::Databa
Ok(())
}
pub async fn setup_new_user(user: &super::UserInfo, db: &rc_database::Database) -> Result<(), rc_database::sea_orm::DbErr> {
pub async fn setup_new_user(user: &super::UserInfo, db: &oj_rc_database::Database) -> Result<(), oj_rc_database::sea_orm::DbErr> {
/*let ref_path = new_dir.as_ref().parent().unwrap().join(REFERENCE_DIR);
if !ref_path.exists() {
log::debug!("Initialising reference directory {}", ref_path.display());
@@ -31,7 +31,7 @@ pub async fn setup_new_user(user: &super::UserInfo, db: &rc_database::Database)
Ok(())
}
pub async fn register_new_user(info: &super::RegistrationInfo, db: &rc_database::Database) -> Result<u32, rc_database::sea_orm::DbErr> {
pub async fn register_new_user(info: &super::RegistrationInfo, db: &oj_rc_database::Database) -> Result<u32, oj_rc_database::sea_orm::DbErr> {
let user_data = db.insert_user(default_user_data(info)).await?;
db.insert_perms(default_user_perms(user_data.id)).await?;
db.insert_user_aux(default_user_aux_data(user_data.id)).await?;
@@ -39,7 +39,7 @@ pub async fn register_new_user(info: &super::RegistrationInfo, db: &rc_database:
Ok(user_data.id)
}
fn default_user_data(info: &super::RegistrationInfo) -> rc_database::schema::user::ActiveModel {
fn default_user_data(info: &super::RegistrationInfo) -> oj_rc_database::schema::user::ActiveModel {
let password = {
use argon2::password_hash::PasswordHasher;
let argon2_algo = argon2::Argon2::default();
@@ -57,208 +57,208 @@ fn default_user_data(info: &super::RegistrationInfo) -> rc_database::schema::use
} else {
None
};
rc_database::schema::user::ActiveModel {
oj_rc_database::schema::user::ActiveModel {
id: Default::default(),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_unix_time()),
public_id: rc_database::sea_orm::ActiveValue::Set(info.display_name.clone()),
display_name: rc_database::sea_orm::ActiveValue::Set(info.display_name.clone()),
password: rc_database::sea_orm::ActiveValue::Set(password),
email: rc_database::sea_orm::ActiveValue::Set(info.email.clone().unwrap_or_else(|| "".to_owned())),
steam_id: rc_database::sea_orm::ActiveValue::Set(steam_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_unix_time()),
public_id: oj_rc_database::sea_orm::ActiveValue::Set(info.display_name.clone()),
display_name: oj_rc_database::sea_orm::ActiveValue::Set(info.display_name.clone()),
password: oj_rc_database::sea_orm::ActiveValue::Set(password),
email: oj_rc_database::sea_orm::ActiveValue::Set(info.email.clone().unwrap_or_else(|| "".to_owned())),
steam_id: oj_rc_database::sea_orm::ActiveValue::Set(steam_id),
}
}
fn default_user_aux_data(user_id: u32) -> Vec<rc_database::schema::user_aux::ActiveModel> {
fn default_user_aux_data(user_id: u32) -> Vec<oj_rc_database::schema::user_aux::ActiveModel> {
let current_time = current_unix_time();
vec![
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::UserXP),
data: rc_database::sea_orm::ActiveValue::Set("0".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::UserXP),
data: oj_rc_database::sea_orm::ActiveValue::Set("0".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::PremiumExpiry),
data: rc_database::sea_orm::ActiveValue::Set(current_time.to_string()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::PremiumExpiry),
data: oj_rc_database::sea_orm::ActiveValue::Set(current_time.to_string()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::UnlockedParts),
data: rc_database::sea_orm::ActiveValue::Set(
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::UnlockedParts),
data: oj_rc_database::sea_orm::ActiveValue::Set(
r#"{
"unlocked": [],
"override": "UnlockAll"
}"#.to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::TechPoints),
data: rc_database::sea_orm::ActiveValue::Set("1337".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::TechPoints),
data: oj_rc_database::sea_orm::ActiveValue::Set("1337".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::UserRank),
data: rc_database::sea_orm::ActiveValue::Set("1".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::UserRank),
data: oj_rc_database::sea_orm::ActiveValue::Set("1".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::UserFreeCurrency),
data: rc_database::sea_orm::ActiveValue::Set("10000".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::UserFreeCurrency),
data: oj_rc_database::sea_orm::ActiveValue::Set("10000".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::UserPaidCurrency),
data: rc_database::sea_orm::ActiveValue::Set("1000".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::UserPaidCurrency),
data: oj_rc_database::sea_orm::ActiveValue::Set("1000".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::GarageSlotOrder),
data: rc_database::sea_orm::ActiveValue::Set("[0]".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::GarageSlotOrder),
data: oj_rc_database::sea_orm::ActiveValue::Set("[0]".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::SubscribedChannels),
data: rc_database::sea_orm::ActiveValue::Set("[\"sys\"]".to_owned()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::SubscribedChannels),
data: oj_rc_database::sea_orm::ActiveValue::Set("[\"sys\"]".to_owned()),
},
rc_database::schema::user_aux::ActiveModel {
oj_rc_database::schema::user_aux::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::AvatarId),
data: rc_database::sea_orm::ActiveValue::Set((current_time % 16).to_string()),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
descriptor: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::user_aux::Descriptor::AvatarId),
data: oj_rc_database::sea_orm::ActiveValue::Set((current_time % 16).to_string()),
}
]
}
fn default_user_perms(user_id: u32) -> rc_database::schema::permissions::ActiveModel {
rc_database::schema::permissions::ActiveModel {
fn default_user_perms(user_id: u32) -> oj_rc_database::schema::permissions::ActiveModel {
oj_rc_database::schema::permissions::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
moderator: rc_database::sea_orm::ActiveValue::Set(false),
administrator: rc_database::sea_orm::ActiveValue::Set(false),
developer: rc_database::sea_orm::ActiveValue::Set(false),
royalty: rc_database::sea_orm::ActiveValue::Set(false),
banned: rc_database::sea_orm::ActiveValue::Set(false),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
moderator: oj_rc_database::sea_orm::ActiveValue::Set(false),
administrator: oj_rc_database::sea_orm::ActiveValue::Set(false),
developer: oj_rc_database::sea_orm::ActiveValue::Set(false),
royalty: oj_rc_database::sea_orm::ActiveValue::Set(false),
banned: oj_rc_database::sea_orm::ActiveValue::Set(false),
}
}
pub fn default_new_slot(user_id: u32, slot: u32, bay_cpu: u32) -> rc_database::schema::garage::ActiveModel {
pub fn default_new_slot(user_id: u32, slot: u32, bay_cpu: u32) -> oj_rc_database::schema::garage::ActiveModel {
let current_time = current_unix_time();
rc_database::schema::garage::ActiveModel {
oj_rc_database::schema::garage::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
slot: rc_database::sea_orm::ActiveValue::Set(slot),
name: rc_database::sea_orm::ActiveValue::Set(format!("Bay {}", slot)),
crf_id: rc_database::sea_orm::ActiveValue::Set(None),
was_rated: rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
uuid: rc_database::sea_orm::ActiveValue::Set(super::uuid_sanitize(current_time)),
thumbnail_version: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: rc_database::sea_orm::ActiveValue::Set(0),
bay_cpu: rc_database::sea_orm::ActiveValue::Set(bay_cpu),
tutorial_robot: rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: rc_database::sea_orm::ActiveValue::Set(None),
control_type: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::garage::ControlType::Camera),
vertical_strafing: rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: rc_database::sea_orm::ActiveValue::Set(false),
mastery_level: rc_database::sea_orm::ActiveValue::Set(1),
bay_skin_id: rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
selected: rc_database::sea_orm::ActiveValue::Set(false),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
slot: oj_rc_database::sea_orm::ActiveValue::Set(slot),
name: oj_rc_database::sea_orm::ActiveValue::Set(format!("Bay {}", slot)),
crf_id: oj_rc_database::sea_orm::ActiveValue::Set(None),
was_rated: oj_rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
uuid: oj_rc_database::sea_orm::ActiveValue::Set(super::uuid_sanitize(current_time)),
thumbnail_version: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: oj_rc_database::sea_orm::ActiveValue::Set(0),
bay_cpu: oj_rc_database::sea_orm::ActiveValue::Set(bay_cpu),
tutorial_robot: oj_rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: oj_rc_database::sea_orm::ActiveValue::Set(None),
control_type: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::garage::ControlType::Camera),
vertical_strafing: oj_rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: oj_rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: oj_rc_database::sea_orm::ActiveValue::Set(false),
mastery_level: oj_rc_database::sea_orm::ActiveValue::Set(1),
bay_skin_id: oj_rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
selected: oj_rc_database::sea_orm::ActiveValue::Set(false),
}
}
pub fn default_reset_slot() -> rc_database::schema::garage::ActiveModel {
rc_database::schema::garage::ActiveModel {
pub fn default_reset_slot() -> oj_rc_database::schema::garage::ActiveModel {
oj_rc_database::schema::garage::ActiveModel {
id: Default::default(),
user_id: Default::default(),
creation_time: Default::default(),
slot: Default::default(),
name: Default::default(),
crf_id: rc_database::sea_orm::ActiveValue::Set(None),
was_rated: rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
crf_id: oj_rc_database::sea_orm::ActiveValue::Set(None),
was_rated: oj_rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
uuid: Default::default(),
thumbnail_version: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: rc_database::sea_orm::ActiveValue::Set(0),
thumbnail_version: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: oj_rc_database::sea_orm::ActiveValue::Set(0),
bay_cpu: Default::default(),
tutorial_robot: rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: rc_database::sea_orm::ActiveValue::Set(None),
control_type: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::garage::ControlType::Camera),
vertical_strafing: rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: rc_database::sea_orm::ActiveValue::Set(false),
tutorial_robot: oj_rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: oj_rc_database::sea_orm::ActiveValue::Set(None),
control_type: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::garage::ControlType::Camera),
vertical_strafing: oj_rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: oj_rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: oj_rc_database::sea_orm::ActiveValue::Set(false),
mastery_level: Default::default(),
bay_skin_id: rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
bay_skin_id: oj_rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
selected: Default::default(),
}
}
fn default_garage_slots(user_id: u32) -> Vec<rc_database::schema::garage::ActiveModel> {
fn default_garage_slots(user_id: u32) -> Vec<oj_rc_database::schema::garage::ActiveModel> {
let current_time = current_unix_time();
vec![
rc_database::schema::garage::ActiveModel {
oj_rc_database::schema::garage::ActiveModel {
id: Default::default(),
user_id: rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: rc_database::sea_orm::ActiveValue::Set(current_time),
slot: rc_database::sea_orm::ActiveValue::Set(0),
name: rc_database::sea_orm::ActiveValue::Set("Bay 0".to_owned()),
crf_id: rc_database::sea_orm::ActiveValue::Set(None),
was_rated: rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
uuid: rc_database::sea_orm::ActiveValue::Set(super::uuid_sanitize(current_time)),
thumbnail_version: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: rc_database::sea_orm::ActiveValue::Set(0),
bay_cpu: rc_database::sea_orm::ActiveValue::Set(2_000),
tutorial_robot: rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: rc_database::sea_orm::ActiveValue::Set(None),
control_type: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::garage::ControlType::Camera),
vertical_strafing: rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: rc_database::sea_orm::ActiveValue::Set(false),
mastery_level: rc_database::sea_orm::ActiveValue::Set(1),
bay_skin_id: rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
selected: rc_database::sea_orm::ActiveValue::Set(true),
user_id: oj_rc_database::sea_orm::ActiveValue::Set(user_id),
creation_time: oj_rc_database::sea_orm::ActiveValue::Set(current_time),
slot: oj_rc_database::sea_orm::ActiveValue::Set(0),
name: oj_rc_database::sea_orm::ActiveValue::Set("Bay 0".to_owned()),
crf_id: oj_rc_database::sea_orm::ActiveValue::Set(None),
was_rated: oj_rc_database::sea_orm::ActiveValue::Set(false),
movement_categories: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
uuid: oj_rc_database::sea_orm::ActiveValue::Set(super::uuid_sanitize(current_time)),
thumbnail_version: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_cosmetic_cpu: oj_rc_database::sea_orm::ActiveValue::Set(0),
total_robot_ranking: oj_rc_database::sea_orm::ActiveValue::Set(0),
bay_cpu: oj_rc_database::sea_orm::ActiveValue::Set(2_000),
tutorial_robot: oj_rc_database::sea_orm::ActiveValue::Set(false),
starter_robot_index: oj_rc_database::sea_orm::ActiveValue::Set(None),
control_type: oj_rc_database::sea_orm::ActiveValue::Set(oj_rc_database::schema::garage::ControlType::Camera),
vertical_strafing: oj_rc_database::sea_orm::ActiveValue::Set(false),
sideways_driving: oj_rc_database::sea_orm::ActiveValue::Set(false),
tracks_turn_on_spot: oj_rc_database::sea_orm::ActiveValue::Set(false),
mastery_level: oj_rc_database::sea_orm::ActiveValue::Set(1),
bay_skin_id: oj_rc_database::sea_orm::ActiveValue::Set("RC_MothershipSkin_Neptune_01".to_owned()),
death_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Explosion".to_owned()),
spawn_animation_id: oj_rc_database::sea_orm::ActiveValue::Set("Spawn".to_owned()),
weapon_order: oj_rc_database::sea_orm::ActiveValue::Set("".to_owned()),
robot_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
colour_data: oj_rc_database::sea_orm::ActiveValue::Set(vec![0u8; 4]),
selected: oj_rc_database::sea_orm::ActiveValue::Set(true),
}
]
/*vec![

12
rc_core/src/persist/user/traits.rs
View File

@@ -75,8 +75,8 @@ pub trait User<C>: ChatUser {
async fn get_slot_customisations(&self, uuid: &str) -> Result<GetCustomisationData<C>, i16>;
async fn set_slot_name(&self, slot: i32, name: String) -> Result<(), i16>;
fn signup_date(&self) -> i64;
async fn singleplayer_robots(&self, factory: &dyn rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<polariton::operation::Typed<C>, i16>;
async fn prepare_factory_upload(&self, vehicle: VehicleUploadData) -> Result<rc_factory::VehicleUploadInfo, i16>;
async fn singleplayer_robots(&self, factory: &dyn oj_rc_factory::VehicleFactoryAdapter, weapon_order: &crate::cubes::WeaponListParser, singleplayer_config: &crate::persist::config::SingleplayerConfig) -> Result<polariton::operation::Typed<C>, i16>;
async fn prepare_factory_upload(&self, vehicle: VehicleUploadData) -> Result<oj_rc_factory::VehicleUploadInfo, i16>;
async fn last_seen(&self) -> Result<u64, i16>;
async fn get_avatar_info(&self) -> Result<GetAvatarInfo<C>, i16>;
async fn set_avatar_info(&self, info: AvatarInfo) -> Result<(), i16>;
@@ -154,11 +154,11 @@ impl ControlType {
}
#[inline]
pub(super) fn into_db(self) -> rc_database::schema::garage::ControlType {
pub(super) fn into_db(self) -> oj_rc_database::schema::garage::ControlType {
match self {
Self::Camera => rc_database::schema::garage::ControlType::Camera,
Self::Keyboard => rc_database::schema::garage::ControlType::Keyboard,
Self::Count => rc_database::schema::garage::ControlType::Count,
Self::Camera => oj_rc_database::schema::garage::ControlType::Camera,
Self::Keyboard => oj_rc_database::schema::garage::ControlType::Keyboard,
Self::Count => oj_rc_database::schema::garage::ControlType::Count,
}
}
}