[StashRandomButton] Consistent Randomization on All Pages (#567)

Author: MrDocSabio

plugins/StashRandomButton/README.md

@@ -40,8 +40,43 @@ Adds a "Random" button to the Stash UI, letting you instantly jump to a random s
    - The button should appear on those pages.
 
 ## Usage
-Click the "Random" button in the navigation bar to jump to a random entity (scene, image, performer, studio, group, tag, or gallery) depending on your current page.
-  - On internal entity pages (e.g., performer, studio, group, tag, gallery), the button picks a random scene or image from inside that entity.
+
+Click the "Random" button in the navigation bar to instantly jump to a random item, with behavior depending on your current page:
+
+- **Scenes:**
+  - On the main scenes page, the button selects a random scene from all scenes in your library.
+  - On a performer, studio, tag, or group *scenes* page, it picks a random scene **from within that entity**.
+  - When viewing a scene's detail page, clicking "Random" again selects a random scene from **all scenes** (not just from the previous filter).
+
+- **Groups:**
+  - On the main groups page, the button picks a random group.
+  - Inside a group (group's scenes page), it selects a random scene from within that group.
+
+- **Galleries & Images:**
+  - On the main galleries page, the button picks a random gallery.
+  - Inside a gallery (gallery's page), it selects a random image from that gallery.
+  - When viewing an individual image (image detail page), the button selects a random image from **all images in the database**, not just from the current gallery.
+
+- **Performers:**
+  - On the main performers page, it picks a random performer.
+  - Inside a performer's page (performer's scenes), it selects a random scene from that performer.
+  - When viewing a scene's detail page, clicking "Random" again picks a random scene from **all scenes**.
+
+- **Studios:**
+  - On the main studios page, the button picks a random studio.
+  - Inside a studio's page (studio's scenes), it selects a random scene from that studio.
+  - When viewing a scene's detail page, clicking "Random" again selects a random scene from **all scenes**.
+
+- **Tags:**
+  - On the main tags page, it picks a random tag.
+  - Inside a tag's page (tag's scenes), it selects a random scene from that tag.
+  - When viewing a scene's detail page, clicking "Random" again picks a random scene from **all scenes**, regardless of tag.
+
+---
+
+**Tip:** The Random button always selects from the *full library* when you are on a detail (scene or image) page, regardless of how you navigated there.
+
+---
 
 ## Requirements
 - Stash version v0.27.2 or higher.
