alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,304 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

7578 Commits

Author SHA1 Message Date
lain 7a2f100061 ActivityPub: Show own replies to muted users. 
Aligns mute with block behavior.
 2020-10-15 12:28:25 +02:00
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export 2020-10-14 15:27:15 -05:00
feld 77bca41595 Apply 3 suggestion(s) to 3 file(s) 2020-10-14 19:33:54 +00:00
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop' 
Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534
 2020-10-14 17:31:45 +00:00
Haelwenn 9a85ec0da0 Merge branch 'refactor/locked_user_field' into 'develop' 
Change user.locked field to user.is_locked

See merge request pleroma/pleroma!3077
 2020-10-14 16:17:32 +00:00
Mark Felder ed61002815 Undo API breaking changes 2020-10-14 11:03:17 -05:00
Mark Felder b001237b79 Finish undoing API breakage 2020-10-14 10:44:18 -05:00
Mark Felder 3242cfef20 Undo API breaking changes 2020-10-14 09:54:07 -05:00
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-10-13 19:26:04 -05:00
Egor Kislitsyn 6734abcbd4
Add pagination for Mutes 2020-10-13 21:58:18 +04:00
Haelwenn (lanodan) Monnier f5d8af1db1
Move Consistency.FileLocation to ./test 
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
 2020-10-13 19:57:45 +02:00
Egor Kislitsyn 33f4f39b1c
Add pagination for Blocks 2020-10-13 21:39:41 +04:00
Mark Felder b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder 64553ebae2 Merge branch 'develop' into chore/elixir-1.11 2020-10-13 09:54:53 -05:00
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field 2020-10-13 09:54:29 -05:00
Mark Felder 4ead0d564f Merge branch 'develop' into refactor/discoverable_user_field 2020-10-13 09:54:11 -05:00
Mark Felder 8bacdc3680 Change user.discoverable field to user.is_discoverable 2020-10-13 09:45:08 -05:00
Mark Felder 9968b7efed Change user.locked field to user.is_locked 2020-10-13 09:31:13 -05:00
Alexander Strizhakov 4c4ea9a348
changes after rebase 2020-10-13 17:10:34 +03:00
Alexander Strizhakov 3cb9c88837
migration and warning for RemoteIp plug rename 2020-10-13 16:44:04 +03:00
Alexander Strizhakov 5f2071c458
changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov 7f5dbb0201
changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov b081080dd9
fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov c4c5caedd8
changes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov 1d0e130cb3
fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov 0f8ab46a0e
fix after rebase 2020-10-13 16:44:00 +03:00
Alexander Strizhakov 207211a2b3
update files consistency after rebase 2020-10-13 16:44:00 +03:00
Alexander Strizhakov 3c8c540707
copyright 2020-10-13 16:43:59 +03:00
Alexander Strizhakov b6eb7997f5
special namespaces for phoenix and api_spec 2020-10-13 16:43:59 +03:00
Alexander Strizhakov 9f4fe5485b
alias alphabetically order 2020-10-13 16:43:59 +03:00
Alexander Strizhakov 3ef4e9d170
AdminSecretAuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov c497558d43
AuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov c1777e7479
BasicAuthDecoderPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov 970932689f
DigestPlug rename 2020-10-13 16:43:57 +03:00
Alexander Strizhakov 66e0b0065b
Cache plug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov c6baa811d6
EnsureAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov 011525a3d1
EnsurePublicOrAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov 8e301a4c37
EnsureUserKeyPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov d6cb1a3b46
ExpectAuthenticatedCheckPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov 99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov 8c993c5f63
FederatingPlug module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov abc3c7689b
HTTPSecurityPlug module name and filename 2020-10-13 16:43:55 +03:00
Alexander Strizhakov 5cd7030076
IdempotencyPlug module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov 8dfaa54ffc
InstanceStatic module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov e2332d92ce
LegacyAuthenticationPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 96d320bdfe
OAuthPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov a6d8cef33e
OAuthScopesPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 15772fda57
PlugHelper module name 2020-10-13 16:43:53 +03:00
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
Alexander Strizhakov 6bf85440b3
mix tasks consistency 2020-10-13 16:33:24 +03:00
Alexander Strizhakov b573711e9c
file locations consistency 2020-10-13 16:33:24 +03:00
Alex Gleason 83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932 2020-10-12 18:49:37 -05:00
feld 03855f9789 Merge branch 'improve/instance-gen' into 'develop' 
#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070
 2020-10-12 17:24:24 +00:00
Mark Felder 8539e386c3 Add missing Copyright headers 2020-10-12 12:00:50 -05:00
Mark Felder 6c61ef14c3 Support enabling upload filters during instance gen 2020-10-12 11:19:48 -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
Mark Felder 822e4472f3 Fix incorrect use of connect/1 
Hint from Phoenix 1.4.17, which has a connect/7 shim:

lib/phoenix/socket/transport.ex:

  def connect(endpoint, handler, _transport_name, transport, serializers, params, _pid \\ self()) do
    IO.warn "Phoenix.Socket.Transport.connect/7 is deprecated"

    handler.connect(%{
      endpoint: endpoint,
      transport: transport,
      options: [serializer: serializers],
      params: params
    })
  end
 2020-10-07 15:06:16 -05:00
feld 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
Mark Felder 8caa6cf91d Transport.connect/7 is deprecated 2020-10-07 11:47:10 -05:00
feld 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
feld 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
Mark Felder 8b84ca4901 Simplify the value comparison 2020-09-25 10:37:59 -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