Commit graph

726 commits

Author SHA1 Message Date
Egor Kislitsyn af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
Egor Kislitsyn 2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
Egor Kislitsyn 39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
Egor Kislitsyn 585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00
Egor Kislitsyn 36a34c36fe
Extract poll actions from MastodonAPIController to PollController 2019-10-01 11:44:34 +07:00
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07:00
Egor Kislitsyn 987e0b8be8
Move update_credentials to MastodonAPI.AccountController 2019-09-30 19:10:56 +07:00
Egor Kislitsyn c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
lain a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:58:14 +02:00
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`

See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
kaniini 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
Egor Kislitsyn b7f27a4f58
Extract report actions from MastodonAPIController to ReportController
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill e653edd182 split scrobble functions into their own controller 2019-09-30 10:39:48 +00:00
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles 2019-09-30 10:39:48 +00:00
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller 2019-09-30 10:39:17 +00:00
Egor Kislitsyn d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController 2019-09-30 16:52:07 +07:00
rinpatch e9d1aa75d5 Revert subscription refactoring.
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
2019-09-29 18:43:27 +03:00
kaniini 92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop'
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request pleroma/pleroma!1730
2019-09-27 07:54:54 +00:00
kaniini 68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop'
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729
2019-09-27 07:54:08 +00:00
kaniini 27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

See merge request pleroma/pleroma!1728
2019-09-27 07:53:22 +00:00
Egor Kislitsyn 408750b94e Extract domain blocks actions from MastodonAPIController to DomainBlockController 2019-09-27 14:28:05 +07:00
Egor Kislitsyn 99c5a35890 Extract follow requests actions from MastodonAPIController to FollowRequestController 2019-09-27 14:25:17 +07:00
Egor Kislitsyn 0a5b106ddd Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController 2019-09-27 13:36:28 +07:00
Egor Kislitsyn 621377f378 Extract filter actions from MastodonAPIController to FilterController 2019-09-27 13:06:25 +07:00
kaniini 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`

See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
kaniini eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
Egor Kislitsyn 98d1347a4e Extract status actions from MastodonAPIController into StatusController 2019-09-27 10:51:15 +07:00
Roman Chvanikov b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Egor Kislitsyn 3572cf29b7 Extract timeline actions from MastodonAPIController into TimelineController 2019-09-26 10:53:42 +07:00
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
Ekaterina Vaartis ba9d35a904 Add an API endpoint for listing remote packs 2019-09-25 12:32:19 +02:00
Haelwenn (lanodan) Monnier 0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media 2019-09-24 19:03:06 +02:00
Egor Kislitsyn a66a7a328f Extract notification actions from MastodonAPIController into NotificationController 2019-09-24 15:16:44 +07:00
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
Haelwenn (lanodan) Monnier 815b904508
Add support for AP C2S uploadMedia
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Maxim Filippov 6f25668215 Admin API: Add ability to force user's password reset 2019-09-22 16:08:07 +03:00
Ekaterina Vaartis d51e5e447e Move emoji reloading to admin api 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 6cd651a38b Make the emoji controller api more RESTy 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis f24731788e Move emoji pack list from /list to / 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis f5131540dc Add a way to create emoji packs via an endpoint 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 9afe7258dd Implememt emoji pack file updating + write tests 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis bcc0bfd0c5 Add an endpoint for emoji pack metadata updating 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 2d4b8f3d20 Add an endpoint for deleting emoji packs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks
If fallback url doesn't have a pack.yml file, one from the source will
be used
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis b791a08656 Implement API actions on packs
That incldues listing them and downloading them from other instances
or from the remote url
2019-09-19 00:16:33 +03:00
Alex S a18f1e7cd7 namings 2019-09-18 10:49:14 +03:00
Alex S 4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
Roman Chvanikov 7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show 2019-09-17 16:48:24 +03:00
Roman Chvanikov a81f80233d Apply suggestion to lib/pleroma/web/router.ex 2019-09-17 13:43:10 +00:00
Roman Chvanikov 6042e21b25 Move subscription notifications to a separate controller 2019-09-16 21:59:49 +03:00
Roman Chvanikov 76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking 2019-09-13 19:42:53 +03:00
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
lain a7f31bf06c Merge remote-tracking branch 'origin/develop' into reactions 2019-09-13 16:31:27 +02:00
Egor Kislitsyn 25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
rinpatch b0e6058021 Parse http signature for request to objects/activities 2019-09-12 23:03:52 +03:00
lain 05e9776517 PleromaAPIController: Add endpoint to fetch emoji reactions. 2019-09-12 18:48:25 +02:00
Egor Kislitsyn b40b10b53d Add an endpoint to get multiple statuses by IDs 2019-09-10 13:39:45 +07:00
rinpatch 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI

