ReviewDB: proper multi account support

3 files changed, 9 insertions, 7 deletions

diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
index 5792400..1865917 100644
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -20,12 +20,12 @@ import { openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { LazyComponent } from "@utils/react";
 import { filters, findBulk } from "@webpack";
-import { Alerts, moment, Parser, Timestamp } from "@webpack/common";
+import { Alerts, moment, Parser, showToast, Timestamp } from "@webpack/common";
 
 import { Review, ReviewType } from "../entities";
 import { deleteReview, reportReview } from "../reviewDbApi";
 import { settings } from "../settings";
-import { canDeleteReview, cl, showToast } from "../utils";
+import { canDeleteReview, cl } from "../utils";
 import { DeleteButton, ReportButton } from "./MessageButton";
 import ReviewBadge from "./ReviewBadge";
 
diff --git a/src/plugins/reviewDB/components/ReviewModal.tsx b/src/plugins/reviewDB/components/ReviewModal.tsx
index 6e85dc2..9669a2b 100644
--- a/src/plugins/reviewDB/components/ReviewModal.tsx
+++ b/src/plugins/reviewDB/components/ReviewModal.tsx
@@ -21,8 +21,8 @@ import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, Mo
 import { useForceUpdater } from "@utils/react";
 import { Paginator, Text, useRef, useState } from "@webpack/common";
 
+import { Auth } from "../auth";
 import { Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
-import { settings } from "../settings";
 import { cl } from "../utils";
 import ReviewComponent from "./ReviewComponent";
 import ReviewsView, { ReviewsInputComponent } from "./ReviewsView";
@@ -35,7 +35,7 @@ function Modal({ modalProps, discordId, name }: { modalProps: any; discordId: st
     const ref = useRef<HTMLDivElement>(null);
 
     const reviewCount = data?.reviewCount;
-    const ownReview = data?.reviews.find(r => r.sender.discordID === settings.store.user?.discordID);
+    const ownReview = data?.reviews.find(r => r.sender.discordID === Auth.user?.discordID);
 
     return (
         <ErrorBoundary>
@@ -68,6 +68,7 @@ function Modal({ modalProps, discordId, name }: { modalProps: any; discordId: st
                             <ReviewComponent
                                 refetch={refetch}
                                 review={ownReview}
+                                profileId={discordId}
                             />
                         )}
                         <ReviewsInputComponent
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index 5eb370f..a87598b 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -18,12 +18,13 @@
 
 import { LazyComponent, useAwaiter, useForceUpdater } from "@utils/react";
 import { find, findByPropsLazy } from "@webpack";
-import { Forms, React, RelationshipStore, useRef, UserStore } from "@webpack/common";
+import { Forms, React, RelationshipStore, showToast, useRef, UserStore } from "@webpack/common";
 
+import { Auth, authorize } from "../auth";
 import { Review } from "../entities";
 import { addReview, getReviews, Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
 import { settings } from "../settings";
-import { authorize, cl, showToast } from "../utils";
+import { cl } from "../utils";
 import ReviewComponent from "./ReviewComponent";
 
 
@@ -120,7 +121,7 @@ function ReviewList({ refetch, reviews, hideOwnReview, profileId }: { refetch():
 
 
 export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: { discordId: string, name: string; isAuthor: boolean; refetch(): void; }) {
-    const { token } = settings.store;
+    const { token } = Auth;
     const editorRef = useRef<any>(null);
     const inputType = InputTypes.FORM;
     inputType.disableAutoFocus = true;