steamutils 1.5.18 → 1.5.20

package/index.js

@@ -3966,98 +3966,87 @@ export default class SteamUser {
   }
 
   async getFriendActivity(params) {
-    let { start, url, filter = {} } = params || {};
-    if (!params) {
-      start = Math.round(new Date().getTime() / 1000);
-    } else if (typeof params === "string") {
-      if (params.startsWith("http")) {
-        url = params;
-      } else {
-        start = params;
-      }
+    let start,
+      url,
+      filter = {};
+    if (typeof params === "string") {
+      params.startsWith("http") ? (url = params) : (start = params);
     } else if (typeof params === "number") {
       start = params;
-    } else if (typeof params === "object") {
-      //do nothing
+    } else if (params && typeof params === "object") {
+      ({ start, url, filter = {} } = params);
     }
 
-    //start or next_request
+    start = start || Math.floor(Date.now() / 1000);
     url = url || `${this.getMyProfileURL()}/ajaxgetusernews/?start=${start}`; //use my, not profiles/76561197977736539 getMySteamUserProfileURL
+
     const _self = this;
     const activity = [];
-    let next_request_timestart = null;
-    let next_request = null;
     const result = await this._httpRequestAjax(url);
     if (result instanceof ResponseError) {
       return result;
     }
     const data = result?.data;
-    if (data?.success) {
-      next_request = data.next_request || null;
-      next_request_timestart = parseInt(next_request.substringAfterLast("?start=")) || null;
-      const $ = cheerio.load(data.blotter_html.replaceAll(/[\t\n\r]/gi, "").trim());
-      $(".blotter_day").each(function () {
-        const blotter_day = $(this);
-        const timestamp = parseInt(blotter_day.attr("id").substringAfter("blotter_day_"));
-        const header_date = blotter_day.find(".blotter_day_header_date").text();
-
-        let _activity = [];
-
-        const activityType = {
-          daily_rollup(blotterBlockEl) {
-            return _self._parseBlotterDailyRollup($, blotterBlockEl);
-          },
-          gamepurchase(blotterBlockEl) {
-            return _self._parseBlotterGamepurchase($, blotterBlockEl);
-          },
-          workshopitempublished() {},
-          recommendation() {},
-          userstatus() {},
-          screenshot() {
-            //screenshot_fullscreen
-          },
-          videopublished() {},
-        };
+    if (!data?.success) return { activity, next_request_timestart: null, next_request: null };
+
+    const next_request = data.next_request || "";
+    const next_request_timestart = parseInt(next_request.substringAfterLast("?start=")) || null;
+    const $ = cheerio.load(data.blotter_html.replaceAll(/[\t\n\r]/gi, "").trim());
+    const activityTypeHandlers = {
+      daily_rollup(blotterBlockEl) {
+        return _self._parseBlotterDailyRollup($, blotterBlockEl);
+      },
+      gamepurchase(blotterBlockEl) {
+        return _self._parseBlotterGamepurchase($, blotterBlockEl);
+      },
+      workshopitempublished() {},
+      recommendation() {},
+      userstatus() {},
+      screenshot() {
+        //screenshot_fullscreen
+      },
+      videopublished() {},
+    };
 
-        blotter_day.find(".blotter_block").each(function (index, blotterBlockEl) {
-          blotterBlockEl = $(blotterBlockEl);
-          let type = [];
-          blotterBlockEl.children().each(function () {
-            const classList = $(this).attr("class")?.replaceAll("blotter_entry", "")?.trim();
-            if (classList) {
-              type = type.concat(classList.split(" ").map((_class) => _class?.removePrefix("blotter_")));
-            }
-          });
+    $(".blotter_day").each(function (_, dayElement) {
+      const dayEl = $(dayElement);
+      const timestamp = parseInt(dayEl.attr("id").substringAfter("blotter_day_"));
+      const header_date = dayEl.find(".blotter_day_header_date").text();
+
+      dayEl.find(".blotter_block").each(function (index, blotterBlockEl) {
+        blotterBlockEl = $(blotterBlockEl);
+        const types = Array.from(
+          new Set(
+            blotterBlockEl
+              .children()
+              .map((_, child) => $(child).attr("class")?.replace("blotter_entry", "").trim())
+              .get()
+              .flatMap((cls) => cls?.split(" ").map((c) => c.replace("blotter_", "")) || []),
+          ),
+        );
 
-          let excute;
-          if ((excute = type.find((_class) => Object.hasOwn(activityType, _class)))) {
-            const __activity = activityType[excute](blotterBlockEl);
-            if (__activity instanceof Array) {
-              __activity.forEach((___activity) => {
-                if (!___activity.type) {
-                  ___activity.type = excute;
-                }
+        const handlerKey = types.find((type) => activityTypeHandlers[type]);
+        if (!handlerKey) {
+          const html = blotterBlockEl.html();
+          console.log(html);
+          return;
+        }
 
-                const activityID = [___activity.type, ___activity.author?.steamId, (___activity.apps?.map?.((app) => app.id) || []).sort().join("|"), (___activity.players?.map?.((p) => p.steamId) || []).sort().join("|"), (___activity.achieved?.map?.((p) => p.title.replaceAll(/\s/gi, "").toLowerCase()) || []).sort().join("|"), (___activity.groups?.map?.((p) => p.URL) || []).sort().join("|")].filter(Boolean);
-                _activity.push(___activity);
-              });
-            }
-          } else {
-            const html = blotterBlockEl.html();
-            console.log(html);
-          }
-        });
-        _activity.forEach((ac) => {
-          ac.timestamp = timestamp;
-          ac.header_date = header_date;
+        const parsedActivities = activityTypeHandlers[handlerKey](blotterBlockEl) || [];
+        if (Array.isArray(parsedActivities)) {
+          for (const parsedActivity of parsedActivities) {
+            parsedActivity.type ||= handlerKey;
+            parsedActivity.timestamp = timestamp;
+            parsedActivity.header_date = header_date;
 
-          if (filter?.type && filter.type !== ac.type) {
-            return;
+            if (filter?.type && filter.type !== parsedActivity.type) {
+              continue;
+            }
+            activity.push(parsedActivity);
           }
-          activity.push(ac);
-        });
+        }
       });
-    }
+    });
 
     return {
       activity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.5.18",
+  "version": "1.5.20",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",