Merge remote-tracking branch 'origin/develop' into fork

Signed-off-by: mkljczk <[email protected]>
mkljczk · Dec 6, 2024 · b38501e · b38501e
2 parents 74b3849 + 16027b7
commit b38501e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.7.1
+
+### Changed
+- Accept `application/activity+json` for requests to `/.well-known/nodeinfo`
+
+### Fixed
+- Truncate remote user fields, avoids them getting rejected
+- Improve the `FollowValidator` to successfully incoming activities with an errant `cc` field.
+- Resolved edge case where the API can report you are following a user but the relationship is not fully established.
+- The Swoosh email adapter for Mailgun was missing a new dependency on `:multipart`
+- Fix Mastodon WebSocket authentication
+
 ## 2.7.0
 
 ### Security

diff --git a/changelog.d/bugfix-truncate-remote-user-fields.fix b/changelog.d/bugfix-truncate-remote-user-fields.fix
diff --git a/changelog.d/follow-validator.fix b/changelog.d/follow-validator.fix
diff --git a/changelog.d/following-state.fix b/changelog.d/following-state.fix
diff --git a/changelog.d/mailgun.fix b/changelog.d/mailgun.fix
diff --git a/changelog.d/mastodon-websocket.fix b/changelog.d/mastodon-websocket.fix
diff --git a/changelog.d/well-known.change b/changelog.d/well-known.change
diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex
@@ -110,11 +110,14 @@ defmodule Pleroma.Frontend do
 
         new_file_path = Path.join(dest, path)
 
-        new_file_path
+        path
         |> Path.dirname()
+        |> then(&Path.join(dest, &1))
         |> File.mkdir_p!()
 
-        File.write!(new_file_path, data)
+        if not File.dir?(new_file_path) do
+          File.write!(new_file_path, data)
+        end
       end)
     end
   end

diff --git a/mix.exs b/mix.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Mixfile do
       app: :pleroma,
       name: "pl",
       compat_name: "Pleroma",
-      version: version("2.7.0"),
+      version: version("2.7.51"),
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),