akkoma
4 years agoParse http signature for request to objects/activities
rinpatch [Thu, 12 Sep 2019 19:40:53 +0000 (22:40 +0300)]
Parse http signature for request to objects/activities

4 years agoPut the cache with the right key when using a tracking function
rinpatch [Thu, 12 Sep 2019 19:10:15 +0000 (22:10 +0300)]
Put the cache with the right key when using a tracking function

4 years agoTrack object/create activity fetches
rinpatch [Thu, 12 Sep 2019 18:37:36 +0000 (21:37 +0300)]
Track object/create activity fetches

4 years agoFix associated test as well
Mark Felder [Thu, 12 Sep 2019 17:29:08 +0000 (12:29 -0500)]
Fix associated test as well

4 years agoFix double quotes in error logs
Mark Felder [Wed, 11 Sep 2019 21:16:09 +0000 (16:16 -0500)]
Fix double quotes in error logs

Example:

pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil

4 years agoMerge branch 'feature/jason-view-render' into 'develop'
kaniini [Wed, 11 Sep 2019 20:47:25 +0000 (20:47 +0000)]
Merge branch 'feature/jason-view-render' into 'develop'

Use Jason for rendering responses

See merge request pleroma/pleroma!1655

4 years agoUse Jason for rendering responses
rinpatch [Wed, 11 Sep 2019 20:04:01 +0000 (23:04 +0300)]
Use Jason for rendering responses

Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)

4 years agoMerge branch 'patch-5' into 'develop'
Haelwenn [Wed, 11 Sep 2019 17:47:19 +0000 (17:47 +0000)]
Merge branch 'patch-5' into 'develop'

Mastodon API: URI encode hashtag name in generated URLs

See merge request pleroma/pleroma!1642

4 years agoMerge branch 'fix/oom-parallel-rendering' into 'develop'
lain [Wed, 11 Sep 2019 11:21:03 +0000 (11:21 +0000)]
Merge branch 'fix/oom-parallel-rendering' into 'develop'

Revert "Parallelize template rendering"

See merge request pleroma/pleroma!1654

4 years agoAdd extended benchmark
rinpatch [Tue, 10 Sep 2019 20:08:15 +0000 (23:08 +0300)]
Add extended benchmark

4 years agoweb_cache_ttl description
Alex S [Wed, 11 Sep 2019 06:32:58 +0000 (09:32 +0300)]
web_cache_ttl description

4 years agorefactoring
Alex S [Tue, 3 Sep 2019 17:11:32 +0000 (20:11 +0300)]
refactoring

4 years agolittle refactor
Alex S [Tue, 3 Sep 2019 17:06:22 +0000 (20:06 +0300)]
little refactor

4 years agosome changes
Alex S [Tue, 3 Sep 2019 16:22:25 +0000 (19:22 +0300)]
some changes

4 years agoplaceholder for config.md
Alex S [Tue, 3 Sep 2019 09:32:00 +0000 (12:32 +0300)]
placeholder for config.md

4 years agolittle fix
Alex S [Tue, 3 Sep 2019 09:31:43 +0000 (12:31 +0300)]
little fix

4 years agobump ex_doc version
Alex S [Tue, 3 Sep 2019 09:30:44 +0000 (12:30 +0300)]
bump ex_doc version

4 years agoformatting
Alex S [Tue, 3 Sep 2019 08:56:21 +0000 (11:56 +0300)]
formatting

4 years agodon't add behaviour to suggestions
Alex S [Tue, 3 Sep 2019 06:45:54 +0000 (09:45 +0300)]
don't add behaviour to suggestions

4 years agoApply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:16 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs

4 years agoApply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:02 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs

4 years agolittle fix
Alex S [Fri, 30 Aug 2019 17:14:18 +0000 (20:14 +0300)]
little fix

4 years agotypo fix
Alex S [Fri, 30 Aug 2019 16:59:13 +0000 (19:59 +0300)]
typo fix

4 years agosome changes
Alex S [Fri, 30 Aug 2019 16:14:01 +0000 (19:14 +0300)]
some changes

4 years agofix
Alex S [Fri, 30 Aug 2019 11:27:55 +0000 (14:27 +0300)]
fix

