sadposter [Tue, 15 Sep 2020 16:21:18 +0000 (17:21 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
Merge branch 'reply-visibility-user-guard' into 'develop'
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
eugenijm [Tue, 15 Sep 2020 10:00:07 +0000 (13:00 +0300)]
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
Mark Felder [Mon, 14 Sep 2020 22:11:08 +0000 (17:11 -0500)]
Move changelog entry to next patch
Mark Felder [Mon, 14 Sep 2020 22:06:42 +0000 (17:06 -0500)]
Ensure SimplePolicy's tags in string representation don't trip up the object validator
Mark Felder [Mon, 14 Sep 2020 17:08:32 +0000 (12:08 -0500)]
Fixed Welcome chats with MRF Simple applied locally
Mark Felder [Mon, 14 Sep 2020 17:07:31 +0000 (12:07 -0500)]
Merge duplicate Changed sections
Mark Felder [Mon, 14 Sep 2020 17:06:08 +0000 (12:06 -0500)]
Validate Welcome Chat message works with Simple policy applied to local instance
rinpatch [Mon, 14 Sep 2020 15:19:09 +0000 (15:19 +0000)]
Merge branch 'remove/managed-config-option' into 'develop'
Remove `:managed_config` option.
Closes #2086
See merge request pleroma/pleroma!2983
rinpatch [Thu, 10 Sep 2020 12:00:19 +0000 (15:00 +0300)]
Remove `:managed_config` option.
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
rinpatch [Mon, 14 Sep 2020 12:46:00 +0000 (15:46 +0300)]
RichMedia: fix a compilation error due to nonexistent variable
No idea why this passed Gitlab CI
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
rinpatch [Mon, 14 Sep 2020 11:56:00 +0000 (11:56 +0000)]
Apply 1 suggestion(s) to 1 file(s)
rinpatch [Mon, 14 Sep 2020 11:45:58 +0000 (14:45 +0300)]
RichMedia: Do a HEAD request to check content type/length
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
rinpatch [Mon, 14 Sep 2020 11:44:25 +0000 (14:44 +0300)]
RichMedia parser: do not set a cache TTL for unchanging errors
rinpatch [Mon, 14 Sep 2020 07:54:06 +0000 (07:54 +0000)]
Merge branch 'fix/2139-oban-migration' into 'develop'
Remove old workers in oban migrations
Closes #2139
See merge request pleroma/pleroma!2994
Alexander Strizhakov [Sun, 13 Sep 2020 07:04:50 +0000 (10:04 +0300)]
remove old workers in oban migrations
Haelwenn [Sat, 12 Sep 2020 08:26:41 +0000 (08:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2991
Mark Felder [Fri, 11 Sep 2020 21:59:45 +0000 (16:59 -0500)]
Ensure we only apply NSFW Simple policy on parsable objects
tarteka [Fri, 11 Sep 2020 18:24:59 +0000 (18:24 +0000)]
Translated using Weblate (Spanish)
Currently translated at 20.7% (22 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
feld [Fri, 11 Sep 2020 23:14:54 +0000 (23:14 +0000)]
Merge branch 'chore/docs-spelling' into 'develop'
Spelling nit
See merge request pleroma/pleroma!2993
Mark Felder [Fri, 11 Sep 2020 22:42:39 +0000 (17:42 -0500)]
Spelling
Reported by: trevoke
rinpatch [Fri, 11 Sep 2020 12:50:05 +0000 (12:50 +0000)]
Merge branch 'feat/log-possible-hol' into 'develop'
ConnectionPool: Log possible HTTP1 blocks
See merge request pleroma/pleroma!2989
rinpatch [Fri, 11 Sep 2020 11:22:54 +0000 (14:22 +0300)]
ConnectionPool: Log possible HTTP1 blocks
rinpatch [Fri, 11 Sep 2020 10:42:25 +0000 (10:42 +0000)]
Merge branch 'bugfix/favicon-none-found' into 'develop'
instance: Handle not getting a favicon
See merge request pleroma/pleroma!2988
Haelwenn (lanodan) Monnier [Fri, 11 Sep 2020 09:22:50 +0000 (11:22 +0200)]
instance: Handle not getting a favicon
Haelwenn [Fri, 11 Sep 2020 08:58:01 +0000 (08:58 +0000)]
Merge branch 'fix/2134-old-cron-jobs' into 'develop'
Migration to remove old cron jobs
Closes #2134
See merge request pleroma/pleroma!2987
Alexander Strizhakov [Fri, 11 Sep 2020 06:09:28 +0000 (09:09 +0300)]
migration to remove old cron jobs
rinpatch [Thu, 10 Sep 2020 19:17:15 +0000 (19:17 +0000)]
Merge branch 'oban-overuse' into 'develop'
Expired activities as scheduled jobs in Oban
See merge request pleroma/pleroma!2916
rinpatch [Thu, 10 Sep 2020 18:53:58 +0000 (21:53 +0300)]
CHANGELOG.md: clarify that the functionality is not removed, just the config options
Alexander Strizhakov [Tue, 8 Sep 2020 12:11:18 +0000 (15:11 +0300)]
remove validate_expires_at from enqueue method
rinpatch [Tue, 8 Sep 2020 09:07:33 +0000 (12:07 +0300)]
Document ephemeral activity changes better
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
Alexander Strizhakov [Mon, 7 Sep 2020 17:57:38 +0000 (20:57 +0300)]
configurable lifetime for ephemeral activities
Alexander Strizhakov [Mon, 7 Sep 2020 17:22:14 +0000 (20:22 +0300)]
changelog
Alexander Strizhakov [Mon, 7 Sep 2020 17:21:32 +0000 (20:21 +0300)]
oban warning
Alexander Strizhakov [Fri, 4 Sep 2020 09:05:17 +0000 (12:05 +0300)]
migration fix
Alexander Strizhakov [Fri, 4 Sep 2020 08:40:32 +0000 (11:40 +0300)]
pin/unpin for activities with expires_at option
Alexander Strizhakov [Thu, 3 Sep 2020 16:02:22 +0000 (19:02 +0300)]
little clean up
Alexander Strizhakov [Thu, 3 Sep 2020 15:08:19 +0000 (18:08 +0300)]
use another stream function in migration
Alexander Strizhakov [Thu, 3 Sep 2020 14:56:20 +0000 (17:56 +0300)]
expiration for new pipeline
Alexander Strizhakov [Thu, 3 Sep 2020 10:30:39 +0000 (13:30 +0300)]
reject activity creation
if passed expires_at option and expiring activities are not configured
Alexander Strizhakov [Tue, 25 Aug 2020 09:45:06 +0000 (12:45 +0300)]
copyright header
Alexander Strizhakov [Tue, 25 Aug 2020 09:33:38 +0000 (12:33 +0300)]
drop activity_expirations table
Alexander Strizhakov [Tue, 25 Aug 2020 09:30:00 +0000 (12:30 +0300)]
move old expirations into Oban
Alexander Strizhakov [Tue, 25 Aug 2020 06:10:45 +0000 (09:10 +0300)]
deprecation warning
changed namespace for activity expiration configuration
Alexander Strizhakov [Mon, 24 Aug 2020 10:43:02 +0000 (13:43 +0300)]
don't expire pinned posts
Alexander Strizhakov [Sat, 22 Aug 2020 17:46:01 +0000 (20:46 +0300)]
schedule activity expiration in Oban
rinpatch [Thu, 10 Sep 2020 18:45:04 +0000 (18:45 +0000)]
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
rinpatch [Thu, 10 Sep 2020 18:41:00 +0000 (18:41 +0000)]
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
rinpatch [Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)]
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
rinpatch [Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)]
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
[#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
rinpatch [Thu, 10 Sep 2020 18:28:47 +0000 (21:28 +0300)]
Streaming integration tests: remove unexpected error assumption
For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing
rinpatch [Thu, 10 Sep 2020 18:26:52 +0000 (21:26 +0300)]
Websocket handler: fix never matching code on failed auth
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
rinpatch [Thu, 10 Sep 2020 10:48:24 +0000 (13:48 +0300)]
Websocket handler: do not raise if handler is terminated before switching protocols
Closes #2131
rinpatch [Thu, 10 Sep 2020 10:47:53 +0000 (13:47 +0300)]
websocket handler: Do not log client ping frames as errors
rinpatch [Thu, 10 Sep 2020 17:41:37 +0000 (17:41 +0000)]
Merge branch 'fix/tesla-client-opts' into 'develop'
Pass options without adapter key in tesla reverse proxy client
See merge request pleroma/pleroma!2985
Alexander Strizhakov [Thu, 10 Sep 2020 17:09:44 +0000 (20:09 +0300)]
pass options without adapter key
Alexander Strizhakov [Mon, 7 Sep 2020 17:06:28 +0000 (20:06 +0300)]
oban warning
Alexander Strizhakov [Mon, 7 Sep 2020 10:54:28 +0000 (13:54 +0300)]
formatting
Alexander Strizhakov [Mon, 7 Sep 2020 10:44:42 +0000 (13:44 +0300)]
migration to move tokens expiration into Oban
Alexander Strizhakov [Mon, 7 Sep 2020 08:54:10 +0000 (11:54 +0300)]
migration and changelog
Alexander Strizhakov [Sat, 5 Sep 2020 15:35:01 +0000 (18:35 +0300)]
expire mfa tokens through Oban
Alexander Strizhakov [Tue, 25 Aug 2020 16:17:51 +0000 (19:17 +0300)]
schedule expired oauth tokens deletion with Oban
lain [Thu, 10 Sep 2020 11:05:00 +0000 (11:05 +0000)]
Merge branch 'fix/2132-emoji-packs' into 'develop'
use Pleroma.HTTP in emoji packs tasks
Closes #2132
See merge request pleroma/pleroma!2980
Alexander Strizhakov [Thu, 10 Sep 2020 08:23:39 +0000 (11:23 +0300)]
use Pleroma.HTTP in emoji packs tasks
sadposter [Thu, 10 Sep 2020 02:07:12 +0000 (03:07 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Ivan Tashkinov [Wed, 9 Sep 2020 19:44:38 +0000 (22:44 +0300)]
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
rinpatch [Wed, 9 Sep 2020 15:49:34 +0000 (15:49 +0000)]
Merge branch 'chore/concurrent_limiter_update' into 'develop'
bump concurrent_limiter
See merge request pleroma/pleroma!2978
rinpatch [Wed, 9 Sep 2020 15:34:07 +0000 (18:34 +0300)]
bump concurrent_limiter
Should fix gun deadlocks
lain [Wed, 9 Sep 2020 11:34:31 +0000 (11:34 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2977
tarteka [Wed, 9 Sep 2020 09:52:08 +0000 (09:52 +0000)]
Translated using Weblate (Spanish)
Currently translated at 9.4% (10 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
tarteka [Wed, 9 Sep 2020 09:49:26 +0000 (09:49 +0000)]
Added translation using Weblate (Spanish)
sadposter [Wed, 9 Sep 2020 08:35:48 +0000 (09:35 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Tue, 8 Sep 2020 17:57:02 +0000 (17:57 +0000)]
Merge branch 'stable-sync/2.1.1' into 'develop'
Sync stable with develop after 2.1.1
Closes #2, #2047, #2095, #2116, #1987, and #2080
See merge request pleroma/pleroma!2974
rinpatch [Tue, 8 Sep 2020 17:34:02 +0000 (20:34 +0300)]
Merge branch 'stable' into stable-sync/2.1.1
rinpatch [Mon, 7 Sep 2020 12:06:06 +0000 (15:06 +0300)]
Metadata: Move restriction check from Feed provider to activated_providers
Mark Felder [Tue, 1 Sep 2020 15:43:44 +0000 (10:43 -0500)]
Use :restrict_unauthenticated testing for more granular control
Mark Felder [Mon, 31 Aug 2020 21:11:13 +0000 (16:11 -0500)]
Document breaking change for metadata providers
Mark Felder [Mon, 31 Aug 2020 21:11:01 +0000 (16:11 -0500)]
RelMe and Feed no longer configurable
Mark Felder [Mon, 31 Aug 2020 20:58:21 +0000 (15:58 -0500)]
Do not serve RSS/Atom feeds when instance is private
Mark Felder [Mon, 31 Aug 2020 20:54:22 +0000 (15:54 -0500)]
Fix test so setting doesn't leak
Mark Felder [Mon, 31 Aug 2020 19:48:22 +0000 (14:48 -0500)]
Feed provider only generates a redirect, so always activate it.
Making this configurable is misleading.
Mark Felder [Mon, 31 Aug 2020 19:35:22 +0000 (14:35 -0500)]
Disable providers of user and status metadata when instance is private
Mark Felder [Mon, 31 Aug 2020 19:19:48 +0000 (14:19 -0500)]
Do not make RelMe metadata provider optional.
There's really no sound reason to turn this off anyway.
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:24:03 +0000 (20:24 +0200)]
user: harden get_friends_query(), get_followers_query() and their wrappers
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:11:24 +0000 (20:11 +0200)]
search: Apply following filter only when user is usable
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 05:06:29 +0000 (07:06 +0200)]
AP C2S: Restrict character limit on Note
Egor Kislitsyn [Wed, 10 Jun 2020 11:37:43 +0000 (15:37 +0400)]
Fix atom leak in AdminAPIController
rinpatch [Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)]
Merge branch 'release/2.1.1' into 'stable'
2.1.1 release
See merge request pleroma/secteam/pleroma!13
rinpatch [Tue, 8 Sep 2020 17:13:00 +0000 (20:13 +0300)]
SECURITY.md: we don't support 2.0 anymore, bump to 2.1
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
rinpatch [Tue, 8 Sep 2020 12:34:20 +0000 (15:34 +0300)]
rinpatch [Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)]
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
rinpatch [Tue, 8 Sep 2020 11:21:34 +0000 (14:21 +0300)]
CHANGELOG.md: Add 2.1.1 entry
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 07:13:11 +0000 (09:13 +0200)]
Remove OStatus in testsuite
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 08:43:57 +0000 (10:43 +0200)]
Drop unused "inReplyToAtomUri" in objects
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
projects / akkoma / log