sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,372 Commits 1 Branch 0 Tags 184 MiB
1692fa8945
Commit Graph

6372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ariadne Conill
10fef2fcee tests: fix up nodeinfo tests 2019-08-13 22:32:40 +00:00
kaniini
f5aacaf4d3 Merge branch 'feature/nicer-safe-render-errors' into 'develop' 
Nicer formatting for safe_render errors

See merge request pleroma/pleroma!1560
 2019-08-13 22:25:15 +00:00
Ariadne Conill
dd0b71ea6d tests: add tests for MRF.describe() 2019-08-13 22:19:15 +00:00
rinpatch
46d7bef7e7 Nicer formatting for safe_render errors 2019-08-14 01:15:18 +03:00
Ariadne Conill
f305e97eeb nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff 2019-08-13 22:09:02 +00:00
Ariadne Conill
c574b7a1fc MRF: add describe() to all modules, add base MRF configuration to base describe() 2019-08-13 22:08:58 +00:00
Ariadne Conill
7089400675 test: add mock MRF module for describe() testing 2019-08-13 21:29:15 +00:00
Ariadne Conill
694bc43123 MRF: add describe() for gathering and describing the MRF configuration 2019-08-13 21:26:24 +00:00
kaniini
943da97d6b Merge branch 'test/web_activity_pub_relay' into 'develop' 
tests for Web/ActivityPub/Relay

See merge request pleroma/pleroma!1557
 2019-08-13 21:12:59 +00:00
Maksim
fea4d89e9f tests for Web/ActivityPub/Relay 2019-08-13 21:12:59 +00:00
kaniini
39e6b16432 Merge branch 'test/web_mastodon_api' into 'develop' 
tests for /web/mastodon_api/mastodon_api.ex

See merge request pleroma/pleroma!1554
 2019-08-13 21:12:37 +00:00
Maksim
04da1166db tests for /web/mastodon_api/mastodon_api.ex 2019-08-13 21:12:37 +00:00
Ariadne Conill
369d9cf03b update changelog for mrf_vocabulary 2019-08-13 21:00:23 +00:00
Ariadne Conill
f7e3b7ff75 tests: add tests for mrf_vocabulary 2019-08-13 20:55:42 +00:00
Ariadne Conill
3cfaac39e2 docs: document mrf_vocabulary module settings 2019-08-13 20:55:42 +00:00
Ariadne Conill
3fdbeb7087 MRF: add vocabulary policy module 2019-08-13 20:55:38 +00:00
rinpatch
c1b6952d2a Mastodon API: Preloading and normalization optimizations 
- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present

This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?)
 2019-08-13 20:34:34 +03:00
kaniini
984d7be1a4 Merge branch 'feature/remove-disable-blocks' into 'develop' 
config: remove legacy activitypub accept_blocks setting

See merge request pleroma/pleroma!1556
 2019-08-13 02:45:47 +00:00
Ariadne Conill
f46cd7e9c7 config: remove legacy activitypub accept_blocks setting 
Anyone who is interested in dropping blocks can write their own MRF
policy at this point.  This setting predated the MRF framework.

Disabling the side effect (unsubscription) is still a config option
per policy.
 2019-08-13 02:15:21 +00:00
rinpatch
b0fad153e1 Merge branch 'update/admin-fe' into 'develop' 
Update AdminFE

See merge request pleroma/pleroma!1555
 2019-08-12 21:07:11 +00:00
Mark Felder
24a731a9a6 Update AdminFE 
Now permits server configuration. Consider this ALPHA.
 2019-08-12 15:00:03 -05:00
lain
2674db14a2 Modify Changelog. 2019-08-12 14:31:12 +02:00
lain
511ccea5aa ConversationView: Align parameter names with other views. 2019-08-12 14:23:06 +02:00
lain
60231ec7bd Conversation: Add endpoint to get a conversation by id. 2019-08-12 13:58:04 +02:00
lain
23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view. 
According to gargron, this is the intended usage.
 2019-08-12 12:51:08 +02:00
rinpatch
b9578bb8a0 Merge branch 'chore/changelog-update' into 'develop' 
Add a changelog entry for !1552