4 years agochangelog
Alex S [Fri, 30 Aug 2019 11:09:07 +0000 (14:09 +0300)]
changelog

4 years agoexpanding regex sigils to use modifiers
Alex S [Fri, 30 Aug 2019 11:04:21 +0000 (14:04 +0300)]
expanding regex sigils to use modifiers

4 years agomix docs generates config.md
Alex S [Fri, 30 Aug 2019 10:22:21 +0000 (13:22 +0300)]
mix docs generates config.md

4 years agodescription formatters
Alex S [Fri, 30 Aug 2019 10:21:48 +0000 (13:21 +0300)]
description formatters

4 years agodescription.exs
Alex S [Fri, 30 Aug 2019 10:20:09 +0000 (13:20 +0300)]
description.exs

4 years agodeleting old config.md file
Alex S [Fri, 30 Aug 2019 09:00:36 +0000 (12:00 +0300)]
deleting old config.md file

4 years agoRevert "Parallelize template rendering"
rinpatch [Tue, 10 Sep 2019 19:01:45 +0000 (22:01 +0300)]
Revert "Parallelize template rendering"

This reverts commit 1ad71592adb47762287aec8c36d0fca565c38362.

Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.

4 years agoMerge branch 'fix/tests' into 'develop'
lain [Tue, 10 Sep 2019 18:53:41 +0000 (18:53 +0000)]
Merge branch 'fix/tests' into 'develop'

Fix tests for `Activity.all_by_ids_with_object/1`

See merge request pleroma/pleroma!1652

4 years agoFix `Activity.all_by_ids_with_object/1` test
Egor Kislitsyn [Tue, 10 Sep 2019 18:08:37 +0000 (01:08 +0700)]
Fix `Activity.all_by_ids_with_object/1` test

4 years agoMerge branch 'statuses-by-ids' into 'develop'
lain [Tue, 10 Sep 2019 17:04:12 +0000 (17:04 +0000)]
Merge branch 'statuses-by-ids' into 'develop'

Add an endpoint to get multiple statuses by IDs

Closes #1240

See merge request pleroma/pleroma!1621

4 years agoAdd note about limit to the doc
Egor Kislitsyn [Tue, 3 Sep 2019 09:58:33 +0000 (16:58 +0700)]
Add note about limit to the doc

4 years agoAdd an endpoint to get multiple statuses by IDs
Egor Kislitsyn [Tue, 3 Sep 2019 09:23:03 +0000 (16:23 +0700)]
Add an endpoint to get multiple statuses by IDs

4 years agoMerge branch 'cache-plug' into 'develop'
feld [Mon, 9 Sep 2019 18:53:09 +0000 (18:53 +0000)]
Merge branch 'cache-plug' into 'develop'

Add Pleroma.Plugs.Cache

Closes #1174

See merge request pleroma/pleroma!1612

4 years agoAdd Pleroma.Plugs.Cache
minibikini [Mon, 9 Sep 2019 18:53:08 +0000 (18:53 +0000)]
Add Pleroma.Plugs.Cache

4 years agoMerge branch 'update-changelog' into 'develop'
feld [Mon, 9 Sep 2019 18:39:44 +0000 (18:39 +0000)]
Merge branch 'update-changelog' into 'develop'

Update CHANGELOG (add a note about !1649)

See merge request pleroma/pleroma!1650

4 years agoUpdate CHANGELOG (add a note about !1649)
Egor Kislitsyn [Mon, 9 Sep 2019 18:30:02 +0000 (01:30 +0700)]
Update CHANGELOG (add a note about !1649)

4 years agoMerge branch 'fix/read-inbox' into 'develop'
feld [Mon, 9 Sep 2019 18:21:29 +0000 (18:21 +0000)]
Merge branch 'fix/read-inbox' into 'develop'

Fix `ActivityPubController.read_inbox/2`

Closes #1248

See merge request pleroma/pleroma!1649

