refactor: update mode terminology from smart/unlimited to whitelist/blacklist

Maphikza · Maphikza · commit dfb3d88fe58c · 2025-05-08T11:33:17.000+02:00
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ We have a live demo that can be found at http://hornetstorage.net for anyone tha
 
 ## Key Features
 - Manage your hornet-storage relay config directly from the panel
-- Switch between our new dumb and smart model for accepting nostr notes
+- Switch between our new whitelist and blacklist model for accepting nostr notes
 - Decide from which of the supported nostr kinds to enable
 - Choose which supported transport protocols to enable such as libp2p and websockets
 - Enable / disable which media extensions are accepted by the relay such as png and mp4
diff --git a/src/components/header/components/settingsDropdown/settingsOverlay/ServerPicker/SmartBaseModeSettings.tsx b/src/components/header/components/settingsDropdown/settingsOverlay/ServerPicker/SmartBaseModeSettings.tsx
@@ -21,7 +21,7 @@ export const SmartBaseModeSettings: React.FC = () => {
   const kinds = useAppSelector((state) => state.mode.kinds);
 
   const handleModeChange = () => {
-    dispatch(setMode(mode === 'smart' ? 'unlimited' : 'smart'));
+    dispatch(setMode(mode === 'whitelist' ? 'blacklist' : 'whitelist'));
   };
 
   // Example kinds options, adjust as necessary
@@ -38,13 +38,13 @@ export const SmartBaseModeSettings: React.FC = () => {
       <SwitchContainer>
         <span>{t('common.serverSetting')}</span>
         <BaseSwitch
-          checkedChildren="Smart"
-          unCheckedChildren="unlimited"
-          checked={mode === 'smart'}
+          checkedChildren="Whitelist"
+          unCheckedChildren="Blacklist"
+          checked={mode === 'whitelist'}
           onChange={handleModeChange}
         />
       </SwitchContainer>
-      <h4>{mode === 'smart' ? t('common.supportedKindsAndMedia') : t('common.unsupportedKindsAndMedia')}</h4>
+      <h4>{mode === 'whitelist' ? t('common.supportedKindsAndMedia') : t('common.unsupportedKindsAndMedia')}</h4>
       <>
         <BaseSelect
           mode="multiple"
diff --git a/src/components/moderation/ModerationNotifications/ModerationNotifications.tsx b/src/components/moderation/ModerationNotifications/ModerationNotifications.tsx
@@ -120,10 +120,41 @@ export const ModerationNotifications: React.FC<ModerationNotificationsProps> = (
       setIsModalVisible(true);
     } catch (error) {
       console.error('Failed to fetch event details:', error);
-      notificationController.error({
-        message: 'Failed to fetch event details',
-        description: error instanceof Error ? error.message : 'Unknown error'
-      });
+      
+      // Check if this is a 400 error (event not found)
+      if (error instanceof Error && error.message.includes('400')) {
+        // Add this event ID to the list of non-existent events
+        // This is done by accessing the module-level variable directly
+        (window as any).nonExistentEventIds = (window as any).nonExistentEventIds || new Set<string>();
+        (window as any).nonExistentEventIds.add(eventId);
+        
+        // Show success message to the user
+        notificationController.success({
+          message: 'Notification removed',
+          description: 'The notification was automatically removed because the referenced event no longer exists'
+        });
+        
+        // Try to delete on backend, but don't worry if it fails
+        try {
+          await deleteEvent(eventId);
+        } catch (deleteError) {
+          // Silently ignore the error since we're handling it locally
+          console.log('Backend delete failed, handling locally:', deleteError);
+        }
+        
+        // Refresh the notifications list to ensure our changes take effect
+        fetchNotifications({
+          page: pagination?.currentPage || 1,
+          limit: pagination?.pageSize || 10,
+          filter
+        });
+      } else {
+        // For other errors, show the standard error message
+        notificationController.error({
+          message: 'Failed to fetch event details',
+          description: error instanceof Error ? error.message : 'Unknown error'
+        });
+      }
     } finally {
       setIsEventLoading(false);
     }
diff --git a/src/components/relay-settings/layouts/DesktopLayout.tsx b/src/components/relay-settings/layouts/DesktopLayout.tsx
@@ -171,9 +171,9 @@ export const DesktopLayout: React.FC<DesktopLayoutProps> = ({
                         <S.LabelSpan>{t('common.serverSetting')}</S.LabelSpan>
                         <S.LargeSwitch
                             className="modeSwitch"
-                            checkedChildren="Strict"
-                            unCheckedChildren="Unlimited"
-                            checked={mode === 'smart'}
+                            checkedChildren="Whitelist"
+                            unCheckedChildren="Blacklist"
+                            checked={mode === 'whitelist'}
                             onChange={onModeChange}
                         />
                     </S.SwitchContainer>
diff --git a/src/components/relay-settings/layouts/MobileLayout.tsx b/src/components/relay-settings/layouts/MobileLayout.tsx
@@ -160,13 +160,13 @@ export const MobileLayout: React.FC<MobileLayoutProps> = ({
                     }}
                 >
                     <S.LabelSpan>{t('common.serverSetting')}</S.LabelSpan>
-                    <S.LargeSwitch
-                        className="modeSwitch"
-                        checkedChildren="Strict"
-                        unCheckedChildren="Unlimited"
-                        checked={mode === 'smart'}
-                        onChange={onModeChange}
-                    />
+                        <S.LargeSwitch
+                            className="modeSwitch"
+                            checkedChildren="Whitelist"
+                            unCheckedChildren="Blacklist"
+                            checked={mode === 'whitelist'}
+                            onChange={onModeChange}
+                        />
                 </S.SwitchContainer>
 
                 <KindsSection
diff --git a/src/components/relay-settings/sections/KindsSection/KindsSection.tsx b/src/components/relay-settings/sections/KindsSection/KindsSection.tsx
@@ -33,13 +33,13 @@ export const KindsSection: React.FC<KindsSectionProps> = ({
   onAddKind,
   onRemoveKind,
 }) => {
-  const header = mode !== 'smart' ? 'Blacklisted Kind Numbers' : 'Kind Numbers';
+  const header = mode !== 'whitelist' ? 'Blacklisted Kind Numbers' : 'Kind Numbers';
 
   return (
     <CollapsibleSection header={header}>
       <S.Card>
         <div className="flex-col w-full">
-          {mode !== 'unlimited' && mode !== '' && (
+          {mode !== 'blacklist' && mode !== '' && (
             <div className="switch-container">
               <BaseSwitch
                 checkedChildren="ON"
@@ -75,4 +75,4 @@ export const KindsSection: React.FC<KindsSectionProps> = ({
   );
 };
 
-export default KindsSection;
+export default KindsSection;
diff --git a/src/components/relay-settings/sections/KindsSection/components/AddKindForm.tsx b/src/components/relay-settings/sections/KindsSection/components/AddKindForm.tsx
@@ -19,7 +19,7 @@ export const AddKindForm: React.FC<AddKindFormProps> = ({ onAddKind, mode }) =>
     }
   };
 
-  if (mode === 'smart') {
+  if (mode === 'whitelist') {
     return null;
   }
 
@@ -40,4 +40,4 @@ export const AddKindForm: React.FC<AddKindFormProps> = ({ onAddKind, mode }) =>
   );
 };
 
-export default AddKindForm;
+export default AddKindForm;
diff --git a/src/components/relay-settings/sections/KindsSection/components/DynamicKindsList.tsx b/src/components/relay-settings/sections/KindsSection/components/DynamicKindsList.tsx
@@ -21,7 +21,7 @@ export const DynamicKindsList: React.FC<DynamicKindsListProps> = ({
   onRemoveKind,
   mode,
 }) => {
-  if (!dynamicKinds.length || mode === 'smart') {
+  if (!dynamicKinds.length || mode === 'whitelist') {
     return null;
   }
 
@@ -32,7 +32,7 @@ export const DynamicKindsList: React.FC<DynamicKindsListProps> = ({
   return (
     <BaseCheckbox.Group
       style={{ paddingLeft: '1rem' }}
-      className={`custom-checkbox-group grid-checkbox-group large-label ${dynamicKinds.length ? 'dynamic-group ' : ''}${mode === 'unlimited' ? 'blacklist-mode-active ' : ''}`}
+      className={`custom-checkbox-group grid-checkbox-group large-label ${dynamicKinds.length ? 'dynamic-group ' : ''}${mode === 'blacklist' ? 'blacklist-mode-active ' : ''}`}
       value={selectedDynamicKinds}
       onChange={handleChange}
     >
@@ -43,7 +43,7 @@ export const DynamicKindsList: React.FC<DynamicKindsListProps> = ({
         >
           <div className="checkbox-container">
             <BaseCheckbox
-              className={mode === 'unlimited' ? 'blacklist-mode-active' : ''}
+              className={mode === 'blacklist' ? 'blacklist-mode-active' : ''}
               value={kind}
             />
             <S.CheckboxLabel
@@ -65,4 +65,4 @@ export const DynamicKindsList: React.FC<DynamicKindsListProps> = ({
   );
 };
 
-export default DynamicKindsList;
+export default DynamicKindsList;
diff --git a/src/components/relay-settings/sections/KindsSection/components/KindsList.tsx b/src/components/relay-settings/sections/KindsSection/components/KindsList.tsx
@@ -34,7 +34,7 @@ export const KindsList: React.FC<KindsListProps> = ({
       className="large-label"
       value={selectedKinds}
       onChange={(checkedValues) => onKindsChange(checkedValues as string[])}
-      disabled={mode !== 'smart' ? false : !isKindsActive}
+      disabled={mode !== 'whitelist' ? false : !isKindsActive}
     >
       {groupedNoteOptions.map((group) => (
         <div key={group.id} style={{ paddingBottom: '2rem' }}>
@@ -44,11 +44,11 @@ export const KindsList: React.FC<KindsListProps> = ({
               <div className="checkbox-container" style={{ paddingLeft: '1rem' }} key={note.kindString}>
                 <BaseCheckbox
                   value={note.kindString}
-                  className={mode === 'unlimited' ? 'blacklist-mode-active' : ''}
-                  disabled={mode !== 'smart' ? false : !isKindsActive}
+                  className={mode === 'blacklist' ? 'blacklist-mode-active' : ''}
+                  disabled={mode !== 'whitelist' ? false : !isKindsActive}
                 />
                 <S.CheckboxLabel
-                  isActive={mode !== 'smart' ? true : isKindsActive}
+                  isActive={mode !== 'whitelist' ? true : isKindsActive}
                   style={{
                     paddingRight: '.8rem',
                     paddingLeft: '.8rem',
@@ -67,4 +67,4 @@ export const KindsList: React.FC<KindsListProps> = ({
   );
 };
 
-export default KindsList;
+export default KindsList;
diff --git a/src/components/relay-settings/sections/MediaSection/MediaSection.tsx b/src/components/relay-settings/sections/MediaSection/MediaSection.tsx
@@ -76,7 +76,7 @@ export const MediaSection: React.FC<MediaSectionProps> = ({
   audio,
 }) => {
   const getHeader = (type: string) => 
-    mode !== 'smart' ? `Blacklisted ${type} Extensions` : `${type} Extensions`;
+    mode !== 'whitelist' ? `Blacklisted ${type} Extensions` : `${type} Extensions`;
 
   return (
     <>
@@ -134,4 +134,4 @@ export const MediaSection: React.FC<MediaSectionProps> = ({
   );
 };
 
-export default MediaSection;
+export default MediaSection;
diff --git a/src/components/relay-settings/sections/MediaSection/components/MediaToggle.tsx b/src/components/relay-settings/sections/MediaSection/components/MediaToggle.tsx
@@ -14,7 +14,7 @@ export const MediaToggle: React.FC<MediaToggleProps> = ({
   onChange,
   mode,
 }) => {
-  if (mode === 'unlimited') {
+  if (mode === 'blacklist') {
     return null;
   }
 
@@ -30,4 +30,4 @@ export const MediaToggle: React.FC<MediaToggleProps> = ({
   );
 };
 
-export default MediaToggle;
+export default MediaToggle;
diff --git a/src/components/relay-settings/sections/MediaSection/components/MediaTypeList.tsx b/src/components/relay-settings/sections/MediaSection/components/MediaTypeList.tsx
@@ -44,13 +44,13 @@ export const MediaTypeList: React.FC<MediaTypeListProps> = ({
 
   return (
     <BaseCheckbox.Group
-      className={`custom-checkbox-group grid-checkbox-group ${mode === 'unlimited' ? 'blacklist-mode-active' : ''}`}
+      className={`custom-checkbox-group grid-checkbox-group ${mode === 'blacklist' ? 'blacklist-mode-active' : ''}`}
       options={options}
       value={selectedFormats}
       onChange={(checkedValues) => onChange(checkedValues as string[])}
-      disabled={mode !== 'smart' ? false : !isActive}
+      disabled={mode !== 'whitelist' ? false : !isActive}
     />
   );
 };
 
-export default MediaTypeList;
+export default MediaTypeList;
diff --git a/src/hooks/useModerationNotifications.ts b/src/hooks/useModerationNotifications.ts
@@ -56,6 +56,11 @@ interface UseModerationNotificationsResult {
   deleteEvent: (eventId: string) => Promise<{ success: boolean; message: string; event_id: string }>;
 }
 
+// Set of event IDs that we know don't exist in the backend
+// Store it in the window object so it can be accessed from other components
+(window as any).nonExistentEventIds = (window as any).nonExistentEventIds || new Set<string>();
+const nonExistentEventIds = (window as any).nonExistentEventIds;
+
 /**
  * Shared fetchNotifications function to be used by all hook instances
  */
@@ -110,8 +115,13 @@ const fetchModerationNotifications = async (params: ModerationNotificationParams
       }
     });
     
+    // Filter out notifications for events that we know don't exist
+    const filteredNotifications = data.notifications.filter(
+      (notification: ModerationNotification) => !nonExistentEventIds.has(notification.event_id)
+    );
+    
     // Merge server data with our local knowledge of read status
-    const mergedNotifications = data.notifications.map((notification: ModerationNotification) => {
+    const mergedNotifications = filteredNotifications.map((notification: ModerationNotification) => {
       // If we previously marked this as read manually, keep it marked as read
       if (manuallyMarkedAsRead.has(notification.id)) {
         return { ...notification, is_read: true };
@@ -123,9 +133,9 @@ const fetchModerationNotifications = async (params: ModerationNotificationParams
     globalNotifications = mergedNotifications;
     globalPagination = data.pagination;
     globalLastFetchTime = Date.now();
-    globalPreviousIds = new Set(data.notifications.map((n: ModerationNotification) => n.id));
+    globalPreviousIds = new Set(filteredNotifications.map((n: ModerationNotification) => n.id));
     
-    return { notifications: data.notifications, pagination: data.pagination };
+    return { notifications: mergedNotifications, pagination: data.pagination };
   } catch (error) {
     throw error;
   }
diff --git a/src/hooks/useRelaySettings.ts b/src/hooks/useRelaySettings.ts
@@ -39,7 +39,7 @@ const defaultTiers: SubscriptionTier[] = [
 ];
 
 const getInitialSettings = (): Settings => ({
-  mode: 'smart',
+  mode: 'whitelist',
   protocol: ['WebSocket'],
   kinds: [],
   dynamicKinds: [],
@@ -85,7 +85,7 @@ const useRelaySettings = () => {
 
     lastMode.current = relaySettings.mode;
 
-    if (relaySettings.mode === 'unlimited') {
+    if (relaySettings.mode === 'blacklist') {
       // Store current settings before clearing
       setPreviousSmartSettings({
         kinds: relaySettings.kinds,
@@ -101,8 +101,8 @@ const useRelaySettings = () => {
         videos: [],
         audio: [],
       }));
-    } else if (relaySettings.mode === 'smart' && previousSmartSettings) {
-      // Restore previous smart mode settings
+    } else if (relaySettings.mode === 'whitelist' && previousSmartSettings) {
+      // Restore previous whitelist mode settings
       setRelaySettings(prev => ({
         ...prev,
         kinds: previousSmartSettings.kinds,
@@ -144,12 +144,12 @@ const useRelaySettings = () => {
       moderationMode: settings.moderationMode,
       MimeTypeGroups: mimeGroups,
       isFileStorageActive: settings.isFileStorageActive,
-      MimeTypeWhitelist: settings.mode === 'smart'
+      MimeTypeWhitelist: settings.mode === 'whitelist'
         ? selectedMimeTypes
         : mimeTypeOptions
           .map(m => m.value)
           .filter(mimeType => !selectedMimeTypes.includes(mimeType)),
-      KindWhitelist: settings.mode === 'smart'
+      KindWhitelist: settings.mode === 'whitelist'
         ? settings.kinds
         : noteOptions
           .map(note => note.kindString)
@@ -183,20 +183,20 @@ const useRelaySettings = () => {
       settings.subscription_tiers = defaultTiers;
     }
 
-    if (backendSettings.mode === 'unlimited') {
-      // In unlimited mode, start with empty selections
+    if (backendSettings.mode === 'blacklist') {
+      // In blacklist mode, start with empty selections
       settings.photos = [];
       settings.videos = [];
       settings.audio = [];
       settings.kinds = [];
     } else {
-      // In smart mode, use the MimeTypeGroups directly
+      // In whitelist mode, use the MimeTypeGroups directly
       settings.photos = backendSettings.MimeTypeGroups?.images || [];
       settings.videos = backendSettings.MimeTypeGroups?.videos || [];
       settings.audio = backendSettings.MimeTypeGroups?.audio || [];
       settings.kinds = backendSettings.KindWhitelist || [];
 
-      // Store these as the previous smart settings
+      // Store these as the previous whitelist settings
       setPreviousSmartSettings({
         kinds: settings.kinds,
         photos: settings.photos,
@@ -254,8 +254,8 @@ const useRelaySettings = () => {
 
       if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
 
-      // Update previous smart settings after successful save
-      if (relaySettings.mode === 'smart') {
+      // Update previous whitelist settings after successful save
+      if (relaySettings.mode === 'whitelist') {
         setPreviousSmartSettings({
           kinds: relaySettings.kinds,
           photos: relaySettings.photos,
diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx
diff --git a/src/services/localStorage.service.ts b/src/services/localStorage.service.ts
diff --git a/src/store/slices/modeSlice.ts b/src/store/slices/modeSlice.ts
diff --git a/src/types/modeTypes.ts b/src/types/modeTypes.ts

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const AddKindForm: React.FC<AddKindFormProps> = ({ onAddKind, mode }) =>`
`19`	`19`	`}`
`20`	`20`	`};`
`21`	`21`
`22`		`- if (mode === 'smart') {`
	`22`	`+ if (mode === 'whitelist') {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`25`	`25`
`@@ -40,4 +40,4 @@ export const AddKindForm: React.FC<AddKindFormProps> = ({ onAddKind, mode }) =>`
`40`	`40`	`);`
`41`	`41`	`};`
`42`	`42`
`43`		`-export default AddKindForm;`
	`43`	`+export default AddKindForm;`