Tidy up and do not track in incognito

README.md

@@ -6,7 +6,11 @@
 
 CrowdWise is a Google Chrome extension that adds to your browsing experience by showing you relevant discussions about your current web page from Hacker News and Reddit.
 
-[![Screenshot](assets/screenshot-1.jpeg)](https://chrome.google.com/webstore/detail/crowdwise/hogoebkpcnajkkjdidfhojkljppfalip)
+<p align="center" >
+  <a href="https://chrome.google.com/webstore/detail/crowdwise/hogoebkpcnajkkjdidfhojkljppfalip">
+    <img src="assets/screenshot-1.png">
+  </a>
+</p>
 
 ## Features
 

src/containers/HotkeysListenerButton.tsx

@@ -1,6 +1,7 @@
 import _ from "lodash";
 import React, { useState } from "react";
 
+import { KEY_INCOGNITO_MODE } from "../shared/constants";
 import { EventType, sendEventsToServerViaWorker } from "../shared/events";
 import { useSettingsStore } from "../shared/settings";
 import { useHotkeysPressed } from "../shared/useHotkeysPressed";
@@ -25,11 +26,14 @@ const HotkeysListenerButton = (props: Props) => {
   ] = useSettingsStore();
   const setKeyValueWithEvents = (key: string, value: any) => {
     setKeyValue(key, value);
-    sendEventsToServerViaWorker({
-      eventType: EventType.CHANGE_SETTING,
-      settingKey: key,
-      settingValue: value,
-    });
+    sendEventsToServerViaWorker(
+      {
+        eventType: EventType.CHANGE_SETTING,
+        settingKey: key,
+        settingValue: value,
+      },
+      settings[KEY_INCOGNITO_MODE]
+    );
   };
 
   // "+" and "," are special delimiters used by react-hotkeys-hook

src/containers/ResultCard.tsx

@@ -6,6 +6,7 @@ import {
   COLOR_IF_OUTSIDE_HASH,
   KEY_BOLD_INITIAL_CHARS_OF_WORDS,
   KEY_FONT_SIZES,
+  KEY_INCOGNITO_MODE,
   KEY_SHOULD_COLOR_FOR_SUBMITTED_BY,
 } from "../shared/constants";
 import { EventType, sendEventsToServerViaWorker } from "../shared/events";
@@ -21,22 +22,26 @@ interface Props {
 const logForumResultEvent = (
   eventType: EventType,
   cardPosition: number,
-  result: ResultItem
+  result: ResultItem,
+  isIncognitoMode: boolean
 ) => {
-  sendEventsToServerViaWorker({
-    eventType,
-    resultCardPosition: cardPosition,
-    resultSubmittedUrl: result.submittedUrl,
-    resultSubmittedDate: result.submittedDate,
-    resultSubmittedUpvotes: result.submittedUpvotes,
-    resultSubmittedTitle: result.submittedTitle,
-    resultSubmittedBy: result.submittedBy,
-    resultSubmittedByLink: result.submittedByLink,
-    resultCommentsCount: result.commentsCount,
-    resultCommentsLink: result.commentsLink,
-    resultSubSourceName: result.subSourceName,
-    resultSubSourceLink: result.subSourceLink,
-  });
+  sendEventsToServerViaWorker(
+    {
+      eventType,
+      resultCardPosition: cardPosition,
+      resultSubmittedUrl: result.submittedUrl,
+      resultSubmittedDate: result.submittedDate,
+      resultSubmittedUpvotes: result.submittedUpvotes,
+      resultSubmittedTitle: result.submittedTitle,
+      resultSubmittedBy: result.submittedBy,
+      resultSubmittedByLink: result.submittedByLink,
+      resultCommentsCount: result.commentsCount,
+      resultCommentsLink: result.commentsLink,
+      resultSubSourceName: result.subSourceName,
+      resultSubSourceLink: result.subSourceLink,
+    },
+    isIncognitoMode
+  );
 };
 
 const ResultCard = (props: Props) => {
@@ -56,6 +61,7 @@ const ResultCard = (props: Props) => {
 
   const boldInitialCharsOfWords = settings[KEY_BOLD_INITIAL_CHARS_OF_WORDS];
   const fontSizes = settings[KEY_FONT_SIZES];
+  const isIncognitoMode = settings[KEY_INCOGNITO_MODE];
   const colorForSubmittedBy = settings[KEY_SHOULD_COLOR_FOR_SUBMITTED_BY]
     ? hashStringToColor(result.submittedBy)
     : COLOR_IF_OUTSIDE_HASH;
@@ -67,7 +73,8 @@ const ResultCard = (props: Props) => {
         logForumResultEvent(
           EventType.CLICK_SIDEBAR_FORUM_RESULT_TITLE,
           cardPosition,
-          result
+          result,
+          isIncognitoMode
         );
         onCardClick(result.commentsLink);
       }}
@@ -84,7 +91,8 @@ const ResultCard = (props: Props) => {
                 logForumResultEvent(
                   EventType.CLICK_SIDEBAR_FORUM_RESULT_SUB_SOURCE,
                   cardPosition,
-                  result
+                  result,
+                  isIncognitoMode
                 );
                 e.stopPropagation();
               }}
@@ -110,7 +118,8 @@ const ResultCard = (props: Props) => {
             logForumResultEvent(
               EventType.CLICK_SIDEBAR_FORUM_RESULT_TITLE,
               cardPosition,
-              result
+              result,
+              isIncognitoMode
             );
             e.stopPropagation();
           }}

src/containers/SettingsPanel.tsx

@@ -48,14 +48,6 @@ export const SettingsPanel = (props: Props) => {
     error,
     isLoadingStore,
   ] = useSettingsStore();
-  const setKeyValueWithEvents = (key: string, value: any) => {
-    setKeyValue(key, value);
-    sendEventsToServerViaWorker({
-      eventType: EventType.CHANGE_SETTING,
-      settingKey: key,
-      settingValue: value,
-    });
-  };
 
   const sideBarWidth = settings[KEY_SIDEBAR_WIDTH];
   const sideBarOpacity = settings[KEY_SIDEBAR_OPACITY];
@@ -72,6 +64,18 @@ export const SettingsPanel = (props: Props) => {
     settings[KEY_SHOULD_SHOW_SIDEBAR_ONLY_ON_EXACT_RESULTS];
   const isIncognitoMode = settings[KEY_INCOGNITO_MODE];
 
+  const setKeyValueWithEvents = (key: string, value: any) => {
+    setKeyValue(key, value);
+    sendEventsToServerViaWorker(
+      {
+        eventType: EventType.CHANGE_SETTING,
+        settingKey: key,
+        settingValue: value,
+      },
+      isIncognitoMode
+    );
+  };
+
   const setSideBarWidth = (state: number) =>
     setKeyValueWithEvents(KEY_SIDEBAR_WIDTH, state);
   const setSideBarOpacity = (state: number) =>

src/pages/Sidebar/Sidebar.tsx

@@ -66,6 +66,7 @@ const Sidebar = () => {
   ] = useSettingsStore();
 
   const hotkeysToggleSidebar = settings[KEY_HOTKEYS_TOGGLE_SIDEBAR];
+  const isIncognitoMode = settings[KEY_INCOGNITO_MODE];
 
   // Handles message from background script that our URL changed.
   // We receive this message only when we are in a SPA and the link changes without full-page reload.
@@ -218,9 +219,12 @@ const Sidebar = () => {
                     <CogIcon
                       className="h-5 w-5 text-slate-500"
                       onClick={() =>
-                        sendEventsToServerViaWorker({
-                          eventType: EventType.CLICK_SIDEBAR_SETTING_ICON,
-                        })
+                        sendEventsToServerViaWorker(
+                          {
+                            eventType: EventType.CLICK_SIDEBAR_SETTING_ICON,
+                          },
+                          isIncognitoMode
+                        )
                       }
                     />
                   </Popover.Button>
@@ -247,9 +251,12 @@ const Sidebar = () => {
                     <QuestionMarkCircleIcon
                       className="h-5 w-5 text-slate-500"
                       onClick={() =>
-                        sendEventsToServerViaWorker({
-                          eventType: EventType.CLICK_SIDEBAR_HELP_ICON,
-                        })
+                        sendEventsToServerViaWorker(
+                          {
+                            eventType: EventType.CLICK_SIDEBAR_HELP_ICON,
+                          },
+                          isIncognitoMode
+                        )
                       }
                     />
                   </Popover.Button>

src/shared/events.ts

@@ -1,5 +1,6 @@
 import { log } from "../utils/log";
-import { EVENTS_HOST } from "./constants";
+import { EVENTS_HOST, KEY_INCOGNITO_MODE } from "./constants";
+import { useSettingsStore } from "./settings";
 
 export enum EventType {
   CLICK_SIDEBAR_FORUM_RESULT_TITLE = "click_sidebar_forum_result_title",
@@ -23,6 +24,11 @@ export const sendEventsToServer = async (payload: Map<string, any>) => {
   }
 };
 
-export const sendEventsToServerViaWorker = (payload: any) => {
-  chrome.runtime.sendMessage({ eventPayload: payload });
+export const sendEventsToServerViaWorker = (
+  payload: any,
+  isIncognitoMode: boolean
+) => {
+  if (!isIncognitoMode) {
+    chrome.runtime.sendMessage({ eventPayload: payload });
+  }
 };