fedipod 1.56.0 → 1.57.0

package/README.md

@@ -31,7 +31,7 @@ This README is about the `FediPod` as used with a Gateway. There are also a numb
 You can access your account by pointing any Mastodon API or C2S client at fedipod.net and signing in.  There are also two built-inclients, both served by fedipod.net: [Sengi](https://github.com/NicolasConstant/sengi) (MIT, by Nicolas Constant), which you get by default, and [Phanpy](https://github.com/cheeaun/phanpy)(MIT, by Chee Aun). The links at the top right of every page switch between
 them, at any time; whichever you opened last is the one that opens next time.
 
-You can follow and unfollow, post, reply, favourite, boost, attach media, edit and delete. Content warnings, polls with up to four options and one or several answers, all four visibility levels, a conversations view for direct messages, bookmarks, lists, keyword filters, pinned posts that other servers can see, blocking and muting, and the custom emojis other servers send.
+You can follow and unfollow, post, reply, favourite, boost, attach media, edit and delete. Content warnings, polls with up to four options and one or several answers, all four visibility levels, a conversations view for direct messages, bookmarks, lists (a list can keep its people out of your home timeline), keyword filters, pinned posts that other servers can see, blocking and muting, and the custom emojis other servers send.
 
 A post can quote another post. Quote is offered on posts whose author allows
 it; the quoted author's server is asked, and the quote shows as pending until

package/gui.md

@@ -104,6 +104,16 @@ that one of your connected accounts also brought in is from someone you follow
 there, and stays. An app already showing them keeps them on screen until it
 reloads.
 
+## Lists in your home timeline
+
+The **lists** row counts your lists, and under it each list has a switch:
+*shown in home* or *hidden from home*. Hidden, the posts and boosts of the
+people on that list leave your home timeline and show on the list's own
+timeline and on the public timeline. Lists are made and filled in the app;
+an app can set the same switch (in Phanpy, **Hide posts on this list from
+Home/Following**). An app already showing the posts keeps them on screen
+until it reloads.
+
 ## Handling follow requests
 
 New followers are accepted automatically. Set **new followers** to *wait for

package/lib/client/masto/accounts.mjs

@@ -250,7 +250,7 @@ export async function handle(api, ctx) {
     const actorUrl = api.store.urlFor(mAccLists[1]);
     if (!actorUrl) return send(404, { error: 'Record not found' });
     return send(200, api.store.getLists().filter(l => (l.members || []).includes(actorUrl))
-      .map(l => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || 'list', exclusive: false })));
+      .map(l => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || 'list', exclusive: !!l.exclusive })));
   }
 
   // The people muted and blocked, as accounts; the domains blocked, as names.

package/lib/client/masto/timelines.mjs