See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
lain 99ea990a16 PleromaAPIController: Add emoji reactions. 2019-09-04 12:20:35 -05:00
rinpatch c2b6c1b089 Extend /api/pleroma/notifications/read to mark multiple notifications
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
rinpatch bd3ed3a622 Add back /api/qvitter/statuses/notifications/read.json 2019-08-31 11:43:06 +03:00
rinpatch eb1739c596 Remove most of TwitterAPIController 2019-08-27 12:29:19 +03:00
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests 2019-08-26 19:37:54 +07:00
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor

See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
Maxim Filippov 37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
lain 90986667ce Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users

See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
Maksim Pechnikov 8dc6a6b210 fix /inbox for Relay 2019-08-22 22:48:07 +03:00
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor 2019-08-22 06:57:55 +03:00
Sachin Joshi 37229af15f remove old user create and delete routes for admin 2019-08-22 00:15:00 +05:45
lain df81abb68c Conversations: Use correct oauth paths for extended api. 2019-08-14 15:55:43 +02:00
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
lain 60231ec7bd Conversation: Add endpoint to get a conversation by id. 2019-08-12 13:58:04 +02:00
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
lain 3af6d14da7 Pleroma Conversations API: Add a way to set recipients. 2019-08-05 15:09:19 +02:00
lain eee98aaa73 Pleroma API: Add endpoint to get conversation statuses. 2019-08-02 19:53:08 +02:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Alexander Strizhakov 51b3b6d816 Admin changes 2019-07-30 16:36:05 +00:00
Sergey Suprunenko c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances 2019-07-29 16:17:22 +00:00
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
Maksim 6b77a88365 [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ 2019-07-26 20:27:38 +00:00
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
Maxim Filippov f46805bb40 Merge branch 'develop' into feature/admin-api-user-statuses 2019-07-24 02:42:28 +03:00
Haelwenn (lanodan) Monnier 90be91b0e0
Router: Remove deprecated AdminAPI endpoints 2019-07-23 21:35:25 +02:00
Ariadne Conill bc6c5c513a router: ensure the AP sharedinbox path is registered first 2019-07-21 03:52:06 +00:00
Roman Chvanikov 36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
Maxim Filippov 9570a5be40 Merge branch 'develop' into feature/admin-api-user-statuses 2019-07-18 23:38:38 +03:00
Ariadne Conill 184fa61fb3 plugs: add MappedSignatureToIdentityPlug 2019-07-18 15:38:45 +00:00
Ariadne Conill cf9cb953d5 activitypub: represent internal fetch actor 2019-07-17 17:34:57 +00:00
Alexander Strizhakov 10f82c88b8 mastoapi password reset
added rate limit to password reset

configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Roman Chvanikov c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Maxim Filippov 418ae6638d Merge branch 'develop' into feature/admin-api-user-statuses 2019-07-14 00:39:06 +03:00
Maxim Filippov a9459ff98f Admin API: Endpoint for fetching latest user's statuses 2019-07-14 00:37:26 +03:00
rinpatch 095117a58c Merge branch 'develop' into fix/ap-hide-follows 2019-07-12 21:43:06 +03:00
rinpatch 97b79efbcd ActivityPub Controller: Actually pass for_user to following/followers
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
Mark Felder 360e4cdaa2 Move these to pleroma namespace in Mastodon API 2019-07-12 11:25:58 -05:00
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini 1417627d07 Merge branch 'remove-avatar-header' into 'develop'
Ability to reset avatar, profile banner and backgroud

See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
rinpatch 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors 2019-07-08 12:59:49 +03:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Egor Kislitsyn 74132e3715 Enable IdempotencyPlug for the all API 2019-06-26 18:42:49 +07:00
Maksim a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header'
# Conflicts:
#   CHANGELOG.md
2019-06-23 03:25:50 +00:00
Mark Felder 9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
Maksim ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
rinpatch 92213fb87c Replace Mix.env with Pleroma.Config.get(:env)
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
rinpatch 300d94c628 Add poll votes
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
Sachin Joshi ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users 2019-06-01 11:42:37 +05:45
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
kaniini 6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
This reverts merge request !1209
2019-05-29 22:10:16 +00:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock 0159a6dbe9 router: require oauth_read for searching
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords.  An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.

Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion.  It also
removes Pleroma as a potential vector in distributed search engines.
2019-05-29 10:58:45 +00:00
Sachin Joshi 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API 2019-05-27 15:31:01 +05:45
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
Aaron Tinio 3ab9255eda Respond with a 404 Not implemented JSON error message
when requested API is not implemented
2019-05-22 07:15:52 +08:00
rinpatch 63b0b7190c MastoAPI: Add GET /api/v1/polls/:id 2019-05-21 20:40:35 +03:00
Sadposter 54e9cb5c2d
Add API endpoints for a custom user mascot 2019-05-20 12:39:23 +01:00
lain f959bf7aa6 MongooseIM: Add basic integration endpoints. 2019-05-17 18:21:11 +02:00
Sachin Joshi 5c028b8f92 user creation admin api will create multiple users 2019-05-17 12:21:58 +05:45
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
Aaron Tinio 70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug 2019-05-15 05:09:32 +08:00
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
Sachin Joshi f01f995816 make url uniform in admin api 2019-05-11 14:46:00 +05:45
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
Roman Chvanikov 0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
Sergey Suprunenko 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
Alexander Strizhakov 88f0be9693 Feature/826 healthcheck endpoint 2019-04-22 07:19:53 +00:00
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
Roman Chvanikov 64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Mark Felder 1aa4994f6d Do not require authentication for user search in MastoAPI 2019-04-18 12:44:25 -05:00
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
Egor Kislitsyn db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
lain c352a0aba6 Conversations: Make tests run. 2019-04-10 17:48:31 +02:00
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls

Closes #738

See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
lain a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations 2019-04-08 14:10:51 +02:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
Alex S b810aac117 added docs to docs/api/admin_api.md
code style and little renamings
2019-04-07 19:48:52 +07:00
eugenijm 7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
Sadposter 9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
Sadposter d35f6551c1 Move subscriptions endpoint to be under /pleroma 2019-04-05 17:02:02 +01:00
Sadposter 79910ce5cc Add API endpoints and user column for subscription 2019-04-05 15:30:18 +01:00
Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
lambda 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
Ivan Tashkinov 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-02 13:50:12 +03:00
Ivan Tashkinov aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations 2019-04-02 09:19:10 +03:00
Haelwenn (lanodan) Monnier f56eef8d8c
router: Add fake identity proof endpoint 2019-04-02 01:53:38 +02:00
Ivan Tashkinov cbe09d94d1 Added force_login authentication option (previously applied by default). 2019-04-01 14:46:50 +03:00
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Ivan Tashkinov 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +03:00
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
Ivan Tashkinov e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI 2019-03-17 17:06:28 +01:00
eugenijm 43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
Ivan Tashkinov 2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Ivan Tashkinov 63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03:00
kaniini 0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users

See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
Maksim bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Maxim Filippov f620199836 Merge search endpoint into /users 2019-03-04 21:26:32 +03:00
Egor Kislitsyn eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07:00
Maxim Filippov 46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
Maxim Filippov 90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
kaniini 5a4e2905fe Merge branch 'fix/twittercards' into 'develop'
Fix Twitter Cards

See merge request pleroma/pleroma!815
2019-02-22 04:38:14 +00:00
William Pitcock 1803d9a022 fix fetching AP objects with application/json 2019-02-20 20:45:40 +00:00
Egor bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
Ivan Tashkinov b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov 6fe7acd58e [#468] Merged upstream/develop. 2019-02-20 16:48:59 +03:00
lambda 11b3c10c54 Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
Ivan Tashkinov 3ad91ec3c1 [#468] Adjusted scope restriction for MastodonAPIController#index. 2019-02-20 14:05:02 +03:00
Ekaterina Vaartis da64ea4a55 Implement mastodon mutes endpoint
Aparently i forgot to add it, it gets a list of muted users
2019-02-19 21:49:55 +03:00
Ekaterina Vaartis f41f017bbc Implement muting, add it to the mastodon API 2019-02-19 21:49:55 +03:00
Mark Felder 2d21ea1a0e Merge branch 'develop' into fix/twittercards 2019-02-19 16:58:28 +00:00
href 10a11f083c
Embed player suitable for Twitter Cards 2019-02-19 17:47:48 +01:00
eugenijm 25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
Ivan Tashkinov c0ecbf6669 [#468] Merged upstream/develop. 2019-02-19 19:10:55 +03:00
kaniini 7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
Ivan Tashkinov d3fe2c8ec6 [#468] Formatting fix. 2019-02-17 14:07:35 +03:00
Ivan Tashkinov bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Haelwenn (lanodan) Monnier 4df455f69b
[MastoAPI] Add switching of frontend flavours 2019-02-16 19:50:13 +01:00
Ivan Tashkinov 2a4a4f3342 [#468] Defined OAuth restrictions for all applicable routes.
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
2019-02-15 19:54:37 +03:00
William Pitcock 9bd6ed975e activitypub: user view: use route helpers instead of hardcoded URIs 2019-02-13 19:34:43 +00:00
Maxim Filippov 62a45bdc11 Add revoke token 2019-02-13 12:59:56 +03:00
Maxim Filippov 61a4bc5095 Add OAuth tokens endpoint 2019-02-13 12:59:56 +03:00
Ivan Tashkinov a337bd114c [#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route. 2019-02-09 17:32:33 +03:00
Ivan Tashkinov 4ad843fb9d [#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions. 2019-02-09 17:09:08 +03:00
Karen Konou 98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00
Karen Konou f4ff4ffba2 Migration and some boilerplate stuff 2019-02-07 17:36:14 +01:00
William Pitcock db1165f70f activitypub: c2s: add /api/ap/whoami endpoint for andstatus 2019-02-04 22:58:29 +00:00
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend

See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
William Pitcock 6096846f5f API: kill /api/rich_media/parse endpoint 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
href 71bb90073b
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
2019-01-27 22:51:50 +01:00
Haelwenn (lanodan) Monnier 3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support 2019-01-26 14:18:23 +00:00
kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider'
# Conflicts:
#   lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
lain e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
href f9a3269099
Uploader callback controller 2019-01-21 22:44:14 +01:00
rinpatch 74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
rinpatch ff01fd3c4f Remove caching because it does not affect performance and may be even worse in some cases 2019-01-16 11:18:25 +03:00
rinpatch 70b2bb6ede add caching 2019-01-16 10:26:01 +03:00
rinpatch 8745c8c990 remove useless newlines after every tag. Make domain.com/username provide opengraph too 2019-01-15 18:34:47 +03:00
rinpatch ce15e0659e Fix some edge cases [nervous laughter] 2019-01-15 11:56:35 +03:00
rinpatch e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
sxsdv1 581edd5a91 Add route to get object like activities 2019-01-12 20:24:38 +01:00
Egor Kislitsyn 44a1e69484 Add Twitter API for the pinned statuses
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true

# Pin
POST /api/statuses/pin/:id

# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
Egor Kislitsyn 380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
Maxim Filippov 48e81d3d40 Add RichMediaController and tests 2019-01-02 17:02:50 +03:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
sxsdv1 aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
Ivan Tashkinov 700661b761 [#483] Blocked users list import (TwitterAPI). 2018-12-28 23:01:03 +03:00
Ivan Tashkinov 6e9a15b181 [#483] Blocked users export for TwitterAPI. 2018-12-28 21:08:07 +03:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation

See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
Ivan Tashkinov f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security.
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
raeno 652f49d176 Remove extra bracket 2018-12-19 23:06:10 +04:00
raeno 7fb3780431 Merge branch 'develop' into oembed_provider 2018-12-19 22:39:44 +04:00
lain f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01:00
Ivan Tashkinov b096e30cff [#114] Added email confirmation resend action. Added tests
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
Ivan Tashkinov 1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. 2018-12-18 17:21:05 +03:00
Ivan Tashkinov a05cb10a95 [#114] Email confirmation route, action, node setting, User.Info fields. 2018-12-18 17:18:53 +03:00
raeno a300336459 Merge branch 'develop' into oembed_provider 2018-12-18 14:59:32 +01:00
href b1860fe85a
Instance/Static runtime plug
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.

If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
Ekaterina Vaartis a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
raeno 90b00701ff Merge branch 'develop' into oembed_provider 2018-12-14 20:28:35 +01:00
raeno 46486595ff Handle "users/:id" links as well. Fix comments in MR. 2018-12-14 19:55:40 +01:00
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Ivan Tashkinov f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. 2018-12-14 12:09:55 +03:00
raeno b5de7c4c4d Remove oembed for now, will submit it in another MR. Fix warnings 2018-12-13 22:34:15 +01:00
raeno 018516d3f3 Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links 2018-12-13 22:21:14 +01:00
raeno 21afdf6d99 Insert meta tags into static index.html on the fly for OStatus#notice 2018-12-13 22:17:53 +01:00
Ivan Tashkinov bfff2399ff [#114] Routes and config for confirm_email and email_invite (Twitter API). 2018-12-12 20:15:43 +03:00
Ivan Tashkinov f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated). 2018-12-12 17:04:39 +03:00
Ivan Tashkinov 12905ce1ad [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop'
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00
Ivan Tashkinov 7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
2018-12-06 19:55:58 +07:00
Ivan Tashkinov 826fc446d5 [#210] TwitterAPI: implemented /api/media/metadata/create
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
lain d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
kaniini 675653ceb7 Merge branch 'feature/admin-api' into 'develop'
Add a admin API

See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
href bcecdc3ab1
Various runtime configuration fixes 2018-11-19 10:09:24 +01:00
Haelwenn (lanodan) Monnier 4634d99d0d
Web.Router: Change right to permission group (except for function names) 2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier f48062488e
Add get endpoints for rights [AdminAPI] 2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier 59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI] 2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier ee2e1328ad
admin_api_controller.ex: Create 2018-11-17 20:25:52 +01:00
lain 27aa136aac Format. 2018-11-14 20:41:12 +01:00
lain 7b170cd616 Add Pleroma user search api for PleromaFE. 2018-11-14 20:33:23 +01:00
kaniini 69d557e86d Merge branch 'twitter-api-direct-messages' into 'develop'
Twitter api direct messages

See merge request pleroma/pleroma!449
2018-11-14 08:52:08 +00:00
lain ea9a776d7b TwitterApi: Add direct message endpoint 2018-11-13 20:08:50 +01:00
href 9b553a1087
media_proxy: CSP, content-disposition
* Adds CSP headers to the media proxy endpoint

* Sends `content-disposition: attachment; …` for non-image/video/audio
content types

The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.

* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
2018-11-13 15:58:02 +01:00
William Pitcock b2105a3131 twitterapi: add notification read endpoint 2018-11-06 23:25:07 +00:00
href 6fe23c5458
Runtime configured router 2018-11-05 15:19:03 +01:00
lain 1e9ced5af4 Test Relay, switch to runtime configuration. 2018-11-01 09:01:43 +00:00
AkiraFukushima e8c698af41 Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs 2018-10-19 01:46:26 +09:00
Martin Kühl d94ee5cd50 Mastodon API: Support push subscription CRUD 2018-09-22 07:04:01 +02:00
kaniini 0fe165165f Merge branch 'task-204-on-options-request' into 'develop'
Return 204 response on options request

See merge request pleroma/pleroma!347
2018-09-20 23:54:51 +00:00
Haelwenn (lanodan) Monnier 33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements 2018-09-20 16:25:07 +02:00
Martin Kühl f4fcea5258 Revert "Mastodon API: Fake support for loading filters"
This reverts commit c1d07da4e1.

The fake support was superseded by 6e030129fb which actually implements the faked filters API.

This change removes the fake support and ensures that the actual implementation is used.
2018-09-18 11:59:10 +02:00
Dominique Feyer 9b0f2d572b Return 204 response on options request 2018-09-17 12:21:01 +02:00
lambda 045953225e Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
auth overhaul and legacy GS auth

See merge request pleroma/pleroma!331
2018-09-08 09:20:34 +00:00
Martin Kühl c1d07da4e1 Mastodon API: Fake support for loading filters 2018-09-07 16:12:44 +02:00
lain 70163aec9b Add LegacyAuthenticationPlug to router. 2018-09-05 22:31:57 +02:00
lain 3aba585e7a Add Plugs to router. 2018-09-05 21:57:56 +02:00
Haelwenn 4a3dbd9d4e Merge branch 'fix/sign-in-with-toot' into 'develop'
Fix sign-in and sign-out with Toot!

See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
lain 636ad3e155 Add new plugs to router. 2018-09-05 19:13:53 +02:00
Martin Kühl 84d84e4ca4 OAuth: Support /revoke endpoint for revoking tokens
(for compatibility with Mastodon)
2018-09-01 23:10:48 +02:00
Haelwenn (lanodan) Monnier 6e030129fb
[MastodonAPI] Add filters 2018-08-27 15:09:05 +02:00
lambda 46c7c2380c Merge branch 'feature/relay' into 'develop'
message relay

Closes #144

See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
William Pitcock bc3c30430e fix formatting 2018-08-26 22:46:25 +00:00
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay'
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
Ekaterina Vaartis 540cce5d10 When logging in, try treating the login as an email
Closes #245
2018-08-25 23:29:03 +03:00
lambda 9908cf8fda Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
Feature / Suggestions API with third party recommendation engine

See merge request pleroma/pleroma!254
2018-08-15 07:47:33 +00:00
lambda 13440a80e1 Merge branch 'feature/invites' into 'develop'
Invites

Closes #108

See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
William Pitcock 5abf9ad602 relay: reintroduce @allow_relay 2018-08-06 08:22:18 +00:00
William Pitcock e49131bb72 relay: move to /relay endpoint from / due to webapp issues 2018-08-06 08:22:16 +00:00