Commit Graph

318 Commits (4ee99dafccd6f7c037270d6bac5e942f322c7efd)

Author SHA1 Message Date
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Egor Kislitsyn c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn 7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn 68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn 854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn 1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn 278b3fa0ad
Add spec for AccountController.show
5 years ago
Egor Kislitsyn d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn 260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn b08ded6c2f
Add spec for AccountController.create
5 years ago
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Egor Kislitsyn d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
lain d2e21fbc96 Merge branch 'open-api' into 'develop'
5 years ago
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop'
5 years ago
Ivan Tashkinov fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Egor Kislitsyn 23219e6fb3
Add OpenAPI
5 years ago
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
5 years ago
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting
5 years ago
lain 3c2c32b460 Merge branch 'remake-remodel' into develop
5 years ago
eugenijm 13cce9c0de Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
rinpatch 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Egor Kislitsyn 4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
rinpatch b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
rinpatch ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
Haelwenn (lanodan) Monnier 3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
5 years ago
Egor Kislitsyn f446744a6a
Allow account registration without an email
5 years ago
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383
5 years ago
Hakaba Hitoyo dabd535e43 Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
5 years ago
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain e9993acdbb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov 29a98b86b7 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 652cc6ba4b updated ScheduledActivity
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov 0937895182 updated fetch_favorites
5 years ago
Maksim Pechnikov 9da4c88b49 fix test
5 years ago
Maksim Pechnikov 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
lain 1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
5 years ago
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain 6e4f52f8a2 Introduce new ingestion pipeline structure, implement internal Likes with it.
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
eugenijm 580a67f5ca Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Haelwenn 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
5 years ago
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Egor Kislitsyn e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn 7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
Egor Kislitsyn d3c404af12
Add MastoFEController
5 years ago
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController
5 years ago
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop'
5 years ago
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
5 years ago
feld 1255ec888d Revert "Add upload limits to /api/v1/instance"
5 years ago
Thibaut Girka 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display
5 years ago
Thibaut Girka 4c1f158f5d Allow users to announce privately, including own private notes
5 years ago
Egor Kislitsyn af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn 2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn 39695c4436 Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn 585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn 36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn 987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn e7aef27c00
Fix merge
5 years ago
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
5 years ago
Egor Kislitsyn b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
5 years ago
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
Maksim Pechnikov 1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier 9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
kaniini 92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop'
5 years ago
kaniini 68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop'
5 years ago
kaniini 27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
5 years ago
Egor Kislitsyn 408750b94e Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn 99c5a35890 Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn 0a5b106ddd Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn 621377f378 Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
Egor Kislitsyn 5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test
5 years ago
Egor Kislitsyn 98d1347a4e Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini 219771288c Merge branch 'refactor/common_api' into 'develop'
5 years ago
Maksim Pechnikov 73ae38ca04 add deprecated tag
5 years ago
Maksim Pechnikov 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn 3572cf29b7 Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn eed774d058 Add CommonAPI.ActivityDraft
5 years ago
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
5 years ago
kaniini 48a82c4609 Merge branch 'refactor/user' into 'develop'
5 years ago
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
5 years ago
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn 035f22f784 Fix Credo warnings
5 years ago
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2
5 years ago
Egor Kislitsyn a66a7a328f Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded
5 years ago
Maksim Pechnikov d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
5 years ago
Steven Fuchs e1d2d69c87 Clean up views
5 years ago
Maksim Pechnikov 494bb6bac6 updated tests
5 years ago
Maksim Pechnikov 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
eugenijm 7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
eugenijm fe5e0b7846 Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
5 years ago
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
eugenijm 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Ivan Tashkinov efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop'
5 years ago
Egor Kislitsyn b40b10b53d Add an endpoint to get multiple statuses by IDs
5 years ago
Ivan Tashkinov b63faf9819 [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
Maksim Pechnikov ab2f21e470 tests for mastodon_api_controller.ex
5 years ago
Maksim Pechnikov eb74c3d5c7 Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn 40b3289c26 Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
rinpatch 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
rinpatch cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to
5 years ago
Maksim Pechnikov 6ef0103ca0 added Emoji struct
5 years ago
Maksim Pechnikov d8098d142a added Emoji.Formatter
5 years ago
Maksim Pechnikov d7808b5db4 added code\path fields without html tags in ets
5 years ago
Egor Kislitsyn 4194abbc8f Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn 4d82bc8b0b Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago