Commit Graph

157 Commits (6316350918d1f55167fa384d55f385ff2c93e6bb)

Author SHA1 Message Date
lain b5aa204eb8 ChatController: Support deletion of chat messages.
4 years ago
lain 8d5597ff68 ChatController: Add GET /chats/:id
4 years ago
lain f335e1404a ChatView: Add the last message to the view.
4 years ago
Ivan Tashkinov aee88d11be [#2456] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov 14a49a0483 [#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
Ivan Tashkinov b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
4 years ago
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
lain f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
lain 20baa2eaf0 ChatMessages: Add attachments.
4 years ago
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
lain db55dc9445 ActivityPub: Remove `react_with_emoji`.
4 years ago
lain b04328c3de ChatController: Add mark_as_read
4 years ago
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record
4 years ago
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
4 years ago
Alexander Strizhakov 4a487e4d0b
fix for auth check
4 years ago
Alexander Strizhakov 36abeedf9f
error rename
4 years ago
Alexander Strizhakov ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov 342f55fb92
refactor emoji api with fixes
4 years ago
Alexander Strizhakov 5839e67eb8
return data only for updated emoji
4 years ago
lain 145d35ff70 Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
4 years ago
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain ad82a216ff Chat API: Align more to Pleroma/Mastodon API.
4 years ago
Ivan Tashkinov b4139cc547 [#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
Ivan Tashkinov 00e62161f6 [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Ivan Tashkinov 2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
lain 66c2eb670b ChatController: Validate parameters.
4 years ago
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain 970b74383b Credo fixes.
4 years ago
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain d45ae64858 ChatController: Use OAuth scopes.
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
lain f8c3ae7a62 ChatController: Handle pagination.
4 years ago
lain 6ace22b56a Chat: Add views, don't return them in timeline queries.
5 years ago
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
lain 2cc6841424 ChatController: Basic message posting.
5 years ago
lain e8fd0dd689 ChatController: Basic support for returning messages.
5 years ago
lain 68abea313d ChatController: Add creation and return of chats.
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
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Egor Kislitsyn 22018adae6
Fix Dialyzer warnings
5 years ago
lain 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
5 years ago
feld b3e9c87724 Update emoji_api_controller.ex
5 years ago
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users
5 years ago
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
Ivan Tashkinov 51111e286b [#1427] Initial support for OAuth admin scopes.
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
5 years ago
eugenijm 0580654485 Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain d580eedfe9 Linting.
5 years ago
lain 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions
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 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 4cb603e1df PleromaAPI: Add unreacting.
5 years ago
lain 391c736292 PleromaAPI: Fix emoji_reactions_by
5 years ago
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 6068d2254e PleromaAPIController: Fixes and refactoring.
5 years ago
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint
5 years ago
Ariadne Conill e653edd182 split scrobble functions into their own controller
5 years ago
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles
5 years ago
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller
5 years ago
rinpatch e9d1aa75d5 Revert subscription refactoring.
5 years ago
Roman Chvanikov b4b147000c Merge develop
5 years ago
Ekaterina Vaartis 118d6dcdf4 Fix nodeinfo handling
5 years ago
Ekaterina Vaartis ba9d35a904 Add an API endpoint for listing remote packs
5 years ago
vaartis a6e85215e1 Credo fix (remove parens on function definition)
5 years ago