@meetelise/chat 1.53.0 → 1.53.2

package/src/WebComponent/Scheduler/tour-scheduler.ts

@@ -780,6 +780,7 @@ export class TourScheduler extends LitElement {
       ).map((source) => snakify({ ...source })),
       google_rwg_token: googleReferral?.rwgToken,
       google_referral_building_id: googleReferral?.buildingId,
+      google_environment: googleReferral?.environment,
     };
 
     const url = `https://app.meetelise.com/platformApi/state/create/v2/scheduleMe`;

package/src/WebComponent/pubnub-message.ts

@@ -107,21 +107,25 @@ export class PubnubMessage extends LitElement {
         const allWords = this.preserveHTMLTags(sanitizedLine);
         if (!allWords) return html``;
         return html`${allWords.map((word) => {
-            if (hyperlinks.find((obj) => obj.id === word)) {
-              // EliseAI made hyperlink
-              const link = hyperlinks.find((obj) => obj.id === word);
-              if (!link) return;
-              imagesToDisplay.push({
-                redirectTo: link?.link,
-                source: link?.link,
+            const markedLinks = hyperlinks.filter((obj) =>
+              word.includes(obj.id)
+            );
+            if (markedLinks.length) {
+              // EliseAI made hyperlink, possibly inside markdown formatting like <b>
+              let wordWithLinks = word;
+              markedLinks.forEach((link) => {
+                imagesToDisplay.push({
+                  redirectTo: link.link,
+                  source: link.link,
+                });
+                wordWithLinks = wordWithLinks.replace(
+                  link.id,
+                  this.hyperlinkHTML(link.link, link.hyperlink)
+                );
               });
-              return html`<a
-                class="redirect-link"
-                href="${link?.link}"
-                target="_blank"
-                rel="noopener noreferrer"
-                >${link?.hyperlink}
-              </a>`;
+              return html`${unsafeHTML(
+                DOMPurify.sanitize(wordWithLinks, { ADD_ATTR: ["target"] })
+              )} `;
             }
             if (urlRegex.test(word)) {
               // general url
@@ -145,6 +149,16 @@ export class PubnubMessage extends LitElement {
     });
   }
 
+  private hyperlinkHTML(link: string, hyperlink: string): string {
+    const anchor = document.createElement("a");
+    anchor.className = "redirect-link";
+    anchor.href = link;
+    anchor.target = "_blank";
+    anchor.rel = "noopener noreferrer";
+    anchor.textContent = hyperlink;
+    return anchor.outerHTML;
+  }
+
   private preserveHTMLTags(text: string): string[] {
     const tagRegex = /(<\/?[a-z][^>]*>[^<]*<\/?[a-z]*>|[^\s]+[.,?!]?|\S)/gi;
     const splitTags = text.match(tagRegex);

package/src/googleReserve.test.ts

@@ -22,26 +22,33 @@ describe("Google Reserve", () => {
     visit(originalSearch);
   });
 
-  it("remembers a click from a Google listing, keeping the token intact", () => {
-    visit("?elise_open=tour&rwg_token=AFd1x%3D%3D");
+  it("remembers a click from our Google feed, keeping the token intact", () => {
+    visit("?elise_open=tour&elise_google_env=production&rwg_token=AFd1x%3D%3D");
     storeGoogleReserveReferral(7);
     visit("");
 
     expect(readGoogleReserveReferral()).to.include({
       rwgToken: "AFd1x==",
+      environment: "production",
       buildingId: 7,
     });
   });
 
-  it("has no referral without a token or once it has expired", () => {
+  it("has no referral without our feed's token or once it has expired", () => {
     visit("?utm_source=website");
     storeGoogleReserveReferral(7);
     expect(readGoogleReserveReferral()).to.equal(null);
 
+    // Another integration's Google link.
+    visit("?rwg_token=AFd1x%3D%3D");
+    storeGoogleReserveReferral(7);
+    expect(readGoogleReserveReferral()).to.equal(null);
+
     localStorage.setItem(
       STORAGE_KEY,
       JSON.stringify({
         rwgToken: "AFd1x==",
+        environment: "production",
         buildingId: 7,
         expiresAt: Date.now() - 1,
       })

package/src/googleReserve.ts

@@ -3,9 +3,12 @@ const REFERRAL_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 const REFERRAL_STORAGE_KEY = "com.eliseai.webchat.googlereserve.referral";
 // Google "Book" links to a customer's page add this so the widget opens the tour scheduler.
 const OPEN_PARAM = "elise_open";
+// Our Google feed tags its links with the Actions Center environment.
+const ENVIRONMENT_PARAM = "elise_google_env";
 
 type GoogleReserveReferral = {
   rwgToken: string;
+  environment: string;
   buildingId: number;
   expiresAt: number;
 };
@@ -16,14 +19,19 @@ export const shouldOpenTourSchedulerFromUrl = (): boolean =>
 /**
  * Remembers a click from a building's Google listing, which arrives with an
  * `rwg_token` query param, so a booking within 30 days can be reported back.
+ * Only links from our feed count: other integrations' links carry an
+ * `rwg_token` too.
  */
 export const storeGoogleReserveReferral = (buildingId: number): void => {
-  const rwgToken = new URLSearchParams(window.location.search).get("rwg_token");
-  if (!rwgToken || !buildingId) {
+  const params = new URLSearchParams(window.location.search);
+  const rwgToken = params.get("rwg_token");
+  const environment = params.get(ENVIRONMENT_PARAM);
+  if (!rwgToken || !environment || !buildingId) {
     return;
   }
   const referral: GoogleReserveReferral = {
     rwgToken,
+    environment,
     buildingId,
     expiresAt: Date.now() + REFERRAL_TTL_MS,
   };

package/src/pubnub-message.test.ts

@@ -0,0 +1,44 @@
+import { expect } from "@esm-bundle/chai";
+import "../public/dist/index";
+import type { SimpleTextChatMessage } from "./MyPubnub";
+import type { PubnubMessage } from "./WebComponent/pubnub-message";
+
+declare const it: (name: string, callback: () => void | Promise<void>) => void;
+
+const renderMessage = async (message: string): Promise<ShadowRoot> => {
+  const element = document.createElement("pubnub-message") as PubnubMessage;
+  element.message = {
+    timestamp: 100,
+    message,
+    isLeadMessage: false,
+    chunks: [{ text: message, order: 0, isDone: true }],
+    type: "text" as SimpleTextChatMessage["type"],
+  };
+  document.body.appendChild(element);
+  await element.updateComplete;
+  await element.updateComplete;
+  return element.shadowRoot as ShadowRoot;
+};
+
+it("renders bolded and plain markdown links as links to the community", async () => {
+  const root = await renderMessage(
+    "- **[Alder House](https://www.clg-test.com/alder)** apartment 109\n" +
+      "- [Cedar Row](https://www.clg-test.com/cedar) apartment 103"
+  );
+
+  const boldLink = root.querySelector("b a.redirect-link");
+  expect(boldLink?.getAttribute("href")).to.equal(
+    "https://www.clg-test.com/alder"
+  );
+  expect(boldLink?.getAttribute("target")).to.equal("_blank");
+  expect(boldLink?.textContent?.trim()).to.equal("Alder House");
+
+  const plainLink = Array.from(root.querySelectorAll("a.redirect-link")).find(
+    (anchor) => anchor.textContent?.trim() === "Cedar Row"
+  );
+  expect(plainLink?.getAttribute("href")).to.equal(
+    "https://www.clg-test.com/cedar"
+  );
+  expect(plainLink?.getAttribute("target")).to.equal("_blank");
+  expect(root.textContent).not.to.match(/[0-9a-f]{32}/);
+});