From ec4c1a29e2bbebce727de7a3e41335516c8fb519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 28 Oct 2024 16:23:51 +0100
Subject: [PATCH] Cleanup, fix sensitive content overlay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 index.html                                      |  2 +-
 src/components/account.tsx                      | 17 ++++++++++++++---
 src/components/scrollable-list.tsx              |  2 +-
 src/components/status.tsx                       |  4 ++--
 .../status/components/detailed-status.tsx       |  7 ++-----
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index 665e33dc8..688f33c83 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,7 @@
   </body>
   <script>
     window.BIG_BUFFET_CONFIG = {
-      baseUrl: 'https://pleroma.woodynet.net/',
+      baseUrl: 'https://pl.fediverse.pl/',
       mountPoint: 'bigbuffet',
       styles: ['default', 'generated'],
       icons: {},
diff --git a/src/components/account.tsx b/src/components/account.tsx
index 840ed7bd9..bb493938f 100644
--- a/src/components/account.tsx
+++ b/src/components/account.tsx
@@ -9,13 +9,14 @@ import VerificationBadge from 'bigbuffet/components/verification-badge';
 import bigBuffetConfig from 'bigbuffet/config';
 import Emojify from 'bigbuffet/features/emoji';
 import ActionButton from 'bigbuffet/features/ui/components/action-button';
+import { useModalsStore } from 'bigbuffet/stores/modals';
 import { getAcct } from 'bigbuffet/utils/accounts';
 
 import type { NormalizedAccount as AccountEntity } from 'pl-hooks';
 
 interface IProfilePopper {
   condition: boolean;
-  wrapper: (children: any) => React.ReactElement<any, any>;
+  wrapper: (children: React.ReactNode) => React.ReactElement<any, any>;
   children: React.ReactNode;
 }
 
@@ -36,7 +37,7 @@ export interface IAccount {
   timestamp?: string;
   timestampUrl?: string;
   withLinkToProfile?: boolean;
-  showEdit?: boolean;
+  showEdit?: string | false;
 }
 
 const Account = ({
@@ -53,6 +54,8 @@ const Account = ({
   const overflowRef = React.useRef<HTMLDivElement>(null);
   const actionRef = React.useRef<HTMLDivElement>(null);
 
+  const { openModal } = useModalsStore();
+
   const username = account ? getAcct(account, bigBuffetConfig.displayFqn) : null;
 
   const renderAction = () => {
@@ -92,6 +95,8 @@ const Account = ({
     </div>
   );
 
+  const openCompareHistoryModal = () => showEdit && openModal('COMPARE_HISTORY', { statusId: showEdit });
+
   return (
     <div data-testid='account' className='account-card__container' ref={overflowRef}>
       <div className='account-card'>
@@ -176,7 +181,13 @@ const Account = ({
                 <>
                   <span>&middot;</span>
 
-                  <Icon className='account-card__account__name__edit-icon' icon='edit' />
+                  <div
+                    onClick={openCompareHistoryModal}
+                    role='button'
+                    tabIndex={0}
+                  >
+                    <Icon className='account-card__account__name__edit-icon' icon='edit' />
+                  </div>
                 </>
               ) : null}
             </div>
diff --git a/src/components/scrollable-list.tsx b/src/components/scrollable-list.tsx
index 513ea3fca..79ff821aa 100644
--- a/src/components/scrollable-list.tsx
+++ b/src/components/scrollable-list.tsx
@@ -122,7 +122,7 @@ const ScrollableList = React.forwardRef<Virtualizer<any, any>, IScrollableList &
     if (autoloadMore || !hasMore || !onLoadMore) {
       return null;
     } else {
-      const button = <LoadMore className='mt-4' visible={!isLoading} onClick={onLoadMore} />;
+      const button = <LoadMore visible={!isLoading} onClick={onLoadMore} />;
 
       return button;
     }
diff --git a/src/components/status.tsx b/src/components/status.tsx
index 5c8b2337a..35b89740f 100644
--- a/src/components/status.tsx
+++ b/src/components/status.tsx
@@ -265,7 +265,7 @@ const Status: React.FC<IStatus> = (props) => {
               timestampUrl={actualStatus.url}
               action={accountAction}
               hideActions={!accountAction}
-              showEdit={!!actualStatus.edited_at}
+              showEdit={actualStatus.edited_at ? actualStatus.id : false}
               showAccountHoverCard={hoverable}
               withLinkToProfile={hoverable}
             />
@@ -279,7 +279,7 @@ const Status: React.FC<IStatus> = (props) => {
               style={{ minHeight: actualStatus.sensitive ? Math.max(minHeight, 208) + 12 : undefined }}
             >
               {actualStatus.sensitive && (
-                <SensitiveContentOverlay status={status} ref={overlay} />
+                <SensitiveContentOverlay status={actualStatus} ref={overlay} />
               )}
 
               {actualStatus.event ? <EventPreview status={actualStatus} /> : (
diff --git a/src/features/status/components/detailed-status.tsx b/src/features/status/components/detailed-status.tsx
index 66a3a48a3..15ec46b56 100644
--- a/src/features/status/components/detailed-status.tsx
+++ b/src/features/status/components/detailed-status.tsx
@@ -80,11 +80,8 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
         className='detailed-status__body'
         style={{ minHeight: actualStatus.sensitive ? Math.max(minHeight, 208) + 12 : undefined }}
       >
-        {(actualStatus.sensitive) && (
-          <SensitiveContentOverlay
-            status={status}
-            ref={overlay}
-          />
+        {actualStatus.sensitive && (
+          <SensitiveContentOverlay status={actualStatus} ref={overlay} />
         )}
 
         <div className='detailed-status__content'>