Changeset 0403187 in Klonkt for src/services/Scheduler.js

Timestamp:

07/01/2026 12:53:32 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

bb3f67c

Parents:

731e431

Message:

feat(fediverse): host your own polls (federate as AS2 Question)

A post can carry a poll that federates as an AS2 Question so remote (Mastodon)
followers vote from their own app; votes are tallied server-side and the fresh
counts are pushed back as Update(Question). Voting is fediverse-only; the site
shows live, read-only results. Complements the existing inbound poll support.

• src/config/database.js — posts.poll_json (our poll definition) + poll_votes table (post_id, actor_uri, choice; UNIQUE) backing the tally + per-actor dedupe.
• src/services/ActivityPubService.js — parseOwnPoll/pollTally/ownPollView helpers; buildNote emits a Question (oneOf/anyOf + replies.totalItems + endTime/closed + votersCount) for a poll post; handleInbox records a ballot (Note with name + inReplyTo our poll) before the reply path, deduped per actor; a debounced Update(Question) pushes fresh counts to followers; votersCount added to AP_CONTEXT.
• src/services/Scheduler.js — closeExpiredPolls() marks a poll closed once its endTime passes and pushes the final tally; runs on the existing 60s tick.
• src/routes/posts.js — parsePollForm() turns the editor fields into poll_json on create/save (a poll with votes is frozen), passes poll_json to the federation hooks, and hands the post page a render-ready ownPollView.
• src/views/pages/post-edit.ejs — poll section (options, multiple-choice, duration); disabled once the poll has votes.
• src/views/pages/post.ejs — display-only poll with result bars + voter/close meta.
• src/services/i18n.js — poll.* + pedit.poll_* strings (nl/en/de).
• test/polls.test.js — Question shape, tally, percentages, closed state, AS2 term.
• CHANGELOG(.nl/.de).md — "Create your own polls" under Unreleased.

Co-Authored-By: Claude <noreply@…>

File:

• src/services/Scheduler.js (modified) (3 diffs)

src/services/Scheduler.js

@@ -15 +15 @@
   try {
     const due = db.prepare(`
-      SELECT p.id, p.site_id, p.slug, p.title, p.content, p.cover_image_url, p.cover_video_url, p.fan_only, p.nsfw, p.content_warning,
+      SELECT p.id, p.site_id, p.slug, p.title, p.content, p.cover_image_url, p.cover_video_url, p.fan_only, p.nsfw, p.content_warning, p.poll_json,
              p.published_at, p.publish_at, p.created_at, u.username
       FROM posts p JOIN users u ON u.id = p.author_id
@@ -39 +39 @@
             id: p.id, slug: p.slug, title: p.title || p.slug,
             content: p.content, cover_image_url: p.cover_image_url || null, cover_video_url: p.cover_video_url || null,
-            published_at: p.published_at || p.publish_at, created_at: p.created_at, fan_only: p.fan_only, nsfw: p.nsfw, content_warning: p.content_warning,
+            published_at: p.published_at || p.publish_at, created_at: p.created_at, fan_only: p.fan_only, nsfw: p.nsfw, content_warning: p.content_warning, poll_json: p.poll_json,
           }).catch(() => { /* best-effort */ });
         }
@@ -48 +48 @@
 }
 
+// Close hosted polls whose endTime has passed: mark them closed (once) and push the final
+// tally + closed state to followers as Update(Question). The `closed` flag in poll_json
+// guards against re-sending — a poll is only processed on the tick that crosses its endTime.
+export function closeExpiredPolls() {
+  try {
+    const due = db.prepare(`
+      SELECT id, poll_json FROM posts
+      WHERE poll_json IS NOT NULL
+        AND status = 'published'
+        AND json_extract(poll_json, '$.endTime') IS NOT NULL
+        AND IFNULL(json_extract(poll_json, '$.closed'), 0) = 0
+        AND datetime(json_extract(poll_json, '$.endTime')) <= datetime('now')
+    `).all();
+    if (!due.length) return 0;
+    const upd = db.prepare('UPDATE posts SET poll_json = ? WHERE id = ?');
+    for (const p of due) {
+      let d; try { d = JSON.parse(p.poll_json); } catch { continue; }
+      d.closed = true;
+      upd.run(JSON.stringify(d), p.id);
+      ActivityPubService.deliverPollUpdate(p.id).catch(() => { /* best-effort */ });
+    }
+    return due.length;
+  } catch { return 0; }
+}
+
 let _timer = null;
+function tick() { flipScheduledPosts(); closeExpiredPolls(); }
 export function startScheduler() {
-  flipScheduledPosts();                 // run immediately on boot
+  tick();                               // run immediately on boot
   if (_timer) return;
-  _timer = setInterval(flipScheduledPosts, 60 * 1000); // every minute
+  _timer = setInterval(tick, 60 * 1000); // every minute
   if (_timer.unref) _timer.unref();
 }