Commit Graph

565 Commits (c23b81e399d5be6fc30f4acb1d757d5eb291d8e1)

Author SHA1 Message Date
lain 61ea8f1f5a Merge branch 'openapi/markers' into 'develop'
4 years ago
Egor Kislitsyn 46aae346f8
Move single used schemas to Filter operation schema
4 years ago
Egor Kislitsyn 7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
Egor Kislitsyn babcae7130
Move single used schemas to Marker operation schema
4 years ago
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2
4 years ago
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
4 years ago
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
4 years ago
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2
4 years ago
lain b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 3635a9c9c2 InstanceController: Add extensions to `/api/v1/instance`
4 years ago
Egor Kislitsyn f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov e16437ff19 [#1706] Formatting fix.
4 years ago
Ivan Tashkinov 0d05e1fe39 [#1706] Prevented error on unresolved activity actors for timeline actions.
4 years ago
lain ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn 6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
lain 5102468d0f Polls: Persist and show voters' count
4 years ago
lain 5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account
4 years ago
lain 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop'
4 years ago
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 970b74383b Credo fixes.
4 years ago
lain c845820911 Notifications: Create a chat notification.
4 years ago
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain ca598e9c27 AccountView: Return user ap_id.
5 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
5 years ago
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count
5 years ago
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
5 years ago
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses
5 years ago
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
rinpatch 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Ivan Tashkinov ac672a9d6b [#1559] Addressed code review requests.
5 years ago
Ivan Tashkinov 1a4875adfa [#1559] Support for "follow_request" notifications (configurable).
5 years ago
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276
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
Haelwenn (lanodan) Monnier 185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Ivan Tashkinov be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
Ivan Tashkinov 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Ivan Tashkinov c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
rinpatch 981e015f1b Mastodon API Account view: Remove an outdated hack
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier 863ec33ba2
Add support for funkwhale Audio activity
5 years ago
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 2ef70b55f5
Fix `status.expires_at` type
5 years ago
Maksim Pechnikov 28701c08ad Merge branch 'develop' into issue/1276
5 years ago
Haelwenn (lanodan) Monnier 1257331291
MastodonAPI.StatusView: Do not use site_name
5 years ago
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276
5 years ago
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
feld df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
5 years ago
rinpatch 983a87175e mastodon API: do not sanitize html in non-html fields
5 years ago
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Maksim Pechnikov e442ea5722 Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov de4102b247
can be changed in runtime
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
Egor Kislitsyn 80ededc04f
Add `direct_conversation_id` to web push payload
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
rinpatch 94f1cfced8 format the code
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
Mark Felder 7d101bc9c5 Fix rendering conversations when there's a malformed status
5 years ago
Maksim Pechnikov ff6c727739 Merge branch 'develop' into issue/1276
5 years ago
eugenijm ed29be24cb Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
Maksim Pechnikov 209319c8d2 update marker api
5 years ago
Maksim Pechnikov 99cf1ef9be Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Maksim Pechnikov d4270397dc Marker: added unread_count field
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
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
5 years ago
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
5 years ago
lain 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
5 years ago
eugenijm 06d9df79c5 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
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
Thibaut Girka 43e3db0951 Fix returned visibility of announces in MastodonAPI
5 years ago
Egor Kislitsyn 36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
Egor Kislitsyn e7aef27c00
Fix merge
5 years ago
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
5 years ago
kaniini 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop'
5 years ago
Egor Kislitsyn b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
5 years ago
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill b7877e9b1c mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
kaniini 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop'
5 years ago
Maksim Pechnikov 1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn 8d31530119 Cleanup ScheduledActivityView
5 years ago
Ariadne Conill 14294243a2 mastodon api: implement follow_requests_count
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
Maksim Pechnikov 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
5 years ago
Maksim Pechnikov 494bb6bac6 updated 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
Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop'
5 years ago
rinpatch 43f02dfe38 Revert "Parallelize template rendering"
5 years ago
shadowfacts e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs
5 years ago
rinpatch b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
rinpatch 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop'
5 years ago
rinpatch 558969a0fd Do not crash if one notification failed to render
5 years ago
rinpatch 3face45467 Mastodon API: Add `pleroma.thread_muted` to Status entity
5 years ago
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
lain ef43016b2c Merge branch 'feature/custom-fields' into 'develop'
5 years ago
lain 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop'
5 years ago
rinpatch 1ad71592ad Parallelize template rendering
5 years ago
rinpatch bd5ad0af78 Cache follow state
5 years ago
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn f7bbf99caa Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn e0ac5c7a66 Add custom profile fields
5 years ago
rinpatch c1b6952d2a Mastodon API: Preloading and normalization optimizations
5 years ago
lain 511ccea5aa ConversationView: Align parameter names with other views.
5 years ago
lain 23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view.
5 years ago
kaniini 84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters'
5 years ago
rinpatch 0802a08871 Mastodon API: Fix thread mute detection
5 years ago
rinpatch 409bcad54b Mastodon API: Set follower/following counters to 0 when hiding
5 years ago
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Thibaut Girka 9c0da1009a Return profile URL in MastodonAPI's `url` field
5 years ago
Thibaut Girka 089d53a961 Simplify logic to mention.js `url` field
5 years ago
Thibaut Girka a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL
5 years ago
lain 3af6d14da7 Pleroma Conversations API: Add a way to set recipients.
5 years ago
lain 7483679a7b StatusView: Return direct conversation id.
5 years ago
Sergey Suprunenko b20020da16 Show the url advertised in the Activity in the Status JSON response
5 years ago
Eugenij 4504135894 Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
5 years ago
Mike Verdone 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Mike Verdone 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Eugenij 520ee6c591 Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij c4ca142e14 Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
lain 1ed24bcc76 Status View: Poll ids are strings.
5 years ago
Alexander Strizhakov e7c39b7ac8 Feature/1072 muting notifications
5 years ago
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users
5 years ago
Maksim 008c55e4e9 add test for search_controller/ 100% coverage
5 years ago
feld 93a0eeab16 Add license/copyright to all project files
5 years ago
rinpatch 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
rinpatch c7acca2abb Mastodon API: Sanitize display names
5 years ago
lain a440cf856d Mastodon API: Return the token needed for the chat.
5 years ago
lain 5965efb216 AccountView: Add user background.
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 1fd8e19d76 Remove a TODO comment as the tests for poll view were written
5 years ago
rinpatch 444406167b Mastodon API: actually check for poll votes
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
rinpatch e6b175ed6c Fix credo issues
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
5 years ago
rinpatch f28747858b Actual vote count in poll view
5 years ago
Aaron Tinio eb02edcad9 Add virtual :thread_muted? field
5 years ago
rinpatch 1d90f9b969 Remove tags/mentions/rich text from poll options because Mastodon and
5 years ago
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects
5 years ago
lambda 46684db84d Update account_view.ex
5 years ago
rinpatch 642a67dd44 Render polls in statuses
5 years ago
Haelwenn (lanodan) Monnier 68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
5 years ago