nixamp 0.24.0 → 0.24.2

package/README.md

@@ -147,6 +147,12 @@ site. In the **Parties** panel, enter an **Invite code** and select **Join party
 to open its room. A listed party's **Join party** link opens the film on the
 site hosting it; **Open room** opens its nixamp room.
 
+A live party also shows the current file's source and folder path, so a course
+can read **Course › Section › Lecture**, with its position in that folder's
+playlist. Numbered download filenames become readable lecture titles. Share
+sheets, browser tabs and device media information follow the current lecture;
+course names come from the server's metadata, never a guess from the filename.
+
 A watch party lives on the site that has the film. bittorrented.com has them:
 a six-character code, a host, and everybody at the same second. nixamp has
 rooms, chat, invitations, a directory, and five clients that can already open
@@ -331,8 +337,9 @@ is tap, talk, tap: the page records, brings the sound to 16 kHz mono itself,
 and sends nixamp.com a small WAV with the room's name on it; the ear posts
 the words to the room in the same request, and the line appears. Said is
 sent, unless the **Edit before sending** switch under the box is on, in
-which case the words wait in the box for Send. A wrong line is taken down
-with its ✕.
+which case the words wait in the box for Send. A line, once sent, is public
+record: there is no taking it down, not by its author and not by the
+server's owner.
 
 **On the phone, too.** Every live room has a six-digit code on the party
 line (see below), and only when somebody is on the phone in a room, each

package/dist/server.js

