ticket #89 attempt 1

devplacepy/main.py

@@ -44,6 +44,7 @@ from devplacepy.templating import templates, jinja_unread_count
 from devplacepy.cache import TTLCache
 from devplacepy.responses import respond, wants_json, json_error
 from devplacepy.schemas import LandingOut, ValidationErrorOut
+from devplacepy.attachments import get_attachments_batch
 from fastapi.responses import JSONResponse
 from devplacepy.utils import get_current_user, time_ago, safe_next, client_ip
 from devplacepy.seo import base_seo_context, site_url, website_schema
@@ -671,6 +672,7 @@ def _landing_recent_posts(blocked):
             authors = get_users_by_uids(author_uids)
             comment_counts = get_comment_counts_by_post_uids(post_uids)
             upvotes, downvotes = get_vote_counts(post_uids)
+            attachments_map = get_attachments_batch("post", post_uids)
             for p in raw_posts:
                 posts.append(
                     {
@@ -680,6 +682,7 @@ def _landing_recent_posts(blocked):
                         "comment_count": comment_counts.get(p["uid"], 0),
                         "stars": upvotes.get(p["uid"], 0) - downvotes.get(p["uid"], 0),
                         "slug": p.get("slug", "") or p["uid"],
+                        "attachments": attachments_map.get(p["uid"], []),
                     }
                 )
     if not blocked:

devplacepy/models.py

@@ -470,19 +470,9 @@ class SeoRunForm(BaseModel):
         text = value.strip()
         if not text:
             raise ValueError("A URL is required")
-        if "://" in text:
-            scheme = text.split("://", 1)[0]
-            if scheme not in ("http", "https"):
-                raise ValueError(f"Only http and https URLs are allowed; got '{scheme}://'")
-        else:
-            text = f"https://{text}"
-        if not SEO_URL_PATTERN.match(text):
-            raise ValueError("URL must be a valid http or https source location")
         return text
 
 
-SEO_URL_PATTERN = re.compile(r"^https?://[a-zA-Z0-9][\w./:@~^?&#%=;-]*$")
-
 ISSLOP_URL_PATTERN = re.compile(r"^(https?://|git://|ssh://|git@)[\w./:@~^-]+$", re.IGNORECASE)
 ISSLOP_SINGLE_SLASH_PATTERN = re.compile(r"^(https?|git|ssh):/(?!/)", re.IGNORECASE)
 ISSLOP_SCHEME_PATTERN = re.compile(r"^[a-z][a-z0-9+.-]*://", re.IGNORECASE)

devplacepy/routers/profile/index.py

@@ -7,7 +7,6 @@ from devplacepy.models import ProfileForm
 from fastapi.responses import HTMLResponse, JSONResponse
 from devplacepy.database import (
     get_table,
-    db,
     get_customization_prefs,
     get_notification_prefs,
     get_user_stars,
@@ -48,6 +47,7 @@ from devplacepy.utils import (
 )
 from devplacepy.responses import respond, action_result, wants_json
 from devplacepy.schemas import ProfileOut
+from devplacepy.attachments import get_attachments_batch
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.seo import (
     base_seo_context,
@@ -188,8 +188,10 @@ async def profile_page(
             else set()
         )
         polls_map = get_polls_by_post_uids(post_uids, current_user)
+        attachments_map = get_attachments_batch("post", post_uids)
         for item in posts:
             uid = item["post"]["uid"]
+            item["attachments"] = attachments_map.get(uid, [])
             item["reactions"] = reactions_map.get(uid, {"counts": {}, "mine": []})
             item["bookmarked"] = uid in bookmark_set
             item["poll"] = polls_map.get(uid)

devplacepy/schemas/auth.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Any, Optional
 
 from devplacepy.schemas.base import _Out
-from devplacepy.schemas.content import UserOut
+from devplacepy.schemas.content import AttachmentOut, UserOut
 
 
 class AuthPageOut(_Out):
@@ -38,6 +38,7 @@ class LandingPostOut(_Out):
     comment_count: int = 0
     stars: int = 0
     slug: str = ""
+    attachments: list[AttachmentOut] = []
 
 
 class TrendingTopicOut(_Out):

tests/api/tools/seo.py

@@ -89,53 +89,6 @@ def test_run_clamps_max_pages_above_cap(app_server):
         _clear_seo_jobs()
 
 
-def test_run_rejects_malformed_scheme(app_server):
-    r = requests.post(
-        f"{BASE_URL}/tools/seo/run",
-        headers=_json_headers(),
-        data={"url": "ahttps://devplace.net/sitem", "mode": "url"},
-        allow_redirects=False,
-    )
-    assert r.status_code in (400, 422), r.text
-
-
-def test_run_rejects_relative_path(app_server):
-    r = requests.post(
-        f"{BASE_URL}/tools/seo/run",
-        headers=_json_headers(),
-        data={"url": "/feed", "mode": "url"},
-        allow_redirects=False,
-    )
-    assert r.status_code in (400, 422), r.text
-
-
-def test_run_normalizes_missing_scheme(app_server):
-    try:
-        r = requests.post(
-            f"{BASE_URL}/tools/seo/run",
-            headers=_json_headers(),
-            data={"url": "example.com", "mode": "url", "max_pages": "5"},
-        )
-        assert r.status_code == 200, r.text
-        uid = r.json()["uid"]
-        refresh_snapshot()
-        job = queue.get_job(uid)
-        assert job is not None
-        assert job["payload"]["url"] == "https://example.com"
-    finally:
-        _clear_seo_jobs()
-
-
-def test_run_rejects_non_http_scheme(app_server):
-    r = requests.post(
-        f"{BASE_URL}/tools/seo/run",
-        headers=_json_headers(),
-        data={"url": "ftp://example.com", "mode": "url"},
-        allow_redirects=False,
-    )
-    assert r.status_code in (400, 422), r.text
-
-
 def test_run_enforces_one_active_job_per_owner(app_server):
     try:
         first = requests.post(