Fix type for max_toot_chars and max_bio_chars in instance info (#163)

* fix type of max_bio_chars and max_toot_chars * treat max_{bio,toot}_chars as ints in admin settings
florence-social · Aug 14, 2019 · 93ab13a · 93ab13a
1 parent f54dd69
commit 93ab13a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
@@ -42,6 +42,11 @@ class SettingsController < BaseController
       preview_sensitive_media
       profile_directory
     ).freeze
+
+    INTEGER_SETTINGS = %w(
+      max_bio_chars
+      max_toot_chars
+    ).freeze
 
     UPLOAD_SETTINGS = %w(
       thumbnail

diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
@@ -42,6 +42,11 @@ class Form::AdminSettings
     preview_sensitive_media
     profile_directory
   ).freeze
+
+  INTEGER_KEYS = %i(
+    max_bio_chars
+    max_toot_chars
+  ).freeze
 
   UPLOAD_KEYS = %i(
     thumbnail
@@ -91,6 +96,8 @@ def initialize_attributes
   def typecast_value(key, value)
     if BOOLEAN_KEYS.include?(key)
       value == '1'
+    elsif INTEGER_KEYS.include?(key)
+      value.to_i
     else
       value
     end

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
@@ -37,11 +37,11 @@ def thumbnail
   end
 
   def max_toot_chars
-    Setting.max_toot_chars
+    Setting.max_toot_chars.to_i
   end
 
   def max_bio_chars
-    Setting.max_bio_chars
+    Setting.max_bio_chars.to_i
   end
 
   def stats