From 56ebf58ce01c55b0bf791f10d5e05db16c78b0cc Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Tue, 3 Sep 2019 18:49:52 +0200
Subject: [PATCH] Unescape html entities in questions

---
 royalnet/commands/royalgames/trivia.py | 9 +++++++--
 royalnet/version.py                    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/royalnet/commands/royalgames/trivia.py b/royalnet/commands/royalgames/trivia.py
index f6513492..44ac88f5 100644
--- a/royalnet/commands/royalgames/trivia.py
+++ b/royalnet/commands/royalgames/trivia.py
@@ -3,6 +3,7 @@ import asyncio
 import aiohttp
 import random
 import uuid
+import html
 from ..command import Command
 from ..commandargs import CommandArgs
 from ..commanddata import CommandData
@@ -41,7 +42,7 @@ class TriviaCommand(Command):
             raise ExternalError(f"OpenTDB returned {j['response_code']} response_code")
         question = j["results"][0]
         text = f'❓ [b]{question["category"]} - {question["difficulty"].capitalize()}[/b]\n' \
-               f'{question["question"]}'
+               f'{html.unescape(question["question"])}'
         # Prepare answers
         correct_answer: str = question["correct_answer"]
         wrong_answers: typing.List[str] = question["incorrect_answers"]
@@ -56,7 +57,7 @@ class TriviaCommand(Command):
             raise ValueError("correct_index not found")
         # Add emojis
         for index, answer in enumerate(answers):
-            answers[index] = f"{self._letter_emojis[index]} {answers[index]}"
+            answers[index] = f"{self._letter_emojis[index]} {html.unescape(answers[index])}"
         # Create the question id
         question_id = uuid.uuid4()
         self._answerers[question_id] = {}
@@ -90,6 +91,10 @@ class TriviaCommand(Command):
         results = f"❗️ Tempo scaduto!\n" \
                   f"La risposta corretta era [b]{answers[correct_index]}[/b]!\n\n"
         for answerer in self._answerers[question_id]:
+            if answerer.trivia_score is None:
+                ts = self.interface.alchemy.TriviaScore(royal=answerer)
+                self.interface.session.add(ts)
+                self.interface.session.commit()
             if self._answerers[question_id][answerer]:
                 results += self._correct_emoji
                 answerer.trivia_score.correct_answers += 1
diff --git a/royalnet/version.py b/royalnet/version.py
index 11f1761f..9b2b69c1 100644
--- a/royalnet/version.py
+++ b/royalnet/version.py
@@ -1 +1 @@
-semantic = "5.0a43"
+semantic = "5.0a44"