fixed: things

bellobyte · bellobyte · commit 1e3f98975300 · 2026-03-31T12:20:05.000-05:00
diff --git a/main.py b/main.py
@@ -1,34 +1,32 @@
 # bello! dont bully my code im still learning gulp
 # i appreciate any feedback or suggestions for improvement though! in fact im begging u to help me!
 import os
-import magic # type: ignore
+import magic
 import re
-import markdown # pyright: ignore[reportMissingModuleSource] GODDAMIT
+import markdown
+import httpx
 
-import httpx # pyright: ignore[reportMissingImports]
-
-from fastapi import FastAPI, UploadFile, File, Form, Request, HTTPException # type: ignore
-from fastapi.middleware.cors import CORSMiddleware # pyright: ignore[reportMissingImports]
-from fastapi.responses import FileResponse, JSONResponse # pyright: ignore[reportMissingImports]
-from fastapi.staticfiles import StaticFiles # pyright: ignore[reportMissingImports]
-from fastapi.templating import Jinja2Templates # type: ignore
+from fastapi import FastAPI, UploadFile, File, Form, Request, HTTPException
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse, JSONResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
 
 from google import genai
-from google.genai import types # pyright: ignore[reportMissingImports]
+from google.genai import types
 
-from dotenv import load_dotenv # type: ignore
+from dotenv import load_dotenv
 
-from slowapi import Limiter, _rate_limit_exceeded_handler # pyright: ignore[reportMissingImports]
-from slowapi.util import get_remote_address # pyright: ignore[reportMissingImports]
-from slowapi.errors import RateLimitExceeded     # pyright: ignore[reportMissingImports]
+from slowapi import Limiter, _rate_limit_exceeded_handler
+from slowapi.util import get_remote_address
+from slowapi.errors import RateLimitExceeded
 from functools import wraps
 import time
 
-# note: overkill? maybe! but i need the prac. also i wanna learn how to do this stuff cus im a chud
-from starlette.middleware.base import BaseHTTPMiddleware # pyright: ignore[reportMissingImports]
+from starlette.middleware.base import BaseHTTPMiddleware
 from pathlib import Path
-import bleach # pyright: ignore[reportMissingImports]
-from PIL import Image # pyright: ignore[reportMissingImports]
+import bleach
+from PIL import Image
 import io
 
 load_dotenv()
@@ -61,7 +59,7 @@ async def dispatch(self, request: Request, call_next):
             "default-src 'self'; "
             "script-src 'self' 'unsafe-inline'; "
             "style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com; "
-            "img-src 'self' data: blob: https://*.google.com https://t1.gstatic.com https://*.gstatic.com; "
+            "img-src 'self' data: blob: https://*.google.com https://t1.gstatic.com https://*.gstatic.com; " # for favicon fetching
             "font-src 'self' data: blob: https://cdnjs.cloudflare.com; "
             "connect-src 'self'; "
             "frame-ancestors 'none'; "
@@ -73,8 +71,8 @@ async def dispatch(self, request: Request, call_next):
 app.add_middleware(SecurityHeadersMiddleware)
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["https://nousint.app"],
-    allow_methods=["*"],
+    allow_origins=["https://nousint-cd55bda4eead.herokuapp.com"], # updated: domain is actually noustint.app so using heroku now :(
+    allow_methods=["GET", "POST", "OPTIONS"],
     allow_headers=["*"],
 )  
 
@@ -151,7 +149,7 @@ def replaceCallout(match):
     'span': ['class'],
     'p': ['class']
 }
-
+# parsing markdown files for frontmatter metadata
 def parseMarkdownFile(filepath):
     try:
         with open(filepath, 'r', encoding='utf-8') as f:
@@ -165,7 +163,6 @@ def parseMarkdownFile(filepath):
                 for line in parts[1].strip().split('\n'): 
                     if ':' in line:
                         k, v = line.split(':', 1)
