From 56643f9753e01cb6c28650d73ed4914490c34ce9 Mon Sep 17 00:00:00 2001
From: Sriram Hariharan <sghsri@gmail.com>
Date: Fri, 17 Nov 2023 11:11:01 -0600
Subject: [PATCH] bunch of misc changes

---
 src/background/util/hotReloadTab.ts           |  3 +++
 src/debug/hotReload.ts                        |  4 ++--
 src/shared/messages/index.ts                  |  4 ++--
 src/shared/storage/DevStore.ts                |  6 ++++++
 src/shared/storage/ExtensionStore.ts          |  2 ++
 src/shared/storage/OptionsStore.ts            |  4 ++++
 src/views/components/PopupMain.tsx            |  5 ++---
 src/views/components/common/Link/Link.tsx     |  4 ++--
 .../CourseButtons/CourseButtons.tsx           |  4 ++--
 src/views/hooks/useVersion.ts                 | 20 +++++++++++++++++++
 src/views/index.tsx                           |  6 ++++++
 11 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 src/views/hooks/useVersion.ts

diff --git a/src/background/util/hotReloadTab.ts b/src/background/util/hotReloadTab.ts
index ae2df8a2..f6c233ec 100644
--- a/src/background/util/hotReloadTab.ts
+++ b/src/background/util/hotReloadTab.ts
@@ -17,6 +17,7 @@ const HOT_RELOADING_WHITELIST = [
     'reddit.com',
     'gmail.com',
     'photopea.com',
+    'chat.openai.com',
 ];
 
 /**
@@ -39,3 +40,5 @@ export async function hotReloadTab(): Promise<void> {
         }
     });
 }
+
+
diff --git a/src/debug/hotReload.ts b/src/debug/hotReload.ts
index 108391e8..925f91a6 100644
--- a/src/debug/hotReload.ts
+++ b/src/debug/hotReload.ts
@@ -1,5 +1,5 @@
 import io from 'socket.io-client';
-import { bMessenger } from 'src/shared/messages';
+import { background } from 'src/shared/messages';
 
 const socket = io('http://localhost:9090');
 let reBuilding = false;
@@ -27,7 +27,7 @@ socket.on('reload', async () => {
     console.log('%c[hot-reloading] reloading...', 'color:white; background-color: orange;');
     chrome.tabs.query({ active: true, currentWindow: true }, tabs => {
         if (tabs?.[0]?.id) {
-            bMessenger.reloadExtension();
+            background.reloadExtension();
         }
     });
 });
diff --git a/src/shared/messages/index.ts b/src/shared/messages/index.ts
index f5b4ba10..590dd59f 100644
--- a/src/shared/messages/index.ts
+++ b/src/shared/messages/index.ts
@@ -16,9 +16,9 @@ export type BACKGROUND_MESSAGES = BrowserActionMessages &
 /**
  * A utility object that can be used to send type-safe messages to the background script
  */
-export const bMessenger = createMessenger<BACKGROUND_MESSAGES>('background');
+export const background = createMessenger<BACKGROUND_MESSAGES>('background');
 
 /**
  * A utility object that can be used to send type-safe messages to specific tabs
  */
-export const tabMessenger = createMessenger<TAB_MESSAGES>('tab');
+export const tabs = createMessenger<TAB_MESSAGES>('tab');
diff --git a/src/shared/storage/DevStore.ts b/src/shared/storage/DevStore.ts
index 1927add8..3b12c641 100644
--- a/src/shared/storage/DevStore.ts
+++ b/src/shared/storage/DevStore.ts
@@ -24,4 +24,10 @@ export const DevStore = createLocalStore<IDevStore>({
     reloadTabId: undefined,
 });
 
+
+
+
+
+
+
 debugStore({ devStore: DevStore });
diff --git a/src/shared/storage/ExtensionStore.ts b/src/shared/storage/ExtensionStore.ts
index cd12660c..09e71b11 100644
--- a/src/shared/storage/ExtensionStore.ts
+++ b/src/shared/storage/ExtensionStore.ts
@@ -15,4 +15,6 @@ export const ExtensionStore = createLocalStore<IExtensionStore>({
     lastUpdate: Date.now(),
 });
 
+
+
 debugStore({ ExtensionStore });
