33f063204e
Add unit test for Pleroma API app controller
2021-08-28 23:18:12 -06:00
a14e1c0003
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
2021-08-28 18:02:36 -06:00
eab6291094
Require follow and read OAuth scopes for GET /api/v1/apps
2021-08-28 11:13:25 -06:00
6519732045
GET /api/v1/apps endpoint
2021-08-25 21:01:04 -06:00
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06:00
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
2021-07-02 13:03:41 +00:00
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
2021-06-08 19:15:04 -05:00
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
2021-06-08 12:50:47 -05:00
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
2021-06-08 12:50:47 -05:00
0877b120c3
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
...
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
2021-06-08 12:50:47 -05:00
2e310b3ec8
Fix more build errors
2021-06-04 15:06:55 -06:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
2021-05-30 12:58:24 -05:00
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
2021-05-29 12:17:24 -05:00
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
2021-05-29 12:15:57 -05:00
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
2021-05-19 12:49:00 -05:00
07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
2021-05-18 17:45:30 -05:00
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
2021-04-15 23:12:42 -06:00
4f55d5123b
Remove MastoFE-related backend code and frontend pieces
2021-04-15 22:56:21 -06:00
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
2021-03-07 11:33:21 +03:00
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
7dac83eb6e
Linting.
2021-03-02 15:03:16 +01:00
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
63739c5a58
Tests to validate client disclosure obeys user setting
2021-02-18 17:23:17 -06:00
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
2021-02-18 16:35:03 -06:00
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
2021-02-17 15:14:27 +00:00
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
2021-02-12 12:44:45 -06:00
c1d78328ee
Consistency
2021-02-11 14:27:52 -06:00
6dc0b13cf8
Revert to original formatting for these function defs
2021-02-11 14:24:51 -06:00
7c508319a5
Prefer naming this put_application because we're putting it into the params map
2021-02-11 14:19:53 -06:00
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
2021-02-11 14:15:25 -06:00
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
3dc7e89c54
Ensure we capture the application details into the object
2021-02-09 18:07:15 -06:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
2021-02-01 14:11:11 +03:00
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
2021-01-29 00:17:33 +03:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
c9d73af74d
Cachex: Unify arity of callback function
2020-12-21 12:03:58 +01:00
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
2020-11-25 21:47:23 +03:00
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
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
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
b001237b79
Finish undoing API breakage
2020-10-14 10:44:18 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
1d0e130cb3
fixes after rebase
2020-10-13 16:44:02 +03:00
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
4b1863ca4e
RateLimiter module name
2020-10-13 16:43:53 +03:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
23d5d7cf59
Fix #2172 HTTP error on password reset
2020-09-21 14:09:26 -05:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
91b9985e1c
Pass expires_in param from status controller
2020-09-08 15:26:06 +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
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03: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
581f382e71
ListController: DRY up stuff.
2020-09-02 18:32:00 +02:00
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
2020-09-01 12:49:32 +02:00
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-08-05 13:08:31 -05:00
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31 14:13:38 +03:00
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
2020-07-30 20:01:04 +00:00
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
2020-07-29 11:47:03 +02:00
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
2020-07-23 20:06:11 +00:00
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
2020-07-09 13:10:05 +00:00
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
2020-07-09 12:10:26 +00:00
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
2020-07-09 09:37:52 +00:00
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
2020-07-08 10:55:03 +00:00
a6495f4a68
[ #1895 ] credo fix.
2020-07-08 12:54:23 +03:00
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
3f8370a285
[ #1895 ] Applied code review suggestion.
2020-07-08 12:36:44 +03:00
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
2020-07-07 20:37:11 +03:00
59cf78e412
AccountController: Allow removal / reset of user images.
2020-07-07 16:53:03 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
fc1f34b851
Delete activity before sending response to client
2020-07-06 00:01:25 +03:00
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
2020-07-03 15:06:33 +00:00
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
2020-07-03 16:44:31 +02:00
945e75c8e8
SearchController: Trim query.
2020-07-03 16:36:55 +02:00
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
59540131c1
Credo fixes.
2020-06-29 14:09:03 +02:00
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
b05f795326
Credo fixes
2020-06-22 14:02:29 +02:00
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
2020-06-22 13:59:45 +02:00
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Sean King