See merge request pleroma/pleroma!1553
 2019-08-11 20:25:17 +00:00
rinpatch
d4d31ffdc4 Add a changelog entry for !1552 2019-08-11 23:19:20 +03:00
rinpatch
9a8a01837e Merge branch 'fix/fix-type-depth' into 'develop' 
Do not fetch the reply object in `fix_type` unless the object has the `name` key and use a depth limit when fetching it

See merge request pleroma/pleroma!1552
 2019-08-11 20:01:10 +00:00
rinpatch
92479c6f48 Do not fetch the reply object in fix_type unless the object has the 
`name` key and use a depth limit when fetching it
 2019-08-11 22:49:55 +03:00
kaniini
779e32a879 Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop' 
MRF: ensure that subdomain_match calls are case-insensitive

See merge request pleroma/pleroma!1550
 2019-08-10 21:33:19 +00:00
Ariadne Conill
9cfc289594 MRF: ensure that subdomain_match calls are case-insensitive 2019-08-10 21:19:26 +00:00
kaniini
17d5564a9c Merge branch 'fix/hide-follows-counters' into 'develop' 
Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled

See merge request pleroma/pleroma!1544
 2019-08-10 18:59:24 +00:00
kaniini
84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters' 
# Conflicts:
#   CHANGELOG.md
 2019-08-10 18:49:04 +00:00
kaniini
708e7f0942 Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop' 
Strip internal fields including likes from incoming and outgoing activities

Closes #1159

See merge request pleroma/pleroma!1533
 2019-08-10 18:47:40 +00:00
Sergey Suprunenko
af4cf35e20 Strip internal fields including likes from incoming and outgoing activities 2019-08-10 18:47:40 +00:00
kaniini
5aa62b8581 Merge branch 'test/pleroma_uploaders' into 'develop' 
tests for Pleroma.Uploaders

See merge request pleroma/pleroma!1543
 2019-08-10 18:46:26 +00:00
Maksim
11d08c2de0 tests for Pleroma.Uploaders 2019-08-10 18:46:26 +00:00
kaniini
390329a303 Merge branch 'fix/mastoapi-threadmute-detection' into 'develop' 
Mastodon API: Fix thread mute detection

See merge request pleroma/pleroma!1548
 2019-08-10 18:29:16 +00:00
rinpatch
0802a08871 Mastodon API: Fix thread mute detection 
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
 2019-08-10 16:27:46 +03:00
rinpatch
337edb3e50 Merge branch 'feature/uploader_s3' into 'develop' 
Uploader.S3 added support stream uploads

See merge request pleroma/pleroma!1545
 2019-08-10 11:28:00 +00:00
Maksim
bb9c539580 Uploader.S3 added support stream uploads 2019-08-10 11:27:59 +00:00
Maxim Filippov
dfae61c25c Fix deactivated user deletion 2019-08-09 23:05:28 +03:00
rinpatch
409bcad54b Mastodon API: Set follower/following counters to 0 when hiding 
followers/following is enabled

We are already doing that in AP representation, so I think we should do
it here as well for consistency.
 2019-08-09 16:53:55 +03:00
lain
29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
rinpatch
b18234e04c Merge branch 'patch-3' into 'develop' 
Return profile URL when available instead of actor URI for MastodonAPI mention URL

Closes #1165

See merge request pleroma/pleroma!1541
 2019-08-07 22:14:02 +00:00
Thibaut Girka
9c0da1009a Return profile URL in MastodonAPI's url field 2019-08-07 21:40:53 +00:00
Thibaut Girka
089d53a961 Simplify logic to mention.js url field 
`User.profile_url` already fallbacks to ap_id
 2019-08-07 20:55:37 +00:00
Thibaut Girka
a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL 
Fixes #1165
 2019-08-07 20:29:30 +00:00
Haelwenn
aa718ab8f6 Merge branch 'fix/object-reembeds' into 'develop' 
Do not rembed the object after updating it

Closes #1142

See merge request pleroma/pleroma!1538
 2019-08-06 22:14:00 +00:00