@@ -51,4 +86,11 @@ Click the "Random" button in the navigation bar to jump to a random entity (scen
 - Edit `random-button.js` to customize and reload plugins in Stash.
 
 ## Changelog
+- 2.0.1:
+  - The Random button now works on scene and image detail pages: when viewing an individual scene or image, clicking "Random" selects a random scene or image from the entire database.
+  - Improved context awareness for the Random button on all major Stash entities (scenes, performers, studios, tags, groups, galleries, images).
+  - When inside a group, tag, studio, performer, or gallery, the button picks a random scene or image from within that entity.
+  - When on a group, tag, studio, performer, or gallery detail page (not listing scenes/images), the Random button selects a random group, tag, studio, performer, or gallery respectively.
+  - Updated documentation.
 - 2.0.0: Major upgrade! Now supports random navigation for performers, studios, groups, tags, galleries, and images (global and internal).
+- 1.1.0: Initial public release with support for random scenes.

plugins/StashRandomButton/random_button.js

@@ -66,29 +66,48 @@
   async function randomButtonHandler() {
     const pathname = window.location.pathname.replace(/\/$/, '');
 
-    if (pathname === '/scenes') return randomGlobal('Scene', 'scenes', '/scenes/');
-    if (pathname === '/performers') return randomGlobal('Performer', 'performers', '/performers/');
-    if (pathname === '/groups') return randomGlobal('Group', 'groups', '/groups/');
-    if (pathname === '/studios') return randomGlobal('Studio', 'studios', '/studios/');
-    if (pathname === '/tags') return randomGlobal('Tag', 'tags', '/tags/');
-    if (pathname === '/galleries') return randomGlobal('Gallery', 'galleries', '/galleries/');
-    if (pathname === '/images') return randomGlobal('Image', 'images', '/images/');
-
-    // --- INTERN ---
+    // GLOBAL
+    if (pathname === '/scenes' || pathname === '/' || pathname === '' || pathname === '/stats' || pathname === '/settings' || pathname === '/scenes/markers' || /^\/scenes\/\d+$/.test(pathname))  
+      return randomGlobal('Scene', 'scenes', '/scenes/');
+
+    if (pathname === '/images' || /^\/images\/\d+$/.test(pathname)) 
+      return randomGlobal('Image', 'images', '/images/');
+
+    if (pathname === '/performers') 
+      return randomGlobal('Performer', 'performers', '/performers/');
+
+    if (pathname === '/studios') 
+      return randomGlobal('Studio', 'studios', '/studios/');
+
+    if (pathname === '/tags') 
+      return randomGlobal('Tag', 'tags', '/tags/');
+
+    if (pathname === '/groups') 
+      return randomGlobal('Group', 'groups', '/groups/');
+
+    if (pathname === '/galleries') 
+      return randomGlobal('Gallery', 'galleries', '/galleries/');
+
+    // Intern
     let studioId = getIdFromPath(/^\/studios\/(\d+)\/scenes/);
-    if (studioId) return randomGlobal('Scene', 'scenes', '/scenes/', { studios: { value: [studioId], modifier: "INCLUDES_ALL" } });
+    if (studioId) 
+      return randomGlobal('Scene', 'scenes', '/scenes/', { studios: { value: [studioId], modifier: "INCLUDES_ALL" } });
 
     let groupId = getIdFromPath(/^\/groups\/(\d+)\/scenes/);
-    if (groupId) return randomGlobal('Scene', 'scenes', '/scenes/', { groups: { value: [groupId], modifier: "INCLUDES_ALL" } });
+    if (groupId) 
+      return randomGlobal('Scene', 'scenes', '/scenes/', { groups: { value: [groupId], modifier: "INCLUDES_ALL" } });
 
     let performerId = getIdFromPath(/^\/performers\/(\d+)\/scenes/);
-    if (performerId) return randomGlobal('Scene', 'scenes', '/scenes/', { performers: { value: [performerId], modifier: "INCLUDES_ALL" } });
+    if (performerId) 
+      return randomGlobal('Scene', 'scenes', '/scenes/', { performers: { value: [performerId], modifier: "INCLUDES_ALL" } });
 
     let tagId = getIdFromPath(/^\/tags\/(\d+)\/scenes/);
-    if (tagId) return randomGlobal('Scene', 'scenes', '/scenes/', { tags: { value: [tagId], modifier: "INCLUDES_ALL" } });
+    if (tagId) 
+      return randomGlobal('Scene', 'scenes', '/scenes/', { tags: { value: [tagId], modifier: "INCLUDES_ALL" } });
 
-    let galleryId = getIdFromPath(/^\/galleries\/(\d+)/);
-    if (galleryId) return randomGlobal('Image', 'images', '/images/', { galleries: { value: [galleryId], modifier: "INCLUDES_ALL" } });
+    let galleryId = getIdFromPath(/^\/galleries\/(\d+)$/);
+    if (galleryId)
+      return randomGlobal('Image', 'images', '/images/', { galleries: { value: [galleryId], modifier: "INCLUDES_ALL" } });
 
     alert('Not supported');
   }

plugins/StashRandomButton/random_button.yml

@@ -1,7 +1,7 @@
 name: RandomButton
 description: Adds a button to quickly jump to a random scene, image, performer, studio, group, tag, or gallery, both on overview and internal entity pages.
-version: 2.0.0
-url: https://example.com
+version: 2.0.1
+url: https://github.com/stashapp/CommunityScripts/tree/main/plugins/StashRandomButton
 ui:
   requires: []
   javascript: