Clean-up mentions of /public/

.github/workflows/update-docs.yml

@@ -1,43 +0,0 @@
-name: Update SillyTavern-Docs
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  update_docs:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout current repository
-      uses: actions/checkout@v2
-
-    - name: Checkout SillyTavern-Docs repository
-      uses: actions/checkout@v2
-      with:
-        repository: SillyTavern/SillyTavern-Docs
-        path: SillyTavern-Docs
-
-    - name: Clone SillyTavern wiki into SillyTavern-Docs/extensions
-      run: rm -rf SillyTavern-Docs/extensions && git clone https://github.com/SillyTavern/SillyTavern.wiki.git SillyTavern-Docs/extensions && rm -rf SillyTavern-Docs/extensions/.git
-
-    - name: Copy files
-      run: |
-        cp public/notes/content.md SillyTavern-Docs/guidebook.md
-        cp faq.md SillyTavern-Docs/faq.md
-        cp readme.md SillyTavern-Docs/readme.md
-        cp public/notes/update.md SillyTavern-Docs/update.md
-
-    - name: Deploy to external repository
-      uses: cpina/github-action-push-to-another-repository@main
-      env:
-        SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-      with:
-          # GitHub Action output files
-          source-directory: SillyTavern-Docs/
-          destination-github-username: SillyTavern
-          destination-repository-name: SillyTavern-Docs
-          user-email: github-actions[bot]@users.noreply.github.com
-          user-name: "GitHub Actions"
-          target-branch: "main"

Update-Instructions.txt

@@ -33,7 +33,14 @@ If you insist on installing via a zip, here is the tedious process for doing the
 2. Unzip it into a folder OUTSIDE of your current ST installation.
 3. Do the usual setup procedure for your OS to install the NodeJS requirements.
 
-4. Copy the following files/folders as necessary(*) from your old ST installation:
+4a. Updating 1.12.0 and above
+
+Copy the user data directory from your data root into the data root of the new install.
+
+By default: /data/default-user
+
+4a. Migrating from <1.12.0 to >=1.20.0
+Copy the following files/folders as necessary(*) from your old ST installation:
 
   - Assets
   - Backgrounds
@@ -54,16 +61,15 @@ If you insist on installing via a zip, here is the tedious process for doing the
   - Worlds
   - User
   - settings.json
-  - secrets.json <---- this one is in the base folder, not /public/
+  - secrets.json <---- This one is in the base folder, not /public/
 
   (*) 'As necessary' = "If you made any custom content related to those folders".
   None of the folders are mandatory, so only copy what you need.
 
   **NB: DO NOT COPY THE ENTIRE /PUBLIC/ FOLDER.**
   Doing so could break the new install and prevent new features from being present.
+  Paste those items into the /data/default-user folder of the new install.
 
-5. Paste those items into the /Public/ folder of the new install.
+5. Start SillyTavern once again with the method appropriate to your OS, and pray you got it right.
 
-6. Start SillyTavern once again with the method appropriate to your OS, and pray you got it right.
+6. If everything shows up, you can safely delete the old ST folder.
-
-7. If everything shows up, you can safely delete the old ST folder.

public/scripts/extensions/expressions/settings.html

@@ -78,7 +78,7 @@
                         <span>Remove all image overrides</span>
                     </div>
                 </div>
-                <p class="hint"><b>Hint:</b> <i>Create new folder in the <b>public/characters/</b> folder and name it as the name of the character.
+                <p class="hint"><b>Hint:</b> <i>Create new folder in the <b>/characters/</b> folder of your user data directory and name it as the name of the character.
                 Put images with expressions there. File names should follow the pattern: <tt>[expression_label].[image_format]</tt></i></p>
             </div>
         </div>

src/util.js

@@ -311,9 +311,9 @@ function tryParse(str) {
 }
 
 /**
- * Takes a path to a client-accessible file in the `public` folder and converts it to a relative URL segment that the
+ * Takes a path to a client-accessible file in the data folder and converts it to a relative URL segment that the
- * client can fetch it from. This involves stripping the `public/` prefix and always using `/` as the separator.
+ * client can fetch it from. This involves stripping the data root path prefix and always using `/` as the separator.
- * @param {string} root The root directory of the public folder.
+ * @param {string} root The root directory of the user data folder.
  * @param {string} inputPath The path to be converted.
  * @returns The relative URL path from which the client can access the file.
  */