Commit Graph

492 Commits (e08ea01d09c67a93801aa05d33bad0eb24dfca8b)

Author SHA1 Message Date
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
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
rinpatch c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the
5 years ago
lambda 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
5 years ago
rinpatch dfc8425659 Move settings to Source subentity
5 years ago
Alex S 85953c0836 fixes for tests
5 years ago
Alex S 73d01857e3 bookmarks in separate table
5 years ago
rinpatch 4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
5 years ago
kaniini 10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
5 years ago
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
rinpatch d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
Egor b9cdf6d3b9 Use `User.get_cached*` everywhere
5 years ago
Roman Chvanikov 4908e0eeee Fix Credo warning
6 years ago
Roman Chvanikov eeb093631c Fix Credo warning
6 years ago
Roman Chvanikov e56afefef9 Refactor conversation function in MastodonAPIController to use a View
6 years ago
eugenijm 375fd21055 Set correct values in the MastoAPI reblog status view
6 years ago
rinpatch ad681877df Make credo happy
6 years ago
rinpatch b09ae02c04 Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view
6 years ago
Alexander Strizhakov e03d24af96 in_reply_to_id - null
6 years ago
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
6 years ago
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
eugenijm 7bf622ce73 Add scheduled activities
6 years ago
Sadposter 9ca91cbb87 Change relationship direction of subscriptions
6 years ago
rinpatch f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm a4ab60ac54 Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials
6 years ago
eugenijm 568e348588 Increment replies_count on replies (MastoAPI)
6 years ago
William Pitcock 3cc2554fa3 mastodon api: add conversation_id extension (ref #674)
6 years ago
Karen Konou c8f31e0bc2 Implement mastodon's reblog hiding feature
6 years ago
Haelwenn 41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop'
6 years ago
rinpatch d7a34b604b Extend MastoAPI to provide attachment mimetypes
6 years ago
eugenijm 100413bf2c Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
Haelwenn (lanodan) Monnier cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Maxim Filippov 25eb6cf1cb Add "roles" to users admin API
6 years ago
lain 4811eefa6e MastoAPI StatusView: Add locality indicator.
6 years ago
Maksim bc7570c282 [#647] tests for web push
6 years ago
kaniini 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
6 years ago
Maxim Filippov 72b7a0797e Use Mastodon API views in Admin API
6 years ago
kaniini cf426a719d Merge branch 'with-mutes' into 'develop'
6 years ago
lain c1ae495878 Add user muted status info to MastodonAPI.
6 years ago
William Pitcock 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
Egor bff9eb5ef7 Reports
6 years ago
lain 59c27f29c8 Add some nicer urls in status view.
6 years ago
Ekaterina Vaartis 5a46d37af9 Update the mute implementation to the current codebase
6 years ago
Ekaterina Vaartis f41f017bbc Implement muting, add it to the mastodon API
6 years ago
rinpatch 96c725328b Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
Karen Konou ac72b578da Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou c01ef574c1 Refactor as per Rin's suggestions, add endpoint tests
6 years ago
Karen Konou cc21fc5f53 refactor, status view updating, error handling
6 years ago
Haelwenn (lanodan) Monnier 6a6a5b3251
de-group alias/es
6 years ago
Haelwenn (lanodan) Monnier 8bcfac93a8
Make credo happy
6 years ago
William Pitcock 65a4b9fbea mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
William Pitcock 1d94b67e40 mastodon api: fix rendering of cards without image URLs (closes #597)
6 years ago
rinpatch 68d461b3a9 Check if rich media uri is relative
6 years ago
rinpatch 833404f0f5 Use with instead of if in the card
6 years ago
rinpatch e4d18f328b merge only if page_url is an absolute path
6 years ago
rinpatch cbadf9d333 Fix rich media relative path
6 years ago
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
6 years ago
Haelwenn ebb3496386 Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
6 years ago
Haelwenn de0fb88a9c Merge branch 'safe-render-activities' into 'develop'
6 years ago
href df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
William Pitcock ddc7ae2c1a mastodon api: card: force OGP images through mediaproxy
6 years ago
William Pitcock 8e42251e06 rich media: add helpers module, use instead of MastodonAPI module
6 years ago
William Pitcock 5a37ddc2dc mastodon api: embed card in status object
6 years ago
William Pitcock 132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago