Ivan Tashkinov
|
32831f371f
|
[#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
|
2020-09-12 10:33:42 +03:00 |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
2020-09-11 17:19:58 +03:00 |
|
Ivan Tashkinov
|
4d18a50f3c
|
[#2497] Formatting fix.
|
2020-09-10 21:54:26 +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
|
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 |
|
Ivan Tashkinov
|
dc4e06e199
|
[#2497] Removed support for thumbnail_max_* params for media preview proxy
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771)
|
2020-09-10 21:28:07 +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 |
|
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 |
|
Ivan Tashkinov
|
148bc24435
|
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
|
2020-09-10 11:54:10 +03:00 |
|
Ivan Tashkinov
|
cad69669fc
|
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
|
2020-09-09 22:44:38 +03:00 |
|
Ivan Tashkinov
|
68a74d6659
|
[#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_.
|
2020-09-09 19:30:42 +03:00 |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-09 11:11:36 -05:00 |
|
rinpatch
|
0d2814ec8e
|
Metadata: Move restriction check from Feed provider to activated_providers
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
2011142ed9
|
Use :restrict_unauthenticated testing for more granular control
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
a85ed6defb
|
Do not serve RSS/Atom feeds when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
14d07081fd
|
Feed provider only generates a redirect, so always activate it.
Making this configurable is misleading.
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
ff07014b26
|
Disable providers of user and status metadata when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
630444ee08
|
Do not make RelMe metadata provider optional.
There's really no sound reason to turn this off anyway.
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
10ef532c63
|
AP C2S: Restrict character limit on Note
|
2020-09-08 20:21:34 +03:00 |
|
Egor Kislitsyn
|
a781ac6ca5
|
Fix atom leak in AdminAPIController
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
ee0e05f930
|
Drop unused "inReplyToAtomUri" in objects
|
2020-09-08 18:43:57 +02:00 |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
2020-09-08 09:31:26 -05:00 |
|
|
|
95688c90ad
|
ForceBotUnlistedPolicy: simplify code
|
2020-09-08 01:15:15 +02:00 |
|
|
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
2020-09-07 22:53:45 +02:00 |
|
|
|
699224a900
|
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
|
2020-09-07 22:15:42 +02:00 |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
2020-09-07 19:59:17 +03:00 |
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
2020-09-07 19:59:17 +03:00 |
|
lain
|
fdab01ab56
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-07 10:19:19 +00:00 |
|
rinpatch
|
170599c390
|
RichMedia: do not log webpages missing metadata as errors
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
|
2020-09-05 22:05:35 +03:00 |
|
rinpatch
|
e198ba492e
|
Rich Media: Do not cache URLs for preview statuses
Closes #1987
|
2020-09-05 20:53:46 +03:00 |
|
Ivan Tashkinov
|
88a6ee4a59
|
[#2497] Func defs grouping fix.
|
2020-09-05 20:23:18 +03:00 |
|
Ivan Tashkinov
|
f170d47130
|
[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
Removed :preview pool in favor of existing :media one. Misc. refactoring.
|
2020-09-05 20:19:09 +03:00 |
|
Ivan Tashkinov
|
c3b02341bf
|
[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
|
2020-09-05 16:16:35 +03:00 |
|
Mark Felder
|
d1e1057e22
|
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
|
2020-09-03 14:48:43 -05:00 |
|
Mark Felder
|
6141eb94ab
|
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
Use a separate pool for preview requests
|
2020-09-03 14:42:11 -05:00 |
|
Ivan Tashkinov
|
60c925380d
|
[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
|
2020-09-03 20:13:29 +03:00 |
|
Mark Felder
|
85446cc30c
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-03 10:34:06 -05:00 |
|
lain
|
9433311923
|
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
|
2020-09-03 11:50:30 +00:00 |
|
|
|
d1a6f67b1d
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
2020-09-02 17:11:24 +00:00 |
|
lain
|
119e11f455
|
Merge branch 'bugfix/mastoapi-lists' into 'develop'
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
|
2020-09-02 17:03:45 +00:00 |
|
lain
|
581f382e71
|
ListController: DRY up stuff.
|
2020-09-02 18:32:00 +02:00 |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
2020-09-02 09:09:13 -05:00 |
|
rinpatch
|
d48fc90978
|
StatusView: Start fetching rich media cards as soon as possible
|
2020-09-02 16:45:54 +03:00 |
|
