preserve json order

diff --git a/server/Cargo.lock b/server/Cargo.lock
index 5f9d783846a29d7b15eed510e8ae1da114c393d0..c135bbe60c07bcd3e162ae59193970abf4a06649 100644 (file)
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -1833,6 +1833,7 @@ name = "serde_json"
 version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 3f555829b871c2f3e107c1b310c044e24abe6718..9d20c643aea700531e5761b012adf83fe764e3ed 100644 (file)
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -12,7 +12,7 @@ bcrypt = "0.5.0"
 activitypub = "0.1.5"
 chrono = { version = "0.4.7", features = ["serde"] }
 failure = "0.1.5"
-serde_json = "1.0.40"
+serde_json = { version = "1.0.40", features = ["preserve_order"]}
 serde = { version = "1.0.94", features = ["derive"] }
 actix = "0.8.3"
 actix-web = "1.0"

diff --git a/server/src/main.rs b/server/src/main.rs
index 9afc12b1e9031552fe93abb48d1a71883acfd515..8c77199fb37ff429ab097e307a50f3a329146277 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -11,7 +11,6 @@ use lemmy_server::nodeinfo;
 use lemmy_server::websocket::server::*;
 use std::env;
 use std::time::{Duration, Instant};
-use actix_web::http::header::ContentType;
 
 embed_migrations!();