Merge branch 'develop' into foxing-patch-1

This commit is contained in:
foxing 2023-03-11 19:09:14 +00:00
commit e17d8f744e
4 changed files with 7 additions and 5 deletions

View file

@ -4,13 +4,15 @@ 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/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased ## 2023.03
## Fixed ## Fixed
- Allowed contentMap to be updated on edit - Allowed contentMap to be updated on edit
- Filter creation now accepts expires\_at
### Changed ### Changed
- Restoring the database from a dump now goes much faster without need for work-arounds - Restoring the database from a dump now goes much faster without need for work-arounds
- Misskey reaction matching uses `content` parameter now
### Added ### Added
- Extend the mix task `prune_objects` with option `--prune-orphaned-activities` to also prune orphaned activities, allowing to reclaim even more database space - Extend the mix task `prune_objects` with option `--prune-orphaned-activities` to also prune orphaned activities, allowing to reclaim even more database space

View file

@ -227,8 +227,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|> Enum.filter(fn tag -> is_map(tag) and tag["type"] == "Mention" end) |> Enum.filter(fn tag -> is_map(tag) and tag["type"] == "Mention" end)
|> Enum.map(fn tag -> tag["href"] end) |> Enum.map(fn tag -> tag["href"] end)
to_data = if is_nil(object.data["to"]), do: [], else: object.data["to"]
mentions = mentions =
(object.data["to"] ++ tag_mentions) (to_data ++ tag_mentions)
|> Enum.uniq() |> Enum.uniq()
|> Enum.map(fn |> Enum.map(fn
Pleroma.Constants.as_public() -> nil Pleroma.Constants.as_public() -> nil

View file

@ -116,8 +116,6 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
script_src = "script-src 'self' '#{nonce_tag}'" script_src = "script-src 'self' '#{nonce_tag}'"
script_src = if Mix.env() == :dev, do: [script_src, " 'unsafe-eval'"], else: script_src
report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"] report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
insecure = if scheme == "https", do: "upgrade-insecure-requests" insecure = if scheme == "https", do: "upgrade-insecure-requests"

View file

@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do def project do
[ [
app: :pleroma, app: :pleroma,
version: version("3.6.0"), version: version("3.7.1"),
elixir: "~> 1.12", elixir: "~> 1.12",
elixirc_paths: elixirc_paths(Mix.env()), elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix] ++ Mix.compilers(), compilers: [:phoenix] ++ Mix.compilers(),