fix ci failures

Author: Tsche

.github/workflows/container.yml

@@ -25,7 +25,7 @@ jobs:
             --tmpfs /tmp:rw,noexec,nosuid,nodev,size=16m,uid=10001,gid=10001 \
             --entrypoint python feedback:${{ github.sha }} \
             -c 'import os; assert os.getuid() == 10001; import feedback'
-      - uses: aquasecurity/trivy-action@0.33.1
+      - uses: aquasecurity/trivy-action@v0.36.0
         with:
           image-ref: feedback:${{ github.sha }}
           format: table

runtime/src/api/client.ts

@@ -276,6 +276,8 @@ export class FeedbackClient {
       id: cached?.id ?? null,
       up: result.up,
       down: result.down,
+      upvotes: cached?.upvotes ?? 0,
+      reactions: cached?.reactions ?? {},
       age: 0,
       stale: true,
       viewer: result.viewer,

runtime/src/example/page.ts

@@ -58,7 +58,20 @@ async function render(): Promise<void> {
     const root = required("thread");
     root.replaceChildren();
     appendText(root, "h2", string(content.title) || key);
+    const category = record(content.category);
+    if (category) appendText(root, "span", `Category: ${string(category.name)}`, "tag");
+    renderLabels(root, content.labels);
     appendText(root, "p", string(content.body));
+    if (state) {
+      appendText(
+        root,
+        "span",
+        `Thumbs up: ${String(state.reactions.THUMBS_UP ?? state.up)}  ` +
+          `Thumbs down: ${String(state.reactions.THUMBS_DOWN ?? state.down)}  ` +
+          `Upvotes: ${String(state.upvotes)}`,
+        "tag",
+      );
+    }
     renderPoll(root, record(content.poll));
     const reactions = document.createElement("div");
     reactions.className = "reactions";
@@ -86,6 +99,15 @@ async function render(): Promise<void> {
   }
 }
 
+function renderLabels(parent: HTMLElement, value: unknown): void {
+  const nodes = record(value)?.nodes;
+  if (!Array.isArray(nodes)) return;
+  for (const label of nodes) {
+    const item = record(label);
+    if (item) appendText(parent, "span", `Label: ${string(item.name)}`, "tag");
+  }
+}
+
 function renderPoll(parent: HTMLElement, poll: Record<string, unknown> | null): void {
   if (!poll) return;
   appendText(parent, "h3", string(poll.question));

src/feedback/api/routes.py

@@ -12,9 +12,9 @@
 
 from feedback.api.http import (
     ApiError,
+    add_comment_request,
     cors,
     ensure_discussion_request,
-    add_comment_request,
     error_response,
     json_strings,
     preflight,
@@ -55,16 +55,17 @@ async def reactions(request: Request) -> Response:
         item = cached.get(key)
         if item is None:
             items[key] = {
-                "id": None, "up": 0, "down": 0, "upvotes": 0,
+                "id": None,
+                "up": 0,
+                "down": 0,
+                "upvotes": 0,
                 "reactions": {name: 0 for name in site.reaction_counters},
-                "age": 0, "stale": False,
+                "age": 0,
+                "stale": False,
             }
             continue
         age = max(0, now - item.fetched_at)
-        reactions = {
-            name: item.reactions.get(name, 0)
-            for name in site.reaction_counters
-        }
+        reactions = {name: item.reactions.get(name, 0) for name in site.reaction_counters}
         thumbsup = item.thumbsup
         thumbsdown = item.thumbsdown
         up = item.thumbsup if site.upvote_source == "thumbsup" else item.upvotes
@@ -224,9 +225,7 @@ async def discussion_content(request: Request) -> Response:
         raise ApiError("service_unavailable", "Discussion content is unavailable.", 503)
     keys = resource_keys(request.query_params, 1)
     try:
-        content = await container.discussions.content(
-            site, container.databases[site.id], keys[0]
-        )
+        content = await container.discussions.content(site, container.databases[site.id], keys[0])
     except DiscussionError as exc:
         raise ApiError("discussion_not_found", str(exc), 404) from exc
     except GitHubError as exc:
@@ -259,7 +258,9 @@ async def add_comment(request: Request) -> Response:
     except GitHubError as exc:
         status = 401 if exc.status == 401 else 502
         raise ApiError("github_comment_failed", "GitHub rejected the comment.", status) from exc
-    return cors(JSONResponse({"v": 1, "comment": result}, headers={"Cache-Control": "no-store"}), origin)
+    return cors(
+        JSONResponse({"v": 1, "comment": result}, headers={"Cache-Control": "no-store"}), origin
+    )
 
 
 async def submit_vote(request: Request) -> Response:

src/feedback/app.py

@@ -16,9 +16,9 @@
 from feedback.api.http import ApiError
 from feedback.api.middleware import SecurityHeadersMiddleware
 from feedback.api.routes import (
+    add_comment,
     api_error,
     discussion_content,
-    add_comment,
     homepage,
     oauth_authorize,
     oauth_exchange,

src/feedback/config.py

@@ -18,9 +18,17 @@ class ConfigError(ValueError):
 _MAPPINGS = frozenset({"key", "title", "url", "pathname", "custom", "number"})
 _UPVOTE_SOURCES = frozenset({"thumbsup", "native", "both"})
 _REACTIONS = frozenset({"LAUGH", "HOORAY", "CONFUSED", "HEART", "ROCKET", "EYES"})
-_FEATURES = frozenset({
-    "counters", "viewer_reactions", "voting", "discussion", "comments", "labels", "github_link",
-})
+_FEATURES = frozenset(
+    {
+        "counters",
+        "viewer_reactions",
+        "voting",
+        "discussion",
+        "comments",
+        "labels",
+        "github_link",
+    }
+)
 _SERVICE_KEYS = frozenset(
     {
         "public_origin",
@@ -157,7 +165,8 @@ def load_config(path: Path | str, *, data_directory: Path | None = None) -> Conf
             raise ConfigError(f"sites.{site_id}.upvote_source is unsupported")
         reaction_counters = (
             tuple(item.upper() for item in _string_list(value, "reaction_counters"))
-            if "reaction_counters" in value else tuple(sorted(_REACTIONS))
+            if "reaction_counters" in value
+            else tuple(sorted(_REACTIONS))
         )
         if not reaction_counters or any(item not in _REACTIONS for item in reaction_counters):
             raise ConfigError(f"sites.{site_id}.reaction_counters contains an unsupported reaction")

src/feedback/database/sqlite.py

@@ -74,7 +74,11 @@ def reactions(self, resource_ids: Iterable[str]) -> dict[str, ReactionCounts]:
             rows = connection.execute(REACTIONS, (json.dumps(keys),)).fetchall()
         return {
             row[0]: ReactionCounts(
-                node_id=row[1], thumbsup=row[2], thumbsdown=row[3], upvotes=row[4], fetched_at=row[5],
+                node_id=row[1],
+                thumbsup=row[2],
+                thumbsdown=row[3],
+                upvotes=row[4],
+                fetched_at=row[5],
                 reactions=json.loads(row[6]),
             )
             for row in rows
@@ -96,15 +100,20 @@ def comment_belongs_to(self, comment_id: str, discussion_id: str) -> bool:
     def comment_can_receive_reply(self, comment_id: str, discussion_id: str) -> bool:
         with self.connect() as connection:
             row = connection.execute(
-                "SELECT 1 FROM comments WHERE id = ? AND discussion_id = ? "
-                "AND parent_id IS NULL",
+                "SELECT 1 FROM comments WHERE id = ? AND discussion_id = ? AND parent_id IS NULL",
                 (comment_id, discussion_id),
             ).fetchone()
         return row is not None
 
     def put_comment(
-        self, *, comment_id: str, discussion_id: str, parent_id: str | None,
-        body: str, url: str | None, fetched_at: int,
+        self,
+        *,
+        comment_id: str,
+        discussion_id: str,
+        parent_id: str | None,
+        body: str,
+        url: str | None,
+        fetched_at: int,
     ) -> None:
         with self.connect() as connection:
             connection.execute(
@@ -124,10 +133,17 @@ def tracked_reactions(
         with self.connect() as connection:
             rows = connection.execute(TRACKED_REACTIONS, (after, fetched_before, limit)).fetchall()
         return [
-            (row[0], ReactionCounts(
-                node_id=row[1], thumbsup=row[2], thumbsdown=row[3], upvotes=row[4], fetched_at=row[5],
-                reactions=json.loads(row[6]),
-            ))
+            (
+                row[0],
+                ReactionCounts(
+                    node_id=row[1],
+                    thumbsup=row[2],
+                    thumbsdown=row[3],
+                    upvotes=row[4],
+                    fetched_at=row[5],
+                    reactions=json.loads(row[6]),
+                ),
+            )
             for row in rows
         ]
 

src/feedback/protocol/github/discussions.py

@@ -86,7 +86,9 @@ async def create(self, site: SiteConfig, *, title: str, body: str) -> GitHubDisc
             raise GitHubError("github_malformed_response")
         return discussion
 
-    async def content(self, site: SiteConfig, discussion_id: str, comments: int = 100) -> dict[str, Any]:
+    async def content(
+        self, site: SiteConfig, discussion_id: str, comments: int = 100
+    ) -> dict[str, Any]:
         return await self._client.graphql(
             site.installation_id,
             load("discussion"),
@@ -137,7 +139,9 @@ def _parse(value: object, site: SiteConfig) -> GitHubDiscussion | None:
     upvotes = value.get("upvoteCount", 0)
     if isinstance(upvotes, bool) or not isinstance(upvotes, int) or upvotes < 0:
         raise GitHubError("github_malformed_response")
-    return GitHubDiscussion(node_id, number, title, url, locked, thumbsup, thumbsdown, upvotes, reactions)
+    return GitHubDiscussion(
+        node_id, number, title, url, locked, thumbsup, thumbsdown, upvotes, reactions
+    )
 
 
 def _vote_counts(value: object) -> tuple[int, int, dict[str, int]]:

src/feedback/service/discussions.py

@@ -23,7 +23,9 @@ async def find(self, site: SiteConfig, lookup_term: str) -> GitHubDiscussion | N
 
     async def create(self, site: SiteConfig, *, title: str, body: str) -> GitHubDiscussion: ...
 
-    async def content(self, site: SiteConfig, discussion_id: str, comments: int = 100) -> dict[str, Any]: ...
+    async def content(
+        self, site: SiteConfig, discussion_id: str, comments: int = 100
+    ) -> dict[str, Any]: ...
 
     async def add_comment(
         self, token: str, discussion_id: str, body: str, reply_to_id: str | None
@@ -81,7 +83,9 @@ async def ensure(
             )
             return result
 
-    async def content(self, site: SiteConfig, database: SiteDatabase, resource_id: str) -> dict[str, Any]:
+    async def content(
+        self, site: SiteConfig, database: SiteDatabase, resource_id: str
+    ) -> dict[str, Any]:
         discussion = database.discussion(resource_id)
         if discussion is None:
             raise DiscussionError("discussion does not exist")

src/feedback/service/reaction_cache.py

@@ -93,7 +93,8 @@ def _parse_node(
         if not isinstance(nodes, list):
             raise GitHubError("github_malformed_response")
         accounts = tuple(
-            node["id"] for node in nodes
+            node["id"]
+            for node in nodes
             if isinstance(node, dict) and isinstance(node.get("id"), str)
         )
         if len(accounts) != len(nodes):
@@ -116,5 +117,6 @@ def _parse_node(
         counts.get("THUMBS_DOWN", (0, ()))[0],
         upvotes,
         counts,
-        locked, updated_at,
+        locked,
+        updated_at,
     )