From f5d249c880e9dbb03f93f3acd0cecc1ebf53ff33 Mon Sep 17 00:00:00 2001
From: worldworm <13227454+worldworm@users.noreply.github.com>
Date: Sun, 10 Jan 2021 09:24:42 +0000
Subject: [PATCH] move charLimit to settings api

---
 app/app.py               | 11 ++++++-----
 app/templates/index.html |  4 +---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/app.py b/app/app.py
index 3b40c63..0f098bc 100644
--- a/app/app.py
+++ b/app/app.py
@@ -75,9 +75,6 @@ def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_la
                   name:
                     type: string
                     description: Human-readable language name (in English)
-                  charLimit:
-                    type: string
-                    description: Character input limit for this language (-1 indicates no limit)
           429:
             description: Slow down
             schema:
@@ -88,7 +85,7 @@ def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_la
                   type: string
                   description: Reason for slow down
         """
-        return jsonify([{'code': l.code, 'name': l.name, 'charLimit': char_limit } for l in languages])
+        return jsonify([{'code': l.code, 'name': l.name} for l in languages])
 
     # Add cors
     @app.after_request
@@ -218,6 +215,9 @@ def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_la
               id: frontend-settings
               type: object
               properties:
+                charLimit:
+                  type: integer
+                  description: Character input limit for this language (-1 indicates no limit)
                 language:
                   type: object
                   properties:
@@ -240,7 +240,8 @@ def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_la
                           type: string
                           description: Human-readable language name (in English)
         """
-        return jsonify({'language': {
+        return jsonify({'charLimit': char_limit,
+                        'language': {
                             'source': {'code': frontend_argos_language_source.code, 'name': frontend_argos_language_source.name},
                             'target': {'code': frontend_argos_language_target.code, 'name': frontend_argos_language_target.name}}
                        })
diff --git a/app/templates/index.html b/app/templates/index.html
index b0a3b60..6d430ce 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -278,7 +278,7 @@ document.addEventListener('DOMContentLoaded', function(){
 				self.settings = JSON.parse(this.response);
 				self.sourceLang = self.settings.language.source.code;
 				self.targetLang = self.settings.language.target.code;
-
+				self.charactersLimit = self.settings.charLimit;
 			}else {
 				self.error = "Cannot load /frontend/settings";
 				self.loading = false;
@@ -305,8 +305,6 @@ document.addEventListener('DOMContentLoaded', function(){
 				return;
 			}
 
-			self.charactersLimit = self.langs[0].charLimit;
-
 		    self.loading = false;			
 		  } else {
 			self.error = "Cannot load /languages";