Merge branch 'develop' into issue/1218
This commit is contained in:
commit
8c6cdff3cc
11
CHANGELOG.md
11
CHANGELOG.md
@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
- OStatus: eliminate the possibility of a protocol downgrade attack.
|
- OStatus: eliminate the possibility of a protocol downgrade attack.
|
||||||
- OStatus: prevent following locked accounts, bypassing the approval process.
|
- OStatus: prevent following locked accounts, bypassing the approval process.
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- **Breaking:** GNU Social API with Qvitter extensions support
|
||||||
|
- **Breaking:** ActivityPub: The `accept_blocks` configuration setting.
|
||||||
|
- Emoji: Remove longfox emojis.
|
||||||
|
- Remove `Reply-To` header from report emails for admins.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config
|
- **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config
|
||||||
- **Breaking:** Configuration: `/media/` is now removed when `base_url` is configured, append `/media/` to your `base_url` config to keep the old behaviour if desired
|
- **Breaking:** Configuration: `/media/` is now removed when `base_url` is configured, append `/media/` to your `base_url` config to keep the old behaviour if desired
|
||||||
@ -109,11 +115,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
- RichMedia: parsers and their order are configured in `rich_media` config.
|
- RichMedia: parsers and their order are configured in `rich_media` config.
|
||||||
- RichMedia: add the rich media ttl based on image expiration time.
|
- RichMedia: add the rich media ttl based on image expiration time.
|
||||||
|
|
||||||
### Removed
|
|
||||||
- GNU Social API with Qvitter extensions support
|
|
||||||
- Emoji: Remove longfox emojis.
|
|
||||||
- Remove `Reply-To` header from report emails for admins.
|
|
||||||
- ActivityPub: The `accept_blocks` configuration setting.
|
|
||||||
|
|
||||||
## [1.0.1] - 2019-07-14
|
## [1.0.1] - 2019-07-14
|
||||||
### Security
|
### Security
|
||||||
|
@ -362,12 +362,12 @@ defmodule Pleroma.Activity do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def restrict_deactivated_users(query) do
|
def restrict_deactivated_users(query) do
|
||||||
|
deactivated_users =
|
||||||
|
from(u in User.Query.build(deactivated: true), select: u.ap_id)
|
||||||
|
|> Repo.all()
|
||||||
|
|
||||||
from(activity in query,
|
from(activity in query,
|
||||||
where:
|
where: activity.actor not in ^deactivated_users
|
||||||
fragment(
|
|
||||||
"? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
|
|
||||||
activity.actor
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -796,7 +796,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||||||
)
|
)
|
||||||
|
|
||||||
unless opts["skip_preload"] do
|
unless opts["skip_preload"] do
|
||||||
from([thread_mute: tm] in query, where: is_nil(tm))
|
from([thread_mute: tm] in query, where: is_nil(tm.user_id))
|
||||||
else
|
else
|
||||||
query
|
query
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user