Commit Graph

4766 Commits (8a7ee9fe74f64680da366b0da51038bed022061b)

Author SHA1 Message Date
Haelwenn 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
4 years ago
stwf 08211eff22 Re-enable the federated tests, increase timeout
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
4 years ago
eugenijm c2be0da79f Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn 68036f5a3b Merge branch 'follow-pipeline' into 'develop'
4 years ago
Maksim Pechnikov 31259cabcc fix test
4 years ago
Ivan Tashkinov 123352ffa1 Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
4 years ago
lain 00e54f8fe7 ActivityPub: Remove `follow` and fix issues.
4 years ago
lain 9dda8b5427 CommonAPI: Switch to pipeline for following.
4 years ago
lain 172f4aff8e Transmogrifier: Move following to the pipeline.
4 years ago
lain 7d0e2b3fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
4 years ago
lain cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
4 years ago
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
4 years ago
Ivan Tashkinov 704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
4 years ago
lain c0385cf47a AccountController: Fix muting / unmuting reblogs.
4 years ago
Maksim Pechnikov e341f81785 fixed delete `Like` activity in remove user
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier 6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier f6d09fafee
Add support for remote favicons
4 years ago
Haelwenn a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop'
4 years ago
lain 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
4 years ago
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain c8dd973af5 AccountController: Remove unused `update_?` routes.
4 years ago
lain 59cf78e412 AccountController: Allow removal / reset of user images.
4 years ago
lain 9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop'
4 years ago
Haelwenn fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn d81acb5f62 Merge branch 'description-limits' into 'develop'
4 years ago
lain a6a12b241f FollowValidator: Add basic validation.
4 years ago
lain 4e3b3998ad BlockValidation test: Rename.
4 years ago
lain eb87430803 ObjectValidator tests: Extract block validation tests.
4 years ago
lain 410c1fab31 ObjectValidator tests: Extract update validation tests.
4 years ago
lain b2e1ea9226 ObjectValidation tests: Extract announce validation tests.
4 years ago
lain bbaf108aee ObjectValidator tests: Extract undo validation tests.
4 years ago
lain 168256dce9 ObjectValidation tests: Extract like validation tests.
4 years ago
lain e6a13d97d0 ObjectValidation tests: Extract delete validation tests.
4 years ago
lain 60d4c6c91d ObjectValidator tests: Extract emoji react testing
4 years ago
lain e0baaa967c ObjectValidator tests: Extract chat tests
4 years ago
lain 0aa4c20d78 ObjectValidator Test: Extract attachments.
4 years ago
lain 28feba8af4 Preloaders: Remove status_net preloader
4 years ago
lain 1963e143c5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
4 years ago
lain ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
4 years ago
lain 208baf157a ActivityPub: Add new 'capabilities' to user.
4 years ago
lain 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
rinpatch 69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop'
4 years ago
lain cc8b4e48d9 InstanceView: Add chat limit, description limit
4 years ago
lain af7720237b Upload: Restrict description length
4 years ago
Alexander Strizhakov 818f3c2393
test fixes
4 years ago
Alexander Strizhakov 028a241b7d
tests fixes
4 years ago
Alexander Strizhakov 20c27bef40
renaming back and reject nil on create
4 years ago
Alexander Strizhakov 52ff75413a
Apply suggestion to test/notification_test.exs
4 years ago
Alexander Strizhakov 086a260c04
Apply suggestion to test/notification_test.exs
4 years ago
Sergey Suprunenko 8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko 5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word
4 years ago
Sergey Suprunenko 4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Alexander Strizhakov 480dfafa83
don't save tesla settings into db
4 years ago
lain cf56655614 Streamer: Don't filter out announce notifications.
4 years ago
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban
4 years ago
lain c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
4 years ago
lain 9a27ef47f1 Merge branch '1912-leading-trailing-space-search' into 'develop'
4 years ago
lain d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain 19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop'
4 years ago
lain 945e75c8e8 SearchController: Trim query.
4 years ago
lain e3b5559780 AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain 4a7b89e372 ChatMessageValidator: Additional validation.
4 years ago
lain 5c0bf4c472 ActivityPub: Ingest information about chat acceptance.
4 years ago
lain 26a7cc3f00 UserView: Add acceptsChatMessages field
4 years ago
lain db76c26469 AccountViewTest: Fix test.
4 years ago
lain 3250228be9 AccountView: Add 'accepts_chat_messages' to view.
4 years ago
lain 98bfdba108 User: On registration, set `accepts_chat_messages` to true.
4 years ago
Ivan Tashkinov 90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
4 years ago
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta
4 years ago
Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop'
4 years ago
lain 311b7c19d0 Streamer: Align announce streaming with polling.
4 years ago
lain 61fe94d698 SideEffects: Refactor.
4 years ago
rinpatch fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop'
4 years ago
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id
4 years ago
lain ce92e6e5ce Fetcher: Work when we can't get the OP.
4 years ago
lain 8ae572d5ae Fixtures: Pretty print.
4 years ago
lain 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'"
4 years ago
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests
4 years ago
Ivan Tashkinov 3d2989278c [#1892] Excluded bot actors (applications, services) from search results.
4 years ago
Mark Felder d69af7f742 Rename user.settings column
4 years ago
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain 2382a2a151 Preload: Load the correct instance panel
4 years ago
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop'
4 years ago
lain c01f4ca07f Notification: Remove TODO.
4 years ago
lain 90083a754d Notifications: Never return `nil` in the notification list.
4 years ago
Egor Kislitsyn 3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
lain 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
4 years ago
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia
4 years ago
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain 651f269568 Merge branch 'avatar-removing' into 'develop'
4 years ago
lain e64d08439e UpdateCredentialsTest: Add test for removing profile images.
4 years ago
lain 8630a6c7f5 Preloaders: Use strings as keys.
4 years ago
lain a19f8778af User preloader: Put user info at correct key
4 years ago
lain 577da132da Merge branch '1031-parent-visible' into 'develop'
4 years ago
Mark Felder ce85db41a3 Lint
4 years ago
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder 69848d5c97 Rename notification "privacy_option" setting
4 years ago
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop'
4 years ago
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop'
4 years ago
Mark Felder fd5e797379 Simplify notification filtering settings further
4 years ago
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings
4 years ago
lain a5bbfa21a1 StaticFE: Prioritize json in requests.
4 years ago
lain f378e93bf4 AccountController: Return scope in proper format.
4 years ago
lain a2002ebb63 Preloading: Fix nodeinfo url.
4 years ago
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff.
4 years ago
lain 7ed2296416 Nodeinfo: Add chat information back in.
4 years ago
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field
4 years ago
feld 8288419686 Merge branch 'preload-data' into 'develop'
4 years ago
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings
4 years ago
lain 04abee782b AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop'
4 years ago
lain 84f9ca1956 Blocking: Don't federate if the options is set.
4 years ago
lain 44bb7cfccd ActivityPub: Remove `block`.
4 years ago
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain 89e5b2046b ObjectValidator: Basic `Block` support.
4 years ago
lain d137f934df Transmogrifier Test: Extract block handling.
4 years ago
lain 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop'
4 years ago
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Mark Felder 67ab580553 Filter outstanding follower requests from deactivated accounts
4 years ago
lain 35f6770436 StatusView: Add pleroma.parent_visible
4 years ago
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
4 years ago
lain 65f3eb333b Apply suggestion to test/http/tzdata_test.exs
4 years ago
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
lain 98af7b59e4 Merge branch 'update-validator' into 'develop'
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1
4 years ago
lain b7f297f0bd Merge branch 'issue/1798' into 'develop'
4 years ago
lain adc199c6a8 ActivityPubControllerTest: Capture error log
4 years ago
lain d93e01137b ActivityPubControllerTest: Testing changes.
4 years ago
lain 2737809bbf An act of desperation.
4 years ago
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Maksim Pechnikov 84aa9c78dd fix tests
4 years ago
Maksim Pechnikov 2715c40e1d added tests
4 years ago
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop'
4 years ago
Egor Kislitsyn 7e6f43c0d7
Add `is_muted` to notifications
4 years ago
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app
4 years ago
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
4 years ago
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
4 years ago
lain e785cd5cae ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop'
4 years ago
lain 1e7ca24430 Update Handling Test: Fix for re-used update ids.
4 years ago
lain 31a4d42ce0 SideEffects: Handle user updating.
4 years ago
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop'
4 years ago
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
4 years ago
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
4 years ago
lain 7d542450b1 Merge branch 'develop' into '1865-media-only'
4 years ago
Alexander Strizhakov 1a704e1f1e
fix for packs pagination
4 years ago
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
4 years ago
feld f928267773 Merge branch 'issue/1855' into 'develop'
4 years ago
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials
4 years ago
lain 75670a99e4 UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain abdb540d45 ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
lain 7e488cd4a7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov 3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov e4c61f1741 added test
4 years ago
Maksim Pechnikov 4044f24e2e fix test
4 years ago
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop'
4 years ago
Maksim 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
Maksim 078d687e6e Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
Maksim 2991aae4c4 Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
Maksim 11b22a4229 Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
Maksim 6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
4 years ago
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop'
4 years ago
Alexander Strizhakov b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders
4 years ago
href f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
Alexander Strizhakov e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov 23decaab81
fix for updated hackney
4 years ago
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples
4 years ago
lain 015f9258a9 Transmogrifier: Extract user update handling tests.
4 years ago
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf faba1a6e33 fix tests
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn bd63089a63
Fix tests
4 years ago
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov 62b8c31b7a added tests
4 years ago
lain b7df7436c8 Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop'
4 years ago
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser
4 years ago
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data
4 years ago
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop'
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
4 years ago
Mark Felder 34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
Maksim Pechnikov f9dcf15ecb added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov 2188097066 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
Haelwenn (lanodan) Monnier 40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain 5d87405b51 ActivityPubTest: Update test for atomized parameters.
4 years ago
Thibaut Girka 570123ae21 Add test
4 years ago
rinpatch 7aa6c82937 Merge branch 'remake-remodel-dms' into 'develop'
4 years ago
lain 600e2ea073 ActivityPubTest: Make test easier to understand.
4 years ago
lain 9e411372d0 ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
Egor Kislitsyn 3dd1de61a7 Add `url` field to AdminAPI.AccountView
4 years ago
lain 063e6b9841 StatusController: Correctly paginate favorites.
4 years ago
lain 064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain e1bc37d118 MigrationHelper: Move notification backfilling to own module.
4 years ago
Roman Chvanikov 604a83ae3e merge develop
4 years ago
Egor Kislitsyn d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain d192492658 Merge branch 'openapi/admin/relay' into 'develop'
4 years ago
lain c450b248cc Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
4 years ago
lain 3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 89b85f6529 ChatController: Remove nonsensical pagination.
4 years ago
lain 7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain fe2a5d0614 ChatController: Make last_read_id mandatory.
4 years ago
Sergey Suprunenko 8d9e586887
Delete pending follow requests on user deletion
4 years ago
lain 801e668a97 ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain 2cdaac4330 SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain f4cf4ae16e ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio
4 years ago
lain 9189b489ee Migrations: Move Notification migration code to helper
4 years ago
lain ca0e6e702b ChatMessageReference -> Chat.MessageReference
4 years ago
lain 4e8c0eecd5 WebPush: Don't break on contentless chat messages.
4 years ago
Egor Kislitsyn b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn d74985af23 Merge branch 'features/apc2s-pagination' into 'develop'
4 years ago
lain 115d08a754 Pipeline: Add a side effects step after the transaction finishes
4 years ago
lain 0efa8aa0b9 Transmogrifier: For follows, create notifications last.
4 years ago
lain cc8a7dc205 SideEffects / ChatView: Add an unread cache.
4 years ago
lain aa2ac76510 Notification: Don't break on figuring out the type of old EmojiReactions
4 years ago
lain d44da91bbf SubscriptionOperation: Let chat mentions through.
4 years ago
Egor Kislitsyn 317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
4 years ago
lain 74edd4f391 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 56dfa0e0fb Transmogrifier: Update notification after accepting.
4 years ago
lain 9a53f619e0 Apply suggestion to test/chat_message_reference_test.exs
4 years ago
lain 41503b1673 Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
4 years ago
lain 00748e9650 ChatMessageReferences: Change seen -> unread
4 years ago
stwf a42d135cce test fix
4 years ago
minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
4 years ago
lain b952f3f379 WebPush: Push out chat message notications.
4 years ago
lain 5d7dda883e SideEffectsTest: More tests.
4 years ago
Egor Kislitsyn a8132690bd
Fix credo
4 years ago
Egor Kislitsyn 70f054b083
Merge branch 'develop' into openapi/admin/relay
4 years ago
Egor Kislitsyn b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
4 years ago
stwf 3b8180d7d1 add status_net/config
4 years ago
stwf dbcc1b105e encode data properly
4 years ago
stwf 29ae5bb771 preload data into index.html
4 years ago
lain b3407344d3 ChatController: Add function to mark single message as read.
4 years ago
lain c020fd4352 ChatMessageReferenceView: Return read status as `unread`.
4 years ago
Egor Kislitsyn c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
lain fb4ae9c720 Streamer, SideEffects: Stream out ChatMessageReferences
4 years ago
lain 7f5c5b11a5 Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain 2591745fc2 ChatMessageReferences: Move tests
4 years ago
lain f3ccd50a33 ChatMessageReferences: Adjust views
4 years ago
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller.
4 years ago
feld 6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop'
4 years ago
Egor Kislitsyn 68cb152a08
Merge branch 'develop' into openapi/admin/relay
4 years ago
lain 879304dcd9 Merge branch 'replies-domain-block' into 'develop'
4 years ago
lain 5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop'
4 years ago
lain 022d975a39 Merge branch 'openapi/admin/invites' into 'develop'
4 years ago
lain 38dce485c4 Notification: Add function to backfill notification types
4 years ago
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 37542a9dfa Activity: Remove notifications-related functions.
4 years ago
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default.
4 years ago
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop'
4 years ago
lain 805ab86933 Notifications: Make notifications save their type.
4 years ago
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested
4 years ago
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop'
4 years ago
lain 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop'
4 years ago
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains
4 years ago
lain af9090238e CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain 8ff3425828 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain d4d4b92f75 TimelineController: Only return `Create` in public timelines.
4 years ago
lain 9460983032 AccountController: Federate user account changes.
4 years ago
Haelwenn e96765df6b Merge branch 'chore/bump-hackney' into 'develop'
4 years ago
Roman Chvanikov b973d0b2f0 Fix config setting to not affect other tests
4 years ago
rinpatch 0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts
4 years ago
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bdf18d7c1 CommonAPI: Linkify chat messages.
4 years ago
lain 2c9465cc51 SafeText: Let through basic html.
4 years ago
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop'
4 years ago
Steven Fuchs 6d4b80822b Conversation pagination
4 years ago
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
Roman Chvanikov 0a83af330b fix unused var warning
4 years ago
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query.
4 years ago
kPherox 9ca978494f
Add test for stream boosts of mastodon user
4 years ago
Haelwenn (lanodan) Monnier a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain 863c02b25d SideEffects: Stream out chat messages.
4 years ago
lain c86a88edec Streamer: Add a chat message stream.
4 years ago
lain 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop'
4 years ago
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
4 years ago
Egor Kislitsyn 06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn d1ee3527ef
Move config actions to AdminAPI.ConfigController
4 years ago
Mark Felder 4c82f657c5 Formatting
4 years ago
lain 1d30608e20 Merge branch 'fix/1557-gets-local-pack' into 'develop'
4 years ago
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop'
4 years ago
Alexander Strizhakov ae05792d2a
get-packs for local generated pack
4 years ago
Mark Felder 9eea800026 Refactor notification settings
4 years ago
rinpatch 455a402c8a HTTP Security plug: rewrite &csp_string/0
4 years ago
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis
4 years ago
rinpatch 78c46fb7ba MediaProxy test: use config macros instead of directly putting values
4 years ago
kPherox 48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop'
4 years ago
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
4 years ago
lain b8e029b5ea Notification: Actually preload objects.
4 years ago
Alexander Strizhakov 3249141588
validate actor type
4 years ago
rinpatch 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop'
4 years ago
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
lain 644195e31e Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
4 years ago
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show
4 years ago
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn e32b7ae044
Skip failing `:crypt` test on mac
4 years ago
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions.
4 years ago
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain 5d5db7e5b7 StealEmojiPolicyTest: Clean up.
4 years ago
lain 2dff376041 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain aeb0875025 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
4 years ago
lain 3bec0d2e50 Factory: Set users to be ap_enabled by default.
4 years ago
lain 0c970a9d44 UserTest: Add test for user refreshing.
4 years ago
lain d0c26956da User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
4 years ago
Roman Chvanikov cc82229ba7 Add filename_display_max_length config
4 years ago
lain 91c8467582 OStatusController: Add Mastodon activity compat route.
4 years ago
lain 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route.
4 years ago
lain 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects.
4 years ago
rinpatch 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop'
4 years ago
Egor Kislitsyn ba106aa9c8
Fix notifications mark as read API
4 years ago
lain ca755f9a73 ActivityPubController: Add Mastodon compatibility route.
4 years ago
lain bcb549531f EmojiReactionController: Return more appropriate error.
4 years ago
Haelwenn 7b02bfca51 Merge branch 'announce-validator' into 'develop'
4 years ago
Haelwenn a57e7f3503 Merge branch '1113-op-mentioning' into 'develop'
4 years ago
Ivan Tashkinov 3a1e810aaa [#2497] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
4 years ago
lain e0d1a942a6 Merge branch 'issue/1707' into 'develop'
4 years ago
lain ab1154e13f Merge branch 'admin-logo-upload' into 'develop'
4 years ago
lain 578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain a42a0716ec Merge branch 'features/emoji_stealer' into 'develop'
4 years ago
lain f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
4 years ago
lain 283fb1e05b Merge branch 'issue/749' into 'develop'
4 years ago
Egor Kislitsyn 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain c4a5cead51 UploadTest: Fix test.
4 years ago
lain cc0d462e91 Attachments: Have the mediaType on the root, too.
4 years ago
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain bf1b221f94 Credo fixes for the credo god.
4 years ago
lain cdc6ba8d7b AnnounceValidator: Check for announcability
4 years ago
lain c76267afb9 Credo fixes.
4 years ago
lain 23e248694d Announcements: Fix all tests.
4 years ago
lain d9d425708e SideEffects: Builed out Announce effects.
4 years ago
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
Maksim Pechnikov 9bc5e18ade rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
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
Maksim Pechnikov c96f425cb0 fixed `mix pleroma.instance gen`
4 years ago
Ivan Tashkinov 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain 39031f4860 Pipeline: Don't federate if federation is disabled.
4 years ago
lain e42bc5f557 Announcements: Handle through common pipeline.
4 years ago
lain 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop'
4 years ago
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop'
4 years ago
lain eb5f428565 CommonAPI: Change public->private implicit addressing.
4 years ago
Egor Kislitsyn 5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn 9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn 490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop'
4 years ago
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop'
4 years ago
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
4 years ago
lain 2328eff09c UserTest: Hide warning in tests.
4 years ago
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
Haelwenn 58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop'
4 years ago
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials
4 years ago
Maksim Pechnikov 5f0a3ac74d added tests
4 years ago
lain d19c716770 AttachmentValidator: Handle empty mediatypes
4 years ago
Egor Kislitsyn fe5d423b43
Add OpenAPI spec for MascotController
4 years ago
Egor Kislitsyn 45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
4 years ago
lain be4db41d71 ChatMessageValidator: Allow one message in an array, too.
4 years ago
lain 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn aef31c69df
Rename EmojiAPIController to EmojiPackController
4 years ago
Egor Kislitsyn 8bde8dfec2
Cleanup Pleroma.Emoji.Pack
4 years ago
Egor Kislitsyn 6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
4 years ago
lain 0d5bce018d AnnounceValidator: Validate for existing announce
4 years ago
lain 17a8342c1e ObjectValidators: Add basic Announce validator.
4 years ago
lain 63ab2743ce TransmogrifierTest: Fix tests.
4 years ago
lain 7d381b16b7 Transmogrifier Test: Extract Announce handling.
4 years ago
Alexander Strizhakov 215daabdb4
copyright update
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
Roman Chvanikov 01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Alexander Strizhakov 0321a3e078
test naming fix
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 baf051a59e SideEffects: Don't update unread count for actor in chatmessages.
4 years ago
lain 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bfd9710ae Pleroma Authenticator: Also update passwords here.
4 years ago
lain bfdd90f6d7 AuthenticationPlug: Also update crypt passwords.
4 years ago
lain baef35bcc8 Authentication Plug: Update bcrypt password on login.
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
lain d96f8f17e8 Merge branch 'features/mastoapi_v2_media' into 'develop'
4 years ago
lain d15aa9d950 Merge branch 'develop' into 'remove-twitter-api'
4 years ago
Ivan Tashkinov 978ccf8f97 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain 2dcb26a6e5 CommonAPI: Unblock a user even if we don't have an activity.
4 years ago
Alexander Strizhakov 3c29f4f957
returning partial chain
4 years ago
lain f012c3a202 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov e4b12494d7 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
rinpatch e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop'
4 years ago
lain 4157c459b8 Merge branch 'bcrypt-auth' into 'develop'
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
Stephanie Wilde-Hobbs 20cbfb5cb5
Allow whitelisting whole groups
4 years ago
lain 3342846ac2 ChatView: Add update_at field.
4 years ago
Haelwenn (lanodan) Monnier cb363f0183
MastodonAPI: /api/v2/media endpoints
4 years ago
Haelwenn (lanodan) Monnier e688d4ee69
MRF.StealEmojiPolicy: New Policy
4 years ago
Roman Chvanikov 8a383707ae Merge develop
4 years ago
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration
4 years ago
Egor Kislitsyn 6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
4 years ago
lain da550be066 Merge branch 'fix/1742-random-failing-tests' into 'develop'
4 years ago
lain 0f0acc740d Chat: Allow posting without content if an attachment is present.
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 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
Alexander Strizhakov fbe3d3aa5f
ignore order
4 years ago
Alexander Strizhakov 2c356a4bac
don't use async with global mocks
4 years ago
Alexander Strizhakov 12635bc156
don't use global mocks in setup callbacks
4 years ago
Alexander Strizhakov b962b24e6f
don't run in async if tests depend on env config
4 years ago
Alexander Strizhakov ec27f346ee
correct order for publised in assert
4 years ago
Alexander Strizhakov e0944dee99
make test fail everytime
4 years ago
Alexander Strizhakov 712055612f
don't run tests which change env in async
4 years ago
Alexander Strizhakov 4ba913d641
{:error, :enoent} s3 fix
4 years ago
Alex Gleason b46811a074
Upgrade Comeonin to v5
4 years ago
Egor Kislitsyn 7803a85d2c
Add OpenAPI spec for StatusController
4 years ago
Stephanie Wilde-Hobbs a2fcfc78c9
Filter config descriptions by config whitelist
4 years ago
rinpatch 2b18b8a263 Merge branch 'streamer-get-topic' into 'develop'
4 years ago
href 68cca29dcf Fix typo in test
4 years ago
rinpatch 24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
4 years ago
rinpatch 4cc71aad65 Merge branch '1748-remote-following-follower-count' into 'develop'
4 years ago
Stephanie Wilde-Hobbs 620247a015
Add database configuration whitelist
4 years ago
href e6d8cacf2d Expand and authorize streams in Streamer directly
4 years ago
lain c0ea5c60e4 ChatController: Don't return chats for user you've blocked.
4 years ago
lain e44166b510 Credo fixes.
4 years ago
lain ec72cba43e Chat Controller: Add basic error handling.
4 years ago
lain dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain b5aa204eb8 ChatController: Support deletion of chat messages.
4 years ago
lain dfb90a1fd6 Transmogrifier: Add tests for certain announces
4 years ago
lain ca31af473c Transmogrifier: On incoming follow accept, update follow counts.
4 years ago
lain d0ba1844b0 ActivityPub: Fix non-federating blocks.
4 years ago
Maksim Pechnikov 63477d07ad unsubscribes of friends when user deactivated
4 years ago
rinpatch f8190aea5e Merge branch 'fix/issue-1676' into 'develop'
4 years ago
Ivan Tashkinov 1b23acf164 [#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
4 years ago
lain f28ed36b4d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 679afb2de4 SideEffects test: Add test for favorite deletion.
4 years ago
lain 5367a00257 Deletion: Handle the case of pruned objects.
4 years ago
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
lain fdb98715b8 Chat: Fix wrong query.
4 years ago
lain 1b1dfb54eb Credo fixes.
4 years ago
lain 8d5597ff68 ChatController: Add GET /chats/:id
4 years ago
lain f335e1404a ChatView: Add the last message to the view.
4 years ago
lain c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov aee88d11be [#2456] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov 14a49a0483 [#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
Roman Chvanikov 5c368b004b Fix refresh_counter_cache test
4 years ago
Roman Chvanikov 942093683a Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Roman Chvanikov cbe383ae83 Update stats admin endpoint
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 03529f6a05 Transmogrifier: Don't modify attachments for chats.
4 years ago
rinpatch 570940a3fd Merge branch 'bugfix/fix-like-notifications' into 'develop'
4 years ago
Alexander Strizhakov 287f781808
user deletion
4 years ago
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop'
4 years ago
lain 7e9aaa0d02 Transmogrifier tests: Remove more double tests.
4 years ago
lain f1274c3326 Transmogrifier tests: Remove double tests.
4 years ago
Maksim Pechnikov 4d71c4b805 fixed 'source' object in verify_credentials
4 years ago
lain 0cf43391f2 Merge branch 'issue/1276-2' into 'develop'
4 years ago
lain 218a22c9a3 Merge branch 'fix/privacy-notification' into 'develop'
4 years ago
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2
4 years ago
Haelwenn 769d95644d Merge branch 'feature/restrict-c2s' into 'develop'
4 years ago
lain ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
rinpatch bef08b85e5 Merge branch 'feature/undo-validator-reduced' into 'develop'
4 years ago
Mark Felder ea01e647df Test Direct, Public, and Favorite notifications with privacy option
4 years ago
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
lain 788b7e7bbd Merge fixes.
4 years ago
lain f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
4 years ago
lain f57fa2a00d Notifications: Simplify recipient calculation for some Activities.
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
lain 4061841846 Merge branch 'streamer-worker-registry' into 'develop'
4 years ago
href 9491ba3e49 Streamer rework
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Mark Felder a2580adc91 Hide the sender when privacy option is enabled
4 years ago
lain 1748e26948 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 473b0d9f3d Merge branch 'feature/delete-validator' into 'develop'
4 years ago
lain fc9d0b6eec Credo fixes.
4 years ago
lain 20baa2eaf0 ChatMessages: Add attachments.
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 07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
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 df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop'
4 years ago
lain c3f1ce80eb Merge branch 'fix/1726-user-pagination' 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 f84c8f2f0d Merge branch 'feature/1728-webfinger-acct-scheme' 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
lain 9637cded21 Chat: Fix missing chat id on second 'get'
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
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
Egor Kislitsyn 3a45952a3a
Add OpenAPI spec for ConversationController
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
lain 42a2acac46 Merge branch 'feature/1720-status-view' into 'develop'
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
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id
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
lain f1da8882f9 UndoValidator: Add UndoValidator.
4 years ago
rinpatch 33f2976020 Merge branch 'feature/1737-magic-key-field' into 'develop'
4 years ago
lain 8b2457bdbf Transmogrifier tests: Extract Undo handling
4 years ago
Egor Kislitsyn decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
lain db55dc9445 ActivityPub: Remove `react_with_emoji`.
4 years ago
lain ad771546d8 Transmogrifier: Move emoji reactions to common pipeline.
4 years ago
lain 142bf0957c Transmogrifier: Extract EmojiReact tests.
4 years ago
lain c297667f16 Merge branch 'fix/issue-1729' into 'develop'
4 years ago
lain 2cb3f8a8cf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 6400998820 AP C2S: Restrict creation to `Note`s for now.
4 years ago
lain 6a2905ccf0 WebFinger Test: Add back test.
4 years ago
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges
4 years ago
Haelwenn (lanodan) Monnier bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
lain c23cb8d37a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 0f9bed022f LikeValidator: Fix up context.
4 years ago
lain e03c301ebe LikeValidator: Fix up missing recipients.
4 years ago
lain 335aabc39c Transmogrifier tests: Extract like tests.
4 years ago
lain ec24c70db8 ActivityPub: Don't fetch `Application` follower counts.
4 years ago
lain b04328c3de ChatController: Add mark_as_read
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
lain a7966f2080 Webfinger: Request account info with the acct scheme
4 years ago
lain 6c337489f4 Various testing fixes in relation to user deletion.
4 years ago
lain 6fb96f64c1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 4dfc617cdf Transmogrifier: Don't fetch actor that's guaranteed to be there.
4 years ago
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
4 years ago
eugenijm 66a8e1312d Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record
4 years ago
Ivan Tashkinov 2d07ed7747 [#1732] Made AP C2S :followers and :following endpoints serve on no auth
4 years ago
Ivan Tashkinov cf5ca7e45b Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
4 years ago
rinpatch e7b1df7252 Fix sporadic test compilation failure caused by unused alias
4 years ago
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
4 years ago
lain a912f72a36 Signature: Handle non-ap ids in key ids.
4 years ago
Alexander Strizhakov aea781cbd8
credo fix
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
lain 44fbd09709 Merge branch 'issue/1577' into 'develop'
4 years ago
lain 1ead5f49b8 AdminApiController: Use common pipeline for user deletion.
4 years ago
lain ebbd9c7f36 AdminAPIController: Refactor.
4 years ago
lain 51f1dbf0a2 User deletion mix task: Use common pipeline.
4 years ago
lain 2008fa9c7f Merge branch 'fix/captcha' into 'develop'
4 years ago
lain ab01863abf Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 5f42e6629d DeleteValidator: Only allow deletion of certain types.
4 years ago
Alexander Strizhakov ecf37b46d2
pagination fix for service users filters
4 years ago
Ivan Tashkinov 92efb888c7 Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2
4 years ago
lain da4b79a56d Merge branch 'tests/more-apc2s' into 'develop'
4 years ago
Lain Soykaf 93f64aba78 Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
4 years ago
lain 32b8386ede DeleteValidator: Don't federate local deletions of remote objects.
4 years ago
lain a81342a234 Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
4 years ago
lain 999d639873 ActivityPub: Remove `delete` function.
4 years ago
lain 5da08c2b73 SideEffects: Fix comment
4 years ago
lain 500f5ec14e SideEffects: On deletion, reduce the reply count cache
4 years ago
Haelwenn (lanodan) Monnier f1523f9acd
Increase tests on AP C2S
4 years ago
lain ab60ee1776 SideEffects: On deletion, reduce the User note count.
4 years ago
lain 3d0dc58e2e SideEffectsTest: Test streaming.
4 years ago
lain 315b773dd9 ObjectValidator: Refactor.
4 years ago
lain 4500fdc04c DeleteValidator: Add internal helper field after validation.
4 years ago
lain 143353432a StreamerTest: Separate deletion test.
4 years ago
eugenijm bef34568f0 Dismiss the follow request notification on rejection
4 years ago
Ivan Tashkinov 2c4844237f Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
4 years ago
lain c9bfa51ea9 Credo fixes.
4 years ago
lain 417eed4a2b SideEffects: Handle deletions.
4 years ago
lain 1fb383f368 DeleteValidator: Deleting a user is valid.
4 years ago
lain 4dc5302f45 Transmogrifier: Handle incoming deletes for non-user objects.
4 years ago
Alexander Strizhakov ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov 342f55fb92
refactor emoji api with fixes
4 years ago
lain db184a8eb4 DeleteValidator: Mastodon sends unaddressed deletes.
4 years ago
Alexander Strizhakov 5839e67eb8
return data only for updated emoji
4 years ago
lain bd219ba7e8 Transmogrifier Tests: Extract deletion tests.
4 years ago
lain 4c4344b7b1 Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
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 503de4b8df ObjectValidator: Add validation for `Delete`s.
4 years ago
lain b8056e69e0 Object Validator Types: Add Recipients.
4 years ago
lain 20587aa931 Chat message creation: Check actor.
4 years ago
lain a88734a0a2 Transmogrifier: Fetch missing actors for chatmessages.
4 years ago
lain e055b8d203 Pipeline: Always run common_pipeline in a transaction for now.
4 years ago
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov 7bd187bc5e added test
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
lain dedffd100c Pipeline: Unify, refactor, DRY.
4 years ago
lain abd0928229 CreateChatMessageValidator: Validate object existence
4 years ago
lain 6aa116eca7 Create activity handling: Flip it and reverse it
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
rinpatch 12bb7fc0dc Merge branch 'openapi/account' into 'develop'
4 years ago
lain 906cf53ab9 Recipient Type: Cast all elements as ObjectIDs.
4 years ago
Egor Kislitsyn 764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
lain 9994768312 Merge branch 'mongoose-secure' into 'develop'
4 years ago
Maksim Pechnikov ea5142b94b convert markdown content to html
4 years ago
fence 5ff20793e7 formating
4 years ago
Egor Kislitsyn dda65f7799
Move single used schemas to operation schema
4 years ago
fence d607b4d840 mongooseim test: explicitly set password for the deactivated used
4 years ago
fence 935ca2c132 requested changes to mongoose test
4 years ago
Egor Kislitsyn 2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
fence 5c7cc10917 add tests for deactivated users for mongoose auth
4 years ago
lain ad82a216ff Chat API: Align more to Pleroma/Mastodon API.
4 years ago
lain 49e673dfea ChatView: Add actor_account_id
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 d2bbea1a80 ChatControllerTest: Use new schema testing functions.
4 years ago
lain c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov b4139cc547 [#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
rinpatch 8addbd948c Merge branch 'bugfix/announce-race-condition' into 'develop'
4 years ago
lain c30b3b2dc5 Merge branch 'reply-filtering-refactor' into 'develop'
4 years ago
lain d89cd0a197 Reply Filtering: Refactor.
4 years ago
lain d862c7156a Merge branch 'openapi-improvements' into 'develop'
4 years ago
Egor Kislitsyn c56c0a3d23
Merge branch 'develop' into global-status-expiration
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 cb12585098 Announcements: Prevent race condition.
4 years ago
lain bbf8554c97 ActivitPub: Remove `like` function.
4 years ago
Egor Kislitsyn f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
lain 1e28d34592 ChatMessage: Correctly ingest emoji tags.
4 years ago
lain ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 1b5f8d19ee Merge branch 'bugfix/repeating-announce' into 'develop'
4 years ago
lain 7d38197894 CommonAPI: Don't make repeating announces possible
4 years ago
rinpatch 25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop'
4 years ago
lain 850377a7b8 Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
4 years ago
Haelwenn af27e4dffd Merge branch 'bugfix/1670-user-count' into 'develop'
4 years ago
lain f5bda09de6 Stats: Use `invisible` property for filtering.
4 years ago
Ivan Tashkinov e7fb593d13 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
4 years ago
lain e62173dfc8 SideEffects: Run in transaction.
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
Haelwenn 28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop'
4 years ago
Haelwenn 468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop'
4 years ago
Haelwenn 238058ecae Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
4 years ago
Egor Kislitsyn 6db52c3b36 Fix Oban warning
4 years ago
Egor Kislitsyn e7771424a8 Fix blocks import
4 years ago
Egor Kislitsyn 88b82e5c3e Fix follow import
4 years ago
lain 7a3a88a13e Streamer: Stream boosts to the boosting user.
4 years ago
Haelwenn 1855c597c2 Merge branch 'feature/voters-count' into 'develop'
4 years ago
Haelwenn 2e73c19edc Merge branch 'worker-messages' into 'develop'
4 years ago
lain 8b88e2a6e2 Stats: Ignore internal users for user count.
4 years ago
lain 5b39526198 AccountController: Use code 400 for self-follow.
4 years ago
lain 69ecc39038 Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
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
lain 923513b641 Federator: Return proper values for jobs
4 years ago
lain f719a5b23a WebPush: Return proper values for jobs.
4 years ago
lain 2e62a63749 ChatMessageValidator: Validation changes
4 years ago
lain 6c8390fa4d ChatControllerTest: Credo fixes.
4 years ago
lain 66c2eb670b ChatController: Validate parameters.
4 years ago
lain 97ad0c4597 Chats: Add API specs.
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
Ivan Tashkinov bb5d0eafa4 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
4 years ago
Egor Kislitsyn 364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason b54c8813d6
Add :reject_deletes option to SimplePolicy
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
Ilja 8b4de61d64 Fix ObjectAgePolicyTest
4 years ago
lain b5df4a98e4 ChatMessageView: Support emoji.
4 years ago
lain 7e53da250e ChatMessage: Support emoji.
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 5b6818b3e5 CommonAPI: Obey local limit for chat messages.
4 years ago
lain ce23673ca1 ChatMessageValidator: Don't validate messages that are too long.
4 years ago
rinpatch 918a8094fc Merge branch '1559-follow-request-notifications' into 'develop'
4 years ago
Ivan Tashkinov 66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
Egor Kislitsyn 163341857a
Improve OpenAPI errors
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
lain 26d9c83316 SideEffects: Test for notification creation.
4 years ago
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient.
4 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
4 years ago
lain d45ae64858 ChatController: Use OAuth scopes.
4 years ago
Alexander Strizhakov 6cda360fea
don't restart postgrex
5 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
5 years ago
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
5 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
5 years ago
Alexander Strizhakov 304ea09f4c
fix for logger configuration
5 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
5 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
5 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain f8c3ae7a62 ChatController: Handle pagination.
5 years ago
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages.
5 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
5 years ago