Merge pull request #379 from SpiritFour/dev

Add free param back

Author: fellnerse

.github/workflows/deployment-dev.yml

@@ -24,7 +24,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/deployment-pr.yml

@@ -24,7 +24,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

components/ChatVisualization/PdfDownloadPopup.vue

@@ -263,7 +263,8 @@ export default {
     },
     downloadSample() {
       gtagEvent("sample_download", GTAG_PDF, 2);
-      this.download(true);
+      const query = (this.$route && this.$route.query) || {};
+      this.download(!('free' in query));
     },
     workerResponseHandler: function (event) {
       const data = event.data;

utils/transformChatData.js

@@ -115,7 +115,7 @@ export class Chat {
     chatObject = [],
     groupAfter = 9,
     maxWordsWordCloud = 150,
-    maxWordsEmojiCloud = 50000
+    maxWordsEmojiCloud = 150
   ) {
     // this one is the complete input
     this.chatObject = chatObject;
@@ -472,8 +472,20 @@ export class Chat {
     return this._allWords.then((x) => x.slice(0, this._maxWordsWordCloud));
   }
 
-  // New method to extract and count emojis, limited to 1000 emojis
   getEmojiCloudData() {
-    return this._allWords.then((x) => x.slice(0, this._maxWordsEmojiCloud));
+    return this._allWords.then((words) => {
+      const emojiFrequencies = {};
+
+      words.forEach(({ word, freq }) => {
+        onlyEmoji(word).forEach((emoji) => {
+          emojiFrequencies[emoji] = (emojiFrequencies[emoji] || 0) + freq;
+        });
+      });
+
+      return Object.entries(emojiFrequencies)
+        .sort((a, b) => b[1] - a[1])
+        .slice(0, this._maxWordsEmojiCloud)
+        .map(([word, freq]) => ({ word, freq }));
+    });
   }
 }

utils/transformChatData.spec.js

@@ -0,0 +1,21 @@
+/* eslint-env jest */
+import { Chat } from "./transformChatData";
+
+describe("Chat.getEmojiCloudData", () => {
+  it("extracts and aggregates emojis before applying the display limit", async () => {
+    const chat = Object.create(Chat.prototype);
+    chat._maxWordsEmojiCloud = 2;
+    chat._allWords = Promise.resolve([
+      { word: "common", freq: 10 },
+      { word: "hello😂", freq: 3 },
+      { word: "goodbye😂", freq: 2 },
+      { word: "wave👋", freq: 2 },
+      { word: "rare👍", freq: 1 },
+    ]);
+
+    await expect(chat.getEmojiCloudData()).resolves.toEqual([
+      { word: "😂", freq: 5 },
+      { word: "👋", freq: 2 },
+    ]);
+  });
+});