4 years agoFix `ActivityPubController.read_inbox/2`
Egor Kislitsyn [Mon, 9 Sep 2019 18:11:57 +0000 (01:11 +0700)]
Fix `ActivityPubController.read_inbox/2`

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
Ivan Tashkinov [Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

4 years agoMastodon API: URI encode hashtag name in generated URLs
shadowfacts [Sat, 7 Sep 2019 19:50:45 +0000 (19:50 +0000)]
Mastodon API: URI encode hashtag name in generated URLs

Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.

4 years agoMerge branch 'develop' into support/tests
Maksim Pechnikov [Sat, 7 Sep 2019 19:13:43 +0000 (22:13 +0300)]
Merge branch 'develop' into support/tests

4 years agoMerge branch 'chore/query-optimization' into 'develop'
kaniini [Fri, 6 Sep 2019 23:25:30 +0000 (23:25 +0000)]
Merge branch 'chore/query-optimization' into 'develop'

chore: query optimization

Closes #1224

See merge request pleroma/pleroma!1640

4 years agoactivity: when restricting deactivated users, precalculate the user list
Ariadne Conill [Fri, 6 Sep 2019 23:14:29 +0000 (23:14 +0000)]
activity: when restricting deactivated users, precalculate the user list

the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make.  while we plan to simplify these queries through
unification of activities and objects, we are not yet there.  it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.

accordingly, drop the subquery and precalc the user list instead.

4 years agoactivitypub: help ecto build a better query for thread mute filtering
Ariadne Conill [Fri, 6 Sep 2019 23:11:26 +0000 (23:11 +0000)]
activitypub: help ecto build a better query for thread mute filtering

using an indexed value in thread_mute table helps ecto build a better query.

4 years agoMerge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'
rinpatch [Fri, 6 Sep 2019 15:29:03 +0000 (15:29 +0000)]
Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'

Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

See merge request pleroma/pleroma!1638

4 years agoPrioritize the removal of TwitterAPI and :accept_blocks in the changelog
rinpatch [Fri, 6 Sep 2019 15:28:01 +0000 (18:28 +0300)]
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

4 years ago[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
Ivan Tashkinov [Fri, 6 Sep 2019 10:26:05 +0000 (13:26 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs

4 years agoRefactor `add_link_headers/7` -> `add_link_headers/3`
Egor Kislitsyn [Fri, 6 Sep 2019 10:08:47 +0000 (17:08 +0700)]
Refactor `add_link_headers/7` -> `add_link_headers/3`

4 years agoMerge branch 'so-long-twitterapi' into 'develop'
rinpatch [Fri, 6 Sep 2019 08:43:38 +0000 (08:43 +0000)]
Merge branch 'so-long-twitterapi' into 'develop'

Removing TwitterAPI

See merge request pleroma/pleroma!1605

4 years agoMerge branch 'update-frontend-e75ac9dd' into 'develop'
rinpatch [Fri, 6 Sep 2019 08:41:30 +0000 (08:41 +0000)]
Merge branch 'update-frontend-e75ac9dd' into 'develop'

Update frontend bundle to e75ac9dd

See merge request pleroma/pleroma!1635

4 years agoUpdate frontend bundle to e75ac9dd
rinpatch [Fri, 6 Sep 2019 08:31:44 +0000 (11:31 +0300)]
Update frontend bundle to e75ac9dd

4 years agoMerge branch 'hotifx/emoji-trailing' into 'develop'
rinpatch [Thu, 5 Sep 2019 19:23:52 +0000 (19:23 +0000)]
Merge branch 'hotifx/emoji-trailing' into 'develop'

Call TrailingFormatPlug for /api/pleroma/emoji

See merge request pleroma/pleroma!1634

4 years agoCall TrailingFormatPlug for /api/pleroma/emoji
rinpatch [Thu, 5 Sep 2019 19:21:20 +0000 (22:21 +0300)]
Call TrailingFormatPlug for /api/pleroma/emoji

Apparently Pleroma-FE still calls it with trailing '.json'

4 years agoReverse reports list
Maxim Filippov [Thu, 5 Sep 2019 13:54:34 +0000 (16:54 +0300)]
Reverse reports list

4 years agoMerge branch 'feature/mastoapi-accounts-external' into 'develop'
Haelwenn [Thu, 5 Sep 2019 12:48:27 +0000 (12:48 +0000)]
Merge branch 'feature/mastoapi-accounts-external' into 'develop'

Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`

See merge request pleroma/pleroma!1622

4 years agoMove checking for restrict_local to User.get_cached_by_id_or_nickname
rinpatch [Thu, 5 Sep 2019 12:33:49 +0000 (15:33 +0300)]
Move checking for restrict_local to User.get_cached_by_id_or_nickname

4 years agoMerge branch 'fix/endless-poll-handling' into 'develop'
rinpatch [Thu, 5 Sep 2019 09:11:16 +0000 (09:11 +0000)]
Merge branch 'fix/endless-poll-handling' into 'develop'

Mastodon API Poll view: Fix handling of polls without an end date

See merge request pleroma/pleroma!1631

4 years agoMastodon API Poll view: Fix handling of polls without an end date
rinpatch [Thu, 5 Sep 2019 08:58:02 +0000 (11:58 +0300)]
Mastodon API Poll view: Fix handling of polls without an end date

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
Ivan Tashkinov [Thu, 5 Sep 2019 08:30:41 +0000 (11:30 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

4 years agoMerge branch 'fix/safe-render-notifications' into 'develop'
rinpatch [Thu, 5 Sep 2019 05:47:06 +0000 (05:47 +0000)]
Merge branch 'fix/safe-render-notifications' into 'develop'

Do not crash if one notification failed to render

See merge request pleroma/pleroma!1630

4 years agoDo not crash if one notification failed to render
rinpatch [Thu, 5 Sep 2019 05:32:49 +0000 (08:32 +0300)]
Do not crash if one notification failed to render

4 years agoMerge branch 'dockerfile-touchups' into 'develop'
rinpatch [Wed, 4 Sep 2019 20:22:41 +0000 (20:22 +0000)]
Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624

4 years agoSwitch to alpine:3.9 to avoid dlsym errors
Ashlynn Anderson [Wed, 4 Sep 2019 18:56:26 +0000 (14:56 -0400)]
Switch to alpine:3.9 to avoid dlsym errors

4 years agofix formatting
Maksim Pechnikov [Wed, 4 Sep 2019 18:40:53 +0000 (21:40 +0300)]
fix formatting

4 years agoApply suggestion to lib/pleroma/web/activity_pub/utils.ex
Maksim [Wed, 4 Sep 2019 18:35:01 +0000 (18:35 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex

4 years agoApply suggestion to lib/pleroma/web/activity_pub/utils.ex
Maksim [Wed, 4 Sep 2019 17:31:14 +0000 (17:31 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex

4 years agoReturn total for reports
Maxim Filippov [Wed, 4 Sep 2019 17:08:13 +0000 (20:08 +0300)]
Return total for reports

4 years agodon't try to truncate non-strings
Sadposter [Wed, 4 Sep 2019 14:57:42 +0000 (15:57 +0100)]
don't try to truncate non-strings

4 years agotruncate remote user bio/display name
Sadposter [Wed, 4 Sep 2019 14:45:40 +0000 (15:45 +0100)]
truncate remote user bio/display name

4 years agofetch_announcements -> take_announcements
Maksim Pechnikov [Wed, 4 Sep 2019 14:42:27 +0000 (17:42 +0300)]
fetch_announcements -> take_announcements

4 years agoadd tests for activity_pub/utils.ex
Maksim Pechnikov [Wed, 4 Sep 2019 12:25:12 +0000 (15:25 +0300)]
add tests for activity_pub/utils.ex

4 years agoMerge branch 'feat/mastoapi-status-threadmuted' into 'develop'
Haelwenn [Wed, 4 Sep 2019 11:26:34 +0000 (11:26 +0000)]
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'

Mastodon API: Add `pleroma.thread_muted` to Status entity

See merge request pleroma/pleroma!1626

4 years agoMastodon API: Add `pleroma.thread_muted` to Status entity
rinpatch [Wed, 4 Sep 2019 11:16:56 +0000 (14:16 +0300)]
Mastodon API: Add `pleroma.thread_muted` to Status entity

Needed for pleroma-fe!941

4 years agoMerge branch 'feature/mastoapi-read-notifications' into 'develop'
Haelwenn [Wed, 4 Sep 2019 10:46:49 +0000 (10:46 +0000)]
Merge branch 'feature/mastoapi-read-notifications' into 'develop'

Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities

See merge request pleroma/pleroma!1625

4 years agoClarify that read notifications are returned
rinpatch [Wed, 4 Sep 2019 10:39:39 +0000 (13:39 +0300)]
Clarify that read notifications are returned

4 years agoApply suggestion to docs/api/pleroma_api.md
rinpatch [Wed, 4 Sep 2019 10:37:43 +0000 (10:37 +0000)]
Apply suggestion to docs/api/pleroma_api.md

4 years agoApply suggestion to lib/pleroma/notification.ex
rinpatch [Wed, 4 Sep 2019 10:14:15 +0000 (10:14 +0000)]
Apply suggestion to lib/pleroma/notification.ex

4 years agoExtend `/api/pleroma/notifications/read` to mark multiple notifications
rinpatch [Wed, 4 Sep 2019 08:33:08 +0000 (11:33 +0300)]
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities

4 years agoMastdon API: Add ability to get a remote account by nickname to
rinpatch [Tue, 3 Sep 2019 14:54:21 +0000 (17:54 +0300)]
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`

4 years agoSwitch to official elixir:1.9-alpine image for build
Ashlynn Anderson [Tue, 3 Sep 2019 15:44:57 +0000 (11:44 -0400)]
Switch to official elixir:1.9-alpine image for build

4 years ago[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
Ivan Tashkinov [Tue, 3 Sep 2019 14:12:15 +0000 (17:12 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# CHANGELOG.md

4 years agoRemove dynamic config as default, add healthcheck
Ashlynn Anderson [Mon, 5 Aug 2019 19:35:34 +0000 (15:35 -0400)]
Remove dynamic config as default, add healthcheck

4 years agoMerge branch 'feature/pagination-total' into 'develop'
rinpatch [Tue, 3 Sep 2019 13:03:06 +0000 (13:03 +0000)]
Merge branch 'feature/pagination-total' into 'develop'

Return total items count from pagination + tests

See merge request pleroma/pleroma!1620

4 years agoReturn "total" optionally
Maxim Filippov [Tue, 3 Sep 2019 10:58:27 +0000 (13:58 +0300)]
Return "total" optionally

4 years agoReturn total from pagination + tests
Maxim Filippov [Mon, 2 Sep 2019 19:48:52 +0000 (22:48 +0300)]
Return total from pagination + tests

4 years ago[#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved...
Ivan Tashkinov [Mon, 2 Sep 2019 11:57:40 +0000 (14:57 +0300)]
[#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.

4 years agoadd mandatory fields for user update
Sadposter [Mon, 2 Sep 2019 11:35:55 +0000 (12:35 +0100)]
add mandatory fields for user update

4 years agouse atom key for fields
Sadposter [Mon, 2 Sep 2019 11:31:23 +0000 (12:31 +0100)]
use atom key for fields

4 years agomix format
Sadposter [Mon, 2 Sep 2019 11:15:40 +0000 (12:15 +0100)]
mix format

4 years agotruncate fields for remote users instead
Sadposter [Mon, 2 Sep 2019 11:15:21 +0000 (12:15 +0100)]
truncate fields for remote users instead

4 years ago[#1149] Refactored Oban workers API (introduced `enqueue/3`).
Ivan Tashkinov [Sat, 31 Aug 2019 18:58:42 +0000 (21:58 +0300)]
[#1149] Refactored Oban workers API (introduced `enqueue/3`).

4 years ago[#1149] Addressed code review comments (code style, jobs pruning etc.).
Ivan Tashkinov [Sat, 31 Aug 2019 16:08:56 +0000 (19:08 +0300)]
[#1149] Addressed code review comments (code style, jobs pruning etc.).

4 years ago[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch ...
Ivan Tashkinov [Sat, 31 Aug 2019 11:25:43 +0000 (14:25 +0300)]
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
# config/config.exs

4 years agocredo fixes
rinpatch [Sat, 31 Aug 2019 10:08:43 +0000 (13:08 +0300)]
credo fixes

4 years agoAdd back /api/qvitter/statuses/notifications/read.json
rinpatch [Sat, 31 Aug 2019 08:40:04 +0000 (11:40 +0300)]
Add back /api/qvitter/statuses/notifications/read.json