Fix sonarqube issues and make showerthoughts async

Author: Will-Hellinger

docker-compose.yml

@@ -13,4 +13,4 @@ services:
       - CALENDAR_TIMEZONE=${CALENDAR_TIMEZONE}
       - WATCHED_CHANNELS=${WATCHED_CHANNELS}
       - SLACK_API_TOKEN=${SLACK_API_TOKEN}
-      - SLACK_JUMPSTART_MESSAGE=${SLACK_JUMPSTART_MESSAGE}
+      - SLACK_JUMPSTART_MESSAGE=${SLACK_JUMPSTART_MESSAGE}

mkdocs.yml

@@ -58,4 +58,4 @@ plugins:
             show_root_full_path: false
             show_signature: false
             filters:
-              - ".*"
+              - ".*"

src/api/endpoints.py

@@ -1,9 +1,9 @@
 from logging import getLogger, Logger
 
 import json
+import httpx
 import random
 import textwrap
-import requests
 
 from fastapi import APIRouter, Request, Form
 from fastapi.responses import JSONResponse
@@ -110,13 +110,13 @@ async def message_actions(payload: str = Form(...)) -> JSONResponse:
 			slack.add_announcement(form_json.get("text", None))
 
 			if response_url:
-				requests.post(
+				await httpx.post(
 					response_url,
 					json={"text": "Posting right now :^)", "replace_original": True},
 				)
 		else:
 			if response_url:
-				requests.post(
+				await httpx.post(
 					response_url,
 					json={"text": "Okay :( maybe next time", "replace_original": True},
 				)
@@ -129,7 +129,7 @@ async def message_actions(payload: str = Form(...)) -> JSONResponse:
 
 
 @router.get("/showerthoughts")
-def showerthoughts() -> JSONResponse:
+async def showerthoughts() -> JSONResponse:
 	"""
 	Returns a random shower thought from the Reddit API.
 
@@ -142,17 +142,20 @@ def showerthoughts() -> JSONResponse:
 	try:
 		logger.info("Fetching shower thoughts from Reddit API...")
 
-		reddit_data: requests.Response = requests.get(
-			"https://www.reddit.com/r/showerthoughts/top.json",
-			headers={"User-agent": "Showerthoughtbot 0.1"},
-		)
+		async with httpx.AsyncClient() as client:
+			reddit_data: httpx.Response = await client.get(
+				"https://www.reddit.com/r/showerthoughts/top.json",
+				headers={"User-agent": "Showerthoughtbot 0.1"},
+			)
+
+			reddit_json = reddit_data.json()
 
-		if len(reddit_data.json()["data"]["children"]) == 0:
+		if len(reddit_json["data"]["children"]) == 0:
 			logger.warning("No shower thoughts found in Reddit API response.")
 			return JSONResponse(response)
 
 		shower_thought: str = textwrap.fill(
-			(random.choice(reddit_data.json()["data"]["children"])["data"]["title"]), 50
+			(random.choice(reddit_json["data"]["children"])["data"]["title"]), 50
 		)
 
 		response["data"] = shower_thought

src/config.py

@@ -19,10 +19,10 @@
 CALENDAR_API_KEY: str = os.getenv("CALENDAR_API_KEY", None)
 
 if SLACK_API_TOKEN in (None, ""):
-	Exception("Missing SLACK_API_TOKEN")
+	raise Exception("Missing SLACK_API_TOKEN")
 
 if CALENDAR_API_KEY in (None, "") and CALENDAR_URL in (None, ""):
-	Exception("Missing CALENDAR_API_KEY or CALENDAR_URL")
+	raise Exception("Missing CALENDAR_API_KEY or CALENDAR_URL")
 
 with open(os.path.join(BASE_DIR, "static", "slack", "dm_request_template.json")) as f:
 	SLACK_DM_TEMPLATE = json.load(f)

src/core/slack.py

@@ -1,5 +1,4 @@
 import re
-import json
 
 from logging import getLogger, Logger
 
@@ -11,7 +10,12 @@
 
 logger: Logger = getLogger(__name__)
 
-client: AsyncWebClient = AsyncWebClient(token=SLACK_API_TOKEN)
+client: AsyncWebClient | None = None
+
+try:
+	client = AsyncWebClient(token=SLACK_API_TOKEN)
+except Exception as e:
+	logger.error(f"Failed to initialize Slack client: {e}")
 
 announcements: list[str] = ["Welcome to Jumpstart!"]
 

src/requirements.txt

@@ -4,6 +4,7 @@ jinja2==3.1.6
 python-multipart==0.0.22
 logging==0.4.9.6
 requests==2.32.5
+httpx==0.28.1
 
 # Config
 dotenv==0.9.9

src/templates/index.html

@@ -51,6 +51,6 @@
         </div>
     </div>
 </div>
-<script src="https://weatherwidget.io/js/widget.min.js"></script>
+<script src="https://weatherwidget.io/js/widget.min.js" integrity="sha384-z1SrZstAkfpo40+eVsXy73T2tzbGOviy6svjVLsoiZvGhs2mgIMzFdWh1YSuoH9D" crossorigin="anonymous"></script>
 <script src="{{ url_for('static', path='js/main.js') }}"></script>
 {% endblock %}