worst/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

Browse source
This commit is contained in:
sadposter 2019-08-13 09:05:44 +01:00
commit 5b385962eb
31 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Not being able to pin unlisted posts - Not being able to pin unlisted posts
- Objects being re-embedded to activities after being updated (e.g faved/reposted). Running 'mix pleroma.database prune_objects' again is advised. - Objects being re-embedded to activities after being updated (e.g faved/reposted). Running 'mix pleroma.database prune_objects' again is advised.
- Metadata rendering errors resulting in the entire page being inaccessible - Metadata rendering errors resulting in the entire page being inaccessible
- `federation_incoming_replies_max_depth` option being ignored in certain cases
- Federation/MediaProxy not working with instances that have wrong certificate order - Federation/MediaProxy not working with instances that have wrong certificate order
- Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`) - Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`)
- Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity - Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity
@ -87,6 +88,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed ### Removed
- Emoji: Remove longfox emojis. - Emoji: Remove longfox emojis.
- Remove `Reply-To` header from report emails for admins. - 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

1
config/config.exs
View file

@ -302,7 +302,6 @@
default_mascot: :pleroma_fox_tan default_mascot: :pleroma_fox_tan
config :pleroma, :activitypub, config :pleroma, :activitypub,
accept_blocks: true,
unfollow_blocked: true, unfollow_blocked: true,
outgoing_blocks: true, outgoing_blocks: true,
follow_handshake_timeout: 500, follow_handshake_timeout: 500,

1
docs/config.md
View file

@ -329,7 +329,6 @@ config :pleroma, Pleroma.Web.Endpoint,
This will make Pleroma listen on `127.0.0.1` port `8080` and generate urls starting with `https://example.com:2020` This will make Pleroma listen on `127.0.0.1` port `8080` and generate urls starting with `https://example.com:2020`
## :activitypub ## :activitypub
* ``accept_blocks``: Whether to accept incoming block activities from other instances
* ``unfollow_blocked``: Whether blocks result in people getting unfollowed * ``unfollow_blocked``: Whether blocks result in people getting unfollowed
* ``outgoing_blocks``: Whether to federate blocks to other instances * ``outgoing_blocks``: Whether to federate blocks to other instances
* ``deny_follow_blocked``: Whether to disallow following an account that has blocked the user in question * ``deny_follow_blocked``: Whether to disallow following an account that has blocked the user in question

6
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -701,8 +701,7 @@ def handle_incoming(
} = _data, } = _data,
_options _options
) do ) do
with true <- Pleroma.Config.get([:activitypub, :accept_blocks]), with %User{local: true} = blocked <- User.get_cached_by_ap_id(blocked),
%User{local: true} = blocked <- User.get_cached_by_ap_id(blocked),
{:ok, %User{} = blocker} <- User.get_or_fetch_by_ap_id(blocker), {:ok, %User{} = blocker} <- User.get_or_fetch_by_ap_id(blocker),
{:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do {:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do
User.unblock(blocker, blocked) User.unblock(blocker, blocked)
@ -716,8 +715,7 @@ def handle_incoming(
%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = _data, %{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = _data,
_options _options
) do ) do
with true <- Pleroma.Config.get([:activitypub, :accept_blocks]), with %User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
%User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
{:ok, %User{} = blocker} = User.get_or_fetch_by_ap_id(blocker), {:ok, %User{} = blocker} = User.get_or_fetch_by_ap_id(blocker),
{:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do {:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do
User.unfollow(blocker, blocked) User.unfollow(blocker, blocked)

BIN
priv/static/adminfe/chunk-0e18.e12401fb.css Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/chunk-56c9.c27dac5e.css → priv/static/adminfe/chunk-1fbf.d7a1893c.css
View file

Binary file not shown.

0
priv/static/adminfe/chunk-f018.0d22684d.css → priv/static/adminfe/chunk-2325.0d22684d.css
View file

BIN
priv/static/adminfe/chunk-5e57.ac97b15a.css Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/chunk-5eaf.1a04e979.css → priv/static/adminfe/chunk-e547.e4b6230b.css
View file

Binary file not shown.

BIN
priv/static/adminfe/chunk-elementUI.e5cd8da6.css Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/chunk-elementUI.f74c256b.css
View file

Binary file not shown.

2
priv/static/adminfe/index.html
View file

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.f74c256b.css rel=stylesheet><link href=chunk-libs.4e8c4664.css rel=stylesheet><link href=app.34fc670f.css rel=stylesheet></head><body><script src=/pleroma/admin/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=static/js/runtime.d8d12c12.js></script><script type=text/javascript src=static/js/chunk-elementUI.1fa5434b.js></script><script type=text/javascript src=static/js/chunk-libs.d5609760.js></script><script type=text/javascript src=static/js/app.4137ad8f.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.e5cd8da6.css rel=stylesheet><link href=chunk-libs.4e8c4664.css rel=stylesheet><link href=app.34fc670f.css rel=stylesheet></head><body><script src=/pleroma/admin/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=static/js/runtime.f40c8ec4.js></script><script type=text/javascript src=static/js/chunk-elementUI.1911151b.js></script><script type=text/javascript src=static/js/chunk-libs.fb0b7f4a.js></script><script type=text/javascript src=static/js/app.8e186193.js></script></body></html>

BIN
priv/static/adminfe/static/fonts/element-icons.2fad952.woff
View file

Binary file not shown.

BIN
priv/static/adminfe/static/fonts/element-icons.535877f.woff Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/fonts/element-icons.6f0a763.ttf
View file

Binary file not shown.

BIN
priv/static/adminfe/static/fonts/element-icons.732389d.ttf Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/app.4137ad8f.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/app.8e186193.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-0e18.208cd826.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-1fbf.616fb309.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-f018.e1a7a454.js → priv/static/adminfe/static/js/chunk-2325.154a537b.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-56c9.28e35fc3.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-5e57.7313703a.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-5eaf.5b76e416.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-7fe2.458f9da5.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-e547.d57d1b91.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-elementUI.1911151b.js Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-elementUI.1fa5434b.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/chunk-libs.d5609760.js → priv/static/adminfe/static/js/chunk-libs.fb0b7f4a.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/runtime.d8d12c12.js
View file

Binary file not shown.

BIN
priv/static/adminfe/static/js/runtime.f40c8ec4.js Normal file
View file

Binary file not shown.