Merge branch 'main' into autoscroll-standalone-behavior

Author: ikreymer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browsertrix-behaviors",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "index.js",
   "author": "Webrecorder Software",
   "license": "AGPL-3.0-or-later",

src/autoscroll.ts

@@ -10,6 +10,7 @@ export class AutoScroll {
   samePosCount: number;
 
   origPath: string;
+  lastMsg = "";
 
   constructor() {
     //super();
@@ -47,6 +48,14 @@ export class AutoScroll {
     return this.currScrollPos() < Math.max(scrollElem.clientHeight, scrollElem.scrollHeight);
   }
 
+  debug(msg: string) {
+    if (this.lastMsg === msg) {
+      return;
+    }
+    super.debug(msg);
+    this.lastMsg = msg;
+  }
+
   hasScrollEL(obj) {
     try {
       return !!self["getEventListeners"](obj).scroll;

src/site/instagram.ts

@@ -25,7 +25,7 @@ export class InstagramFeedBehavior {
   static id = "Instagram";
 
   static isMatch() {
-    return !!window.location.href.match(/https:\/\/(www\.)?instagram\.com\/\w[\w.-]+/);
+    return !!window.location.href.match(/https:\/\/(www\.)?instagram\.com\//);
   }
 
   static init() {
@@ -206,14 +206,7 @@ export class InstagramFeedBehavior {
 
       await fetch(window.location.href);
 
-      yield* this.iterSubposts(ctx);
-
-      yield getState(ctx, "Loaded Comments", "comments");
-
-      await Promise.race([
-        this.iterComments(ctx),
-        sleep(this.maxCommentsTime)
-      ]);
+      yield* this.handleSinglePost(ctx);
 
       next = xpathNode(Q.nextPost);
 
@@ -225,7 +218,25 @@ export class InstagramFeedBehavior {
     await sleep(waitUnit * 5);
   }
 
+  async* handleSinglePost(ctx) {
+    const { getState, sleep } = ctx.Lib;
+
+    yield* this.iterSubposts(ctx);
+
+    yield getState(ctx, "Loaded Comments", "comments");
+
+    await Promise.race([
+      this.iterComments(ctx),
+      sleep(this.maxCommentsTime)
+    ]);
+  }
+
   async* run(ctx) {
+    if (window.location.pathname.startsWith("/p/")) {
+      yield* this.handleSinglePost(ctx);
+      return;
+    }
+
     const { getState, scrollIntoView, sleep, waitUnit, xpathNode } = ctx.Lib;
     //const origLoc = window.location.href;