-                        # Sanitize metadata values
                         metadata[k.strip()] = bleach.clean(v.strip())
                 mdContent = parts[2].strip()
         
@@ -194,19 +191,15 @@ def parseMarkdownFile(filepath):
 
 def getAllArticles(): 
     articles = []
-    if not os.path.exists("articles"): 
-        # print("ARTICLES DIRECTORY MISSING")
-        return articles
-    
     for filename in os.listdir("articles"):
         if filename.endswith('.md'):
             parsed = parseMarkdownFile(f"articles/{filename}")
             if parsed:
                 m = parsed['metadata']
                 tags = []
                 if m.get('tags'):
-                    for t in m.get('tags', '').split(','):
-                        tags.append(t.strip())
+                    for tag in m.get('tags', '').split(','):
+                        tags.append(tag.strip())
                 articles.append({
                     'id': filename[:-3],
                     'title': m.get('title', filename[:-3]),
@@ -217,7 +210,7 @@ def getAllArticles():
                 }) 
     return sorted(articles, key=lambda x: x.get('date', ''), reverse=True)
 
-# no db, global cache!
+# no db, global cache
 ARTICLE_CACHE = getAllArticles()
 
 @app.get("/articles")  
@@ -333,7 +326,6 @@ async def scanPost(
             except Exception:
                 raise HTTPException(status_code=400, detail="Invalid or corrupted image")
 
-        # TODO: find a way to make it more aggressive cus ts not very bueno at being a threat actor
         if toggleThreat:
             persona = "Act as an aggressive threat actor and OSINT expert by mapping out potential habits " \
             "from the user's behavior.Check for image metadata, and tell the user exactly what you find."  
diff --git a/static/js/catalogscript.js b/static/js/catalogscript.js
@@ -12,7 +12,7 @@ if (redBtnElement) {
 
 var catalogState = {
     mode: "blue",
-    nav: "categories", 
+    nav: "categories",
     cat: null,
     sub: null
 };
@@ -23,14 +23,13 @@ if (isRedPath || isRedBtn) {
 }
 
 // Stats Counter Animation
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
     var statsContainer = document.getElementById('statsContainer');
     var blueCountEl = document.getElementById('blueCount');
     var redCountEl = document.getElementById('redCount');
 
     if (!statsContainer || !blueCountEl || !redCountEl) return;
 
-    // Calculate totals
     var totalBlue = 0;
     var totalRed = 0;
 
@@ -51,7 +50,7 @@ document.addEventListener("DOMContentLoaded", function() {
             for (var cat in db.red) {
                 var categoryObj = db.red[cat];
                 for (var sub in categoryObj) {
-                     if (sub !== 'meta' && categoryObj[sub].tools) {
+                    if (sub !== 'meta' && categoryObj[sub].tools) {
                         totalRed += categoryObj[sub].tools.length;
                     }
                 }
@@ -60,8 +59,8 @@ document.addEventListener("DOMContentLoaded", function() {
     }
 
     // Animation observer
-    var observer = new IntersectionObserver(function(entries) {
-        entries.forEach(function(entry) {
+    var observer = new IntersectionObserver(function (entries) {
+        entries.forEach(function (entry) {
             if (entry.isIntersecting) {
                 statsContainer.classList.add('visible');
                 animateValue(blueCountEl, 0, totalBlue, 1500);
@@ -75,7 +74,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
     function animateValue(obj, start, end, duration) {
         var startTimestamp = null;
-        var step = function(timestamp) {
+        var step = function (timestamp) {
             if (!startTimestamp) startTimestamp = timestamp;
             var progress = Math.min((timestamp - startTimestamp) / duration, 1);
             obj.innerHTML = Math.floor(progress * (end - start) + start);
@@ -87,7 +86,7 @@ document.addEventListener("DOMContentLoaded", function() {
     }
 });
 
-// DONT REMOVE TS: formats keys
+// DONT REMOVE THIS: formats keys
 function formatName(str) {
     var words = str.split("-");
     var finalString = "";
@@ -124,7 +123,7 @@ function renderCatalog() {
     if (catalogState.sub != null) {
         breadcrumb += ` <span class="breadcrumb-separator">></span> <span class="breadcrumb-current">${formatName(catalogState.sub)}</span>`;
     }
-    
+
     // legend: only when viewing tools
     var legend = '';
     if (catalogState.nav === 'tools') {
@@ -136,7 +135,7 @@ function renderCatalog() {
                 <span class="tool-indicator download">(D)</span> Download
             </div>`;
     }
-    
+
     // show breadcrumbs if not at root
     if (catalogState.nav !== "categories") {
         filterDiv.innerHTML = `<div class="breadcrumb-nav">${breadcrumb}</div>${legend}`;
@@ -153,7 +152,7 @@ function renderCatalog() {
             if (catData.meta && catData.meta.desc) {
                 desc = catData.meta.desc;
             }
-            
+
             gridHtml += `
                 <div class="category-card" onclick="catalogState.cat='${cat}'; catalogState.nav='subcategories'; renderCatalog()">
                     <div class="category-cover"><div class="logo-placeholder"></div></div>
@@ -165,7 +164,7 @@ function renderCatalog() {
         }
         gridHtml += '</div>';
 
-    } 
+    }
     else if (catalogState.nav === "subcategories") {
 
         gridHtml = '<div class="subcategory-grid">';
@@ -192,25 +191,25 @@ function renderCatalog() {
                 <div class="subcategory-card" onclick="catalogState.sub='${sub}'; catalogState.nav='tools'; renderCatalog()">
                     <div class="subcategory-name">${formatName(sub)}</div>
                     <div class="subcategory-count">${toolCount} tools</div>`;
-            
+
             if (subDesc !== '') {
                 subHtml += `<div class="subcategory-description">${subDesc}</div>`;
             }
-            
+
             subHtml += `</div>`;
             gridHtml += subHtml;
         }
-        
+
         if (hasSubs == false) {
             gridHtml = "<div class='selection-prompt'>No subcategories found.</div>";
         }
         gridHtml += '</div>';
 
-    } 
+    }
     else if (catalogState.nav === "tools") {
 
         gridHtml = '<div class="tool-category-grid">';
-        
+
         var subData = {};
         if (currentDb[catalogState.cat] && currentDb[catalogState.cat][catalogState.sub]) {
             subData = currentDb[catalogState.cat][catalogState.sub];
@@ -224,21 +223,21 @@ function renderCatalog() {
         } else {
             tools = [];
         }
-        
+
         if (tools.length === 0) {
             gridHtml = gridHtml + "<div style='color:white; padding:20px;'>No tools found in this subcategory.</div>";
         }
 
         for (const t of tools) {
-            // fetch favicons 
+            // fetch favicons (care: can break with cosrm )
             let domain = 'google.com';
             try {
                 if (t.url) {
                     const urlObj = new URL(t.url);
                     domain = urlObj.hostname;
                 }
-            } 
-            catch(e) {
+            }
+            catch (e) {
                 console.error("Invalid URL for tool:", t.name, t.url);
                 throw e;
             }
@@ -257,7 +256,7 @@ function renderCatalog() {
                     indicators += "<span class='tool-indicator download' title='Download only'>(D)</span>";
                 }
             }
-            
+
             let tName = t.name;
             if (indicators) {
                 tName = tName + ' ' + indicators;
@@ -288,12 +287,12 @@ function renderCatalog() {
     gridDiv.innerHTML = '<div class="tools-scroll-container">' + gridHtml + '</div>';
 }
 
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
     var hasCatalog = document.querySelector(".catalog-preview");
     if (!hasCatalog) {
         hasCatalog = document.querySelector(".catalog-fullscreen");
     }
-    
+
     if (hasCatalog) {
         renderCatalog();
     }
