sadposter [Tue, 27 Aug 2019 07:58:47 +0000 (08:58 +0100)]
fix gab rewrite
sadposter [Fri, 16 Aug 2019 09:58:32 +0000 (10:58 +0100)]
add describe to gab rewrite
sadposter [Fri, 16 Aug 2019 09:54:53 +0000 (10:54 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Thu, 15 Aug 2019 17:51:30 +0000 (17:51 +0000)]
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
Fix OAuth cleanup worker unconditionally starting
See merge request pleroma/pleroma!1578
rinpatch [Thu, 15 Aug 2019 17:36:20 +0000 (20:36 +0300)]
Fix OAuth cleanup worker unconditionally starting
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
kaniini [Thu, 15 Aug 2019 17:34:16 +0000 (17:34 +0000)]
Merge branch 'features/formatting-sub_sup' into 'develop'
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
lain [Thu, 15 Aug 2019 15:51:11 +0000 (15:51 +0000)]
Merge branch 'feature/parallel-rendering' into 'develop'
Parallelize template rendering
See merge request pleroma/pleroma!1576
rinpatch [Thu, 15 Aug 2019 14:41:26 +0000 (17:41 +0300)]
Parallelize template rendering
lain [Thu, 15 Aug 2019 14:06:27 +0000 (14:06 +0000)]
Merge branch 'cache-follow-state' into 'develop'
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
rinpatch [Wed, 14 Aug 2019 22:10:44 +0000 (22:10 +0000)]
Merge branch 'fix/stats-send-after' into 'develop'
Collect stats immediately after init
See merge request pleroma/pleroma!1574
rinpatch [Wed, 14 Aug 2019 22:01:13 +0000 (01:01 +0300)]
Collect stats immediately after init
rinpatch [Wed, 14 Aug 2019 21:47:30 +0000 (00:47 +0300)]
Cache follow state
rinpatch [Wed, 14 Aug 2019 21:43:02 +0000 (00:43 +0300)]
Add a task to benchmark timeline rendering
Haelwenn (lanodan) Monnier [Wed, 14 Aug 2019 20:48:44 +0000 (22:48 +0200)]
html.ex: Allow sub and sup elements by default
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
rinpatch [Wed, 14 Aug 2019 19:22:15 +0000 (19:22 +0000)]
Merge branch 'misc-otp-issues' into 'develop'
Misc OTP issues
See merge request pleroma/pleroma!1567
rinpatch [Wed, 14 Aug 2019 19:16:52 +0000 (19:16 +0000)]
Merge branch 'fix/http-signatures-post' into 'develop'
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
kaniini [Wed, 14 Aug 2019 19:05:44 +0000 (19:05 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
rinpatch [Wed, 14 Aug 2019 19:03:39 +0000 (19:03 +0000)]
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'
MRF: fix up unserializable option lists in describe implementations
See merge request pleroma/pleroma!1568
Ariadne Conill [Wed, 14 Aug 2019 19:00:48 +0000 (19:00 +0000)]
activitypub: publisher: add (request-target) to http signature when POSTing
Ariadne Conill [Wed, 14 Aug 2019 18:53:18 +0000 (18:53 +0000)]
MRF: fix up unserializable option lists in describe implementations
stwf [Wed, 14 Aug 2019 18:01:11 +0000 (14:01 -0400)]
fix formatting
stwf [Wed, 14 Aug 2019 15:59:33 +0000 (11:59 -0400)]
Implement Pleroma.Stats as GenServer
stwf [Wed, 14 Aug 2019 15:58:32 +0000 (11:58 -0400)]
streamline Streamer pings
stwf [Wed, 14 Aug 2019 15:57:50 +0000 (11:57 -0400)]
Isolate OAuth.Token.CleanWorker
stwf [Wed, 14 Aug 2019 15:55:17 +0000 (11:55 -0400)]
use default child_specs
lain [Wed, 14 Aug 2019 15:07:03 +0000 (15:07 +0000)]
Merge branch 'fix/revert-tzdata-1.8' into 'develop'
Switch to pre-1.8 version of tzdata.
Closes #1183
See merge request pleroma/pleroma!1566
rinpatch [Wed, 14 Aug 2019 14:05:21 +0000 (17:05 +0300)]
Switch to pre-1.8 version of tzdata.
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
rinpatch [Wed, 14 Aug 2019 02:12:09 +0000 (02:12 +0000)]
Merge branch 'backport/describe-api-changelog' into 'develop'
Backport the describe API changelog entry to develop
See merge request pleroma/pleroma!1564
Ariadne Conill [Wed, 14 Aug 2019 01:36:42 +0000 (01:36 +0000)]
update changelog to cover MRF describe API.
kaniini [Wed, 14 Aug 2019 01:04:07 +0000 (01:04 +0000)]
Merge branch 'preload-user-timelines' into 'develop'
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
kaniini [Wed, 14 Aug 2019 01:03:54 +0000 (01:03 +0000)]
Merge branch 'get-context-optimizations' into 'develop'
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
rinpatch [Wed, 14 Aug 2019 00:02:09 +0000 (03:02 +0300)]
Preload thread mutes/bookmarks in user_statuses
rinpatch [Tue, 13 Aug 2019 23:36:54 +0000 (02:36 +0300)]
Preload thread mutes/bookmarks in get_context
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
rinpatch [Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)]
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
kaniini [Tue, 13 Aug 2019 22:46:19 +0000 (22:46 +0000)]
Merge branch 'feature/mrf-describe' into 'develop'
MRF describe API
See merge request pleroma/pleroma!1561
Ariadne Conill [Tue, 13 Aug 2019 22:40:18 +0000 (22:40 +0000)]
docs tweak
rinpatch [Tue, 13 Aug 2019 22:40:13 +0000 (22:40 +0000)]
Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
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?)
sadposter [Tue, 13 Aug 2019 08:05:44 +0000 (09:05 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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.
sadposter [Mon, 12 Aug 2019 13:55:20 +0000 (14:55 +0100)]
TOS
sadposter [Sun, 11 Aug 2019 23:51:04 +0000 (00:51 +0100)]
TOS
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
sadposter [Sun, 11 Aug 2019 20:03:20 +0000 (21:03 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter [Sat, 10 Aug 2019 22:43:32 +0000 (23:43 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
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
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
sadposter [Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
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
Egor Kislitsyn [Mon, 5 Aug 2019 08:33:34 +0000 (15:33 +0700)]
Update CHANGELOG
projects / akkoma / log