@rcpooley/botyard 0.4.0 → 0.4.2

package/dist/botyard.js

@@ -187,7 +187,7 @@ const COMMANDS = [
             'Names are 1-100 characters; words after <channel> are joined, so quotes are optional. Without --from it is a new public thread with no opening message.',
             'For a new topic: post a short opening message in the channel, then botyard thread <server> <channel> <name> --from <that message id>, and keep the discussion in the thread. The channel then holds one entrance post per topic.',
             'Threads close themselves after a week without messages; sending to one opens it again.',
-            "--add <user id> adds that person to the thread (repeat it, up to 10), silently: no ping. Discord notifies someone about a thread's messages only once they are a member of it, so add the humans who should hear about it. Someone Discord refuses (not in the server, say) is listed and the thread is still made. For a thread that already exists: botyard thread-add.",
+            "--add <user id> adds that person to the thread (repeat it, up to 10), without a ping (Discord shows an 'added to the thread' line in it). Discord notifies someone about a thread's messages only once they are a member of it, so add the humans who should hear about it. Someone Discord refuses (not in the server, say) is listed and the thread is still made. For a thread that already exists: botyard thread-add.",
         ],
         args: 3,
         rest: true,
@@ -210,7 +210,7 @@ const COMMANDS = [
         name: 'thread-add',
         group: 'Writing',
         usage: 'thread-add <server> <thread> <user id>...',
-        summary: 'add people to an existing thread, silently',
+        summary: 'add people to an existing thread, without a ping',
         details: [
             'Adds each user id to the thread without pinging them. Discord notifies a person about a thread\'s messages only once they are a member of it, so this is how the humans who own a project get notified of the threads you start.',
             '<thread> is its id or, while it is active, its name. A user id is a number (Discord: Settings > Advanced > Developer Mode, then right-click a person > Copy User ID).',
@@ -433,7 +433,7 @@ function commandHelp(c) {
 }
 /** Who a thread's members call added, and who Discord refused. */
 function memberLines(added, failed) {
-    return [...(added.length > 0 ? [`Added (silently, no ping): ${added.join(', ')}`] : []), ...failed.map((f) => `Could not add ${f.id}: ${f.error}`)];
+    return [...(added.length > 0 ? [`Added (no ping): ${added.join(', ')}`] : []), ...failed.map((f) => `Could not add ${f.id}: ${f.error}`)];
 }
 function quote(s) {
     return /^[\w#.-]+$/.test(s) ? s : `"${s.replace(/"/g, '\\"')}"`;

package/dist/watch.js

@@ -77,7 +77,7 @@ export async function watch(o) {
         // catch up on what was posted while it was down; the stream's own copy of
         // any of those is skipped by the id check in print().
         if (last > 0n)
-            await catchUp(o, [...asked, ...seen.values()], seen, print);
+            await catchUp(o, [...asked, ...seen.values()], seen, print, o.includeOwn ? null : me.bot.userId || me.bot.id);
         else {
             const named = [...o.servers.map((s) => `all of ${s}`), ...o.channels.map((c) => `${c} and its threads`), ...o.threads.map((c) => `thread ${c}`)];
             const scope = named.length ? named.join(', ') : 'every server, channel and thread this key can read';
@@ -115,13 +115,15 @@ function named(ref, thread) {
     return { server: { id: server, name: server }, channel: { id: channel, name: channel, thread, parentId: null, parentName: null } };
 }
 /** Read the channels and threads this run has seen and print what is newer than the last message printed, oldest first. */
-async function catchUp(o, channels, seen, print) {
+// `own` is the bot's user id when its own messages are to be left out: the
+// stream drops them server-side, but catch-up reads history, which has them.
+async function catchUp(o, channels, seen, print, own) {
     const missed = [];
     for (const where of channels) {
         try {
             const page = await call(o.url, o.key, 'GET', `/servers/${seg(where.server.id)}/channels/${seg(where.channel.id)}/messages?limit=100`);
             // A channel asked for by name prints under its real name once one of its messages has come through the stream.
-            missed.push(...page.messages.map((m) => ({ ...m, ...(seen.get(m.channelId) ?? where) })));
+            missed.push(...page.messages.filter((m) => m.author.id !== own).map((m) => ({ ...m, ...(seen.get(m.channelId) ?? where) })));
         }
         catch (e) {
             o.log(`botyard: could not catch up on ${place(where)} (${e instanceof Error ? e.message : e})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcpooley/botyard",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Read and send in Discord through your own bot, hosted by Botyard. Made for AI agents.",
   "type": "module",
   "bin": {