@@ -2241,14 +2241,20 @@ export function createHandler(engine, options) {
          * The trollbox: the chat for one live room, keyed by the server and
          * the channel so every viewer of a stream is in the same box whichever
          * page they came from. Reading is open; a line needs a nixamp.com
-         * account and is signed with its public handle; taking one down is the
-         * author's, or the listing owner's.
+         * account and is signed with its public handle; and once sent it is
+         * public record, so there is no DELETE here for anybody.
          */
         if ((path === "/api/v1/trollbox" || path.startsWith("/api/v1/trollbox/")) && options.trollbox && options.accounts) {
             const trollbox = options.trollbox;
             const child = path.startsWith("/api/v1/trollbox/") ? path.slice("/api/v1/trollbox/".length) : "";
+            // Nothing lives under a line's id: a sent line is public record, so
+            // there is no line to address, whatever the method.
+            if (child !== "") {
+                json(response, 404, { error: "no such endpoint" });
+                return;
+            }
             try {
-                if (request.method === "GET" && child === "") {
+                if (request.method === "GET") {
                     const where = roomFor(url.searchParams.get("server"), url.searchParams.get("channel"));
                     if (!where) {
                         json(response, 400, { error: "a room is a server address and a channel" });
@@ -2259,13 +2265,11 @@ export function createHandler(engine, options) {
                     json(response, 200, {
                         room: where.room,
                         you: who ? ((await options.handles?.of(who.id)) || fallbackHandle(who.id)) : "",
-                        messages: lines.map((one) => ({
-                            id: one.id, handle: one.handle, body: one.body, createdAt: one.createdAt, mine: who !== null && one.authorId === who.id,
-                        })),
+                        messages: lines.map((one) => ({ id: one.id, handle: one.handle, body: one.body, createdAt: one.createdAt })),
                     });
                     return;
                 }
-                if (request.method === "POST" && child === "") {
+                if (request.method === "POST") {
                     const who = await options.accounts.whoIs(tokenFrom(request.headers));
                     if (who === null) {
                         json(response, 401, { error: "sign in to nixamp.com to chat" });
@@ -2287,34 +2291,10 @@ export function createHandler(engine, options) {
                     const handle = (await options.handles?.of(who.id)) || fallbackHandle(who.id);
                     const line = await trollbox.post(where, who.id, handle, body.body);
                     readOnThePhone(where, who.id, line.handle, line.body);
-                    json(response, 201, { message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt, mine: true } });
+                    json(response, 201, { message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt } });
                     return;
                 }
-                if (request.method === "DELETE" && child !== "") {
-                    const who = await options.accounts.whoIs(tokenFrom(request.headers));
-                    if (who === null) {
-                        json(response, 401, { error: "sign in to nixamp.com first" });
-                        return;
-                    }
-                    const where = roomFor(url.searchParams.get("server"), url.searchParams.get("channel"));
-                    if (!where) {
-                        json(response, 400, { error: "a room is a server address and a channel" });
-                        return;
-                    }
-                    // The listing owner moderates their own server's rooms.
-                    const moderator = (options.directory?.list() ?? []).some((listing) => {
-                        try {
-                            return listing.ownerId === who.id && new URL(listing.url).origin === where.server;
-                        }
-                        catch {
-                            return false;
-                        }
-                    });
-                    const removed = await trollbox.remove(where.room, child, who.id, moderator);
-                    json(response, removed ? 200 : 404, removed ? { ok: true } : { error: "not your line, or already gone" });
-                    return;
-                }
-                json(response, 405, { error: "GET, POST or DELETE" });
+                json(response, 405, { error: "GET or POST" });
             }
             catch (error) {
                 if (error instanceof TrollboxError)
@@ -2373,7 +2353,7 @@ export function createHandler(engine, options) {
                     readOnThePhone(where, who.id, line.handle, line.body);
                     json(response, 201, {
                         ...said,
-                        message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt, mine: true },
+                        message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt },
                     });
                     return;
                 }

package/dist/translate.d.ts

@@ -21,6 +21,14 @@ export declare const LANGUAGES: Record<string, {
     name: string;
     native: string;
 }>;
+/**
+ * A Marian model's line, tidied. Given a short line it tends to run on in
+ * punctuation until the token cap ("Och sånt.............."), and to put a
+ * comma and a full stop where one was meant. A space before a mark, a mark
+ * repeated, and a run of different marks each become the one mark, the
+ * first of them.
+ */
+export declare function tidyTranslation(text: string): string;
 /** The models a translation from one language to another goes through, or null when there is no way. */
 export declare function route(from: string, to: string, pairs?: ReadonlySet<string>): [string, string][] | null;
 export declare function modelFor(from: string, to: string): string;

package/dist/translate.js

@@ -71,6 +71,21 @@ export const LANGUAGES = {
     id: { name: "Indonesian", native: "Bahasa Indonesia" },
     hi: { name: "Hindi", native: "हिन्दी" },
 };
+/**
+ * A Marian model's line, tidied. Given a short line it tends to run on in
+ * punctuation until the token cap ("Och sånt.............."), and to put a
+ * comma and a full stop where one was meant. A space before a mark, a mark
+ * repeated, and a run of different marks each become the one mark, the
+ * first of them.
+ */
+export function tidyTranslation(text) {
+    return text
+        .replace(/\s+([.,!?;:])/g, "$1")
+        .replace(/([.,!?;:])[.,;:]+/g, "$1")
+        .replace(/([!?])[!?]+/g, "$1")
+        .replace(/\s+/g, " ")
+        .trim();
+}
 /** The models a translation from one language to another goes through, or null when there is no way. */
 export function route(from, to, pairs = PAIRS) {
     if (from === to)
@@ -226,7 +241,7 @@ export class Translator {
             }
             const out = [...spoken];
             which.forEach((i, at) => {
-                out[i] = (current[at] ?? "").trim();
+                out[i] = tidyTranslation(current[at] ?? "");
             });
             return out;
         });

package/dist/trollbox.d.ts

@@ -40,14 +40,13 @@ export declare class Trollbox {
     private readonly spoke;
     constructor(db: Queryable, now?: () => number);
     private ensure;
-    /** The room's lines, oldest first, after a moment when given. */
+    /**
+     * The room's lines, oldest first, after a moment when given. Nothing
+     * writes deleted_at any more; the filter only keeps the lines taken down
+     * before a sent line became public record out of view.
+     */
     messages(room: string, after?: string, limit?: number): Promise<TrollboxMessage[]>;
     /** Whether this account may speak now, and the bookkeeping if so. */
     private allow;
     post(where: TrollboxRoom, authorId: string, handle: string, body: unknown): Promise<TrollboxMessage>;
-    /**
-     * A line taken down: by its author, or by a moderator (whoever owns the
-     * server's listing). Anybody else's ask removes nothing and says so.
-     */
-    remove(room: string, id: string, byAccount: string, moderator: boolean): Promise<boolean>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixamp",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "It really whips the terminal's ass. A Winamp-shaped audio player for your terminal.",
   "license": "MIT",
   "type": "module",

package/src/server.ts

@@ -2771,14 +2771,20 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
      * The trollbox: the chat for one live room, keyed by the server and
      * the channel so every viewer of a stream is in the same box whichever
      * page they came from. Reading is open; a line needs a nixamp.com
-     * account and is signed with its public handle; taking one down is the
-     * author's, or the listing owner's.
+     * account and is signed with its public handle; and once sent it is
+     * public record, so there is no DELETE here for anybody.
      */
     if ((path === "/api/v1/trollbox" || path.startsWith("/api/v1/trollbox/")) && options.trollbox && options.accounts) {
       const trollbox = options.trollbox;
       const child = path.startsWith("/api/v1/trollbox/") ? path.slice("/api/v1/trollbox/".length) : "";
+      // Nothing lives under a line's id: a sent line is public record, so
+      // there is no line to address, whatever the method.
+      if (child !== "") {
+        json(response, 404, { error: "no such endpoint" });
+        return;
+      }
       try {
-        if (request.method === "GET" && child === "") {
+        if (request.method === "GET") {
           const where = roomFor(url.searchParams.get("server"), url.searchParams.get("channel"));
           if (!where) {
             json(response, 400, { error: "a room is a server address and a channel" });
@@ -2789,13 +2795,11 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           json(response, 200, {
             room: where.room,
             you: who ? ((await options.handles?.of(who.id)) || fallbackHandle(who.id)) : "",
-            messages: lines.map((one) => ({
-              id: one.id, handle: one.handle, body: one.body, createdAt: one.createdAt, mine: who !== null && one.authorId === who.id,
-            })),
+            messages: lines.map((one) => ({ id: one.id, handle: one.handle, body: one.body, createdAt: one.createdAt })),
           });
           return;
         }
-        if (request.method === "POST" && child === "") {
+        if (request.method === "POST") {
           const who = await options.accounts.whoIs(tokenFrom(request.headers));
           if (who === null) {
             json(response, 401, { error: "sign in to nixamp.com to chat" });
@@ -2816,33 +2820,10 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           const handle = (await options.handles?.of(who.id)) || fallbackHandle(who.id);
           const line = await trollbox.post(where, who.id, handle, body.body);
           readOnThePhone(where, who.id, line.handle, line.body);
-          json(response, 201, { message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt, mine: true } });
+          json(response, 201, { message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt } });
           return;
         }
-        if (request.method === "DELETE" && child !== "") {
-          const who = await options.accounts.whoIs(tokenFrom(request.headers));
-          if (who === null) {
-            json(response, 401, { error: "sign in to nixamp.com first" });
-            return;
-          }
-          const where = roomFor(url.searchParams.get("server"), url.searchParams.get("channel"));
-          if (!where) {
-            json(response, 400, { error: "a room is a server address and a channel" });
-            return;
-          }
-          // The listing owner moderates their own server's rooms.
-          const moderator = (options.directory?.list() ?? []).some((listing) => {
-            try {
-              return listing.ownerId === who.id && new URL(listing.url).origin === where.server;
-            } catch {
-              return false;
-            }
-          });
-          const removed = await trollbox.remove(where.room, child, who.id, moderator);
-          json(response, removed ? 200 : 404, removed ? { ok: true } : { error: "not your line, or already gone" });
-          return;
-        }
-        json(response, 405, { error: "GET, POST or DELETE" });
+        json(response, 405, { error: "GET or POST" });
       } catch (error) {
         if (error instanceof TrollboxError) json(response, error.status, { error: error.message });
         else throw error;
@@ -2899,7 +2880,7 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           readOnThePhone(where, who.id, line.handle, line.body);
           json(response, 201, {
             ...said,
-            message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt, mine: true },
+            message: { id: line.id, handle: line.handle, body: line.body, createdAt: line.createdAt },
           });
           return;
         }

package/src/translate.ts

@@ -75,6 +75,22 @@ export const LANGUAGES: Record<string, { name: string; native: string }> = {
   hi: { name: "Hindi", native: "हिन्दी" },
 };
 
+/**
+ * A Marian model's line, tidied. Given a short line it tends to run on in
+ * punctuation until the token cap ("Och sånt.............."), and to put a
+ * comma and a full stop where one was meant. A space before a mark, a mark
+ * repeated, and a run of different marks each become the one mark, the
+ * first of them.
+ */
+export function tidyTranslation(text: string): string {
+  return text
+    .replace(/\s+([.,!?;:])/g, "$1")
+    .replace(/([.,!?;:])[.,;:]+/g, "$1")
+    .replace(/([!?])[!?]+/g, "$1")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
 /** The models a translation from one language to another goes through, or null when there is no way. */
 export function route(from: string, to: string, pairs: ReadonlySet<string> = PAIRS): [string, string][] | null {
   if (from === to) return [];
@@ -262,7 +278,7 @@ export class Translator {
       }
       const out = [...spoken];
       which.forEach((i, at) => {
-        out[i] = (current[at] ?? "").trim();
+        out[i] = tidyTranslation(current[at] ?? "");
       });
       return out;
     });

package/web/dist/assets/{hls-3VKVEQE3-Dtl-3mpW.js → hls-3VKVEQE3-B3PGV4wK.js}

@@ -1 +1 @@
-import{t as e}from"./index-B0h4Nexr.js";var t=3;async function n(n){let{media:r,src:i,isTv:a}=n,{default:o}=await e(async()=>{let{default:e}=await import(`./hls-n74Cnh8A.js`);return{default:e}},[]);if(!o.isSupported())return n.onError(`This browser cannot play HLS streams.`),{destroy:()=>void 0,levels:()=>[]};let s=new o({...a?{maxBufferLength:60,maxMaxBufferLength:120,backBufferLength:30,liveSyncDurationCount:4}:{backBufferLength:90},enableWorker:!0}),c=0,l=!1;s.on(o.Events.ERROR,(e,r)=>{if(!l&&r.fatal){if(c>=t){n.onError(`This stream kept failing and has been stopped.`),s.destroy();return}switch(c+=1,r.type){case o.ErrorTypes.NETWORK_ERROR:n.onNotice(`Reconnecting…`),s.startLoad();break;case o.ErrorTypes.MEDIA_ERROR:n.onNotice(`Recovering…`),s.recoverMediaError();break;default:n.onError(`This stream could not be played.`),s.destroy()}}}),s.on(o.Events.MANIFEST_PARSED,()=>{l||(n.onNotice(null),n.onReady?.({live:s.levels.length>0&&!Number.isFinite(r.duration),levels:u()}))}),s.on(o.Events.LEVEL_LOADED,(e,t)=>{l||n.onReady?.({live:t.details.live,levels:u()})}),s.on(o.Events.FRAG_BUFFERED,()=>{l||n.onNotice(null)});function u(){return s.levels.map((e,t)=>({index:t,height:e.height||null,bitrate:e.bitrate||null,label:e.height?`${String(e.height)}p`:`${String(Math.round((e.bitrate||0)/1e3))}k`}))}return s.loadSource(i),s.attachMedia(r),{destroy(){l=!0,s.destroy()},levels:u,setLevel(e){s.currentLevel=e},currentLevel:()=>s.autoLevelEnabled?-1:s.currentLevel}}export{n as createHlsEngine};
+import{t as e}from"./index-DOOjAq1w.js";var t=3;async function n(n){let{media:r,src:i,isTv:a}=n,{default:o}=await e(async()=>{let{default:e}=await import(`./hls-n74Cnh8A.js`);return{default:e}},[]);if(!o.isSupported())return n.onError(`This browser cannot play HLS streams.`),{destroy:()=>void 0,levels:()=>[]};let s=new o({...a?{maxBufferLength:60,maxMaxBufferLength:120,backBufferLength:30,liveSyncDurationCount:4}:{backBufferLength:90},enableWorker:!0}),c=0,l=!1;s.on(o.Events.ERROR,(e,r)=>{if(!l&&r.fatal){if(c>=t){n.onError(`This stream kept failing and has been stopped.`),s.destroy();return}switch(c+=1,r.type){case o.ErrorTypes.NETWORK_ERROR:n.onNotice(`Reconnecting…`),s.startLoad();break;case o.ErrorTypes.MEDIA_ERROR:n.onNotice(`Recovering…`),s.recoverMediaError();break;default:n.onError(`This stream could not be played.`),s.destroy()}}}),s.on(o.Events.MANIFEST_PARSED,()=>{l||(n.onNotice(null),n.onReady?.({live:s.levels.length>0&&!Number.isFinite(r.duration),levels:u()}))}),s.on(o.Events.LEVEL_LOADED,(e,t)=>{l||n.onReady?.({live:t.details.live,levels:u()})}),s.on(o.Events.FRAG_BUFFERED,()=>{l||n.onNotice(null)});function u(){return s.levels.map((e,t)=>({index:t,height:e.height||null,bitrate:e.bitrate||null,label:e.height?`${String(e.height)}p`:`${String(Math.round((e.bitrate||0)/1e3))}k`}))}return s.loadSource(i),s.attachMedia(r),{destroy(){l=!0,s.destroy()},levels:u,setLevel(e){s.currentLevel=e},currentLevel:()=>s.autoLevelEnabled?-1:s.currentLevel}}export{n as createHlsEngine};