Skip to content

Commit dcec7d7

Browse files
committed
fix missing OrderedJson in pelican/pterodactyl import
1 parent 8f7bae5 commit dcec7d7

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

backend/src/commands/import/pelican.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use clap::{Args, FromArgMatches};
1010
use colored::Colorize;
1111
use compact_str::ToCompactString;
1212
use indexmap::IndexMap;
13-
use shared::models::database_host::DatabaseCredentials;
13+
use shared::models::{OrderedJson, database_host::DatabaseCredentials};
1414
use sqlx::Row;
1515
use std::{
1616
collections::{HashMap, HashSet},
@@ -790,13 +790,13 @@ impl shared::extensions::commands::CliCommand<PelicanArgs> for PelicanCommand {
790790
.bind(name)
791791
.bind(description)
792792
.bind(features)
793-
.bind(docker_images)
793+
.bind(OrderedJson(docker_images))
794794
.bind(file_denylist)
795795
.bind(serde_json::to_value(config_files)?)
796796
.bind(serde_json::to_value(config_startup)?)
797797
.bind(serde_json::to_value(config_stop)?)
798798
.bind(serde_json::to_value(config_script)?)
799-
.bind(serde_json::to_value(startup_commands)?)
799+
.bind(OrderedJson(startup_commands))
800800
.bind(force_outgoing_ip)
801801
.bind(created)
802802
.fetch_one(database.write())

backend/src/commands/import/pterodactyl.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use base64::Engine;
88
use clap::{Args, FromArgMatches};
99
use colored::Colorize;
1010
use compact_str::ToCompactString;
11-
use shared::models::database_host::DatabaseCredentials;
11+
use shared::models::{OrderedJson, database_host::DatabaseCredentials};
1212
use sqlx::Row;
1313
use std::{
1414
collections::{HashMap, HashSet},
@@ -693,13 +693,13 @@ impl shared::extensions::commands::CliCommand<PterodactylArgs> for PterodactylCo
693693
.bind(name)
694694
.bind(description)
695695
.bind(features)
696-
.bind(docker_images)
696+
.bind(OrderedJson(docker_images))
697697
.bind(file_denylist)
698698
.bind(serde_json::to_value(config_files)?)
699699
.bind(serde_json::to_value(config_startup)?)
700700
.bind(serde_json::to_value(config_stop)?)
701701
.bind(serde_json::to_value(config_script)?)
702-
.bind(serde_json::json!({ "Default": startup }))
702+
.bind(OrderedJson(serde_json::json!({ "Default": startup })))
703703
.bind(force_outgoing_ip)
704704
.bind(created)
705705
.fetch_one(database.write())

0 commit comments

Comments
 (0)