Merge pull request #289 from philomena-dev/updates

Dependency updates

docker-compose.yml

@@ -60,7 +60,7 @@ services:
       - '5173:5173'
 
   postgres:
-    image: postgres:16.2-alpine
+    image: postgres:16.3-alpine
     environment:
       - POSTGRES_PASSWORD=postgres
     volumes:
@@ -86,7 +86,7 @@ services:
       driver: "none"
 
   files:
-    image: andrewgaul/s3proxy:sha-ec12ae0
+    image: andrewgaul/s3proxy:sha-4175022
     environment:
       - JCLOUDS_FILESYSTEM_BASEDIR=/srv/philomena/priv/s3
     volumes:

docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.16.2-alpine
+FROM elixir:1.17-alpine
 
 ADD https://api.github.com/repos/philomena-dev/FFmpeg/git/refs/heads/release/6.1 /tmp/ffmpeg_version.json
 RUN (echo "https://github.com/philomena-dev/prebuilt-ffmpeg/raw/master"; cat /etc/apk/repositories) > /tmp/repositories \

docker/web/Dockerfile

@@ -1,4 +1,4 @@
-FROM openresty/openresty:1.25.3.1-2-alpine
+FROM openresty/openresty:1.25.3.1-4-alpine
 ARG APP_DIR
 ARG S3_SCHEME
 ARG S3_HOST

lib/philomena_media/analyzers.ex

@@ -54,7 +54,8 @@ defmodule PhilomenaMedia.Analyzers do
       :error = Analyzers.analyze(file)
 
   """
-  @spec analyze(Plug.Upload.t() | Path.t()) :: {:ok, Result.t()} | :error
+  @spec analyze(Plug.Upload.t() | Path.t()) ::
+          {:ok, Result.t()} | {:unsupported_mime, Mime.t()} | :error
   def analyze(%Plug.Upload{path: path}), do: analyze(path)
 
   def analyze(path) when is_binary(path) do

lib/philomena_web/controllers/profile_controller.ex

@@ -212,7 +212,7 @@ defmodule PhilomenaWeb.ProfileController do
   end
 
   defp individual_stat(mapping, stat_name) do
-    Enum.map(89..0, &(map_fetch(mapping[&1], stat_name) || 0))
+    Enum.map(89..0//-1, &(map_fetch(mapping[&1], stat_name) || 0))
   end
 
   defp map_fetch(nil, _field_name), do: nil

lib/philomena_web/templates/markdown/_input.html.slime

@@ -1,6 +1,6 @@
 - form = assigns[:f]
-- action_text = assigns[:action_text] || 'Edit'
-- action_icon = assigns[:action_icon] || 'edit'
+- action_text = assigns[:action_text] || "Edit"
+- action_icon = assigns[:action_icon] || "edit"
 - field_name = assigns[:name] || :body
 - field_placeholder = assigns[:placeholder] || "Your message"
 - is_required = assigns[:required]
@@ -11,7 +11,7 @@
     = action_text
 
   a href="#" data-click-tab="preview"
-    i.fa.fa-cog.fa-fw.fa-spin.js-preview-loading.hidden> title=raw('Loading preview…')
+    i.fa.fa-cog.fa-fw.fa-spin.js-preview-loading.hidden> title=raw("Loading preview…")
     i.fa.fa-eye.fa-fw.js-preview-idle>
     | Preview
 

lib/philomena_web/templates/profile/commission/_form.html.slime

@@ -23,7 +23,7 @@
   .field
     => label f, :categories, "Art Categories:"
     br
-    = collection_checkboxes f, :categories, categories(), selected: f.data.categories, input_opts: [ class: 'checkbox spacing-right' ], wrapper: &Phoenix.HTML.Tag.content_tag(:span, &1, class: "commission__category")
+    = collection_checkboxes f, :categories, categories(), selected: f.data.categories, input_opts: [ class: "checkbox spacing-right" ], wrapper: &Phoenix.HTML.Tag.content_tag(:span, &1, class: "commission__category")
     = error_tag f, :categories
   .field
     => label f, :sheet_image_id, "Image ID of your commissions sheet (optional but recommended):"

mix.exs

@@ -34,7 +34,7 @@ defmodule Philomena.MixProject do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.6"},
+      {:phoenix, "~> 1.7"},
       {:phoenix_pubsub, "~> 2.1"},
       {:phoenix_ecto, "~> 4.4"},
       {:ecto_sql, "~> 3.9"},
@@ -46,8 +46,7 @@ defmodule Philomena.MixProject do
       {:jason, "~> 1.4"},
       {:ranch, "~> 2.1", override: true},
       {:plug_cowboy, "~> 2.6"},
-      {:slime, "~> 1.3.0",
-       github: "liamwhite/slime", ref: "4c8ad4e9e9dcc792f4db769a9ef2ad7d6eba8f31", override: true},
+      {:slime, "~> 1.3.1"},
       {:phoenix_slime, "~> 0.13",
        github: "slime-lang/phoenix_slime", ref: "8944de91654d6fcf6bdcc0aed6b8647fe3398241"},
       {:phoenix_pubsub_redis, "~> 3.0"},
@@ -83,7 +82,7 @@ defmodule Philomena.MixProject do
       {:rustler, "~> 0.27"},
 
       # Linting
-      {:credo, "~> 1.6", only: [:dev, :test], override: true},
+      {:credo, "~> 1.6", only: [:dev, :test], runtime: false},
       {:credo_envvar, "~> 0.1", only: [:dev, :test], runtime: false},
       {:credo_naming, "~> 2.0", only: [:dev, :test], runtime: false},
 
@@ -94,10 +93,6 @@ defmodule Philomena.MixProject do
       # Static analysis
       {:dialyxir, "~> 1.2", only: :dev, runtime: false},
 
-      # Fixes for OTP/25
-      {:neotoma, "~> 1.7.3", manager: :rebar3, override: true},
-      {:hut, "~> 1.4.0", manager: :rebar3, override: true},
-
       # Fixes for Elixir v1.15+
       {:canary, "~> 1.1",
        github: "marcinkoziej/canary", ref: "704debde7a2c0600f78c687807884bf37c45bd79"}