diff --git a/src/shared/storage/OptionsStore.ts b/src/shared/storage/OptionsStore.ts
index bc5cccbf..36ef2551 100644
--- a/src/shared/storage/OptionsStore.ts
+++ b/src/shared/storage/OptionsStore.ts
@@ -8,6 +8,8 @@ interface IOptionsStore {
     shouldHighlightConflicts: boolean;
     /** whether we should automatically scroll to load more courses on the course schedule page (without having to click next) */
     shouldScrollToLoad: boolean;
+
+    url: URL;
 }
 
 export const OptionsStore = createSyncStore<IOptionsStore>({
@@ -15,4 +17,6 @@ export const OptionsStore = createSyncStore<IOptionsStore>({
     shouldScrollToLoad: true,
 });
 
+// Clothing retailer right
+
 debugStore({ OptionsStore });
diff --git a/src/views/components/PopupMain.tsx b/src/views/components/PopupMain.tsx
index c17cb8fe..3fbab731 100644
--- a/src/views/components/PopupMain.tsx
+++ b/src/views/components/PopupMain.tsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { bMessenger } from 'src/shared/messages';
+import { background } from 'src/shared/messages';
 import useSchedules from '../hooks/useSchedules';
 import { Button } from './common/Button/Button';
 import ExtensionRoot from './common/ExtensionRoot/ExtensionRoot';
 
-const { clearCourses } = bMessenger;
 export default function PopupMain() {
     const [activeSchedule, schedules] = useSchedules();
 
@@ -15,7 +14,7 @@ export default function PopupMain() {
             <Button
                 onClick={() => {
                     if (!activeSchedule) return;
-                    clearCourses({ scheduleName: activeSchedule?.name });
+                    background.clearCourses({ scheduleName: activeSchedule?.name });
                 }}
             >
                 Clear Courses
diff --git a/src/views/components/common/Link/Link.tsx b/src/views/components/common/Link/Link.tsx
index 9dd9488b..9a3ae9f4 100644
--- a/src/views/components/common/Link/Link.tsx
+++ b/src/views/components/common/Link/Link.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import React, { PropsWithChildren } from 'react';
-import { bMessenger } from 'src/shared/messages';
+import { background } from 'src/shared/messages';
 import Text, { TextProps } from '../Text/Text';
 import styles from './Link.module.scss';
 
@@ -20,7 +20,7 @@ export default function Link(props: PropsWithChildren<Props>) {
     const { url } = props;
 
     if (url && !props.onClick) {
-        passedProps.onClick = () => bMessenger.openNewTab({ url });
+        passedProps.onClick = () => background.openNewTab({ url });
     }
     const isDisabled = props.disabled || (!url && !props.onClick);
 
diff --git a/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx b/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx
index 417eebde..5b5d1889 100644
--- a/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx
+++ b/src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { bMessenger } from 'src/shared/messages';
+import { background } from 'src/shared/messages';
 import { Course } from 'src/shared/types/Course';
 import { UserSchedule } from 'src/shared/types/UserSchedule';
 import { Button } from 'src/views/components/common/Button/Button';
@@ -13,7 +13,7 @@ type Props = {
     course: Course;
 };
 
-const { openNewTab, addCourse, removeCourse } = bMessenger;
+const { openNewTab, addCourse, removeCourse } = background;
 
 /**
  * This component displays the buttons for the course info popup, that allow the user to either
diff --git a/src/views/hooks/useVersion.ts b/src/views/hooks/useVersion.ts
new file mode 100644
index 00000000..7b24654e
--- /dev/null
+++ b/src/views/hooks/useVersion.ts
@@ -0,0 +1,20 @@
+import { Serialized } from 'chrome-extension-toolkit';
+import { useEffect, useState } from 'react';
+import { ExtensionStore } from 'src/shared/storage/ExtensionStore';
+
+export default function useVersion(): string {
+    const [version, setVersion] = useState<string>('');
+
+    useEffect(() => {
+        const listener = ExtensionStore.listen('version', ({ newValue }) => {
+            setVersion(newValue);
+        });
+
+        return () => {
+            ExtensionStore.removeListener(listener);
+        };
+    }, []);
+
+    return version;
+}
+    
\ No newline at end of file
diff --git a/src/views/index.tsx b/src/views/index.tsx
index b602954f..8bd664e3 100644
--- a/src/views/index.tsx
+++ b/src/views/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { background } from 'src/shared/messages';
 import render from './lib/react';
 
 import { ContextInvalidated, createShadowDOM, isExtensionPopup, onContextInvalidated } from 'chrome-extension-toolkit';
@@ -14,6 +15,11 @@ if (!support) {
     throw new Error('UT Registration Plus does not support this page, even though it should...');
 }
 
+// if we are in an iframe, throw an error
+if (window.self !== window.top) {
+    throw new Error('inside an iframe');
+}
+
 if (support === SiteSupport.EXTENSION_POPUP) {
     render(<PopupMain />, document.getElementById('root'));
 }