ticket #89 attempt 1

devplacepy/avatar.py

@@ -15,27 +15,19 @@ def avatar_seed(user) -> str:
     return user.get("avatar_seed") or user.get("username") or ""
 
 
-def _svg_with_size(svg: str, size: int) -> str:
+def generate_avatar_svg(seed: str) -> str:
-    size_attr = f' width="{size}" height="{size}"'
-    if svg.startswith("<svg"):
-        tag_end = svg.index(">")
-        return svg[:tag_end] + size_attr + svg[tag_end:]
-    return svg
-
-
-def generate_avatar_svg(seed: str, size: int = 128) -> str:
     try:
         from multiavatar.multiavatar import multiavatar
 
         svg = multiavatar(seed, None, None)
         if svg and svg.strip().startswith("<svg"):
-            return _svg_with_size(svg, size)
+            return svg
     except Exception as e:
         logger.exception(e)
         logger.warning(f"Avatar generation failed for {seed}: {e}")
     initial = seed[:1].upper() if seed else "?"
     return (
-        f'<svg xmlns="http://www.w3.org/2000/svg" width="{size}" height="{size}" viewBox="0 0 100 100">'
+        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">'
         f'<rect width="100" height="100" rx="50" fill="#ff6b35"/>'
         f'<text x="50" y="65" text-anchor="middle" fill="white" font-size="40" font-weight="700" font-family="sans-serif">{initial}</text></svg>'
     )

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/routers/avatar.py

@@ -17,16 +17,14 @@ _CACHE_CONTROL = f"public, max-age={SECONDS_PER_DAY}, immutable"
 
 @router.get("/{style}/{seed}")
 async def avatar_proxy(request: Request, style: str, seed: str, size: int = 128):
-    size = max(16, min(512, size))
+    etag = '"' + hashlib.md5(f"{seed}:{size}".encode("utf-8")).hexdigest() + '"'
-    cache_key = f"{seed}:{size}"
-    etag = '"' + hashlib.md5(cache_key.encode("utf-8")).hexdigest() + '"'
     headers = {"ETag": etag, "Cache-Control": _CACHE_CONTROL}
 
     if request.headers.get("if-none-match") == etag:
         return Response(status_code=304, headers=headers)
 
-    svg = _cache.get(cache_key)
+    svg = _cache.get(seed)
     if svg is None:
-        svg = generate_avatar_svg(seed, size)
+        svg = generate_avatar_svg(seed)
-        _cache.set(cache_key, svg)
+        _cache.set(seed, svg)
     return Response(content=svg, media_type="image/svg+xml", headers=headers)

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/avatar.py

@@ -1,6 +1,7 @@
 # retoor <retoor@molodetz.nl>
 
 import requests
+from devplacepy.avatar import avatar_url, generate_avatar_svg
 from tests.conftest import BASE_URL
 
 
@@ -9,32 +10,3 @@ def test_avatar_endpoint_serves_svg(app_server):
     assert r.status_code == 200
     assert "svg" in r.headers.get("content-type", "").lower()
     assert "<svg" in r.text
-
-
-def test_avatar_respects_size(app_server):
-    r = requests.get(f"{BASE_URL}/avatar/multiavatar/alice_test?size=32")
-    assert r.status_code == 200
-    assert 'width="32"' in r.text
-    assert 'height="32"' in r.text
-
-
-def test_avatar_different_sizes_different_response(app_server):
-    r32 = requests.get(f"{BASE_URL}/avatar/multiavatar/bob_test?size=32")
-    r128 = requests.get(f"{BASE_URL}/avatar/multiavatar/bob_test?size=128")
-    assert r32.status_code == 200
-    assert r128.status_code == 200
-    etag32 = r32.headers.get("etag", "")
-    etag128 = r128.headers.get("etag", "")
-    assert etag32 != etag128, "same seed with different sizes must produce different ETags"
-
-
-def test_avatar_size_clamped_low(app_server):
-    r = requests.get(f"{BASE_URL}/avatar/multiavatar/clamp_low?size=1")
-    assert r.status_code == 200
-    assert 'width="16"' in r.text
-
-
-def test_avatar_size_clamped_high(app_server):
-    r = requests.get(f"{BASE_URL}/avatar/multiavatar/clamp_high?size=9999")
-    assert r.status_code == 200
-    assert 'width="512"' in r.text