@@ -22,6 +22,10 @@ export async function handle(api, ctx) {
     // stay on the public timeline, their hashtags' pages and trends. One a
     // connected account also brought in is from someone followed there.
     const hideTags = pathname === '/api/v1/timelines/home' && api.store.getConfig?.()?.tagsInHome === false;
+    // A list set to hide its people from Home (`exclusive`): their posts and
+    // boosts show on the list and on the public timeline only.
+    const hiddenBy = new Set(pathname === '/api/v1/timelines/home'
+      ? (api.store.getLists?.() || []).filter(l => l.exclusive).flatMap(l => l.members || []) : []);
     // The UNFILTERED list, both as the source and as the reply-count corpus:
     // a reply can be a mention, and mentions are filtered out of timelines
     // below — counting against the filtered set would undercount them.
@@ -36,6 +40,7 @@ export async function handle(api, ctx) {
       .filter(s => !s.direct && s.visibility !== 'direct')
       .filter(s => !muted.has(s.actor) && !muted.has(s.via))
       .filter(s => !hideTags || s.kind !== 'tag' || s.sourceAccts?.length)
+      .filter(s => !hiddenBy.size || !(hiddenBy.has(s.actor) || hiddenBy.has(s.via)))
       .filter(s => !localOnly || (s.kind === 'post' && s.visibility !== 'private'))
       .sort((a, b) => String(b.published || '').localeCompare(String(a.published || '')));
     const { items: page, headers } = api.page(items, url);
@@ -122,7 +127,9 @@ export async function handle(api, ctx) {
 
   // Lists, filters and scheduled posts are the client's own arrangements —
   // kept in local state, nothing federates.
-  const listJson = (l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || 'list', exclusive: false });
+  // `exclusive`: the list hides its people from Home. A form sends it as a word.
+  const flag = (v) => v === true || v === 'true' || v === 'on' || v === '1';
+  const listJson = (l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || 'list', exclusive: !!l.exclusive });
   if (pathname === '/api/v1/lists' && req.method === 'GET') {
     return send(200, api.store.getLists().map(listJson));
   }
@@ -131,7 +138,8 @@ export async function handle(api, ctx) {
     const title = String(body.title || '').trim();
     if (!title) return send(422, { error: 'a title is required' });
     const lists = api.store.getLists();
-    const l = { id: crypto.randomBytes(8).toString('hex'), title, repliesPolicy: body.replies_policy || 'list', members: [] };
+    const l = { id: crypto.randomBytes(8).toString('hex'), title, repliesPolicy: body.replies_policy || 'list',
+      exclusive: flag(body.exclusive), members: [] };
     lists.push(l);
     api.store.setLists(lists);
     return send(200, listJson(l));
@@ -149,6 +157,7 @@ export async function handle(api, ctx) {
       const body = await readBody(req);
       if (body.title) l.title = String(body.title);
       if (body.replies_policy) l.repliesPolicy = body.replies_policy;
+      if ('exclusive' in body) l.exclusive = flag(body.exclusive);
       api.store.setLists(lists);
     }
     return send(200, listJson(l));

package/lib/surface/routes/owner.mjs

@@ -14,6 +14,9 @@ const PERMANENT_CONFIG = ['handle', 'remotePod', 'issuer', 'root', 'kind'];
 // Config the actor document carries, so a change is not real until it is
 // republished.
 const WIRE_CONFIG = ['name', 'summary', 'icon', 'image', 'fields', 'approveJoins', 'moderators', 'autoAcceptFollows'];
+// A list as the page shows it: its name and whether its people are kept out
+// of Home. Lists are made and filled in the client; the page only switches.
+const listRow = (l) => ({ id: l.id, title: l.title, exclusive: !!l.exclusive });
 
 export async function get(p, ctx, req, res, url) {   // eslint-disable-line no-unused-vars
   const { agent, log, allowed, embedded, port, publicOrigin, versionOnDisk, isGroup } = ctx;   // eslint-disable-line no-unused-vars
@@ -71,6 +74,7 @@ export async function get(p, ctx, req, res, url) {   // eslint-disable-line no-u
       aliases: cfg.aliases || [],
       autoAcceptFollows: cfg.autoAcceptFollows !== false,
       tagsInHome: cfg.tagsInHome !== false,
+      lists: agent.store.getLists().map(listRow),
       quiescedAt: cfg.quiescedAt || null, movedTo: cfg.movedTo || null,
       // Per-machine, so it comes from the credential file, not pod config —
       // and it is a fact here, not a setting: moving it means moving data,
@@ -254,6 +258,18 @@ export async function post(p, body, ctx, req, res) {   // eslint-disable-line no
         },
       });
     }
+    // One list's Home switch, the same `exclusive` a Mastodon app sets.
+    case '/lists': {
+      if (typeof body.exclusive !== 'boolean') return json(res, 400, { error: 'exclusive (true or false) is the one thing to set here' });
+      await agent.requestTakeover?.();
+      const lists = agent.store.getLists();
+      const l = lists.find(x => x.id === String(body.id || ''));
+      if (!l) return json(res, 404, { error: 'no such list' });
+      l.exclusive = body.exclusive;
+      agent.store.setLists(lists);
+      await agent.store.flush();
+      return json(res, 200, { ok: true, lists: lists.map(listRow) });
+    }
     default: return false;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "description": "Standalone single-actor ActivityPub agent whose wire face, RDF truth and state all live on a Solid pod (CSS). Bundles a Phanpy UI and a Mastodon client-API facade.",
   "type": "module",
   "license": "MIT",

package/web/admin/record.js

@@ -108,6 +108,37 @@ document.getElementById('win').addEventListener('win:closed', () => {
 });
 
 
+// One row per list, indented under the lists row: its name, and one dropdown
+// whose two options are its states — the list's people shown in Home, or kept
+// to the list. Changing the word is the whole action.
+function listRows() {
+  const out = [];
+  for (const l of config.lists || []) {
+    const dt = document.createElement('dt');
+    dt.className = 'under';
+    dt.textContent = l.title;
+    const sel = document.createElement('select');
+    sel.setAttribute('aria-label', `Posts from ${l.title} in your home timeline`);
+    sel.title = '   Whether the posts and boosts of the people on this list appear in your home timeline; hidden, they show only on the list and on the public timeline';
+    for (const [v, t] of [['show', 'shown in home'], ['hide', 'hidden from home']]) {
+      const o = document.createElement('option');
+      o.value = v; o.textContent = t; o.selected = (v === 'hide') === !!l.exclusive;
+      sel.appendChild(o);
+    }
+    sel.addEventListener('change', async () => {
+      const hide = sel.value === 'hide';
+      sel.disabled = true;
+      const r = await write('/lists', { id: l.id, exclusive: hide },
+        hide ? `${l.title} is hidden from your home timeline` : `${l.title} is shown in your home timeline`);
+      if (r) await load(); else { sel.value = l.exclusive ? 'hide' : 'show'; sel.disabled = false; }
+    });
+    const dd = document.createElement('dd');
+    dd.append(sel);
+    out.push([dt, dd]);
+  }
+  return out;
+}
+
 // One row per identity connected elsewhere, indented under the row that adds
 // them. Each carries its own way out: disconnecting one has nothing to do with
 // the others.
@@ -254,7 +285,7 @@ function render() {
   if (config.movedTo) rows.push(['moved to', config.movedTo]);
   // A person gates followers here; a group's gate is the joins control on its
   // kind row, so the row would be a second switch for the same thing.
-  if (config.kind !== 'group') rows.splice(2, 0, ['new followers', 'ctl'], ['hashtag posts in home', 'ctl']);
+  if (config.kind !== 'group') rows.splice(2, 0, ['new followers', 'ctl'], ['hashtag posts in home', 'ctl'], ['lists', 'ctl']);
   // Rows that belong under the one being written, appended after it.
   let kids = null;
   for (const [k, v, link] of rows) {
@@ -301,6 +332,13 @@ function render() {
       HOME_TAGS_CTL.hidden = false;
       HOME_TAGS_PICK.value = config.tagsInHome !== false ? 'show' : 'hide';
     }
+    // How many lists; each one is a row of its own underneath with its Home
+    // switch. Lists are made and filled in the client, so this row only counts.
+    if (k === 'lists') {
+      const n = (config.lists || []).length;
+      dd.textContent = n ? `${n} ${n === 1 ? 'list' : 'lists'}` : 'none — make one in Phanpy';
+      kids = listRows();
+    }
     if (k === 'gateway') {
       dd.textContent = '';
       dd.append(GATEWAY_CTL);

package/web/app/admin-facade.mjs

@@ -23,12 +23,15 @@ import { followActor, followHandle } from '../../lib/core/social.mjs';
 const PERMANENT_CONFIG = ['handle', 'remotePod', 'issuer', 'root', 'kind'];
 // Carried in the actor document, so a change is not live until republished.
 const WIRE_CONFIG = ['name', 'summary', 'icon', 'image', 'fields', 'aliases', 'autoAcceptFollows'];
+// A list as the page shows it: its name and whether its people are kept out
+// of Home. Lists are made and filled in the client; the page only switches.
+const listRow = (l) => ({ id: l.id, title: l.title, exclusive: !!l.exclusive });
 
 // The data endpoints this agent answers at the origin root (the page computes
 // its base as the origin, so it asks for /status, not /admin/status). Anything
 // not here falls through to the network as a static file or the gateway.
 export const ADMIN_PATHS = new Set([
-  '/status', '/config', '/gateway', '/alias', '/rotate-key', '/import',
+  '/status', '/config', '/gateway', '/alias', '/rotate-key', '/import', '/lists',
   '/deadletter', '/trouble', '/blocks', '/profiles', '/modqueue', '/log', '/fediacct', '/describe', '/follow',
   '/atproto', '/atproto/connect', '/atproto/disconnect',
   '/rebuild', '/move', '/retire', '/inbox/prune', '/park', '/revive', '/takeover',
@@ -121,6 +124,7 @@ export class AdminFacade {
             aliases: cfg.aliases || [],
             autoAcceptFollows: cfg.autoAcceptFollows !== false,
             tagsInHome: cfg.tagsInHome !== false,
+            lists: a.store.getLists().map(listRow),
             quiescedAt: cfg.quiescedAt || null, movedTo: cfg.movedTo || null,
             mode: a.status().mode,
             // Live from the credential's actual backend on THIS browser (a
@@ -242,6 +246,19 @@ export class AdminFacade {
         });
       }
 
+      // One list's Home switch, the same `exclusive` a Mastodon app sets.
+      case '/lists': {
+        if (typeof body.exclusive !== 'boolean') return json(400, { error: 'exclusive (true or false) is the one thing to set here' });
+        await a.requestTakeover?.();
+        const lists = a.store.getLists();
+        const l = lists.find(x => x.id === String(body.id || ''));
+        if (!l) return json(404, { error: 'no such list' });
+        l.exclusive = body.exclusive;
+        a.store.setLists(lists);
+        await a.store.flush();
+        return json(200, { ok: true, lists: lists.map(listRow) });
+      }
+
       case '/describe': {
         const cfg = { ...a.store.getConfig() };
         if ('summary' in body) cfg.summary = body.summary || undefined;

package/web/app/dist/sw.js

@@ -69313,7 +69313,7 @@ async function handle3(api, ctx) {
   if (mAccLists && req.method === "GET") {
     const actorUrl = api.store.urlFor(mAccLists[1]);
     if (!actorUrl) return send(404, { error: "Record not found" });
-    return send(200, api.store.getLists().filter((l) => (l.members || []).includes(actorUrl)).map((l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || "list", exclusive: false })));
+    return send(200, api.store.getLists().filter((l) => (l.members || []).includes(actorUrl)).map((l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || "list", exclusive: !!l.exclusive })));
   }
   if (pathname === "/api/v1/mutes" && req.method === "GET") {
     return send(200, (api.store.getMuted().actors || []).map((a) => api.account(a)));
@@ -69382,9 +69382,10 @@ async function handle4(api, ctx) {
   if (pathname === "/api/v1/timelines/home" || pathname === "/api/v1/timelines/public" || pathname === "/api/v1/trends/statuses") {
     const localOnly = pathname === "/api/v1/timelines/public" && url.searchParams.get("local") === "true";
     const hideTags = pathname === "/api/v1/timelines/home" && api.store.getConfig?.()?.tagsInHome === false;
+    const hiddenBy = new Set(pathname === "/api/v1/timelines/home" ? (api.store.getLists?.() || []).filter((l) => l.exclusive).flatMap((l) => l.members || []) : []);
     const all = api.store.getStatuses();
     const muted = new Set(api.store.getMuted().actors);
-    let items = all.filter((s) => s.kind !== "remote" && s.kind !== "mention").filter((s) => !s.direct && s.visibility !== "direct").filter((s) => !muted.has(s.actor) && !muted.has(s.via)).filter((s) => !hideTags || s.kind !== "tag" || s.sourceAccts?.length).filter((s) => !localOnly || s.kind === "post" && s.visibility !== "private").sort((a, b) => String(b.published || "").localeCompare(String(a.published || "")));
+    let items = all.filter((s) => s.kind !== "remote" && s.kind !== "mention").filter((s) => !s.direct && s.visibility !== "direct").filter((s) => !muted.has(s.actor) && !muted.has(s.via)).filter((s) => !hideTags || s.kind !== "tag" || s.sourceAccts?.length).filter((s) => !hiddenBy.size || !(hiddenBy.has(s.actor) || hiddenBy.has(s.via))).filter((s) => !localOnly || s.kind === "post" && s.visibility !== "private").sort((a, b) => String(b.published || "").localeCompare(String(a.published || "")));
     const { items: page2, headers } = api.page(items, url);
     return send(200, page2.map((s) => api.statusOrBoost(s, { all })), headers);
   }
@@ -69452,7 +69453,8 @@ async function handle4(api, ctx) {
     const { items: page2, headers } = api.page(items, url);
     return send(200, page2.map((s) => api.statusOrBoost(s, { all })), headers);
   }
-  const listJson = (l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || "list", exclusive: false });
+  const flag = (v) => v === true || v === "true" || v === "on" || v === "1";
+  const listJson = (l) => ({ id: l.id, title: l.title, replies_policy: l.repliesPolicy || "list", exclusive: !!l.exclusive });
   if (pathname === "/api/v1/lists" && req.method === "GET") {
     return send(200, api.store.getLists().map(listJson));
   }
@@ -69461,7 +69463,13 @@ async function handle4(api, ctx) {
     const title = String(body.title || "").trim();
     if (!title) return send(422, { error: "a title is required" });
     const lists = api.store.getLists();
-    const l = { id: node_crypto_default.randomBytes(8).toString("hex"), title, repliesPolicy: body.replies_policy || "list", members: [] };
+    const l = {
+      id: node_crypto_default.randomBytes(8).toString("hex"),
+      title,
+      repliesPolicy: body.replies_policy || "list",
+      exclusive: flag(body.exclusive),
+      members: []
+    };
     lists.push(l);
     api.store.setLists(lists);
     return send(200, listJson(l));
@@ -69479,6 +69487,7 @@ async function handle4(api, ctx) {
       const body = await readBody2(req);
       if (body.title) l.title = String(body.title);
       if (body.replies_policy) l.repliesPolicy = body.replies_policy;
+      if ("exclusive" in body) l.exclusive = flag(body.exclusive);
       api.store.setLists(lists);
     }
     return send(200, listJson(l));
@@ -71622,6 +71631,7 @@ var ImportWorker = class {
 // web/app/admin-facade.mjs
 var PERMANENT_CONFIG = ["handle", "remotePod", "issuer", "root", "kind"];
 var WIRE_CONFIG = ["name", "summary", "icon", "image", "fields", "aliases", "autoAcceptFollows"];
+var listRow = (l) => ({ id: l.id, title: l.title, exclusive: !!l.exclusive });
 var ADMIN_PATHS = /* @__PURE__ */ new Set([
   "/status",
   "/config",
@@ -71629,6 +71639,7 @@ var ADMIN_PATHS = /* @__PURE__ */ new Set([
   "/alias",
   "/rotate-key",
   "/import",
+  "/lists",
   "/deadletter",
   "/trouble",
   "/blocks",
@@ -71733,6 +71744,7 @@ var AdminFacade = class {
             aliases: cfg.aliases || [],
             autoAcceptFollows: cfg.autoAcceptFollows !== false,
             tagsInHome: cfg.tagsInHome !== false,
+            lists: a.store.getLists().map(listRow),
             quiescedAt: cfg.quiescedAt || null,
             movedTo: cfg.movedTo || null,
             mode: a.status().mode,
@@ -71876,6 +71888,18 @@ var AdminFacade = class {
           ...pub?.unreachable?.length ? { unreachable: pub.unreachable } : {}
         });
       }
+      // One list's Home switch, the same `exclusive` a Mastodon app sets.
+      case "/lists": {
+        if (typeof body.exclusive !== "boolean") return json2(400, { error: "exclusive (true or false) is the one thing to set here" });
+        await a.requestTakeover?.();
+        const lists = a.store.getLists();
+        const l = lists.find((x) => x.id === String(body.id || ""));
+        if (!l) return json2(404, { error: "no such list" });
+        l.exclusive = body.exclusive;
+        a.store.setLists(lists);
+        await a.store.flush();
+        return json2(200, { ok: true, lists: lists.map(listRow) });
+      }
       case "/describe": {
         const cfg = { ...a.store.getConfig() };
         if ("summary" in body) cfg.summary = body.summary || void 0;