# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2022-03-06 11:01:38
# Node ID 2fd1be8b4f56f3ef9a5bfaafe18db03213b39021
# Parent  982d871c458ccc1a2f840161163e439899e38c8f

We now use only v14

diff --git a/spaceapi/sensors.py b/spaceapi/sensors.py
--- a/spaceapi/sensors.py
+++ b/spaceapi/sensors.py
@@ -21,8 +21,7 @@ get_identification_key = partial(first, 
 
 def set_value(data, key):
 
-    active = ActiveStatus()
-    active_v14 = ActiveStatusv14()
+    active = ActiveStatusv14()
 
     try:
         subkey = get_identification_key(data)
@@ -33,27 +32,18 @@ def set_value(data, key):
     try:
         index = fuzzy_list_find(active["sensors"][key], subkey, data[subkey])
         if key == "barometer":
-            data["unit"] == "hPA"
+            data["unit"] == "hPa"
         active["sensors"][key][index].update(data)
     except ValueError:
         active["sensors"][key].append(data)
 
-    try:
-        index_v14 = fuzzy_list_find(active_v14["sensors"][key], subkey, data[subkey])
-        if key == "barometer":
-            data["unit"] = "hPa"
-        active_v14["sensors"][key][index].update(data)
-    except ValueError:
-        active_v14["sensors"][key].append(data)
-
     active.save_last_state()
-    active_v14.save_last_state()
     return jsonify(active)
 
 
 def set_radiation_value(data):
 
-    active = ActiveStatus()
+    active = ActiveStatusv14()
 
     radiation_keys = [k for k in RADIATON_SUBKEYS if k in data]
 
@@ -85,7 +75,7 @@ def set_radiation_value(data):
 @httpauth.login_required
 def set_sensors(key):
 
-    active = ActiveStatus()
+    active = ActiveStatusv14()
 
     if key in ALLOWED_SENSORS_KEYS and key in active["sensors"]:
         data = request.json
diff --git a/spaceapi/utils.py b/spaceapi/utils.py
--- a/spaceapi/utils.py
+++ b/spaceapi/utils.py
@@ -213,9 +213,6 @@ class ActiveStatusv14(ActiveStatus):
         self.default_json_file = default_json_file_v14
         self.last_state_file = last_state_file_v14
 
-    def send_tweet(self, value):
-        pass
-
 
 def request_wants_json():
     best = request.accept_mimetypes.best_match(["application/json", "text/html"])
@@ -245,7 +242,7 @@ def first(iterable, keys):
 def pass_active_status(f):
     @wraps(f)
     def wrapper(*args, **kwargs):
-        status = ActiveStatus()
+        status = ActiveStatusv14()
         rv = f(status, *args, **kwargs)
         status.save_last_state()
         return rv
diff --git a/spaceapi/views.py b/spaceapi/views.py
--- a/spaceapi/views.py
+++ b/spaceapi/views.py
@@ -18,31 +18,18 @@ root_views = Blueprint("root", __name__)
 @root_views.route("/")
 def index():
     if request_wants_json():
-        return jsonify(ActiveStatus())
+        return jsonify(ActiveStatusv14())
     return render_template("index.html", status=ActiveStatus())
 
 
 @root_views.route("/status.json")
 def status_json():
-    return jsonify(ActiveStatus())
-
-
-@root_views.route("/v14/status.json")
-def v14_json():
     return jsonify(ActiveStatusv14())
 
 
 @root_views.route("/reload")
 @httpauth.login_required
 def reload():
-    active = ActiveStatus()
-    active.reload()
-    return jsonify(active)
-
-
-@root_views.route("/v14/reload")
-@httpauth.login_required
-def v14_reload():
     active = ActiveStatusv14()
     active.reload()
     return jsonify(active)
@@ -52,8 +39,7 @@ def v14_reload():
 @httpauth.login_required
 def open():
     if request.method == "POST":
-        active = ActiveStatus()
-        activev14 = ActiveStatusv14()
+        active = ActiveStatusv14()
 
         try:
             if (
@@ -79,11 +65,7 @@ def open():
         active.set_new_state(
             value=new_state, trigger_person=trigger_person, message=message
         )
-        activev14.set_new_state(
-            value=new_state, trigger_person=trigger_person, message=message
-        )
         active.save_last_state()
-        activev14.save_last_state()
         return redirect(url_for("root.index"))
 
     return render_template("open.html")
@@ -94,8 +76,7 @@ def open():
 def present():
     if request.method == "POST":
 
-        active = ActiveStatus()
-        activev14 = ActiveStatusv14()
+        active = ActiveStatusv14()
 
         if active["state"]["open"]:
             user = (
@@ -105,15 +86,12 @@ def present():
             )
             if "present" in request.form:
                 active.add_user_present(user)
-                activev14.add_user_present(user)
             elif "leave" in request.form:
                 active.remove_user_present(user)
-                activev14.remove_user_present(user)
             else:
                 return redirect(url_for("root.index"))
 
             active.save_last_state()
-            activev14.save_last_state()
 
         return redirect(url_for("root.index"))
 
@@ -124,8 +102,7 @@ def present():
 @basicauth.login_required
 def basicopen():
     if request.method == "POST":
-        active = ActiveStatus()
-        activev14 = ActiveStatusv14()
+        active = ActiveStatusv14()
 
         try:
             if (
@@ -151,11 +128,7 @@ def basicopen():
         active.set_new_state(
             value=new_state, trigger_person=trigger_person, message=message
         )
-        activev14.set_new_state(
-            value=new_state, trigger_person=trigger_person, message=message
-        )
         active.save_last_state()
-        activev14.save_last_state()
         return redirect(url_for("root.index"))
 
     return render_template("open.html")
@@ -166,8 +139,7 @@ def basicopen():
 def basicpresent():
     if request.method == "POST":
 
-        active = ActiveStatus()
-        activev14 = ActiveStatusv14()
+        active = ActiveStatusv14()
 
         if active["state"]["open"]:
             user = (
@@ -177,15 +149,12 @@ def basicpresent():
             )
             if "present" in request.form:
                 active.add_user_present(user)
-                activev14.add_user_present(user)
             elif "leave" in request.form:
                 active.remove_user_present(user)
-                activev14.remove_user_present(user)
             else:
                 return redirect(url_for("root.index"))
 
             active.save_last_state()
-            activev14.save_last_state()
 
         return redirect(url_for("root.index"))