Merge remote-tracking branch 'upstream/master'

Author: liamwhite

.editorconfig

@@ -7,3 +7,20 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
+
+# These configurations are recognized by `shfmt`:
+# https://github.com/mvdan/sh/blob/master/cmd/shfmt/shfmt.1.scd
+#
+# If you are using this VSCode extension https://github.com/foxundermoon/vs-shell-format/tree/master,
+# then add this to your settings.json, because it doesn't use the .editorconfig file by default:
+# ```json
+# {
+#     "shellformat.useEditorConfig": true
+# }
+# ```
+# That's really annoying, but it is what it is.
+#
+# The default for `shfmt` is not to indent the match arms of case statements, that is
+# exremely ugly. The issue about that in the VSCode extension repo:
+# https://github.com/foxundermoon/vs-shell-format/issues/371
+switch_case_indent = true

README.md

@@ -4,29 +4,40 @@
 
 ## Getting Started
 
-On systems with `docker` and `docker compose` installed, the process should be as simple as:
+Make sure you have [Docker](https://docs.docker.com/engine/install/) and [Docker Compose plugin](https://docs.docker.com/compose/install/#scenario-two-install-the-docker-compose-plugin) installed.
 
-```
-docker compose build
-docker compose up
+Add the directory `scripts/path` to your `PATH` to get the `philomena` dev CLI globally available in your terminal. For example you can add the following to your shell's `.*rc` file, but adjust the path to philomena repo accordingly.
+
+```bash
+export PATH="$PATH:$HOME/dev/philomena/scripts/path"
 ```
 
-If you use `podman` and `podman-compose` instead, the process for constructing a rootless container is nearly identical:
+Use the following commands to bring up or shut down a dev server.
 
-```
-podman-compose build
-podman-compose up
+```bash
+philomena up
+philomena down
 ```
 
-Once the application has started, navigate to http://localhost:8080 and login with admin@example.com / philomena123
+Once the application has started, navigate to http://localhost:8080 and login with
 
-## Development
+| Credential | Value               |
+| ---------- | ------------------- |
+| Email      | `admin@example.com` |
+| Password   | `philomena123`      |
 
-Install NodeJS, Rust and Elixir toolchains. Then, run the following command to install other dependencies and configure the git pre-commit hook that will auto-format the code and run lightweight checks on each commit:
+> [!TIP]
+> See the source code of `scripts/philomena.sh` for details on the additional parameters and other subcommands.
 
+## Pre-commit hook
+
+Run the following command to configure the git pre-commit hook that will auto-format the code and run lightweight checks on each commit.
+
+```bash
+philomena init
 ```
-./scripts/init.sh
-```
+
+## IDE Setup
 
 If you are using VSCode, you are encouraged to install the recommended extensions that VSCode should automatically suggest to you based on `.vscode/extensions.json` file in this repo.
 

assets/css/elements/forms.css

@@ -92,6 +92,39 @@ textarea {
   margin-bottom: 6px;
 }
 
+.field-help-button,
+.field-help-button * {
+  font-style: italic;
+  cursor: pointer;
+}
+
+.field-help-button {
+  margin-left: 6px;
+  font-size: 0.8em;
+  color: var(--foreground-half-color);
+  border-color: var(--foreground-half-color);
+  border-style: dashed;
+  border-width: 1px;
+  border-radius: 10px;
+  padding: 4px;
+
+  /*
+    We want this to behave like a button, so double clicking on it
+    shouldn't trigger a selection
+  */
+  user-select: none;
+}
+
+.field-help-button:hover {
+  background-color: var(--primary-light-color);
+}
+
+.field-help-content {
+  color: var(--foreground-half-color);
+  margin: 10px auto;
+  font-style: italic;
+}
+
 .field_with_errors {
   background: var(--danger-color);
 }
@@ -107,6 +140,7 @@ span.help-block {
   max-width: 30em;
   width: 100%;
 }
+
 /* text input - grow to container size */
 .hform__text {
   flex: 1 0 auto;

assets/js/settings.ts

@@ -44,6 +44,22 @@ function setupAutocompleteSettings() {
   });
 }
 
+function setupHelpExpansions() {
+  document.addEventListener('click', event => {
+    if (!(event.target instanceof HTMLElement)) {
+      return;
+    }
+
+    const helpButton = event.target.closest('.field-help-button');
+
+    if (!helpButton || !helpButton.nextElementSibling) {
+      return;
+    }
+
+    helpButton.nextElementSibling.classList.toggle('hidden');
+  });
+}
+
 export function setupSettings() {
   if (!$('#js-setting-table')) return;
 
@@ -58,4 +74,5 @@ export function setupSettings() {
 
   setupThemeSettings();
   setupAutocompleteSettings();
+  setupHelpExpansions();
 }

assets/package-lock.json

@@ -20,7 +20,7 @@
     "postcss-mixins": "^11.0.3",
     "postcss-simple-vars": "^7.0.1",
     "typescript": "^5.7.2",
-    "vite": "^6.2.5"
+    "vite": "^6.2.6"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",

assets/package.json

@@ -40,15 +40,8 @@ RUN git clone --depth 1 https://github.com/philomena-dev/mediatools /tmp/mediato
     && cd /tmp/mediatools \
     && make -j$(nproc) install
 
-COPY scripts/lib.sh /var/philomena/scripts/
+# docker-compose configures a bind-mount of the repo root dir to /srv/philomena
+ENV PATH=$PATH:/root/.cargo/bin:/srv/philomena/docker/app
 
-COPY \
-  docker/app/run-development \
-  docker/app/run-test \
-  docker/app/safe-rsvg-convert \
-  docker/app/purge-cache \
-  /var/philomena/docker/app/
-
-ENV PATH=$PATH:/root/.cargo/bin:/var/philomena/docker/app
 EXPOSE 5173
 CMD run-development

docker/app/Dockerfile

@@ -344,6 +344,8 @@ defmodule Philomena.Images.Image do
 
   def approve_changeset(image) do
     change(image)
+    |> validate_not_approved()
+    |> validate_not_hidden()
     |> put_change(:approved, true)
     |> put_change(:first_seen_at, DateTime.utc_now(:second))
   end
@@ -365,4 +367,11 @@ defmodule Philomena.Images.Image do
       false -> changeset
     end
   end
+
+  defp validate_not_approved(changeset) do
+    case get_field(changeset, :approved) do
+      true -> add_error(changeset, :approved, "must be false")
+      false -> changeset
+    end
+  end
 end

lib/philomena/images/image.ex

@@ -1,6 +1,7 @@
 defmodule Philomena.Images.Query do
   alias PhilomenaQuery.Parse.Parser
   alias Philomena.Repo
+  alias Philomena.Tags.Tag
 
   defp gallery_id_transform(_ctx, value) do
     case Integer.parse(value) do
@@ -99,7 +100,8 @@ defmodule Philomena.Images.Query do
         "faved_by" => "favourited_by_users",
         "faved_by_id" => "favourited_by_user_ids"
       },
-      no_downcase_fields: ~W(file_name)
+      no_downcase_fields: ~W(file_name),
+      normalizations: %{"namespaced_tags.name" => &Tag.clean_tag_name/1}
     ]
   end
 
@@ -124,7 +126,7 @@ defmodule Philomena.Images.Query do
           ~W(fingerprint upvoted_by downvoted_by true_uploader hidden_by deleted_by_user),
       ngram_fields: fields[:ngram_fields] ++ ~W(deletion_reason),
       ip_fields: ~W(ip),
-      bool_fields: fields[:bool_fields] ++ ~W(deleted),
+      bool_fields: fields[:bool_fields] ++ ~W(anonymous deleted),
       aliases:
         Map.merge(fields[:aliases], %{
           "upvoted_by" => "upvoters",

lib/philomena/images/query.ex

@@ -17,6 +17,7 @@ defmodule Philomena.Tags.Tag do
     "blog",
     "colorist",
     "comic",
+    "commissioner",
     "editor",
     "fanfic",
     "generator",
@@ -50,6 +51,7 @@ defmodule Philomena.Tags.Tag do
   @underscore_safe_namespaces [
     "artist:",
     "colorist:",
+    "commissioner:",
     "editor:",
     "generator:",
     "oc:",
@@ -203,9 +205,10 @@ defmodule Philomena.Tags.Tag do
     )
     |> String.replace(~r/[\x{00b4}\x{2018}\x{2019}\x{201a}\x{201b}\x{2032}]/u, "'")
     |> String.replace(~r/[\x{201c}\x{201d}\x{201e}\x{201f}\x{2033}]/u, "\"")
-    |> String.trim()
     |> clean_tag_namespace()
     |> ununderscore()
+    |> String.trim()
+    |> String.replace(~r/ +/, " ")
   end
 
   defp clean_tag_namespace(name) do