akkoma
4 years agoremoves duplicates from relay subscription list
Maksim Pechnikov [Mon, 19 Aug 2019 10:31:56 +0000 (13:31 +0300)]
removes duplicates from relay subscription list

4 years agoMerge branch 'chore/fix-ap-muted-tests' into 'develop'
kaniini [Sun, 18 Aug 2019 22:33:51 +0000 (22:33 +0000)]
Merge branch 'chore/fix-ap-muted-tests' into 'develop'

tests: activitypub: fix muted thread tests

See merge request pleroma/pleroma!1584

4 years agotests: activitypub: fix typo
Ariadne Conill [Sun, 18 Aug 2019 22:21:31 +0000 (22:21 +0000)]
tests: activitypub: fix typo

4 years agoMerge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
kaniini [Sun, 18 Aug 2019 21:59:22 +0000 (21:59 +0000)]
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'

Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583

4 years agoMerge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
kaniini [Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)]
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'

Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575

4 years agouse commonAPI in tests
Sadposter [Sun, 18 Aug 2019 21:54:40 +0000 (22:54 +0100)]
use commonAPI in tests

4 years agoclear follow requests when blocking a user
Sadposter [Sun, 18 Aug 2019 19:29:31 +0000 (20:29 +0100)]
clear follow requests when blocking a user

4 years agoAdd changelog entry too
Mark Felder [Fri, 16 Aug 2019 15:28:07 +0000 (10:28 -0500)]
Add changelog entry too

4 years agoFormatting
Mark Felder [Fri, 16 Aug 2019 15:00:18 +0000 (10:00 -0500)]
Formatting

4 years agofixed User.unfollow with synchronization external user
Maksim Pechnikov [Fri, 16 Aug 2019 12:58:42 +0000 (15:58 +0300)]
fixed User.unfollow with synchronization external user

4 years agoMerge branch 'pleroma-conversations' into 'develop'
lain [Fri, 16 Aug 2019 12:55:33 +0000 (12:55 +0000)]
Merge branch 'pleroma-conversations' into 'develop'

Extended Pleroma Conversations

See merge request pleroma/pleroma!1535

4 years agoAdd configurable colors and logo for the digest template
Egor Kislitsyn [Fri, 16 Aug 2019 11:32:25 +0000 (18:32 +0700)]
Add configurable colors and logo for the digest template

4 years agomax_body_size -> max_body_length, as it should be
Mark Felder [Thu, 15 Aug 2019 20:34:41 +0000 (15:34 -0500)]
max_body_size -> max_body_length, as it should be

4 years agoMerge branch 'fix/oauth-cleanup-worker-unconditional-start' 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

4 years agoFix OAuth cleanup worker unconditionally starting
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

4 years agoMerge branch 'features/formatting-sub_sup' into 'develop'
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

4 years agoMerge branch 'feature/parallel-rendering' into 'develop'
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

4 years agoParallelize template rendering
rinpatch [Thu, 15 Aug 2019 14:41:26 +0000 (17:41 +0300)]
Parallelize template rendering

4 years agoHide muted theads from home/public timelines unless `with_muted` is set
rinpatch [Thu, 15 Aug 2019 14:37:30 +0000 (17:37 +0300)]
Hide muted theads from home/public timelines unless `with_muted` is set

4 years agoMerge branch 'cache-follow-state' into 'develop'
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

4 years agoMerge branch 'develop' into 'fix/admin-api-user-deletion'
Maxim Filippov [Wed, 14 Aug 2019 22:45:32 +0000 (22:45 +0000)]
Merge branch 'develop' into 'fix/admin-api-user-deletion'

# Conflicts:
#   CHANGELOG.md

4 years agoFix CHANGELOG entry
Maxim Filippov [Wed, 14 Aug 2019 22:42:43 +0000 (01:42 +0300)]
Fix CHANGELOG entry

4 years agoDo not check if actor is active when deleting a user
Maxim Filippov [Wed, 14 Aug 2019 22:35:29 +0000 (01:35 +0300)]
Do not check if actor is active when deleting a user

