spectrum-ts 1.9.0 → 1.9.1

package/dist/{chunk-OM5VSKWD.js → chunk-3RBWEAQQ.js}

@@ -578,8 +578,6 @@ var MessageCache = class {
 var PollCache = class {
   map = /* @__PURE__ */ new Map();
   max;
-  selectionEventTimesByPoll = /* @__PURE__ */ new Map();
-  selectionsByPoll = /* @__PURE__ */ new Map();
   constructor(max = DEFAULT_MAX) {
     this.max = max;
   }
@@ -595,61 +593,11 @@ var PollCache = class {
       const first = this.map.keys().next().value;
       if (first !== void 0) {
         this.map.delete(first);
-        this.selectionEventTimesByPoll.delete(first);
-        this.selectionsByPoll.delete(first);
       }
     }
   }
   clear() {
     this.map.clear();
-    this.selectionEventTimesByPoll.clear();
-    this.selectionsByPoll.clear();
-  }
-  actorSelectionDeltas(pollId, actorId, optionIds) {
-    const previous = this.selectionsByPoll.get(pollId)?.get(actorId);
-    if (!previous) {
-      return optionIds.map((optionId) => ({ optionId, selected: true }));
-    }
-    const current = new Set(optionIds);
-    const selected = optionIds.filter((optionId) => !previous.has(optionId)).map((optionId) => ({ optionId, selected: true }));
-    const deselected = [...previous].filter((optionId) => !current.has(optionId)).map((optionId) => ({ optionId, selected: false }));
-    return [...selected, ...deselected];
-  }
-  clearedActorSelectionDeltas(pollId, actorId) {
-    const previous = this.selectionsByPoll.get(pollId)?.get(actorId);
-    if (!previous) {
-      return [];
-    }
-    return [...previous].map((optionId) => ({ optionId, selected: false }));
-  }
-  actorSelection(pollId, actorId) {
-    const selection = this.selectionsByPoll.get(pollId)?.get(actorId);
-    return selection ? [...selection] : void 0;
-  }
-  commitActorSelection(pollId, actorId, optionIds, at) {
-    let selections = this.selectionsByPoll.get(pollId);
-    if (!selections) {
-      selections = /* @__PURE__ */ new Map();
-      this.selectionsByPoll.set(pollId, selections);
-    }
-    selections.set(actorId, new Set(optionIds));
-    if (!at) {
-      return;
-    }
-    let eventTimes = this.selectionEventTimesByPoll.get(pollId);
-    if (!eventTimes) {
-      eventTimes = /* @__PURE__ */ new Map();
-      this.selectionEventTimesByPoll.set(pollId, eventTimes);
-    }
-    const eventTime = at.getTime();
-    const previousTime = eventTimes.get(actorId);
-    if (previousTime === void 0 || eventTime >= previousTime) {
-      eventTimes.set(actorId, eventTime);
-    }
-  }
-  isStaleActorSelectionEvent(pollId, actorId, at) {
-    const previousTime = this.selectionEventTimesByPoll.get(pollId)?.get(actorId);
-    return previousTime !== void 0 && at.getTime() < previousTime;
   }
 };
 var messageCaches = /* @__PURE__ */ new WeakMap();
@@ -1711,8 +1659,7 @@ var fetchPollInfo = async (client, cache, event) => {
   }
 };
 var resolvePoll = async (client, cache, event) => {
-  const pollId = event.pollMessageGuid;
-  const cached = cache.get(pollId);
+  const cached = cache.get(event.pollMessageGuid);
   if (cached) {
     return cached;
   }
@@ -1747,25 +1694,6 @@ var buildPollOptionMessage = (input) => {
     })
   };
 };
