Commit Graph

3028 Commits (6c0d869d9d46af12b2977842e4e1381871c49118)

Author SHA1 Message Date
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383
5 years ago
lain 98990d2d61 Merge branch 'fed-testing-updates' into 'develop'
5 years ago
lain 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop'
5 years ago
Sadposter c7cc80a9ee obligatory format commit
5 years ago
Sadposter fa97eddf8a make follows take precedence over domain blocks
5 years ago
Egor Kislitsyn c4b468a95b
Cleanup tests output
5 years ago
Maksim Pechnikov 1403a1441d added tests
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
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
lain f36724efb1 User: Never return nil for user follower counts.
5 years ago
Maksim Pechnikov a4f834a687 moved DigestEmail to Oban Periodic jobs
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
Maksim Pechnikov c5766a8100 moved ActivityExpiration to Oban Periodic jobs
5 years ago
Maksim Pechnikov 6f202a401b moved ScheduledActivity to Oban Periodic jobs
5 years ago
stwf bd1984f054 update tests and Oban
5 years ago
lain 717d246491 Tests: Don't run federated tests by default
5 years ago
Chris McCord f01881e82a Add federated test infrastructure
5 years ago
Maksim Pechnikov ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov 5869a43fe7 Fix tests
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago
feld 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
5 years ago
Sadposter d3656c2725 add ability to set a custom user-agent string
5 years ago
Maxim Filippov 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
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
Egor Kislitsyn d38ab4bb89
Fix user.following_count
5 years ago
Ivan Tashkinov 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn 63711258ce
Fix sporadically failing test
5 years ago
Ivan Tashkinov 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
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 708fd234bd fix order favorites activites
5 years ago
Maxim Filippov b88dbc17c8 Fix tests
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
Maksim Pechnikov 7d727dbfec added test
5 years ago
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
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
kPherox c9a06b14ab Add test
5 years ago
rinpatch 22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop'
5 years ago
Ariadne Conill 7c59bc9ef9 fix credo
5 years ago
Ariadne Conill 5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov 114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 30af5da330 Admin API: list all statuses from a given instance
5 years ago
feld 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago
Phil Hagelberg 3c60adbc1f Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg 0867cb083e Support redirecting by object ID in static FE.
5 years ago
lain 60cc5a7750 Merge branch 'fix-rate-limiter-test' into 'develop'
5 years ago
Egor Kislitsyn 72cf6a76f4
Fix random fails of the rate limiter tests
5 years ago
lain facc37aaa6 Merge branch 'static-remote-redirect' into 'develop'
5 years ago
Phil Hagelberg 62f3a93049 For remote notices, redirect to the original instead of 404.
5 years ago
Egor Kislitsyn 27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
lain e835cd97f6 Containment: Add a catch-all clause to contain_origin.
5 years ago
eugenijm f86a7d5d8b Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
feld e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
href b39b49cc14 report federating status in nodeinfo
5 years ago
lain 1ca7b877a1 Merge branch 'iss-1376' into 'develop'
5 years ago
lain 417f9a782f Merge branch 'fix/1399' into 'develop'
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
lain f6056e9c9c UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
lain 8521553ad9 User: Don't let deactivated users authenticate.
5 years ago
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Alexander 6a4201e0b4
fix for migrate task
5 years ago
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
5 years ago
lain a88e834dba Merge branch 'develop' into 'reactions'
5 years ago
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop'
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
Phil Hagelberg 6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize.
5 years ago
Phil Hagelberg ef7c3bdc7a Add some further test cases.
5 years ago
Phil Hagelberg 2bf592f5dc Add tests for static_fe controller.
5 years ago
Ariadne Conill 5b60d82592 object containment: handle all cases where ID is invalid (missing, nil, non-string)
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7258db023e Support old flag format
5 years ago
eugenijm 7888803ffe Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
rinpatch 84175fe30e Set better Cache-Control header for static content
5 years ago
feld 8b19464176 Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
5 years ago
Maxim Filippov f171095960 Grouped reports with status data baked in
5 years ago
rinpatch 54746c6c26 Object Fetcher: set cache after reinjecting
5 years ago
AkiraFukushima e1fc6cb78f Check client and token in GET /oauth/authorize
5 years ago
Maksim Pechnikov e52955c961 update following_relationship.ex
5 years ago
Maksim Pechnikov 62bc0657e7 excluded invisible users from search results
5 years ago
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
rinpatch fee1276963 Merge branch 'failing-search-fixes' into 'develop'
5 years ago
lain 4e53520917 User Search: Remove superfluous setweight and random test.
5 years ago
eugenijm ed29be24cb Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
lain a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop'
5 years ago
Steven Fuchs 5271bbcf11 add missing tesla mocks
5 years ago
lain 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
5 years ago
rinpatch 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop'
5 years ago
kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop'
5 years ago
kaniini 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop'
5 years ago
Ariadne Conill 4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity
5 years ago
Maxim Filippov 743b622b7b Force password reset for multiple users
5 years ago
Maxim Filippov 6f9d3d30fa AdminAPI: Omit relay user from users list
5 years ago
Mark Felder fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize
5 years ago
Egor Kislitsyn 61fc739ab8
Handle "Move" activity
5 years ago
kPherox d1ae51b02a Update test for get_recipients_from_activity
5 years ago
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex
5 years ago
rinpatch 61400d7eb7 Fix XSS emoji test
5 years ago
kPherox c2f2d7bcf6 Add test follow activity for locked account
5 years ago
rinpatch 08f6837065 Switch from HtmlSanitizeEx to FastSanitize
5 years ago
stwf 56e42602b0 capture where errors are expected
5 years ago
Egor Kislitsyn 4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
5 years ago
Maxim Filippov 8282b6ac3d Make sure incoming flags are updated with status data
5 years ago
Maxim Filippov 791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
Maxim Filippov 8eff05d4c6 Strip status data from Flag (when federating or closing/resolving report)
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 b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
stwf 5329b361ec fix test
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maxim Filippov b08b1d5d91 Store status data inside Flag activity
5 years ago
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ariadne Conill 3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
Ariadne Conill 277aea45b9 tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
5 years ago
kaniini 6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop'
5 years ago
Mark Felder 0c628fafc5 Spelling
5 years ago
Mark Felder 2cbb3f2364 Add tests for the subject of push notifications
5 years ago
rinpatch 6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
5 years ago
rinpatch 2dbee29cf5 Do not include notifications from blocked users when with_muted is set
5 years ago
Ivan Tashkinov 7c7f90bc4f [#1304] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers
5 years ago
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Egor Kislitsyn c6fba62666
Fix Relay
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
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
Ariadne Conill 05c58eaece change Maksim's test description
5 years ago
Ariadne Conill ba92522c69 tests: add test to ensure invisible actors are rendered with the invisible hint set to true
5 years ago
Ariadne Conill 52d56ed705 tests: add test verifying the relay user is invisible
5 years ago
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG
5 years ago
Maksim Pechnikov 189a288925 fix test
5 years ago
Maksim Pechnikov 9694d51437 added test fo Pleroma.Web.MastodonAPI.StatusController
5 years ago
Ariadne Conill 80d3912a56 test: activitypub: use User.invisible?/1 for testing invisibility
5 years ago
Ariadne Conill ef659331b0 implement invisible support for remote users
5 years ago
Ariadne Conill 95871cb462 user: implement User.invisible?/1
5 years ago
Ariadne Conill cd90735a4b tests: ostatus controller tests: fix sporadic compilation failure
5 years ago
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
Maxim Filippov 019147f115 Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill c2ae6310dc tests: mastodon api: fix broken test that used OStatus
5 years ago
Ariadne Conill a8eb1f0975 tests: mastodon search: search for an account that is visible via activitypub, not ostatus
5 years ago
Ariadne Conill dbfdb1f6e3 add some missing tesla fixtures
5 years ago
Ariadne Conill 85ddcaf418 tests: fix up signature tests
5 years ago
Ariadne Conill 700c654208 tests: fix relay tests
5 years ago
Ariadne Conill af9aa8e358 tests: simplify object fetching and containment tests
5 years ago
Ariadne Conill 597cb8897b tests: remove some more ostatus tests
5 years ago
Ariadne Conill 48059c03c9 fix up some tests
5 years ago
Ariadne Conill d379b48769 kill almost all of the OStatus module
5 years ago
Ariadne Conill 835ad52378 remove Salmon module
5 years ago
Ariadne Conill 4f82e42e4e websub: remove entirely
5 years ago
Ariadne Conill c6de0cbb4a config: disable Websub and Salmon publisher modules
5 years ago
rinpatch b085cd2660 Add a test for safe_jsonb_set
5 years ago
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list
5 years ago
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message
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 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop'
5 years ago
rinpatch b8be6a4dc9 Remove a failing search test due to it being unrealistic
5 years ago
rinpatch c10ce113d4 User search: Remove trigram and refactor the module
5 years ago
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Egor Kislitsyn 1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
Maxim Filippov 751513b6df This line either causes a warning, or a failed test
5 years ago
Maxim Filippov cc6875b582 Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain cb8492962e SearchController: Fix test.
5 years ago
lain 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain 9b963064eb Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain 29647dfd09 Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
5 years ago
Maxim Filippov 24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
kaniini 9fd5176c35 Merge branch 'unicode-search' into 'develop'
5 years ago
Steven Fuchs dc6d20b68d provide mocks for webfinger endpoints
5 years ago
lain 1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
5 years ago
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users
5 years ago
lain c1bae01376 Search: Add tests for unicode searches.
5 years ago
Egor Kislitsyn d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
eugenijm 580a67f5ca Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7aceaa517b Admin API: Reports, grouped by status
5 years ago
lain 6c278cfe09 Merge branch 'develop' into 'reactions'
5 years ago
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus
5 years ago
lain 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop'
5 years ago
lain 91e90aa807 Merge branch 'misskey-compat' into 'reactions'
5 years ago
Haelwenn b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini 2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
5 years ago
feld 1d8e956c32 Use the user.id instead of nickname in report URLs
5 years ago
rinpatch fefbd31c6e Move local keys out of `user.info`
5 years ago
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 61097ba6ab Merge branch 'develop' into 'reactions'
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
kaniini 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
kaniini 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop'
5 years ago
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 276a520163 CommonAPI: Create profile updates as public.
5 years ago
lain 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
Thibaut Girka b1ff66dc5f Add test for handling Announces with inlined object from different origin
5 years ago
Thibaut Girka 977e711e22 Import object from self-Announce whenever possible
5 years ago
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
5 years ago
lain 6a85f7d1ea Transmogrifier: Extend misskey like compatibility.
5 years ago
lain d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maksim Pechnikov 83631752af removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
5 years ago
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
5 years ago
Maxim Filippov 8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill 8325858ed2 tests: streamer: add a test for blocked transitive activities
5 years ago
lain 2a7f44acfe ActivityPub.Utils: Fix undo test.
5 years ago
lain 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
lain 568a995d64 ActivityPub: Change addressing of Undo.
5 years ago
lain 27110793a7 Merge branch 'featrue/job-monitor' into 'develop'
5 years ago
lain 27e914955e Merge branch 'fix/nickname-fail' into 'develop'
5 years ago
rinpatch 8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by
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
lain c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions.
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
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 9b68aab8b3
Fix credo warning
5 years ago
lain 9cfe9a57c5 CommonAPI: Add unreactions.
5 years ago
Egor Kislitsyn d3c404af12
Add MastoFEController
5 years ago
lain dfe5c958eb ActivityPub: Add undo for emoji reactions.
5 years ago
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController
5 years ago
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
5 years ago
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object
5 years ago
Egor Kislitsyn 0fc29deba0
Add tests for Pleroma.JobQueueMonitor
5 years ago
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
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
Sergey Suprunenko c541b83bef Track failed proxy urls and don't request them again
5 years ago
Thibaut Girka 7d5a9f3f6d Add tests for privately announcing statuses via API
5 years ago
Thibaut Girka e0b654e202 Add tests
5 years ago
Maxim Filippov 0f9c2c8b87 Send an identifier alongside with error message in OAuthController
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 f364438032
Add `rel="ugc"`
5 years ago
kPherox a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain dae744478e Transmogrifier: Handle compact objects in undos.
5 years ago
lain 19bc0b8c79 .
5 years ago
lain 08256e9299 ActivityPub: Federate 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 c55facf78b
Fix warning in TransmogrifierTest
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 122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest
5 years ago
Egor Kislitsyn 38db4878a4
Disable async in DomainBlockControllerTest
5 years ago
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn e7aef27c00
Fix merge
5 years ago
lain a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Egor Kislitsyn 1207e88195
Fix ReportControllerTest
5 years ago
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
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 1d7cbdaf7b change new scrobble endpoint
5 years ago
Ariadne Conill 211008ae2f test: fix scrobble controller tests
5 years ago
Ariadne Conill 71eff09e56 common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill e7309d3b60 test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
5 years ago
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill 2c82d8603b common api: implement scrobbling
5 years ago
Ariadne Conill 172c74a77b activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill b7877e9b1c mastodon api: implement rendering of listen activities
5 years ago
Ariadne Conill c3d09921e4 test: factory: implement support for generating mock audio and listen objects
5 years ago
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
rinpatch e9d1aa75d5 Revert subscription refactoring.
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
Haelwenn (lanodan) Monnier 9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
rinpatch 374f83d29b Fix not being able to post empty statuses with attachments
5 years ago
minibikini f9380289eb Add `remote_ip` plug
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
kaniini 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop'
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 76b7e5cd5b Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
5 years ago
kaniini eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop'
5 years ago
Egor Kislitsyn 98d1347a4e Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop'
5 years ago
Maksim Pechnikov b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov e7836adf21 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn 75290cbfbd Add Pleroma.JobQueueMonitor
5 years ago
Roman Chvanikov b4b147000c Merge develop
5 years ago
Egor Kislitsyn 3572cf29b7 Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
5 years ago
kaniini a39e065916 Merge branch 'feature/return-link-for-password-reset' 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
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
5 years ago
kaniini beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop'
5 years ago
kaniini 1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
5 years ago
rinpatch 16487716af Merge branch 'support/test' into 'develop'
5 years ago
Maksim dd4263da5a Apply suggestion to test/tasks/instance_test.exs
5 years ago
rinpatch d87be2ec96 Don't embed the first page in inboxes/outboxes and refactor the views to
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
Maksim Pechnikov 1b2e4a0ae0 clears `robot.txt` after tests
5 years ago
Egor Kislitsyn b5dfe83433 Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218
5 years ago
Maxim Filippov 60cbea5bb2 Allow activities pagination via limit/offset
5 years ago
Haelwenn (lanodan) Monnier 0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago