fix

Anti-Raid · Nov 24, 2024 · 24ae5ea · 24ae5ea
1 parent 73457ba
commit 24ae5ea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/core/go.std/silverpelt/config_opts.go b/core/go.std/silverpelt/config_opts.go
@@ -48,12 +48,24 @@ type CanonicalSettingsError struct {
 }
 
 type CanonicalColumnType struct {
-	Scalar *struct {
-		ColumnType CanonicalInnerColumnType `json:"column_type"`
-	} `json:"Scalar,omitempty"`
-	Array *struct {
-		Inner CanonicalInnerColumnType `json:"inner"`
-	} `json:"Array,omitempty"`
+	Type   string    `json:"type"` // Either Scalar or Array
+	Uuid   *struct{} `json:"Uuid,omitempty"`
+	String *struct {
+		MinLength     *int                               `json:"min_length,omitempty"`
+		MaxLength     *int                               `json:"max_length,omitempty"`
+		AllowedValues []string                           `json:"allowed_values,omitempty"`
+		Kind          CanonicalInnerColumnTypeStringKind `json:"kind,omitempty"`
+	} `json:"String,omitempty"`
+	Timestamp   *struct{} `json:"Timestamp,omitempty"`
+	TimestampTz *struct{} `json:"TimestampTz,omitempty"`
+	Interval    *struct{} `json:"Interval,omitempty"`
+	Integer     *struct{} `json:"Integer,omitempty"`
+	Float       *struct{} `json:"Float,omitempty"`
+	BitFlag     *struct {
+		Values orderedmap.OrderedMap[string, int64] `json:"values"`
+	} `json:"BitFlag,omitempty"`
+	Boolean *struct{} `json:"Boolean,omitempty"`
+	Json    *struct{} `json:"Json,omitempty"`
 }
 
 type CanonicalInnerColumnTypeStringKind struct {
@@ -75,26 +87,6 @@ type CanonicalInnerColumnTypeStringKind struct {
 	Modifier *struct{} `json:"Modifier,omitempty"`
 }
 
-type CanonicalInnerColumnType struct {
-	Uuid   *struct{} `json:"Uuid,omitempty"`
-	String *struct {
-		MinLength     *int                               `json:"min_length,omitempty"`
-		MaxLength     *int                               `json:"max_length,omitempty"`
-		AllowedValues []string                           `json:"allowed_values,omitempty"`
-		Kind          CanonicalInnerColumnTypeStringKind `json:"kind,omitempty"`
-	} `json:"String,omitempty"`
-	Timestamp   *struct{} `json:"Timestamp,omitempty"`
-	TimestampTz *struct{} `json:"TimestampTz,omitempty"`
-	Interval    *struct{} `json:"Interval,omitempty"`
-	Integer     *struct{} `json:"Integer,omitempty"`
-	Float       *struct{} `json:"Float,omitempty"`
-	BitFlag     *struct {
-		Values orderedmap.OrderedMap[string, int64] `json:"values"`
-	} `json:"BitFlag,omitempty"`
-	Boolean *struct{} `json:"Boolean,omitempty"`
-	Json    *struct{} `json:"Json,omitempty"`
-}
-
 type CanonicalColumnSuggestion struct {
 	Static *struct {
 		Suggestions []string `json:"suggestions"`

diff --git a/services/website b/services/website
+54 −11		src/components/settings/Setting.svelte
+39 −41		src/components/settings/SettingsColumn.svelte
+2 −6		src/components/settings/SettingsRow.svelte
+0 −100		src/components/settings/SettingsSuggestionBox.svelte
+24 −21		src/components/settings/SettingsView.svelte
+1 −1		src/lib/generated/build_assets/serenity_perms.json
+28 −61		src/lib/generated/silverpelt.ts
+0 −1		src/lib/generated/types.ts
+63 −89		src/lib/ui/settings.ts