feat: add betterstatus embed

and remove old method of scraping the TJCSL status page

Author: aarushtools

intranet/apps/emerg/views.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import time
 
@@ -14,20 +13,19 @@
 
 
 def check_emerg():
-    """Fetch from FCPS and CSL emergency announcement pages.
+    """Fetch from FCPS emergency announcement pages.
 
-    URLs defined in settings.FCPS_EMERGENCY_PAGE and settings.CSL_STATUS_PAGE
+    URLs defined in settings.FCPS_EMERGENCY_PAGE
 
     Request timeout defined in settings.FCPS_EMERGENCY_TIMEOUT
 
     """
     fcps_page = settings.FCPS_EMERGENCY_PAGE
-    csl_page = settings.CSL_STATUS_PAGE
     announcements = []
 
     if settings.EMERGENCY_MESSAGE:
         return True, settings.EMERGENCY_MESSAGE
-    if not fcps_page or not csl_page:
+    if not fcps_page:
         return None, None
 
     timeout = settings.EMERGENCY_TIMEOUT
@@ -67,44 +65,10 @@ def check_emerg():
 
         announcements.append({"title": f"<a target='_blank' href=\"{get_domain_name(fcps_page)}\">{title}</a>", "body": body})
 
-    try:
-        r = requests.get(csl_page, timeout=timeout)
-    except requests.exceptions.Timeout:
-        pass
-
-    try:
-        csl_status = json.loads(r.text)
-    except json.decoder.JSONDecodeError:
-        return False, None
-
-    for system in csl_status["systems"]:
-        if system["status"] != "ok":
-            status = True
-            issues = system["unresolvedIssues"]
-            for issue in issues:
-                desc = requests.get(issue["permalink"], timeout=timeout).text
-                soup = BeautifulSoup(desc, "html.parser")
-
-                text = soup.find_all(["p", "hr"])
-                desc = text[2 : len(text) - 5]
-                a = {
-                    "title": f"<a target='_blank' href=\"{get_domain_name(csl_page)}\">{issue['title']}</a>",
-                    "body": "".join(d.prettify() for d in desc),
-                }
-                if a not in announcements and issue["severity"] != "notice":
-                    announcements.append(a)
-
-    # Not needed due to the filtering of "p" elements, but as a backup:
-    bad_text = [
-        '<p><strong class="bold">© tjCSL Status, 2022</strong>&nbsp; • &nbsp; <a href="#">Back to top</a></p>',
-        "<p>We continuously monitor the status of our services and if there are any interruptions, a note will be posted here.</p>",
-    ]
-
     message = "".join(
         [
             f"<h3><i class='fas fa-exclamation-triangle'></i>&nbsp; {announcement['title']}</h3><hr />{announcement['body']}\n"
             for announcement in announcements
-            if announcement not in bad_text
         ]
     )
 
@@ -117,12 +81,12 @@ def get_emerg_result(*, custom_logger=None):
         custom_logger = logger
 
     status, message = check_emerg()
-    custom_logger.debug("Fetched emergency info from FCPS and CSL status")
+    custom_logger.debug("Fetched emergency info from FCPS")
     return {"status": status, "message": message}
 
 
 def get_emerg():
-    """Get the cached FCPS emergency page and CSL status page, or check it again.
+    """Get the cached FCPS emergency page, or check it again.
 
     Timeout defined in settings.CACHE_AGE["emerg"]
 

intranet/settings/__init__.py

@@ -885,8 +885,6 @@ def get_log(name):  # pylint: disable=redefined-outer-name; 'name' is used as th
 # The timeout for the request to FCPS' emergency page (in seconds)
 EMERGENCY_TIMEOUT = 5
 
-CSL_STATUS_PAGE = "https://status.tjhsst.edu/index.json"
-
 # How frequently the emergency announcement cache should be updated by the Celerybeat task.
 # This should be less than CACHE_AGE["emerg"].
 FCPS_EMERGENCY_CACHE_UPDATE_INTERVAL = CACHE_AGE["emerg"] - 30

intranet/static/css/page_base.scss

@@ -211,6 +211,23 @@ h1 {
     }
 }
 
+.header .csl-apps .betterstatus-indicator {
+    display: inline;
+    vertical-align: middle;
+
+    @media only screen and (max-width: 900px) {
+        width: 30px;
+        margin-right: -10px;
+    }
+
+    @media only screen and (min-width: 901px) {
+        width: 200px;
+        margin-right: -30px;
+        margin-bottom: 5px;
+    }
+}
+
+
 .header .username {
     margin-right: 10px;
 }

intranet/templates/page_with_header.html

@@ -84,6 +84,10 @@ <h1>Ion</h1>
                     </li>
                 {% endif %}
 
+                <li class="csl-apps">
+                    <iframe src="https://status.tjhsst.edu/badge?theme=dark" height="30" scrolling="no" style="color-scheme: normal;" class="betterstatus-indicator"></iframe>
+                </li>
+
                 {% if csl_apps|length > 0 %}
                 <li class="csl-apps has-dropdown">
                     <div class="dropdown-item-wrapper">