Commit graph

11601 commits

Author SHA1 Message Date
Mark Felder 709723182d Ensure SimplePolicy's tags in string representation don't trip up the object validator 2020-09-14 17:06:42 -05:00
Mark Felder 118bf6e92b Fixed Welcome chats with MRF Simple applied locally 2020-09-14 12:08:32 -05:00
Mark Felder 25d1caf1dd Merge duplicate Changed sections 2020-09-14 12:07:31 -05:00
Mark Felder d31f0393bf Validate Welcome Chat message works with Simple policy applied to local instance 2020-09-14 12:06:08 -05:00
Mark Felder c0b36621f1 Ensure we only apply NSFW Simple policy on parsable objects 2020-09-11 23:22:14 -05:00
rinpatch 9fb88c814d Merge branch 'feat/log-possible-hol' into 'develop'
ConnectionPool: Log possible HTTP1 blocks

See merge request pleroma/pleroma!2989
2020-09-11 12:50:05 +00:00
rinpatch 89a7efab69 ConnectionPool: Log possible HTTP1 blocks 2020-09-11 15:37:39 +03:00
rinpatch 53dc61ba90 Merge branch 'bugfix/favicon-none-found' into 'develop'
instance: Handle not getting a favicon

See merge request pleroma/pleroma!2988
2020-09-11 10:42:25 +00:00
Haelwenn (lanodan) Monnier dbc013f24c
instance: Handle not getting a favicon 2020-09-11 11:37:46 +02:00
Haelwenn 03d1730f30 Merge branch 'fix/2134-old-cron-jobs' into 'develop'
Migration to remove old cron jobs

Closes #2134

See merge request pleroma/pleroma!2987
2020-09-11 08:58:01 +00:00
Alexander Strizhakov e3ca0a7e2d
migration to remove old cron jobs 2020-09-11 09:09:28 +03:00
rinpatch 6316350918 Merge branch 'oban-overuse' into 'develop'
Expired activities as scheduled jobs in Oban

See merge request pleroma/pleroma!2916
2020-09-10 19:17:15 +00:00
rinpatch 82b56cdb9b CHANGELOG.md: clarify that the functionality is not removed, just the config options 2020-09-10 21:53:58 +03:00
Alexander Strizhakov 15aece7238 remove validate_expires_at from enqueue method 2020-09-10 21:52:31 +03:00
rinpatch a098e10fd6 Document ephemeral activity changes better
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
2020-09-10 21:52:30 +03:00
Alexander Strizhakov 2c2094d4b2 configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
Alexander Strizhakov 4954667fb2 changelog 2020-09-10 21:51:58 +03:00
Alexander Strizhakov f24828a3e8 oban warning 2020-09-10 21:51:30 +03:00
Alexander Strizhakov 29c1178c2b migration fix 2020-09-10 21:50:41 +03:00
Alexander Strizhakov eb5ff715f7 pin/unpin for activities with expires_at option 2020-09-10 21:50:41 +03:00
Alexander Strizhakov b3485a6dbf little clean up 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 6f2d114518 use another stream function in migration 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 357d971a10 expiration for new pipeline 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 93e1c8df9d reject activity creation
if passed expires_at option and expiring activities are not configured
2020-09-10 21:50:41 +03:00
Alexander Strizhakov 4981b5a1a3 copyright header 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 5381d4b78b drop activity_expirations table 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 5ad0cc4c86 move old expirations into Oban 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 629a8de9cb deprecation warning
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
Alexander Strizhakov de4c935071 don't expire pinned posts 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 9bf1065a06 schedule activity expiration in Oban 2020-09-10 21:50:40 +03:00
rinpatch 0254696e30 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
2020-09-10 18:45:04 +00:00
rinpatch 541a3eede2 Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
Remove OStatus in testsuite

See merge request pleroma/pleroma!2968
2020-09-10 18:41:00 +00:00
rinpatch 53cf7fef6e Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982
2020-09-10 18:40:54 +00:00
rinpatch 45c299e5b5 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
2020-09-10 18:38:48 +00:00
rinpatch 275602daa7 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
2020-09-10 21:28:47 +03:00
rinpatch 01fa68fe45 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/
2020-09-10 21:26:52 +03:00
rinpatch e16e8f9816 Websocket handler: do not raise if handler is terminated before switching protocols
Closes #2131
2020-09-10 21:14:23 +03:00
rinpatch cb06e98da2 websocket handler: Do not log client ping frames as errors 2020-09-10 21:14:23 +03:00
rinpatch 9b6ab32166 Merge branch 'fix/tesla-client-opts' into 'develop'
Pass options without adapter key in tesla reverse proxy client

See merge request pleroma/pleroma!2985
2020-09-10 17:41:37 +00:00
Alexander Strizhakov e8bfb50fa3
pass options without adapter key 2020-09-10 20:09:44 +03:00
Alexander Strizhakov 8af1fd3223
oban warning 2020-09-10 16:01:20 +03:00
Alexander Strizhakov eca42566ba
formatting 2020-09-10 16:01:20 +03:00
Alexander Strizhakov e11fca88d4
migration to move tokens expiration into Oban 2020-09-10 16:01:20 +03:00
Alexander Strizhakov c6647c08e1
migration and changelog 2020-09-10 16:01:20 +03:00
Alexander Strizhakov 7dd986a563
expire mfa tokens through Oban 2020-09-10 16:01:19 +03:00
Alexander Strizhakov 3ce658b930
schedule expired oauth tokens deletion with Oban 2020-09-10 16:01:19 +03:00
lain c8c17d9c63 Merge branch 'fix/2132-emoji-packs' into 'develop'
use Pleroma.HTTP in emoji packs tasks

Closes #2132

See merge request pleroma/pleroma!2980
2020-09-10 11:05:00 +00:00
Alexander Strizhakov ab56dd54e7
use Pleroma.HTTP in emoji packs tasks 2020-09-10 11:23:39 +03:00
Ivan Tashkinov cad69669fc [#2130] Fixed OAuth OOB authentication for users with enabled MFA. 2020-09-09 22:44:38 +03:00
rinpatch 9d20d29a79 Merge branch 'chore/concurrent_limiter_update' into 'develop'
bump concurrent_limiter

See merge request pleroma/pleroma!2978
2020-09-09 15:49:34 +00:00