From 6c0d21867cc65e65c5671586c72c8d30327897c1 Mon Sep 17 00:00:00 2001
From: bitfl0wer <florian@pro-weber.com>
Date: Wed, 7 Jun 2023 22:40:48 +0200
Subject: [PATCH] Sort fields on Guild alphabetically

---
 src/types/entities/guild.rs | 113 ++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/types/entities/guild.rs b/src/types/entities/guild.rs
index 1b4d641..f9fa2e2 100644
--- a/src/types/entities/guild.rs
+++ b/src/types/entities/guild.rs
@@ -13,80 +13,81 @@ use crate::types::{
 #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct Guild {
-    pub id: Snowflake,
-    pub name: Option<String>,
-    pub icon: Option<String>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub icon_hash: Option<String>,
-    pub splash: Option<String>,
-    pub discovery_splash: Option<String>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub owner: Option<bool>, // True if requesting user is owner
-    pub owner_id: Option<Snowflake>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub permissions: Option<String>,
     pub afk_channel_id: Option<Snowflake>,
     pub afk_timeout: Option<i32>,
-    pub widget_enabled: Option<bool>,
-    pub widget_channel_id: Option<Snowflake>,
-    pub verification_level: Option<i32>,
-    pub default_message_notifications: Option<i32>,
-    pub explicit_content_filter: Option<i32>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub roles: Option<Vec<RoleObject>>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    #[serde(default)]
-    pub emojis: Vec<Emoji>,
-    //#[cfg_attr(feature = "sqlx", sqlx(try_from = "String"))]
-    pub features: GuildFeaturesList,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub application_id: Option<String>,
-    pub system_channel_id: Option<Snowflake>,
-    pub system_channel_flags: Option<i32>,
-    pub rules_channel_id: Option<Snowflake>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub rules_channel: Option<String>,
-    pub max_presences: Option<i32>,
-    pub max_members: Option<i32>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub vanity_url_code: Option<String>,
-    pub description: Option<String>,
-    pub banner: Option<String>,
-    pub premium_tier: Option<i32>,
-    pub premium_subscription_count: Option<i32>,
-    pub preferred_locale: Option<String>,
-    pub public_updates_channel_id: Option<Snowflake>,
-    pub max_video_channel_users: Option<i32>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub max_stage_video_channel_users: Option<i32>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub approximate_member_count: Option<i32>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub approximate_presence_count: Option<i32>,
-    #[cfg(feature = "sqlx")]
-    pub welcome_screen: Option<sqlx::types::Json<WelcomeScreenObject>>,
-    #[cfg(not(feature = "sqlx"))]
-    pub welcome_screen: Option<WelcomeScreenObject>,
-    pub nsfw_level: Option<i32>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub stickers: Option<Vec<Sticker>>,
-    pub premium_progress_bar_enabled: Option<bool>,
-    #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub joined_at: Option<String>,
+    pub banner: Option<String>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub bans: Option<Vec<GuildBan>>,
-    pub primary_category_id: Option<Snowflake>,
-    pub large: Option<bool>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub channels: Option<Vec<Channel>>,
+    pub default_message_notifications: Option<i32>,
+    pub description: Option<String>,
+    pub discovery_splash: Option<String>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    #[serde(default)]
+    pub emojis: Vec<Emoji>,
+    pub explicit_content_filter: Option<i32>,
+    //#[cfg_attr(feature = "sqlx", sqlx(try_from = "String"))]
+    pub features: GuildFeaturesList,
+    pub icon: Option<String>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub icon_hash: Option<String>,
+    pub id: Snowflake,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub invites: Option<Vec<GuildInvite>>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub joined_at: Option<String>,
+    pub large: Option<bool>,
+    pub max_members: Option<i32>,
+    pub max_presences: Option<i32>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub max_stage_video_channel_users: Option<i32>,
+    pub max_video_channel_users: Option<i32>,
+    pub mfa_level: Option<i32>,
+    pub name: Option<String>,
+    pub nsfw_level: Option<i32>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub owner: Option<bool>,
+    // True if requesting user is owner
+    pub owner_id: Option<Snowflake>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub permissions: Option<String>,
+    pub preferred_locale: Option<String>,
+    pub premium_progress_bar_enabled: Option<bool>,
+    pub premium_subscription_count: Option<i32>,
+    pub premium_tier: Option<i32>,
+    pub primary_category_id: Option<Snowflake>,
+    pub public_updates_channel_id: Option<Snowflake>,
+    pub region: Option<String>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub roles: Option<Vec<RoleObject>>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub rules_channel: Option<String>,
+    pub rules_channel_id: Option<Snowflake>,
+    pub splash: Option<String>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub stickers: Option<Vec<Sticker>>,
+    pub system_channel_flags: Option<i32>,
+    pub system_channel_id: Option<Snowflake>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
+    pub vanity_url_code: Option<String>,
+    pub verification_level: Option<i32>,
+    #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub voice_states: Option<Vec<VoiceState>>,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub webhooks: Option<Vec<Webhook>>,
-    pub mfa_level: Option<i32>,
-    pub region: Option<String>,
+    #[cfg(feature = "sqlx")]
+    pub welcome_screen: Option<sqlx::types::Json<WelcomeScreenObject>>,
+    #[cfg(not(feature = "sqlx"))]
+    pub welcome_screen: Option<WelcomeScreenObject>,
+    pub widget_channel_id: Option<Snowflake>,
+    pub widget_enabled: Option<bool>,
 }
 
 /// See https://docs.spacebar.chat/routes/#get-/guilds/-guild_id-/bans/-user-