Ariadne Conill [Tue, 13 Aug 2019 22:39:26 +0000 (22:39 +0000)]
mrf_vocabulary: add describe API support
Ariadne Conill [Tue, 13 Aug 2019 22:36:24 +0000 (22:36 +0000)]
fix credo
Haelwenn [Tue, 13 Aug 2019 22:32:49 +0000 (22:32 +0000)]
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
Ariadne Conill [Tue, 13 Aug 2019 22:32:40 +0000 (22:32 +0000)]
tests: fix up nodeinfo tests
kaniini [Tue, 13 Aug 2019 22:25:15 +0000 (22:25 +0000)]
Merge branch 'feature/nicer-safe-render-errors' into 'develop'
Nicer formatting for safe_render errors
See merge request pleroma/pleroma!1560
Ariadne Conill [Tue, 13 Aug 2019 22:19:15 +0000 (22:19 +0000)]
tests: add tests for MRF.describe()
rinpatch [Tue, 13 Aug 2019 22:15:18 +0000 (01:15 +0300)]
Nicer formatting for safe_render errors
Ariadne Conill [Tue, 13 Aug 2019 21:57:39 +0000 (21:57 +0000)]
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
Ariadne Conill [Tue, 13 Aug 2019 21:52:54 +0000 (21:52 +0000)]
MRF: add describe() to all modules, add base MRF configuration to base describe()
Ariadne Conill [Tue, 13 Aug 2019 21:29:15 +0000 (21:29 +0000)]
test: add mock MRF module for describe() testing
Ariadne Conill [Tue, 13 Aug 2019 21:26:24 +0000 (21:26 +0000)]
MRF: add describe() for gathering and describing the MRF configuration
kaniini [Tue, 13 Aug 2019 21:12:59 +0000 (21:12 +0000)]
Merge branch 'test/web_activity_pub_relay' into 'develop'
tests for Web/ActivityPub/Relay
See merge request pleroma/pleroma!1557
Maksim [Tue, 13 Aug 2019 21:12:59 +0000 (21:12 +0000)]
tests for Web/ActivityPub/Relay
kaniini [Tue, 13 Aug 2019 21:12:37 +0000 (21:12 +0000)]
Merge branch 'test/web_mastodon_api' into 'develop'
tests for /web/mastodon_api/mastodon_api.ex
See merge request pleroma/pleroma!1554
Maksim [Tue, 13 Aug 2019 21:12:37 +0000 (21:12 +0000)]
tests for /web/mastodon_api/mastodon_api.ex
Ariadne Conill [Tue, 13 Aug 2019 21:00:23 +0000 (21:00 +0000)]
update changelog for mrf_vocabulary
Ariadne Conill [Tue, 13 Aug 2019 20:55:13 +0000 (20:55 +0000)]
tests: add tests for mrf_vocabulary
Ariadne Conill [Tue, 13 Aug 2019 20:32:43 +0000 (20:32 +0000)]
docs: document mrf_vocabulary module settings
Ariadne Conill [Tue, 13 Aug 2019 20:28:59 +0000 (20:28 +0000)]
MRF: add vocabulary policy module
rinpatch [Tue, 13 Aug 2019 17:34:34 +0000 (20:34 +0300)]
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?)
kaniini [Tue, 13 Aug 2019 02:45:47 +0000 (02:45 +0000)]
Merge branch 'feature/remove-disable-blocks' into 'develop'
config: remove legacy activitypub accept_blocks setting
See merge request pleroma/pleroma!1556
Ariadne Conill [Tue, 13 Aug 2019 02:15:21 +0000 (02:15 +0000)]
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.
rinpatch [Mon, 12 Aug 2019 21:07:11 +0000 (21:07 +0000)]
Merge branch 'update/admin-fe' into 'develop'
Update AdminFE
See merge request pleroma/pleroma!1555
Mark Felder [Mon, 12 Aug 2019 20:00:03 +0000 (15:00 -0500)]
Update AdminFE
Now permits server configuration. Consider this ALPHA.
lain [Mon, 12 Aug 2019 12:26:18 +0000 (14:26 +0200)]
Modify Changelog.
lain [Mon, 12 Aug 2019 12:23:06 +0000 (14:23 +0200)]
ConversationView: Align parameter names with other views.
lain [Mon, 12 Aug 2019 11:58:04 +0000 (13:58 +0200)]
Conversation: Add endpoint to get a conversation by id.
lain [Mon, 12 Aug 2019 10:51:08 +0000 (12:51 +0200)]
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
rinpatch [Sun, 11 Aug 2019 20:25:17 +0000 (20:25 +0000)]
Merge branch 'chore/changelog-update' into 'develop'
Add a changelog entry for !1552
See merge request pleroma/pleroma!1553
rinpatch [Sun, 11 Aug 2019 20:19:20 +0000 (23:19 +0300)]
Add a changelog entry for !1552
rinpatch [Sun, 11 Aug 2019 20:01:10 +0000 (20:01 +0000)]
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
rinpatch [Sun, 11 Aug 2019 19:49:55 +0000 (22:49 +0300)]
Do not fetch the reply object in `fix_type` unless the object has the
`name` key and use a depth limit when fetching it
kaniini [Sat, 10 Aug 2019 21:33:19 +0000 (21:33 +0000)]
Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'
MRF: ensure that subdomain_match calls are case-insensitive
See merge request pleroma/pleroma!1550
Ariadne Conill [Sat, 10 Aug 2019 21:18:26 +0000 (21:18 +0000)]
MRF: ensure that subdomain_match calls are case-insensitive
kaniini [Sat, 10 Aug 2019 18:59:24 +0000 (18:59 +0000)]
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
kaniini [Sat, 10 Aug 2019 18:49:04 +0000 (18:49 +0000)]
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
kaniini [Sat, 10 Aug 2019 18:47:40 +0000 (18:47 +0000)]
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
Sergey Suprunenko [Sat, 10 Aug 2019 18:47:40 +0000 (18:47 +0000)]
Strip internal fields including likes from incoming and outgoing activities
kaniini [Sat, 10 Aug 2019 18:46:26 +0000 (18:46 +0000)]
Merge branch 'test/pleroma_uploaders' into 'develop'
tests for Pleroma.Uploaders
See merge request pleroma/pleroma!1543
Maksim [Sat, 10 Aug 2019 18:46:26 +0000 (18:46 +0000)]
tests for Pleroma.Uploaders
kaniini [Sat, 10 Aug 2019 18:29:16 +0000 (18:29 +0000)]
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'
Mastodon API: Fix thread mute detection
See merge request pleroma/pleroma!1548
rinpatch [Sat, 10 Aug 2019 13:27:46 +0000 (16:27 +0300)]
Mastodon API: Fix thread mute detection
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
rinpatch [Sat, 10 Aug 2019 11:28:00 +0000 (11:28 +0000)]
Merge branch 'feature/uploader_s3' into 'develop'
Uploader.S3 added support stream uploads
See merge request pleroma/pleroma!1545
Maksim [Sat, 10 Aug 2019 11:27:59 +0000 (11:27 +0000)]
Uploader.S3 added support stream uploads
Maxim Filippov [Fri, 9 Aug 2019 20:05:28 +0000 (23:05 +0300)]
Fix deactivated user deletion
rinpatch [Fri, 9 Aug 2019 13:49:09 +0000 (16:49 +0300)]
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.
lain [Thu, 8 Aug 2019 14:38:33 +0000 (14:38 +0000)]
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email
See merge request pleroma/pleroma!1078
lain [Thu, 8 Aug 2019 14:04:20 +0000 (16:04 +0200)]
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
rinpatch [Wed, 7 Aug 2019 22:14:02 +0000 (22:14 +0000)]
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
Thibaut Girka [Wed, 7 Aug 2019 21:40:53 +0000 (21:40 +0000)]
Return profile URL in MastodonAPI's `url` field
Thibaut Girka [Wed, 7 Aug 2019 20:55:37 +0000 (20:55 +0000)]
Simplify logic to mention.js `url` field
`User.profile_url` already fallbacks to ap_id
Thibaut Girka [Wed, 7 Aug 2019 20:29:30 +0000 (20:29 +0000)]
Return profile URL when available instead of actor URI for MastodonAPI mention URL
Fixes #1165
Haelwenn [Tue, 6 Aug 2019 22:14:00 +0000 (22:14 +0000)]
Merge branch 'fix/object-reembeds' into 'develop'
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
rinpatch [Tue, 6 Aug 2019 22:02:29 +0000 (01:02 +0300)]
Do not rembed the object after updating it
rinpatch [Tue, 6 Aug 2019 21:58:48 +0000 (00:58 +0300)]
OStatus tests: stop relying on embedded objects
rinpatch [Tue, 6 Aug 2019 21:36:13 +0000 (00:36 +0300)]
ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
rinpatch [Tue, 6 Aug 2019 21:23:58 +0000 (00:23 +0300)]
OStatus Announce Representer: Do not depend on the object being embedded
in the Create activity
rinpatch [Tue, 6 Aug 2019 21:12:42 +0000 (00:12 +0300)]
Stop depending on the embedded object in restrict_favorited_by
kaniini [Tue, 6 Aug 2019 20:19:28 +0000 (20:19 +0000)]
Merge branch 'issue/1150' into 'develop'
[#1150] fixed parser TwitterCard
See merge request pleroma/pleroma!1537
Maksim [Tue, 6 Aug 2019 20:19:28 +0000 (20:19 +0000)]
[#1150] fixed parser TwitterCard
lain [Tue, 6 Aug 2019 13:06:19 +0000 (15:06 +0200)]
Conversation: Rename function to better express what it does.
lain [Tue, 6 Aug 2019 12:51:17 +0000 (14:51 +0200)]
Participation: Setting recipients will always add the owner.
kaniini [Mon, 5 Aug 2019 15:37:05 +0000 (15:37 +0000)]
Merge branch 'test/common_api_utils.ex' into 'develop'
tests for CommonApi/Utils
See merge request pleroma/pleroma!1534
Maksim [Mon, 5 Aug 2019 15:37:05 +0000 (15:37 +0000)]
tests for CommonApi/Utils
lain [Mon, 5 Aug 2019 14:11:23 +0000 (16:11 +0200)]
Linting.
lain [Mon, 5 Aug 2019 13:58:14 +0000 (15:58 +0200)]
Pleroma Conversations: Document differences.
lain [Mon, 5 Aug 2019 13:33:22 +0000 (15:33 +0200)]
CommonAPI: Replies to conversations also get the correct context id.
lain [Mon, 5 Aug 2019 13:09:19 +0000 (15:09 +0200)]
Pleroma Conversations API: Add a way to set recipients.
Egor Kislitsyn [Mon, 5 Aug 2019 08:33:34 +0000 (15:33 +0700)]
Update CHANGELOG
kaniini [Sun, 4 Aug 2019 22:24:50 +0000 (22:24 +0000)]
Merge branch 'report-email-from-remote-user' into 'develop'
Remove Reply-To from report emails
Closes #1141
See merge request pleroma/pleroma!1531
Eugenij [Sun, 4 Aug 2019 22:24:50 +0000 (22:24 +0000)]
Remove Reply-To from report emails
kaniini [Sun, 4 Aug 2019 17:14:37 +0000 (17:14 +0000)]
Merge branch 'feature/relay-list-task' into 'develop'
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
kaniini [Sun, 4 Aug 2019 17:13:06 +0000 (17:13 +0000)]
Merge branch 'fix/wrong-next-key-likes-json' into 'develop'
Do not add the "next" key to likes.json if there is no more items
See merge request pleroma/pleroma!1530
Sergey Suprunenko [Sun, 4 Aug 2019 17:13:06 +0000 (17:13 +0000)]
Do not add the "next" key to likes.json if there is no more items
kaniini [Sun, 4 Aug 2019 17:05:17 +0000 (17:05 +0000)]
Merge branch 'patch-2' into 'develop'
Replace "impode" with "implode"
See merge request pleroma/pleroma!1532
x0rz3q [Sun, 4 Aug 2019 14:35:45 +0000 (14:35 +0000)]
Replace "impode" with "implode" for
kaniini [Sun, 4 Aug 2019 04:32:45 +0000 (04:32 +0000)]
Merge branch 'remove-longfox-emoji-set' into 'develop'
Remove longfox emoji set
See merge request pleroma/pleroma!1525
Hakaba Hitoyo [Sun, 4 Aug 2019 04:32:45 +0000 (04:32 +0000)]
Remove longfox emoji set
kaniini [Sun, 4 Aug 2019 04:32:09 +0000 (04:32 +0000)]
Merge branch 'develop' into 'develop'
Fix a stale link and a few typos
See merge request pleroma/pleroma!1529
Pierce McGoran [Sun, 4 Aug 2019 03:12:38 +0000 (03:12 +0000)]
Fix some typos and rework a few lines in howto_mediaproxy.md
Pierce McGoran [Sun, 4 Aug 2019 03:01:21 +0000 (03:01 +0000)]
Update link in README.md
Ariadne Conill [Sat, 3 Aug 2019 23:17:17 +0000 (23:17 +0000)]
tasks: relay: add list task
kaniini [Sat, 3 Aug 2019 21:29:39 +0000 (21:29 +0000)]
Merge branch 'bugfix/password-reset-link-styling' into 'develop'
templates/layout/app.html.eex: Style anchors
See merge request pleroma/pleroma!1527
Haelwenn (lanodan) Monnier [Sat, 3 Aug 2019 20:56:20 +0000 (22:56 +0200)]
templates/layout/app.html.eex: Style anchors
[ci skip]
kaniini [Sat, 3 Aug 2019 18:55:09 +0000 (18:55 +0000)]
Merge branch 'patch-2' into 'develop'
Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526
Thibaut Girka [Sat, 3 Aug 2019 18:37:20 +0000 (18:37 +0000)]
Refactor
Thibaut Girka [Sat, 3 Aug 2019 18:28:08 +0000 (18:28 +0000)]
Only add `preferredUsername` to service actor json when the underlying user actually has a username
kaniini [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Merge branch 'admin-fixes' into 'develop'
Admin fixes
See merge request pleroma/pleroma!1524
Alexander Strizhakov [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Admin fixes
kaniini [Sat, 3 Aug 2019 18:13:21 +0000 (18:13 +0000)]
Merge branch 'fix/search-space-error' into 'develop'
Remove spaces from the domain search
Closes #1154
See merge request pleroma/pleroma!1521
Sergey Suprunenko [Sat, 3 Aug 2019 18:13:20 +0000 (18:13 +0000)]
Remove spaces from the domain search
kaniini [Sat, 3 Aug 2019 18:12:39 +0000 (18:12 +0000)]
Merge branch 'fix/with-reject-nil-clause' into 'develop'
Handle MRF rejections of incoming AP activities
Closes #1095
See merge request pleroma/pleroma!1520
Sergey Suprunenko [Sat, 3 Aug 2019 18:12:38 +0000 (18:12 +0000)]
Handle MRF rejections of incoming AP activities
kaniini [Sat, 3 Aug 2019 18:12:03 +0000 (18:12 +0000)]
Merge branch 'official-docker-support' into 'develop'
Add Dockerfile
See merge request pleroma/pleroma!1523
Ashlynn Anderson [Sat, 3 Aug 2019 17:42:57 +0000 (13:42 -0400)]
Run mix format
Thibaut Girka [Sat, 3 Aug 2019 17:24:57 +0000 (17:24 +0000)]
Add preferredUsername to service actors so Mastodon can resolve them
Ashlynn Anderson [Sat, 3 Aug 2019 03:33:47 +0000 (23:33 -0400)]
Add .dockerignore
Ashlynn Anderson [Sat, 3 Aug 2019 02:40:31 +0000 (22:40 -0400)]
Optimize Dockerfile
Just merging RUNs to decrease the number of layers
Ashlynn Anderson [Sat, 3 Aug 2019 02:28:48 +0000 (22:28 -0400)]
Create docker.exs and docker-entrypoint + round out Dockerfile
At this point, the implementation is completely working and has been
tested running live and federating with other instances.
Ashlynn Anderson [Wed, 31 Jul 2019 23:35:14 +0000 (19:35 -0400)]
Basic working Dockerfile
No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works.