Merge pull request 'elixir1.16 testing' (#742) from elixir1.16 into develop

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/742

.woodpecker/test.yml

@@ -7,6 +7,7 @@ matrix:
   ELIXIR_VERSION:
     - 1.14
     - 1.15
+    - 1.16
   OTP_VERSION:
     - 25
     - 26
@@ -17,6 +18,8 @@ matrix:
       OTP_VERSION: 25
     - ELIXIR_VERSION: 1.15
       OTP_VERSION: 26
+    - ELIXIR_VERSION: 1.16
+      OTP_VERSION: 26
 
 variables:
   - &scw-secrets

CHANGELOG.md

@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
 
 ## Added
+- Support for [FEP-fffd](https://codeberg.org/fediverse/fep/src/branch/main/fep/fffd/fep-fffd.md) (proxy objects)
+- Verified support for elixir 1.16
 
 ## Changed
 

docs/docs/installation/generic_dependencies.include

@@ -1,8 +1,8 @@
 ## Required dependencies
 
 * PostgreSQL 9.6+
-* Elixir 1.14+
+* Elixir 1.14+ (currently tested up to 1.16)
-* Erlang OTP 25+
+* Erlang OTP 25+ (currently tested up to OTP26)
 * git
 * file / libmagic
 * gcc (clang might also work)

lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex

@@ -53,12 +53,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
 
   defp fix_url(%{"url" => url} = data) when is_bitstring(url), do: data
   defp fix_url(%{"url" => url} = data) when is_map(url), do: Map.put(data, "url", url["href"])
+
   defp fix_url(%{"url" => url} = data) when is_list(url) do
-    if is_map(List.first(url)) do
+    data
-      Map.put(data, "url", List.first(url)["href"])
+    |> Map.put("url", List.first(url))
-    else
+    |> fix_url()
-      Map.put(data, "url", List.first(url))
-    end
   end
 
   defp fix_url(data), do: data

test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs

@@ -50,14 +50,17 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
     end
 
     test "note with url array validates if contains a link object", %{note: note} do
-      note = Map.put(note, "url", [%{
+      note =
-        "type" => "Link",
+        Map.put(note, "url", [
-        "href" => "https://remote.example/link"
+          %{
-      }])
+            "type" => "Link",
+            "href" => "https://remote.example/link"
+          }
+        ])
+
       %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
     end
 
-
     test "a note with a language validates" do
       insert(:user, %{ap_id: "https://mastodon.social/users/akkoma_ap_integration_tester"})
       note = File.read!("test/fixtures/mastodon/note_with_language.json") |> Jason.decode!()