html parse fix

Author: GnarLito

tryhackme/__init__.py

@@ -1,5 +1,5 @@
 
-__version__ = "1.2.6"
+__version__ = "1.2.7"
 
 from .errors import *
 from .converters import *

tryhackme/question.py

@@ -9,14 +9,14 @@ def __init__(self, state, data):
 
     def _from_data(self, data):
         self.raw_question = data.get("question")
-        self.question = utils.HTML_parse(self.raw_question)
+        self.question = utils.HTML_parse(self.raw_question).strip()
         self.raw_hint = data.get("hint")
-        self.hint = utils.HTML_parse(self.raw_hint)
+        self.hint = utils.HTML_parse(self.raw_hint).strip()
         self.number = data.get("questionNo")
 
         # * only when authenticated
         self.raw_description = data.get("answerDesc", "")
-        self.description = utils.HTML_parse(self.raw_description)
+        self.description = utils.HTML_parse(self.raw_description).strip()
         self.extra_points = data.get("extraPoints", None)
         self.correct = data.get("correct", False)
         self.attempts = data.get("attempts", 0)

tryhackme/room.py

@@ -1,10 +1,10 @@
 from .errors import NotImplemented
 from .task import RoomTask
-
+from . import utils
 # ? writeups class
 
 class Room:
-    __slots__ = ("__weakref__", "_state", "_creators", "name", "id", "title", "description", "created", "published", "users", "type", "public", "difficulty", "freeToUse", "ctf", "tags", "ipType", "simpleRoom", "writeups", "locked", "comingSoon", "views", "certificate", "timeToComplete", "userCompleted", )
+    __slots__ = ("__weakref__", "_state", "_creators", "name", "id", "raw_title", "title", "raw_description", "description", "created", "published", "users", "type", "public", "difficulty", "freeToUse", "ctf", "tags", "ipType", "simpleRoom", "writeups", "locked", "comingSoon", "views", "certificate", "timeToComplete", "userCompleted", )
 
     def __init__(self, state, data):
         self._state = state
@@ -22,8 +22,10 @@ def __init__(self, state, data):
     def _from_data(self, data):
         self.name = data.get("roomCode")
         self.id = data.get("roomId")
-        self.title = data.get("title")
-        self.description = data.get("description")
+        self.raw_title = data.get("title")
+        self.title = utils.HTML_parse(self.raw_title).strip()
+        self.raw_description = data.get("description")
+        self.description = utils.HTML_parse(self.raw_description).strip()
         self.created = data.get("created")
         self.published = data.get("published")
         self.users = data.get("users")

tryhackme/task.py

@@ -3,7 +3,7 @@
 
 
 class RoomTask:
-    __slots__ = ("_state", "_questions", "raw_title", "raw_description", "description", "type", "number", "created", "deadline", "uploadId", )
+    __slots__ = ("_state", "_questions", "raw_title", "title", "raw_description", "description", "type", "number", "created", "deadline", "uploadId", )
 
     def __init__(self, state, data):
         self._state = state
@@ -13,9 +13,9 @@ def __init__(self, state, data):
 
     def _from_data(self, data):
         self.raw_title = data.get('taskTitle')
-        self.title = utils.HTML_parse(self.raw_title, "*")
+        self.title = utils.HTML_parse(self.raw_title, "*").strip()
         self.raw_description = data.get('taskDesc')
-        self.description = utils.HTML_parse(self.raw_description)
+        self.description = utils.HTML_parse(self.raw_description).strip()
         self.type = data.get('taskType')
         self.number = data.get('taskNo')
         self.created = data.get('taskCreated')

tryhackme/utils.py

@@ -15,7 +15,7 @@ def response_to_json_or_text(response):
         pass
     return text
 
-_HTML_TAGS_ = re.compile("<[^<]*>")
+_HTML_TAGS_ = re.compile("<[^<]*?>")
 def HTML_parse(text, replace=""):
     text = text.replace("\n", "")
     text = html.unescape(text)