Commit Graph

3028 Commits (6c0d869d9d46af12b2977842e4e1381871c49118)

Author SHA1 Message Date
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
Egor Kislitsyn a66a7a328f Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded
5 years ago
Maksim Pechnikov d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
5 years ago
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
5 years ago
kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
5 years ago
kaniini ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
5 years ago
Steven Fuchs e1d2d69c87 Clean up views
5 years ago
Maksim Pechnikov 494bb6bac6 updated tests
5 years ago
Maksim Pechnikov 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maksim Pechnikov 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
5 years ago
rinpatch 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure
5 years ago
Haelwenn (lanodan) Monnier 815b904508
Add support for AP C2S uploadMedia
5 years ago
Haelwenn (lanodan) Monnier 2ad50583f0
Document and test /api/ap/whoami
5 years ago
Maxim Filippov 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov 72a01f1350 Use router helper to generate reset password link
5 years ago
Maxim Filippov 6f25668215 Admin API: Add ability to force user's password reset
5 years ago
eugenijm 7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
lain b80c41a14f Merge branch 'outbox_pagination' into 'develop'
5 years ago
D Anzorge 9aca2cc95d Add test for correct AP outbox pagination
5 years ago
Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Egor Kislitsyn 95c948110c Add `rel="ugc"` to hashtags and mentions
5 years ago
Egor Kislitsyn cf3041220a Add support for `rel="ugc"`
5 years ago
eugenijm fe5e0b7846 Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
Maksim Pechnikov d4ed3a35b8 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Haelwenn f95a2b2cda Merge branch 'issue/733' into 'develop'
5 years ago
rinpatch b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 447514dfa2
Bump copyright years of files changed in 2019
5 years ago
Ekaterina Vaartis b585134c90 Get the nodeinfo address from the well-known
5 years ago
Ekaterina Vaartis a1325d5fd9 Change path from nodeinfo to metadata->features
5 years ago
Ekaterina Vaartis 36f2275dc9 A feature for shareable emoji packs, use it in download_from & tests
5 years ago
Ekaterina Vaartis 74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
Ekaterina Vaartis 6cd651a38b Make the emoji controller api more RESTy
5 years ago
Ekaterina Vaartis 7c784128fd Change emoji api responses to JSON
5 years ago
Ekaterina Vaartis 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
Ekaterina Vaartis f5131540dc Add a way to create emoji packs via an endpoint
5 years ago
Ekaterina Vaartis 8dbdd5c280 Allow uploading new emojis to packs from URLs
5 years ago
Ekaterina Vaartis 9afe7258dd Implememt emoji pack file updating + write tests
5 years ago
Ekaterina Vaartis 9dc9689144 Add tests for pack metadata updating
5 years ago
Ekaterina Vaartis adf31d596e Add tests for downloading from fallback url
5 years ago
Ekaterina Vaartis 2a94eca096 Change YAML to JSON
5 years ago
Ekaterina Vaartis 2d4b8f3d20 Add an endpoint for deleting emoji packs
5 years ago
Ekaterina Vaartis 7e4c8b56ea Add tests for emoji pack sharing
5 years ago
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
5 years ago
feld 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop'
5 years ago
feld 220afadc55 Merge branch 'restore-tests' into 'develop'
5 years ago
Haelwenn 56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop'
5 years ago
rinpatch a12aeb09c4 Cleanup uploads after the tests are finished
5 years ago
rinpatch eb87a86b5b Preserve internal fields when reinjecting
5 years ago
rinpatch 84a40f6f26 Capture log in object refetch tests
5 years ago
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Alex S 4faf2b1555 post for creating invite tokens in admin api
5 years ago
Ivan Tashkinov b17f217bf3 [#1234] Addressed code analysis issue.
5 years ago
Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Maksim Pechnikov 0447c42715 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
5 years ago
Maksim Pechnikov 7dd51652f9 Merge branch 'develop' into issue/733
5 years ago
rinpatch 95a4a19417 Merge branch 'support/tests' into 'develop'
5 years ago
Steven Fuchs 80c5c3495b remove remaining errors from tests
5 years ago
Roman Chvanikov e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders
5 years ago
Roman Chvanikov 7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
Roman Chvanikov 015597c2ab Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
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
Roman Chvanikov 6042e21b25 Move subscription notifications to a separate controller
5 years ago
Roman Chvanikov 76c3e290fc Merge develop
5 years ago
Maxim Filippov df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maxim Filippov 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
5 years ago
rinpatch e8120944d8 Fix signed fetch inclusion publisher test
5 years ago
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
5 years ago
Steven Fuchs aab264db82 Streamer refactoring
5 years ago
kaniini 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop'
5 years ago
Egor Kislitsyn ca88e37a8f Fix a race condition in tests
5 years ago
Egor Kislitsyn 43f17c2e67 Restore tests for `change_password` and `delete_account`
5 years ago
Maksim Pechnikov d75bc728e7 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
Maksim Pechnikov 8751809e1e Merge branch 'develop' into support/tests
5 years ago
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop'
5 years ago
Roman Chvanikov d7457c9165 Merge branch 'develop' into refactor/subscription
5 years ago
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn b870ae08fd Fix `Activity.all_by_actor_and_id/2` test
5 years ago
rinpatch a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
rinpatch 85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain a9b78f55e3 Merge branch 'capture-test-errors' into 'develop'
5 years ago
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking
5 years ago
stwf 25a64a4aa0 Capture test error messages where appropriate
5 years ago
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications
5 years ago
lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop'
5 years ago
lain a7f31bf06c Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain e5b3ad3d04 ActivityPub: Use is_unicode_emoji? function.
5 years ago
Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop'
5 years ago
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
5 years ago
Maksim Pechnikov bc3e8c033b fix formatting
5 years ago
Maksim Pechnikov ec5aaf5bd7 fix tests
5 years ago
rinpatch fb96facc32 Remove unused functions and fix credo issues
5 years ago
rinpatch ce23529d91 Use delivery info when federating deletes
5 years ago
Egor Kislitsyn 25d8216804 Add email change endpoint
5 years ago
Egor Kislitsyn 5bfbad13ad Add more tests for Pleroma.Activity
5 years ago
Egor Kislitsyn 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
Maksim Pechnikov d8a178274b fix Activity.get_by_id
5 years ago
Maksim 58b17196fa Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
Maksim Pechnikov 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
lain a697f0d791 Emoji: Add function to detect if a character is an emoji
5 years ago
Maksim Pechnikov 936951826e Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch 769fb778d4 Track object/create activity fetches
5 years ago
Mark Felder 102eb4455c Fix associated test as well
5 years ago
lain 8d4b661ecb Transmogrifier: Strip internal emoji reaction fields.
5 years ago
lain 05e9776517 PleromaAPIController: Add endpoint to fetch emoji reactions.
5 years ago
Maksim Pechnikov 4f548cb2b7 added test for Ostatus
5 years ago
Maksim Pechnikov 007e0c1ce1 added tests
5 years ago
Alex S a1f2dfb10a expanding regex sigils to use modifiers
5 years ago
Maksim Pechnikov fcf604fa43 added tests
5 years ago
Egor Kislitsyn 3d12e05f43 Fix `Activity.all_by_ids_with_object/1` test
5 years ago
Maksim Pechnikov a31af93e1d added tests /activity_pub/transmogrifier.ex
5 years ago
Egor Kislitsyn b40b10b53d Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov d1abf7a358 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini 11e12b5761 Add Pleroma.Plugs.Cache
5 years ago
Egor Kislitsyn e0f84d0043 Fix `ActivityPubController.read_inbox/2`
5 years ago
Ivan Tashkinov b63faf9819 [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
Maksim Pechnikov 39f99dc6cd Merge branch 'develop' into support/tests
5 years ago
Maksim Pechnikov ab2f21e470 tests for mastodon_api_controller.ex
5 years ago
Maksim Pechnikov eb74c3d5c7 Merge branch 'develop' into issue/1218
5 years ago
Ivan Tashkinov ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop'
5 years ago
Haelwenn fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop'
5 years ago
rinpatch b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain 99ea990a16 PleromaAPIController: Add emoji reactions.
5 years ago
Maxim Filippov af746fa4a8 Return total for reports
5 years ago
Maxim Filippov 3542ca6702 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Sadposter 2975da284b truncate remote user bio/display name
5 years ago
Maksim Pechnikov 8cbad5500c add tests for activity_pub/utils.ex
5 years ago
rinpatch 3face45467 Mastodon API: Add `pleroma.thread_muted` to Status entity
5 years ago
rinpatch c2b6c1b089 Extend `/api/pleroma/notifications/read` to mark multiple notifications
5 years ago
lain 9bc12b88b3 ActivityPub: Save emoji reactions in object.
5 years ago
rinpatch cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to
5 years ago
Ivan Tashkinov eb17cc17a1 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Maxim Filippov b15cfd80ef Return "total" optionally
5 years ago
Maxim Filippov a4c5f71e93 Return total from pagination + tests
5 years ago
Ivan Tashkinov b49085c156 [#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Sadposter e73685834c add mandatory fields for user update
5 years ago
Sadposter 05c935c396 mix format
5 years ago
Sadposter 35ef470d00 truncate fields for remote users instead
5 years ago
Maxim Filippov 6c2fd1b78b Fix tests
5 years ago
Ivan Tashkinov a90ea8ba15 [#1149] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 9cabc02864 Remove a useless import
5 years ago
rinpatch dbfcba85ec Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
rinpatch 64410497d2 Remove TwitterAPI representers
5 years ago
rinpatch 985122cc03 Remove Activity, User and Notification views from TwitterAPI
5 years ago
rinpatch 90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
Maksim Pechnikov 6ef0103ca0 added Emoji struct
5 years ago
Maxim Filippov f182f0f6bd Add ability to search moderation logs
5 years ago
Maksim Pechnikov d8098d142a added Emoji.Formatter
5 years ago
Maksim Pechnikov d7808b5db4 added code\path fields without html tags in ets
5 years ago
Maksim Pechnikov cef2e980b1 division emoji.ex on loader.ex and emoji.ex
5 years ago
Haelwenn d9d7765383 Merge branch 'fix-osada-follow' into 'develop'
5 years ago
lain b770ed1d99 CommonAPI: Support emoji reactions.
5 years ago
lain f017260cdc Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 66519f2100 Merge branch 'list-controller' into 'develop'
5 years ago
Maxim Filippov 5e4fde1d3d Filter logs by date
5 years ago
Maksim Pechnikov 00abe099cd added tests for ActivityPub.like\unlike
5 years ago
rinpatch eb1739c596 Remove most of TwitterAPIController
5 years ago
lain a0b21c8928 Transmogrifier: Handle incoming emoji reactions.
5 years ago
lain 6e1ec4c5da ActivityPub: Basic EmojiReactions.
5 years ago
lain 3da65292b3 Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Maxim Filippov c338224c93 Fix sporadic test
5 years ago
Egor Kislitsyn 019ced0558 Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
5 years ago
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn 3b1b631c2a Add validation in Pleroma.List.create/2
5 years ago
kPherox eb75ea502d
Update test for custom fields when content-type urlencoded
5 years ago
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
5 years ago
Maxim Filippov 37dd3867bb Log admin/moderator actions
5 years ago
kaniini 503139b343 Merge branch 'fix-all-custom-fields-deleted' into 'develop'
5 years ago
kPherox b8777b01ae
Update test for custom fields when name empty string
5 years ago
kPherox d74efde94e
Update test for custom profile fields
5 years ago
lain 5e7098cf69 Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 20c3f613d8
HttpRequestMock: Remove useless `error = error`
5 years ago
Haelwenn (lanodan) Monnier f3b1266273
user_test.exs: fix rel=me tests
5 years ago
Haelwenn (lanodan) Monnier 211e163770
Implement missing mocks for rel=me
5 years ago
Haelwenn (lanodan) Monnier e22737ffb5
HttpRequestMock: Improve non-implemented error message
5 years ago
Haelwenn (lanodan) Monnier 18668447d2
HttpRequestMock: Log mock errors as warnings
5 years ago
kPherox 45e21a9df4
Rename fields to fields_attributes
5 years ago
lain 90986667ce Merge branch 'admin-create-users' into 'develop'
5 years ago
lain efb8818e9e Activity Expiration: Switch to 'expires_in' system.
5 years ago
Maksim Pechnikov 654d291b6d update tests
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Maksim Pechnikov 73bcbf4fa3 add tests
5 years ago
Ivan Tashkinov 71700ea6d4 [#1149] Updated docs & tests.
5 years ago
Ivan Tashkinov c29686309e [#1149] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Maksim Pechnikov 399ca9133b fix test
5 years ago
Maksim Pechnikov f95b67c933 Merge branch 'develop' into issue/1177
5 years ago
Ivan Tashkinov 7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor
5 years ago