Alexander Strizhakov
4b1863ca4e
RateLimiter module name
2020-10-13 16:43:53 +03:00
Alexander Strizhakov
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
Alexander Strizhakov
4b4c0eef36
SessionAuthenticationPlug module name
2020-10-13 16:42:53 +03:00
Alexander Strizhakov
8249b75761
SetFormatPlug module name
2020-10-13 16:42:53 +03:00
Alexander Strizhakov
c97c7d982f
SetLocalePlug module name
2020-10-13 16:42:52 +03:00
Alexander Strizhakov
f7614d4718
SetUserSessionIdPlug module name
2020-10-13 16:42:52 +03:00
Alexander Strizhakov
d36c9e210a
StaticFEPlug module name
2020-10-13 16:42:52 +03:00
Alexander Strizhakov
a07688deb1
TrailingFormatPlug module name
2020-10-13 16:42:51 +03:00
Alexander Strizhakov
a5987155f7
UploadedMedia module name
2020-10-13 16:42:51 +03:00
Alexander Strizhakov
ebd6dd7c53
UserEnabledPlug module name
2020-10-13 16:42:51 +03:00
Alexander Strizhakov
61c609884c
UserFetcherPlug module name
2020-10-13 16:42:51 +03:00
Alexander Strizhakov
1d16cd0c3d
UserIsAdminPlug module name
2020-10-13 16:42:50 +03:00
Alexander Strizhakov
2125286e90
fix for fallback controller
2020-10-13 16:42:50 +03:00
Alexander Strizhakov
e267991a44
renaming LimiterSupervisor
2020-10-13 16:42:48 +03:00
Alexander Strizhakov
6a87f94ee2
renaming ratelimiter supervisor
2020-10-13 16:38:48 +03:00
Alexander Strizhakov
2501793f81
moving plugs into web dir
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
fc7151a9c4
more files renamings
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
e8e4034c48
metadata providers consistency
2020-10-13 16:38:18 +03:00
Alexander Strizhakov
b5b4395e4a
oauth consistency
2020-10-13 16:38:18 +03:00
Alexander Strizhakov
103f3dcb9e
rich media parser ttl files consistency
2020-10-13 16:38:15 +03:00
Alex Gleason
83ae45b000
Preload /api/pleroma/frontend_configurations, fixes #1932
2020-10-12 18:49:37 -05:00
Alex Gleason
66e00ace7c
Refactor User.post_register_action/1 emails
2020-10-12 17:21:08 -05:00
Alex Gleason
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
2020-10-12 16:42:59 -05:00
Alex Gleason
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
Mark Felder
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
Alex Gleason
bb8c0614ef
Move admin approval email logic into User.post_register_action/1
2020-10-11 21:46:10 -05:00
Alex Gleason
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
Alex Gleason
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -05:00
Alex Gleason
c69b205409
Registration: user state is separate from instance state
2020-10-11 19:25:34 -05:00
Alex Gleason
b2fed59209
Handle User.post_register_action/1 in steps
2020-10-11 18:52:35 -05:00
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
Ivan Tashkinov
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
2020-10-11 13:37:19 +03:00
Mark Felder
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
Mark Felder
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
Mark Felder
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
Mark Felder
70880d54f8
@env is not used
2020-10-07 12:55:16 -05:00
Mark Felder
42e78a08b2
Fix rendering of reports
2020-10-07 12:30:55 -05:00
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 16:44:52 +00:00
Mark Felder
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
2020-10-07 10:04:25 -05:00
Mark Felder
d3106c69c8
Fix incompatible type (Elixir 1.11)
2020-10-07 10:02:20 -05:00
Mark Felder
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
08972dd135
Use Path.join/2
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
9af9f02f4b
Use Gettext for error messages
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
d7a5291b4f
Use Jason.encode/1 for likes and bookmarks
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
8baee855d9
Fix emails
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
17562bf414
Move API endpoints to /api/v1/pleroma/backups
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
a9efd441e2
Use Pleroma.Repo.chunk_stream/2 instead of Pleroma.RepoStreamer.chunk_stream/2
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
e50314d9d3
Fix export
2020-10-07 18:35:26 +04:00
Egor Kislitsyn
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
Egor Kislitsyn
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
cd13613db3
Fix query
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
739cb1463b
Add backups deletion
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
4f3a633745
Add backups table
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
75e07ba206
Fix tests
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
be42ab70dc
Add backup upload
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
c01a818048
Add tests
2020-10-07 18:34:27 +04:00
Egor Kislitsyn
9d564ffc29
Zip exported files
2020-10-07 18:34:27 +04:00
Egor Kislitsyn
257e059e61
Add account export
2020-10-07 18:34:27 +04:00
Mark Felder
7a2ed2fc90
Credo
2020-10-06 17:26:31 -05:00
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
Mark Felder
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
rinpatch
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
Ivan Tashkinov
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
Ivan Tashkinov
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
Haelwenn (lanodan) Monnier
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
Mark Felder
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
2020-10-05 11:49:56 -05:00
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
Ivan Tashkinov
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
Ivan Tashkinov
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
Ivan Tashkinov
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
Alexander Strizhakov
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
rinpatch
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
2020-09-30 13:37:46 +00:00
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03:00
Mark Felder
b3a9ba09ec
More robust expires_at timestamp processing
2020-09-29 12:27:47 -05:00
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
Ivan Tashkinov
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
2020-09-29 16:28:06 +03:00
Mark Felder
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
Maksim Pechnikov
de993b856b
added force option to the unfollow operation
2020-09-28 09:16:42 +03:00
Ivan Tashkinov
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
Mark Felder
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 11:45:51 -05:00
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
Mark Felder
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 10:48:01 -05:00
rinpatch
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
rinpatch
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
lain
05b5241314
Linter fixes
2020-09-25 09:12:48 +02:00
lain
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
lain
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
Alexander Strizhakov
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
Alexander Strizhakov
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
lain
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
lain
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
Roman Chvanikov
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
Mark Felder
e2dcf039d2
Fix gun_pool_options deprecation warning message
2020-09-22 11:15:40 -05:00
Mark Felder
2fc3b46ee7
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
2020-09-22 11:13:36 -05:00
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
Egor Kislitsyn
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by following.
2020-09-22 14:20:19 +02:00
Mark Felder
e5927e92a6
Fix deprecation warning for welcome message
2020-09-21 17:08:49 -05:00
a5c34e3123
Merge branch 'fix/fedsocket-useragent' into 'develop'
...
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
2020-09-21 21:06:32 +00:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset
2020-09-21 14:09:26 -05:00
Alex Gleason
8b6ac45f3c
Allow emails to be sent again, #2101 #2172
...
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21 13:28:02 -05:00
lain
59680f27ff
Merge branch 'bugfix/federator-actor-error' into 'develop'
...
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
2020-09-21 17:24:14 +00:00
lain
9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
2020-09-21 17:15:54 +00:00
lain
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
2020-09-21 16:25:17 +00:00
Mark Felder
8afdbcdb1c
Force HTTP for fedsockets
2020-09-21 10:13:41 -05:00
lain
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
2020-09-21 16:08:38 +02:00
Roman Chvanikov
28d0986f83
Refactor mutes removing in CommonAPI and User
2020-09-20 20:58:17 +03:00
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +03:00
Ivan Tashkinov
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
rinpatch
4b12e071ac
OpenAPI: make it possible to generate a spec without starting the app
...
Needed for api docs generation on pleroma.social that will come later
2020-09-19 16:26:15 +03:00
rinpatch
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
2020-09-19 16:26:15 +03:00
Mark Felder
26859c549c
Add user agent to fedsocket requests
2020-09-19 07:26:46 -05:00
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
rinpatch
26c571df33
FedSockets: fix log spam on cached rejects
2020-09-18 16:09:37 +03:00
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
2020-09-17 22:07:54 +03:00
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
rinpatch
6bbd65fb09
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-17 19:51:54 +03:00
rinpatch
608017b7df
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-17 19:50:51 +03:00
Haelwenn
0465bdbd49
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
2020-09-17 19:50:23 +03:00
lain
bb70b231d0
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
2020-09-17 19:49:08 +03:00
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
stwf
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
rinpatch
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
2020-09-17 19:06:10 +03:00
rinpatch
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
2020-09-17 19:04:50 +03:00
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
2020-09-17 09:32:50 -05:00
lain
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
2020-09-17 14:20:03 +00:00
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
rinpatch
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
2020-09-17 16:56:39 +03:00
eugenijm
c711a2b157
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
2020-09-17 14:54:00 +03:00
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
Maksim Pechnikov
5a8ea0a5b0
small refactoring
2020-09-17 09:13:43 +03:00
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
Ivan Tashkinov
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring.
2020-09-16 22:30:42 +03:00
rinpatch
3a9baa9d0d
Merge branch '2144-empty-users' into 'develop'
...
User: Remote users don't need to be confirmed or approved
Closes #2144
See merge request pleroma/pleroma!3003
2020-09-16 15:47:07 +00:00
lain
7a88b726bf
User: Remote users don't need to be confirmed or approved
2020-09-16 17:29:16 +02:00
rinpatch
a4f80e1e74
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'
...
ConnectionPool Worker: use monitor flush instead of checking ref
See merge request pleroma/pleroma!3002
2020-09-16 15:10:20 +00:00
rinpatch
adb1b0282d
ConnectionPool Worker: use monitor flush instead of checking ref
...
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
2020-09-16 17:29:07 +03:00
rinpatch
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
2020-09-16 13:37:04 +00:00
rinpatch
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
2020-09-16 13:36:27 +00:00
lain
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
Maksim Pechnikov
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
2020-09-16 09:47:18 +03:00
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user
2020-09-15 13:00:56 +03:00
Haelwenn
5c4ff5c73c
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
2020-09-15 08:25:10 +00:00
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
stwf
38b2db297b
search indexing metadata respects discoverable flag
2020-09-14 13:18:11 -04:00
rinpatch
bb407edce4
RichMedia: fix a compilation error due to nonexistent variable
...
No idea why this passed Gitlab CI
2020-09-14 15:46:00 +03:00
rinpatch
f70335002d
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).
2020-09-14 14:45:58 +03:00
rinpatch
f66a15c4a5
RichMedia parser: do not set a cache TTL for unchanging errors
2020-09-14 14:44:25 +03:00
Maksim Pechnikov
3e53ab4e98
added notification constraints
2020-09-14 14:08:12 +03:00
Maksim
489a107cf4
Apply 1 suggestion(s) to 1 file(s)
2020-09-13 11:54:15 +00:00
Roman Chvanikov
c5830ac037
Merge develop
2020-09-13 12:24:57 +03:00
Roman Chvanikov
527afb813a
Remove unused require
2020-09-13 12:23:45 +03:00
Ivan Tashkinov
cd234a5321
[ #2497 ] Media preview proxy: preview bypass for small images
...
(basing on Content-Length and Content-Type).
2020-09-12 11:20:41 +03:00
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
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
2020-09-11 23:22:14 -05:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields
2020-09-11 14:11:00 -05:00
Alex Gleason
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
Alex Gleason
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
Alex Gleason
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
Alex Gleason
c41430b23e
Refactor with Chat.for_user_query/1
2020-09-11 14:10:13 -05:00
Alex Gleason
fb0de07343
AdminAPI: list chats for a user
2020-09-11 14:10:05 -05:00
Alex Gleason
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
Alex Gleason
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason
2020-09-11 20:00:41 +02: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
rinpatch
89a7efab69
ConnectionPool: Log possible HTTP1 blocks
2020-09-11 15:37:39 +03:00
Haelwenn
36c9197ac3
Apply 1 suggestion(s) to 1 file(s)
2020-09-11 10:46:16 +00:00
Haelwenn (lanodan) Monnier
dbc013f24c
instance: Handle not getting a favicon
2020-09-11 11:37:46 +02:00
Haelwenn (lanodan) Monnier
f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type
2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier
1b3d5956b1
Pipeline Ingestion: Article
2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier
2132b24a9d
object_validators: likes & announcements as [ObjectID]
2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier
846b59ccb0
Pipeline Ingestion: Video
2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier
b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion
2020-09-11 01:39:38 +02:00
Haelwenn (lanodan) Monnier
da876d09e8
federator: normalize only actor, catch actor error
2020-09-11 00:56:21 +02:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
Ivan Tashkinov
4d18a50f3c
[ #2497 ] Formatting fix.
2020-09-10 21:54:26 +03:00
Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
Alexander Strizhakov
f24828a3e8
oban warning
2020-09-10 21:51:30 +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
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
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
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
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
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
Maksim Pechnikov
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +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
b4860c57a6
[ #2497 ] Formatting fix.
2020-09-09 19:43:36 +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
Alexander Strizhakov
de2499e54b
don't run update in tests
2020-09-09 10:48:18 +03:00
Mark Felder
d23d0c27c2
Handle possibility of user account in a bulk operation not having an email address
2020-09-08 16:48:54 -05:00
Mark Felder
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
Mark Felder
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -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
947ee55ae2
user: harden get_friends_query(), get_followers_query() and their wrappers
2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier
16c451f8f1
search: Apply following filter only when user is usable
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
rinpatch
27c3973b78
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
2020-09-08 19:45:44 +03:00
rinpatch
7490b76bbf
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
2020-09-08 19:45:44 +03:00
Haelwenn (lanodan) Monnier
921f926e96
Remove OStatus in testsuite
2020-09-08 18:43:57 +02:00
Haelwenn (lanodan) Monnier
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
2020-09-08 18:43:57 +02:00
Alexander Strizhakov
87d2805791
combo fixes
2020-09-08 17:40:23 +02:00
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
2020-09-08 15:26:06 +03:00
rinpatch
0a05670b44
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
2020-09-08 12:21:33 +00:00
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
2020-09-08 15:16:43 +03:00
Roman Chvanikov
e3f845b243
Add expiring mutes for activities
2020-09-08 15:13:50 +03:00
rinpatch
4b76d7ce67
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
...
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
2020-09-08 14:00:00 +03:00
lain
9b85592b8b
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-08 13:56:42 +03:00
rinpatch
964bc8e2e8
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-08 13:55:52 +03:00
43b07c31cb
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-08 13:53:47 +03:00
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
74d46a1b09
Merge branch 'secfix/search-crash' into 'develop'
...
Fix crash done via search
See merge request pleroma/secteam/pleroma!12
2020-09-08 12:53:11 +03:00
rinpatch
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
Mark Felder
4ea07f74e9
Revert/simplify.
...
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
2020-09-08 12:29:38 +03:00
Mark Felder
216c84a8f4
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
2020-09-08 12:29:38 +03:00
Mark Felder
2165a24974
Improve upload filter return values so we can identify when filters make no changes to the input
2020-09-08 12:29:38 +03:00
Mark Felder
fa347b9c2f
Fix uploading webp image files when Exiftool Upload Filter is enabled
2020-09-08 12:29:38 +03: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
18d21aed00
deprecation warnings
2020-09-07 19:59:17 +03: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
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
rinpatch
6c6de8e5df
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
2020-09-07 12:47:43 +00:00
rinpatch
d5c286b802
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-07 11:12:30 +00: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
Haelwenn (lanodan) Monnier
08aef7dd4e
instance: Log catch favicon errors as warnings
2020-09-07 08:40:52 +02:00
Maksim Pechnikov
917d325972
added api spec
2020-09-07 07:17:30 +03:00
Maksim Pechnikov
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
Mark Felder
563718cab9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
2020-09-06 08:15:34 -05: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
129a2f48df
ConnectionPool middleware: handle connection opening errors
2020-09-05 21:36:17 +03:00