-var buildPollOptionMessages = (input) => {
-  const messages5 = [];
-  for (const delta of input.deltas) {
-    const message = buildPollOptionMessage({
-      cached: input.cached,
-      chatGuid: input.chatGuid,
-      event: input.event,
-      optionId: delta.optionId,
-      phone: input.phone,
-      selected: delta.selected,
-      senderAddress: input.senderAddress
-    });
-    if (message) {
-      messages5.push(message);
-    }
-  }
-  return messages5;
-};
-var allOptionIdsKnown = (cached, optionIds) => optionIds.every((optionId) => cached.optionsByIdentifier.has(optionId));
 var refreshPollMetadata = async (client, pollCache, event) => {
   const info = await fetchPollInfo(client, pollCache, event);
   if (!info) {
@@ -1773,94 +1701,39 @@ var refreshPollMetadata = async (client, pollCache, event) => {
   }
   return pollCache.get(info.pollMessageGuid);
 };
-var toPollVoteMessages = async (client, pollCache, event, phone) => {
+var toPollOptionMessage = async (client, pollCache, event, phone) => {
   const senderAddress = event.actor?.address;
-  if (!senderAddress) {
-    return [];
-  }
-  const pollId = event.pollMessageGuid;
-  if (pollCache.isStaleActorSelectionEvent(
-    pollId,
-    senderAddress,
-    event.occurredAt
-  )) {
+  const optionId = event.delta.optionIdentifier;
+  if (!(senderAddress && optionId)) {
     return [];
   }
-  const cached = await resolvePoll(client, pollCache, event);
+  let cached = await resolvePoll(client, pollCache, event);
   if (!cached) {
     return [];
   }
-  const chatGuidStr = event.chatGuid;
-  const currentOptionIds = [event.delta.optionIdentifier];
-  let resolvedPoll = cached;
-  if (currentOptionIds.some(
-    (optionId) => !resolvedPoll.optionsByIdentifier.has(optionId)
-  )) {
-    const snapshot = await refreshPollMetadata(client, pollCache, event);
-    if (snapshot) {
-      resolvedPoll = snapshot;
+  if (!cached.optionsByIdentifier.has(optionId)) {
+    const refreshed = await refreshPollMetadata(client, pollCache, event);
+    if (refreshed) {
+      cached = refreshed;
     }
   }
-  if (!allOptionIdsKnown(resolvedPoll, currentOptionIds)) {
-    return [];
-  }
-  const deltas = pollCache.actorSelectionDeltas(
-    pollId,
-    senderAddress,
-    currentOptionIds
-  );
-  const messages5 = buildPollOptionMessages({
-    cached: resolvedPoll,
-    chatGuid: chatGuidStr,
-    deltas,
-    event,
-    phone,
-    senderAddress
-  });
-  pollCache.commitActorSelection(
-    pollId,
-    senderAddress,
-    currentOptionIds,
-    event.occurredAt
-  );
-  return messages5;
-};
-var toPollUnvoteMessages = async (client, pollCache, event, phone) => {
-  const senderAddress = event.actor?.address;
-  if (!senderAddress) {
-    return [];
-  }
-  const pollId = event.pollMessageGuid;
-  if (pollCache.isStaleActorSelectionEvent(
-    pollId,
-    senderAddress,
-    event.occurredAt
-  )) {
-    return [];
-  }
-  const cached = await resolvePoll(client, pollCache, event);
-  if (!cached) {
-    return [];
-  }
-  const chatGuidStr = event.chatGuid;
-  const deltas = pollCache.clearedActorSelectionDeltas(pollId, senderAddress);
-  const messages5 = buildPollOptionMessages({
+  const message = buildPollOptionMessage({
     cached,
-    chatGuid: chatGuidStr,
-    deltas,
+    chatGuid: event.chatGuid,
     event,
+    optionId,
     phone,
+    selected: event.delta.type === "voted",
     senderAddress
   });
-  pollCache.commitActorSelection(pollId, senderAddress, [], event.occurredAt);
-  return messages5;
+  return message ? [message] : [];
 };
 var toPollDeltaMessages = async (client, pollCache, event, phone) => {
   if (isVotedPollEvent(event)) {
-    return toPollVoteMessages(client, pollCache, event, phone);
+    return toPollOptionMessage(client, pollCache, event, phone);
   }
   if (isUnvotedPollEvent(event)) {
-    return toPollUnvoteMessages(client, pollCache, event, phone);
+    return toPollOptionMessage(client, pollCache, event, phone);
   }
   return [];
 };
@@ -1875,7 +1748,7 @@ var isRetryableIMessageStreamError = (error) => {
   }
   return false;
 };
-var isEventFromCurrentAccount = (event, phone) => phone !== SHARED_PHONE && event.actor?.address !== void 0 && event.actor.address === phone;
+var isEventFromCurrentAccount = (event, phone) => event.isFromMe || phone !== SHARED_PHONE && event.actor?.address !== void 0 && event.actor.address === phone;
 var toMessageItem = async (client, event, phone, cursor) => {
   if (event.type === "message.received") {
     if (event.message.isFromMe) {

package/dist/providers/imessage/index.js

@@ -2,7 +2,7 @@ import {
   background,
   effect,
   imessage
-} from "../../chunk-OM5VSKWD.js";
+} from "../../chunk-3RBWEAQQ.js";
 import "../../chunk-5NHNMN4H.js";
 import "../../chunk-HWADNTQF.js";
 import "../../chunk-XZSBR26X.js";

package/dist/providers/index.js

@@ -1,6 +1,6 @@
 import {
   imessage
-} from "../chunk-OM5VSKWD.js";
+} from "../chunk-3RBWEAQQ.js";
 import "../chunk-5NHNMN4H.js";
 import {
   terminal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spectrum-ts",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -23,7 +23,7 @@
     }
   },
   "dependencies": {
-    "@photon-ai/advanced-imessage": "^0.7.0",
+    "@photon-ai/advanced-imessage": "^0.7.2",
     "@photon-ai/imessage-kit": "^3.0.0",
     "@photon-ai/otel": "^0.1.1",
     "@photon-ai/whatsapp-business": "^0.1.1",