Commit Graph

1427 Commits (dd947d9bc8320ec828df97353733bed4d4e2b5b8)

Author SHA1 Message Date
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis
4 years ago
lain 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn 7b02bfca51 Merge branch 'announce-validator' into 'develop'
4 years ago
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 23e248694d Announcements: Fix all tests.
4 years ago
eugenijm b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Ivan Tashkinov 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop'
4 years ago
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials
4 years ago
lain 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 188b32145e InstanceView: Expose background image link.
4 years ago
lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop'
4 years ago
Alexander Strizhakov 1671864d88
return :visible instead of boolean
4 years ago
Alexander Strizhakov b1aa402229
removing 410 status
4 years ago
Alexander Strizhakov e7bc2f980c
account visibility
4 years ago
Ivan Tashkinov 9b76565264 MediaController: enforced owner-only access in :show action.
4 years ago
lain 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop'
4 years ago
Ivan Tashkinov af9dfdce6b MediaController OAuth scope assignments fix.
4 years ago
Ivan Tashkinov e4b12494d7 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Egor Kislitsyn bb03dfdb03
Do not require `description` in `update` action
4 years ago
Egor Kislitsyn 0f885b4b86
Fix OpenAPI spec
4 years ago
Haelwenn (lanodan) Monnier 099e314a1b
Add OpenAPISpex for MediaController
4 years ago
Haelwenn (lanodan) Monnier cb363f0183
MastodonAPI: /api/v2/media endpoints
4 years ago
Ivan Tashkinov 8062d590dd [#2456] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
4 years ago
Ivan Tashkinov 59b6d5f2aa [#2456] Changed `embed_relationships` param to `with_relationships`.
4 years ago
lain 06cad239e5 InstanceView: Add pleroma chat messages to nodeinfo
4 years ago
lain 3cff4e24cd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn bcadbf964a
Add OpenAPI spec for SuggestionController
4 years ago
Ivan Tashkinov 33b798425f [#2456] Post-merge fix.
4 years ago
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
4 years ago
lain 156c8a5088 Merge branch 'openapi/statuses' into 'develop'
4 years ago
lain 1307d6ca3c Merge branch 'openapi/timelines' into 'develop'
4 years ago
Egor Kislitsyn 7803a85d2c
Add OpenAPI spec for StatusController
4 years ago
Ivan Tashkinov 63a1a82f38 [#2456] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
4 years ago
href e6d8cacf2d Expand and authorize streams in Streamer directly
4 years ago
lain dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch f8190aea5e Merge branch 'fix/issue-1676' into 'develop'
4 years ago
href e2b15e8ad3 Fix streamer timeout (closes #1753).
4 years ago
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
Ivan Tashkinov aee88d11be [#2456] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov ac4250a18c [#2456] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.
4 years ago
Ivan Tashkinov 14a49a0483 [#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
Ivan Tashkinov bbdad85568 Initial implementation of image preview proxy. Media proxy tests refactoring.
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
Maksim Pechnikov 4d71c4b805 fixed 'source' object in verify_credentials
4 years ago
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2
4 years ago
rinpatch bef08b85e5 Merge branch 'feature/undo-validator-reduced' into 'develop'
4 years ago
lain 516ff945ce Merge branch 'openapi/search' into 'develop'
4 years ago
rinpatch eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user
4 years ago
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
4 years ago
Egor Kislitsyn dc4a448f48
Add OpenAPI spec for SearchController
4 years ago
lain 4c92dfb73e Merge branch 'openapi/polls' into 'develop'
4 years ago
href 9491ba3e49 Streamer rework
4 years ago
Maksim Pechnikov bd261309cc added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
4 years ago
Maksim Pechnikov 8b97b6f5ba Merge branch 'develop' into issue/1276-2
4 years ago
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain a716543267 Merge branch 'openapi/subscriptions' into 'develop'
4 years ago
lain 61ea8f1f5a Merge branch 'openapi/markers' into 'develop'
4 years ago
lain 0a88bf6a9d Merge branch 'openapi/follow_requests' into 'develop'
4 years ago
lain 957172a307 Merge branch 'openapi/filters' into 'develop'
4 years ago
lain 1ee34d4acb Merge branch 'openapi/instance' into 'develop'
4 years ago
lain 7fdc7078ae Merge branch 'openapi/lists' into 'develop'
4 years ago
lain 76c1a7a34b Merge branch 'openapi/conversations' into 'develop'
4 years ago
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn 332e016bcd
Add OpenAPI spec for ScheduledActivityController
4 years ago
Egor Kislitsyn 0a1394cc1a
Add OpenAPI spec for PollController
4 years ago
lain 92caae5923 Undoing: Move undoing blocks to the pipeline everywhere.
4 years ago
lain a3bb2e5474 Undoing: Move undoing announcements to the pipeline everywhere.
4 years ago
Egor Kislitsyn 3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn 32ca9f2c59
Render mastodon-like errors in FilterController
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 ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
Egor Kislitsyn 88a14da817
Add OpenAPI spec for InstanceController
4 years ago
lain a3071f0231 Undoing: Move undoing likes to the pipeline everywhere.
4 years ago
Egor Kislitsyn 5ec6aad567
Add OpenAPI spec for ListController
4 years ago
Egor Kislitsyn babcae7130
Move single used schemas to Marker operation schema
4 years ago
Egor Kislitsyn 8096565653
Add OpenAPI spec for MarkerController
4 years ago
Egor Kislitsyn d861b0790a
Add OpenAPI spec for SubscriptionController
4 years ago
Egor Kislitsyn d08c63500b
Ignore unexpected query params
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
lain 3370bb0e46 Merge branch 'openapi/notifications' into 'develop'
4 years ago
lain 607e06c245 Merge branch 'openapi/reports' into 'develop'
4 years ago
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn 9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn 1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
Egor Kislitsyn 7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn 5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov 908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
4 years ago
Egor Kislitsyn 560f2c1979
Add OpenAPI spec for ReportController
4 years ago
lain b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn dda65f7799
Move single used schemas to operation schema
4 years ago
Egor Kislitsyn 2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
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
Ivan Tashkinov b4139cc547 [#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
lain d89cd0a197 Reply Filtering: Refactor.
4 years ago
Ivan Tashkinov 00e62161f6 [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Alexander 6e625a427c
reply filtering
4 years ago
lain ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop'
4 years ago
Egor Kislitsyn 6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
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
Haelwenn 468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop'
4 years ago
lain 5b39526198 AccountController: Use code 400 for self-follow.
4 years ago
lain c10485db16 StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain 5102468d0f Polls: Persist and show voters' count
4 years ago
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
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 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 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
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
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
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
5 years ago
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276
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
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
Egor Kislitsyn d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
Ivan Tashkinov ac672a9d6b [#1559] Addressed code review requests.
5 years ago
lain d2e21fbc96 Merge branch 'open-api' into 'develop'
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
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
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
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
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 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-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 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
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
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
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
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
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
Alexander Strizhakov f3791add99
removing with_move parameter
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
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
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
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 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
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Maksim Pechnikov 58574ef156 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov cd040691bd maked `unread_count` as virtual field
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
Maksim Pechnikov 2c40c8b4a2 Merge branch 'develop' into issue/1383
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 ba5e8a6444 Merge branch 'develop' into issue/1276
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 e442ea5722 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383
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
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity
5 years ago
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop'
5 years ago
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
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
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account
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 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276
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
Egor Kislitsyn 624e720aa4 Add `with_move` query param to the notifications API
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 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 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
Maksim Pechnikov b9041c2097 added recount unread notifications to markers
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
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
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 b27a92e8fa Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
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 243719a965 Merge branch 'develop' into feature/masto_api_markers
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
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
5 years ago
kaniini 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
5 years ago
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
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
kPherox 5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
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
kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop'
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
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 43e3db0951 Fix returned visibility of announces in MastodonAPI
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
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