4 years agoMerge branch 'fix/stats-send-after' into 'develop'
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

4 years agoCollect stats immediately after init
rinpatch [Wed, 14 Aug 2019 22:01:13 +0000 (01:01 +0300)]
Collect stats immediately after init

4 years agoCache follow state
rinpatch [Wed, 14 Aug 2019 21:47:30 +0000 (00:47 +0300)]
Cache follow state

4 years agoAdd a task to benchmark timeline rendering
rinpatch [Wed, 14 Aug 2019 21:43:02 +0000 (00:43 +0300)]
Add a task to benchmark timeline rendering

4 years agohtml.ex: Allow sub and sup elements by default
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
4 years agoMerge branch 'misc-otp-issues' into 'develop'
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

4 years agoMerge branch 'fix/http-signatures-post' into 'develop'
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

4 years agoApply suggestion to lib/pleroma/web/activity_pub/publisher.ex
kaniini [Wed, 14 Aug 2019 19:05:44 +0000 (19:05 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex

4 years agoMerge branch 'fix/mrf-describe-keyword-lists' into 'develop'
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

4 years agoactivitypub: publisher: add (request-target) to http signature when POSTing
Ariadne Conill [Wed, 14 Aug 2019 19:00:48 +0000 (19:00 +0000)]
activitypub: publisher: add (request-target) to http signature when POSTing

4 years agoMRF: fix up unserializable option lists in describe implementations
Ariadne Conill [Wed, 14 Aug 2019 18:53:18 +0000 (18:53 +0000)]
MRF: fix up unserializable option lists in describe implementations

4 years agofix formatting
stwf [Wed, 14 Aug 2019 18:01:11 +0000 (14:01 -0400)]
fix formatting

4 years agoImplement Pleroma.Stats as GenServer
stwf [Wed, 14 Aug 2019 15:59:33 +0000 (11:59 -0400)]
Implement Pleroma.Stats as GenServer

4 years agostreamline Streamer pings
stwf [Wed, 14 Aug 2019 15:58:32 +0000 (11:58 -0400)]
streamline Streamer pings

4 years agoIsolate OAuth.Token.CleanWorker
stwf [Wed, 14 Aug 2019 15:57:50 +0000 (11:57 -0400)]
Isolate OAuth.Token.CleanWorker

4 years agouse default child_specs
stwf [Wed, 14 Aug 2019 15:55:17 +0000 (11:55 -0400)]
use default child_specs

4 years agoMerge branch 'fix/revert-tzdata-1.8' into 'develop'
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

4 years agoConversations: Load relations in one query.
lain [Wed, 14 Aug 2019 15:01:11 +0000 (17:01 +0200)]
Conversations: Load relations in one query.

4 years agoSwitch to pre-1.8 version of tzdata.
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.

4 years agoFix compatibility with Elixir 1.8
Egor Kislitsyn [Wed, 14 Aug 2019 14:03:25 +0000 (21:03 +0700)]
Fix compatibility with Elixir 1.8

4 years agoConversation: Render new participation on update.
lain [Wed, 14 Aug 2019 13:56:15 +0000 (15:56 +0200)]
Conversation: Render new participation on update.

4 years agoConversations: Use correct oauth paths for extended api.
lain [Wed, 14 Aug 2019 13:55:43 +0000 (15:55 +0200)]
Conversations: Use correct oauth paths for extended api.

4 years agoImprove digest email template
Egor Kislitsyn [Wed, 14 Aug 2019 13:46:05 +0000 (20:46 +0700)]
Improve digest email template

4 years agoMerge remote-tracking branch 'origin/develop' into pleroma-conversations
lain [Wed, 14 Aug 2019 13:30:40 +0000 (15:30 +0200)]
Merge remote-tracking branch 'origin/develop' into pleroma-conversations

4 years agoIncrease max account fields limits
Egor Kislitsyn [Thu, 8 Aug 2019 06:20:35 +0000 (13:20 +0700)]
Increase max account fields limits

4 years agoLimit custom fields for old remote users
Egor Kislitsyn [Wed, 7 Aug 2019 11:48:05 +0000 (18:48 +0700)]
Limit custom fields for old remote users

4 years agoAdd `:max_remote_account_fields` config option
Egor Kislitsyn [Wed, 7 Aug 2019 11:14:22 +0000 (18:14 +0700)]
Add `:max_remote_account_fields` config option

4 years agoUse info.fields instead of source_data for remote users
Egor Kislitsyn [Tue, 6 Aug 2019 11:21:25 +0000 (18:21 +0700)]
Use info.fields instead of source_data for remote users

4 years agoAdd configurable account field name length limit
Egor Kislitsyn [Thu, 1 Aug 2019 08:09:15 +0000 (15:09 +0700)]
Add configurable account field name length limit

4 years agoAdd configurable account field value length limit
Egor Kislitsyn [Tue, 30 Jul 2019 10:22:52 +0000 (17:22 +0700)]
Add configurable account field value length limit

4 years agoLinkify custom fields values in ActivityPub.UserViewx
Egor Kislitsyn [Mon, 29 Jul 2019 12:17:09 +0000 (19:17 +0700)]
Linkify custom fields values in ActivityPub.UserViewx

4 years agoSupport user attachment update in Transmogrifier
Egor Kislitsyn [Mon, 29 Jul 2019 12:01:15 +0000 (19:01 +0700)]
Support user attachment update in Transmogrifier

4 years agoApply suggestion to CHANGELOG.md
Egor [Fri, 26 Jul 2019 12:08:46 +0000 (12:08 +0000)]
Apply suggestion to CHANGELOG.md

4 years agoAdd profile custom fields to ActivityPub.UserView
Egor Kislitsyn [Thu, 25 Jul 2019 12:35:34 +0000 (19:35 +0700)]
Add profile custom fields to ActivityPub.UserView

4 years agoAdd custom fields to TwitterAPI.UserView
Egor Kislitsyn [Thu, 25 Jul 2019 12:33:18 +0000 (19:33 +0700)]
Add custom fields to TwitterAPI.UserView

4 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 25 Jul 2019 07:34:52 +0000 (14:34 +0700)]
Update CHANGELOG

4 years agoFix tests
Egor Kislitsyn [Wed, 24 Jul 2019 12:48:15 +0000 (19:48 +0700)]
Fix tests

4 years agoAdd custom profile fields
Egor Kislitsyn [Wed, 24 Jul 2019 12:26:35 +0000 (19:26 +0700)]
Add custom profile fields

4 years agoMerge branch 'backport/describe-api-changelog' into 'develop'
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

4 years agoupdate changelog to cover MRF describe API.
Ariadne Conill [Wed, 14 Aug 2019 01:36:42 +0000 (01:36 +0000)]
update changelog to cover MRF describe API.

4 years agoMerge branch 'preload-user-timelines' into 'develop'
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

4 years agoMerge branch 'get-context-optimizations' into 'develop'
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

4 years agoPreload thread mutes/bookmarks in user_statuses
rinpatch [Wed, 14 Aug 2019 00:02:09 +0000 (03:02 +0300)]
Preload thread mutes/bookmarks in user_statuses

4 years agoPreload thread mutes/bookmarks in get_context
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.

4 years agoMerge branch 'feature/mrf-vocabulary' into 'develop'
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

4 years agoMerge branch 'feature/mrf-describe' into 'develop'
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

4 years agodocs tweak
Ariadne Conill [Tue, 13 Aug 2019 22:40:18 +0000 (22:40 +0000)]
docs tweak

4 years agoMerge branch 'length-limit-bio' into 'develop'
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

4 years agomrf_vocabulary: add describe API support
Ariadne Conill [Tue, 13 Aug 2019 22:39:26 +0000 (22:39 +0000)]
mrf_vocabulary: add describe API support

4 years agofix credo
Ariadne Conill [Tue, 13 Aug 2019 22:36:24 +0000 (22:36 +0000)]
fix credo

4 years agoMerge branch 'fix/mastoapi-more-object-preloads' into 'develop'
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

4 years agotests: fix up nodeinfo tests
Ariadne Conill [Tue, 13 Aug 2019 22:32:40 +0000 (22:32 +0000)]
tests: fix up nodeinfo tests

4 years agoMerge branch 'feature/nicer-safe-render-errors' into 'develop'
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

4 years agotests: add tests for MRF.describe()
Ariadne Conill [Tue, 13 Aug 2019 22:19:15 +0000 (22:19 +0000)]
tests: add tests for MRF.describe()

4 years agoNicer formatting for safe_render errors
rinpatch [Tue, 13 Aug 2019 22:15:18 +0000 (01:15 +0300)]
Nicer formatting for safe_render errors

4 years agonodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
Ariadne Conill [Tue, 13 Aug 2019 21:57:39 +0000 (21:57 +0000)]
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff

4 years agoMRF: add describe() to all modules, add base MRF configuration to base describe()
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()

4 years agotest: add mock MRF module for describe() testing
Ariadne Conill [Tue, 13 Aug 2019 21:29:15 +0000 (21:29 +0000)]
test: add mock MRF module for describe() testing

4 years agoMRF: add describe() for gathering and describing the MRF configuration
Ariadne Conill [Tue, 13 Aug 2019 21:26:24 +0000 (21:26 +0000)]
MRF: add describe() for gathering and describing the MRF configuration

4 years agoMerge branch 'test/web_activity_pub_relay' into 'develop'
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

4 years agotests for Web/ActivityPub/Relay
Maksim [Tue, 13 Aug 2019 21:12:59 +0000 (21:12 +0000)]
tests for Web/ActivityPub/Relay

4 years agoMerge branch 'test/web_mastodon_api' into 'develop'
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

4 years agotests for /web/mastodon_api/mastodon_api.ex
Maksim [Tue, 13 Aug 2019 21:12:37 +0000 (21:12 +0000)]
tests for /web/mastodon_api/mastodon_api.ex

4 years agoupdate changelog for mrf_vocabulary
Ariadne Conill [Tue, 13 Aug 2019 21:00:23 +0000 (21:00 +0000)]
update changelog for mrf_vocabulary

4 years agotests: add tests for mrf_vocabulary
Ariadne Conill [Tue, 13 Aug 2019 20:55:13 +0000 (20:55 +0000)]
tests: add tests for mrf_vocabulary

4 years agodocs: document mrf_vocabulary module settings
Ariadne Conill [Tue, 13 Aug 2019 20:32:43 +0000 (20:32 +0000)]
docs: document mrf_vocabulary module settings

4 years agoMRF: add vocabulary policy module
Ariadne Conill [Tue, 13 Aug 2019 20:28:59 +0000 (20:28 +0000)]
MRF: add vocabulary policy module

4 years agoMastodon API: Preloading and normalization optimizations
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?)

4 years agoMerge branch 'feature/remove-disable-blocks' 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

4 years agoconfig: remove legacy activitypub accept_blocks setting
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.

4 years agoMerge branch 'update/admin-fe' into 'develop'
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

4 years agoUpdate AdminFE
Mark Felder [Mon, 12 Aug 2019 20:00:03 +0000 (15:00 -0500)]
Update AdminFE

Now permits server configuration. Consider this ALPHA.

4 years agoModify Changelog.
lain [Mon, 12 Aug 2019 12:26:18 +0000 (14:26 +0200)]
Modify Changelog.

4 years agoConversationView: Align parameter names with other views.
lain [Mon, 12 Aug 2019 12:23:06 +0000 (14:23 +0200)]
ConversationView: Align parameter names with other views.

4 years agoConversation: Add endpoint to get a conversation by id.
lain [Mon, 12 Aug 2019 11:58:04 +0000 (13:58 +0200)]
Conversation: Add endpoint to get a conversation by id.

4 years agoConversations: Use 'recipients' for accounts in conversation view.
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.

4 years agoMerge branch 'chore/changelog-update' into 'develop'
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