Commit Graph

4042 Commits (fa4ec17c841a65eccacdc35c98b6c047549b305b)

Author SHA1 Message Date
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
rinpatch d32894ae51 Move object internal fields to a constant
5 years ago
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Maxim Filippov 384b7dd40d Fix response
5 years ago
Maxim Filippov f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Alex S a18f1e7cd7 namings
5 years ago
Alex S 2263c8b6b9 little fixes
5 years ago
Alex S 4faf2b1555 post for creating invite tokens in admin api
5 years ago
Ivan Tashkinov b4d775161c [#1234] Undone reordering-related changes in router.ex.
5 years ago
Maxim Filippov f9dd121ad3 Admin API: Return link alongside with token on password reset
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
Haelwenn 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
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 9fa2586abd Refactor SubscriptionNotificationView
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 a76168e743 Cleanup PleromaAPIController
5 years ago
Roman Chvanikov a81f80233d Apply suggestion to lib/pleroma/web/router.ex
5 years ago
Roman Chvanikov f9be517c7f Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov c0f776faec Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov 2688b876ab Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Ivan Tashkinov e7afb67c5c [#1260] Rate-limiting for create authentication and related requests.
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 56b60798c2 Code style fixes
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
Egor Kislitsyn 085d014f08 Fix `Transmogrifier.upgrade_user_from_ap_id/1`
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
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
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop'
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 b4cf74c106 added prepare html for RichMedia.Parser
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
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
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop'
5 years ago
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking
5 years ago
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications
5 years ago
rinpatch 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop'
5 years ago
lain 3ff5532220 Linting.
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
rinpatch 3896a51b8a Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch 5170170483 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
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 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
Maksim Pechnikov 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch b0e6058021 Parse http signature for request to objects/activities
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
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
Mark Felder 74e4c72c4a Fix double quotes in error logs
5 years ago
Maksim Pechnikov 007e0c1ce1 added tests
5 years ago
Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop'
5 years ago
lain fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop'
5 years ago
Alex S a1f2dfb10a expanding regex sigils to use modifiers
5 years ago
Maksim Pechnikov fcf604fa43 added tests
5 years ago
rinpatch 43f02dfe38 Revert "Parallelize template rendering"
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
feld edbaf78176 Merge branch 'fix/read-inbox' into 'develop'
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
Ivan Tashkinov c3f00447af Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
shadowfacts e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs
5 years ago
Maksim Pechnikov 8c6cdff3cc Merge branch 'develop' into issue/1218
5 years ago
Maksim Pechnikov 39f99dc6cd Merge branch 'develop' into support/tests
5 years ago
Ariadne Conill 5effb2cbca activitypub: help ecto build a better query for thread mute filtering
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
Egor Kislitsyn 40b3289c26 Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
rinpatch 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop'
5 years ago
Maxim Filippov 736165c082 Reverse reports list
5 years ago
Alex S 79dde58044 one more temp commit
5 years ago
Haelwenn fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop'
5 years ago
rinpatch 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname
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
rinpatch 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop'
5 years ago
rinpatch 558969a0fd Do not crash if one notification failed to render
5 years ago
Maksim Pechnikov ae506ca997 fix formatting
5 years ago
Maksim e2011a667c Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
Maksim 8306078de1 Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
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
Maksim Pechnikov a890451187 fetch_announcements -> take_announcements
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
Maxim Filippov 9c96b17e16 Add pagination to logs
5 years ago
Ivan Tashkinov dd017c65a4 [#1149] Refactored Oban workers API (introduced `enqueue/3`).
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 70eed0594c credo fixes
5 years ago
rinpatch bd3ed3a622 Add back /api/qvitter/statuses/notifications/read.json
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
feld 7853b3f17d Fix AntiFollowbotPolicy when trying to follow a relay
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 ffcd742aa0 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain c30cc039e4 Transmogrifier: Use Containment.get_actor to get actors.
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
Egor Kislitsyn 4194abbc8f Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn 4d82bc8b0b Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
kPherox 8ca4f145a5
Extract if block into private function
5 years ago
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
5 years ago
Maxim Filippov 37dd3867bb Log admin/moderator actions
5 years ago
kPherox b15e226593
Change to delete empty name field
5 years ago
kPherox 705b5adfc4
Fix type of fields_attributes
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
Maksim Pechnikov 6062017493 put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov 581123f8bb [#1149] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Maksim Pechnikov 8dc6a6b210 fix /inbox for Relay
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
Egor Kislitsyn a79ebac592 Improve AP routes rate limit
5 years ago
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor
5 years ago
Sachin Joshi 37229af15f remove old user create and delete routes for admin
5 years ago
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop'
5 years ago
lain 74f7f308f8 Merge branch 'fix/admin-api-user-deletion' into 'develop'
5 years ago
Egor Kislitsyn 8d899d6197 Add `:ap_routes` rate limit
5 years ago
lain 8340fe8fcc Merge branch 'digest-template' into 'develop'
5 years ago
lain ef43016b2c Merge branch 'feature/custom-fields' into 'develop'
5 years ago
Maxim Filippov 5171aa5b4d Refactor check_actor_is_active
5 years ago
kaniini 18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
5 years ago
lain 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop'
5 years ago
Egor Kislitsyn 158231cd20 Add configurable colors and logo for the digest template
5 years ago
rinpatch 1ad71592ad Parallelize template rendering
5 years ago
rinpatch a4a3e3becd Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
Maxim Filippov ec969eec51 Merge branch 'develop' into 'fix/admin-api-user-deletion'
5 years ago
Maxim Filippov 2b94ae3b39 Do not check if actor is active when deleting a user
5 years ago
rinpatch bd5ad0af78 Cache follow state
5 years ago
rinpatch 31d576de0c Merge branch 'misc-otp-issues' into 'develop'
5 years ago
rinpatch dc902ad3df Merge branch 'fix/http-signatures-post' into 'develop'
5 years ago
kaniini 1754f8ce6d Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
5 years ago
Ariadne Conill 5bb418a90d activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
Ariadne Conill 626e094589 MRF: fix up unserializable option lists in describe implementations
5 years ago
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
stwf 574856ef01 streamline Streamer pings
5 years ago
stwf 15ef521009 Isolate OAuth.Token.CleanWorker
5 years ago
stwf 51bdf0cab6 use default child_specs
5 years ago
lain d3af9e19ed Conversations: Load relations in one query.
5 years ago
lain f73212b2a3 Conversation: Render new participation on update.
5 years ago
lain df81abb68c Conversations: Use correct oauth paths for extended api.
5 years ago
Egor Kislitsyn 4b7f1c6995 Improve digest email template
5 years ago
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn e457fcc479 Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn f7bbf99caa Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn 7d6f8a7fd7 Linkify custom fields values in ActivityPub.UserViewx
5 years ago
Egor Kislitsyn 5178f960c3 Support user attachment update in Transmogrifier
5 years ago
Egor Kislitsyn 88598c9baf Add profile custom fields to ActivityPub.UserView
5 years ago
Egor Kislitsyn a22f540fc4 Add custom fields to TwitterAPI.UserView
5 years ago
Egor Kislitsyn e0ac5c7a66 Add custom profile fields
5 years ago
kaniini 5c35d2f1d8 Merge branch 'preload-user-timelines' into 'develop'
5 years ago
kaniini fe42844bda Merge branch 'get-context-optimizations' into 'develop'
5 years ago
rinpatch 8202f1634a Preload thread mutes/bookmarks in user_statuses
5 years ago
rinpatch f4e087ee48 Preload thread mutes/bookmarks in get_context
5 years ago
rinpatch 9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop'
5 years ago
kaniini c3a54cc34d Merge branch 'feature/mrf-describe' into 'develop'
5 years ago
Ariadne Conill abfbcfdcb3 mrf_vocabulary: add describe API support
5 years ago
Ariadne Conill 4244e17de0 fix credo
5 years ago
Haelwenn 47c20ab796 Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
5 years ago
rinpatch 46d7bef7e7 Nicer formatting for safe_render errors
5 years ago
Ariadne Conill f305e97eeb nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
5 years ago
Ariadne Conill c574b7a1fc MRF: add describe() to all modules, add base MRF configuration to base describe()
5 years ago
Ariadne Conill 694bc43123 MRF: add describe() for gathering and describing the MRF configuration
5 years ago
Maksim fea4d89e9f tests for Web/ActivityPub/Relay
5 years ago
Maksim 04da1166db tests for /web/mastodon_api/mastodon_api.ex
5 years ago
Ariadne Conill 3fdbeb7087 MRF: add vocabulary policy module
5 years ago
rinpatch c1b6952d2a Mastodon API: Preloading and normalization optimizations
5 years ago
Ivan Tashkinov 0e1c481a94 [#1149] Added more oban workers. Refactoring.
5 years ago
Ariadne Conill f46cd7e9c7 config: remove legacy activitypub accept_blocks setting
5 years ago
lain 511ccea5aa ConversationView: Align parameter names with other views.
5 years ago
lain 60231ec7bd Conversation: Add endpoint to get a conversation by id.
5 years ago
lain 23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view.
5 years ago
rinpatch 92479c6f48 Do not fetch the reply object in `fix_type` unless the object has the
5 years ago
Ariadne Conill 9cfc289594 MRF: ensure that subdomain_match calls are case-insensitive
5 years ago
kaniini 84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters'
5 years ago
Sergey Suprunenko af4cf35e20 Strip internal fields including likes from incoming and outgoing activities
5 years ago
rinpatch 0802a08871 Mastodon API: Fix thread mute detection
5 years ago
Maxim Filippov dfae61c25c Fix deactivated user deletion
5 years ago
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
rinpatch 409bcad54b Mastodon API: Set follower/following counters to 0 when hiding
5 years ago
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop'
5 years ago
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Thibaut Girka 9c0da1009a Return profile URL in MastodonAPI's `url` field
5 years ago
Thibaut Girka 089d53a961 Simplify logic to mention.js `url` field
5 years ago
Thibaut Girka a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL
5 years ago
Haelwenn aa718ab8f6 Merge branch 'fix/object-reembeds' into 'develop'
5 years ago
rinpatch 4f1b9c54b9 Do not rembed the object after updating it
5 years ago
rinpatch 03ad31328c OStatus Announce Representer: Do not depend on the object being embedded
5 years ago
rinpatch 73d8d5c49f Stop depending on the embedded object in restrict_favorited_by
5 years ago
Maksim 139b196bc0 [#1150] fixed parser TwitterCard
5 years ago
Maksim bdc9a7222c tests for CommonApi/Utils
5 years ago
lain d6fe220e32 Linting.
5 years ago
lain b64b6fee2a CommonAPI: Replies to conversations also get the correct context id.
5 years ago
lain 3af6d14da7 Pleroma Conversations API: Add a way to set recipients.
5 years ago
Sergey Suprunenko e8ad116c2a Do not add the "next" key to likes.json if there is no more items
5 years ago
Haelwenn (lanodan) Monnier a035ab8c1d
templates/layout/app.html.eex: Style anchors
5 years ago
kaniini 86fffe9c27 Merge branch 'patch-2' into 'develop'
5 years ago
Thibaut Girka 1fce56c7df Refactor
5 years ago
Thibaut Girka 16cfb89240 Only add `preferredUsername` to service actor json when the underlying user actually has a username
5 years ago
Alexander Strizhakov de0f3b73dd Admin fixes
5 years ago
Sergey Suprunenko 8b2fa31fed Handle MRF rejections of incoming AP activities
5 years ago
Thibaut Girka a187dbb326 Add preferredUsername to service actors so Mastodon can resolve them
5 years ago
lain eee98aaa73 Pleroma API: Add endpoint to get conversation statuses.
5 years ago
feld d93d777915 Fix/mediaproxy whitelist base url
5 years ago
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email
5 years ago
lain 56b1c3af13 CommonAPI: Extend api with conversation replies.
5 years ago
lain 5ff8f07ca9 Merge branch 'feature/hide-follows-remote' into 'develop'
5 years ago
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries.
5 years ago
kaniini 6c06529cd4 Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
5 years ago
rinpatch 813c686dd7 Disallow following locked accounts over OStatus
5 years ago
Maksim 6eb33e7303 test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
5 years ago
Ariadne Conill f72e0b7cad ostatus: explicitly disallow protocol downgrade from activitypub
5 years ago
Maksim 58443d0cd6 tests for TwitterApi/UtilController
5 years ago
lain 7483679a7b StatusView: Return direct conversation id.
5 years ago
rinpatch c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Alexander Strizhakov 51b3b6d816 Admin changes
5 years ago
Ariadne Conill 3850812503 twitter api: utils: rework do_remote_follow() to use CommonAPI
5 years ago
kaniini 5835069215 Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
5 years ago
Ariadne Conill 5795a890e9 markdown: clean up html generated by earmark
5 years ago
lain 1dfde4151c Merge branch 'refactor/use-constants' into 'develop'
5 years ago
Eugenij 0bee2131ce Add `mailerEnabled` to the NodeInfo metadata
5 years ago
Sergey Suprunenko c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances
5 years ago
Maksim 159bbec570 added tests for OstatusController
5 years ago
Ariadne Conill b93498eb52 constants: add as_public constant and use it everywhere
5 years ago
Ariadne Conill 492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
5 years ago
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api
5 years ago
Maksim 6b77a88365 [#1097] added redirect: /pleroma/admin -> /pleroma/admin/
5 years ago
rinpatch 41e0304757 Merge branch 'develop' into feature/hide-follows-remote
5 years ago
kaniini 19835be067 Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
5 years ago
Sergey Suprunenko b20020da16 Show the url advertised in the Activity in the Status JSON response
5 years ago
kPherox ac27b94ffa
Change to not require `magic-public-key` on WebFinger
5 years ago
Maksim 55341ac717 tests WebFinger
5 years ago
Eugenij 4504135894 Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
5 years ago
Mike Verdone 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email
5 years ago
Mike Verdone 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor
5 years ago
Mike Verdone 36012ef6c1 Require that ephemeral posts live for at least one hour
5 years ago
Mike Verdone 704960b3c1 Add support for activity expiration to common and Masto API
5 years ago
sadposter f5d574f4ed check both item and parent domain blocks
5 years ago
Sadposter 48bd3be9cb move domain block check to with block
5 years ago
Sadposter 4af4f6166b honour domain blocks on streaming notifications
5 years ago
kaniini 9c6357324e Merge branch 'feature/admin-api-user-statuses' into 'develop'
5 years ago
Ariadne Conill d3bdb8e704 rich media: parser: splice the given URL into the result
5 years ago
Maxim Filippov f46805bb40 Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov 03471151d6 AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
5 years ago
kaniini bd265acf91 Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 90be91b0e0
Router: Remove deprecated AdminAPI endpoints
5 years ago
Alexander Strizhakov 5e72554f3c Admin config fix
5 years ago
Maksim c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
Mark Felder 6a79bb12c3 Fix function
5 years ago
Mark Felder fd287387a0 Do not notify subscribers for messages from users which are replies to others
5 years ago
kPherox e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
5 years ago
Alexander Strizhakov b70e659304 Feature/1087 wildcard option for blocks
5 years ago
Haelwenn 674ad5e1df Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
5 years ago
Sadposter f712ee879a Bugfix: muted/blocked user notification streaming
5 years ago
Sergey Suprunenko 05b5af8075 Add tests for users tasks and PleromaAuthenticator
5 years ago
Sadposter a5d6287ba8 Hide blocked users from interactions
5 years ago
Ariadne Conill 56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules
5 years ago
kaniini a00aab3402 Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
5 years ago
rinpatch 3368174785 Fix rich media parser failing when no TTL can be found by image TTL
5 years ago
Ariadne Conill bc6c5c513a router: ensure the AP sharedinbox path is registered first
5 years ago
rinpatch 196cad46f3 Resolve merge conflicts
5 years ago
Roman Chvanikov 8292331b35 Merge branch 'develop' into feature/digest-email
5 years ago
Roman Chvanikov 36049f08ef Merge develop
5 years ago
feld 93df0796f0 Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
5 years ago
Mark Felder 9169f331b6 Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
kaniini 33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop'
5 years ago
kaniini 716afc83ce Merge branch 'refactor/http-signature-plug' into 'develop'
5 years ago
Maksim c2e2aadc42 #1110 fixed /api/pleroma/healthcheck
5 years ago
Sachin Joshi de9906ad56 change the structure of image ttl parsar
5 years ago
Maxim Filippov 9570a5be40 Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Ariadne Conill 184fa61fb3 plugs: add MappedSignatureToIdentityPlug
5 years ago
Maksim b6b748d3e7 tests for Uploader with webhook
5 years ago
kaniini 1e48af9acf Merge branch 'feature/instance-fetch-actor' into 'develop'
5 years ago
Eugenij 4bf2bb9cff Fix password reset for non-test env
5 years ago
Ariadne Conill cf9cb953d5 activitypub: represent internal fetch actor
5 years ago
Ariadne Conill d930e5d5c3 activitypub: introduce internal fetch service actor
5 years ago
Ariadne Conill 0a6f6e1b5b webfinger: allow resolution of usernames with dots in them (internal actors)
5 years ago
Ariadne Conill a9d6a12bb3 activitypub: controller: rework the way the relay actor is presented so the code can be reused
5 years ago
Ariadne Conill 4885473be2 user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
5 years ago
kaniini ce73d5f6a5 Merge branch 'feature/mention-mrf' into 'develop'
5 years ago
RX14 96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
5 years ago
Alexander Strizhakov 10f82c88b8 mastoapi password reset
5 years ago
Sachin Joshi 18234cc44e add the rich media ttl based on image exp time
5 years ago
Ivan Tashkinov 889dc17abd [#1094] Rate-limited follow & unfollow actions.
5 years ago
Roman Chvanikov 9bca70b10a Merge develop
5 years ago
Eugenij 520ee6c591 Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij c4ca142e14 Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
Egor Kislitsyn 70439494af Fix typo
5 years ago
rinpatch 996fd58ac4 Merge branch 'bugfix/poll-id-as-string' into 'develop'
5 years ago
lain 1ed24bcc76 Status View: Poll ids are strings.
5 years ago
Mark Felder ffb4eb9779 Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
feld 9f987dd017 Merge branch 'match-file-name' into 'develop'
5 years ago
Sergey Suprunenko b74300bc7a Add more tests for MastodonAPIController and CommonAPI
5 years ago
kaniini ee5250ae56 Merge branch 'sha512-crypt' into 'develop'
5 years ago
Sachin Joshi 1d906ffa82 Merge branch 'develop' into match-file-name
5 years ago
Maksim c32384c1ea tests for Pleroma.Signature
5 years ago
Egor Kislitsyn de13c9bb8f List messages must be visible for mentioned users
5 years ago
Egor Kislitsyn d86a97abfb Add an explanation comment to Publisher.publish/2
5 years ago
Egor Kislitsyn 64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn a87c313309 Support `list` visibility in StatusView
5 years ago
Maksim fa17879c20 added tests for Web.MediaProxy
5 years ago
Sergey Suprunenko dce8ebc9ea Unfollow should also unsubscribe
5 years ago
Roman Chvanikov c729883936 Merge branch 'develop' into feature/digest-email
5 years ago
Ariadne Conill 739bbe0d3b security: detect object containment violations at the IR level
5 years ago
Moonman f98f7ad1b9 detect and use sha512-crypt for stored password hash.
5 years ago
Alexander Strizhakov e7c39b7ac8 Feature/1072 muting notifications
5 years ago
Alex S f4447d82b8 parsers configurable
5 years ago
rinpatch 0c2dcb4c69 Add follow information refetching after following/unfollowing
5 years ago
rinpatch 183da33e00 Add tests for fetch_follow_information_for_user and check object type
5 years ago
Maxim Filippov 418ae6638d Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov a9459ff98f Admin API: Endpoint for fetching latest user's statuses
5 years ago
rinpatch d06d1b751d Use atoms when updating user info
5 years ago
rinpatch e5b850a991 Refactor fetching follow information to a separate function
5 years ago
Ariadne Conill 80c46d6d8b nodeinfo: implement MRF transparency exclusions
5 years ago
rinpatch e8fa477793 Refactor Follows/Followers counter syncronization
5 years ago
Ivan Tashkinov d72876c57d [#1041] Minor refactoring.
5 years ago
Ivan Tashkinov 369e9bb42f [#1041] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch 095117a58c Merge branch 'develop' into fix/ap-hide-follows
5 years ago
rinpatch 97b79efbcd ActivityPub Controller: Actually pass for_user to following/followers
5 years ago
Sachin Joshi f8e3ae6154 try to always match the filename for proxy url
5 years ago
Maksim 92055941bd Pleroma.Web.Metadata - tests
5 years ago
rinpatch 1f6ac7680d ActivityPub User view: Following/Followers refactoring
5 years ago
Mark Felder 360e4cdaa2 Move these to pleroma namespace in Mastodon API
5 years ago
Sachin Joshi 6a6c4d134b preserve the original path/filename (no encoding/decoding) for proxy
5 years ago
Roman Chvanikov eae991b06a merge develop
5 years ago
Eugenij 4198c3ac39 Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Alexander Strizhakov 846ad9a463 admin api configure changes
5 years ago
kaniini e4e3fd7e55 Merge branch 'fix/1019-refactor' into 'develop'
5 years ago
Egor Kislitsyn 9e06873d58 Add `list` to Visibility
5 years ago
Egor Kislitsyn 958fb9aa80 Add "listMessage"
5 years ago
Egor Kislitsyn 182f7bbb11 Merge branch 'develop' into feature/addressable-lists
5 years ago
Haelwenn (lanodan) Monnier 252e129b1e
MastoAPI: Add categories to custom emojis
5 years ago
Alex S beba7bbc85 removing synchronization worker
5 years ago
Alex S f8786fa6f2 adding following_address field to user
5 years ago
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users
5 years ago
Egor Kislitsyn 5104f65b69 Wrap error messages into gettext helpers
5 years ago
Egor Kislitsyn 26a6871609 Add translation helpers
5 years ago
Egor Kislitsyn 0d54a571ca Add SetLocalePlug
5 years ago
Maksim 008c55e4e9 add test for search_controller/ 100% coverage
5 years ago
Sergey Suprunenko 2d2b50ccca Send and handle "Delete" activity for deleted users
5 years ago
feld 93a0eeab16 Add license/copyright to all project files
5 years ago
Maksim bb8065a1fd tests MRF filters
5 years ago
Roman Chvanikov 371d39e160 Merge develop
5 years ago
kaniini 670a77ecbc Merge branch 'feature/allow-user-query-via-id' into 'develop'
5 years ago
kaniini 1417627d07 Merge branch 'remove-avatar-header' into 'develop'
5 years ago
Mark Felder 9a9b60cfbc Merge branch 'develop' into feature/allow-user-query-via-id
5 years ago
kaniini 1179a13533 Merge branch 'features/sec-websocket-protocol-header' into 'develop'
5 years ago
Haelwenn 1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop'
5 years ago
feld 167f810ff1 Merge branch 'proxy-error' into 'develop'
5 years ago
Haelwenn 95c085174d Merge branch 'test-speedup' into 'develop'
5 years ago
Mark Felder 31a59d6f23 Merge branch 'develop' into proxy-error
5 years ago
rinpatch 376a55c97f Merge branch '161-incoming-replies-depth-limit' into 'develop'
5 years ago
lain abe2e8881f Testing: Don't federate in testing.
5 years ago
rinpatch 44b2e1fdad Formatting
5 years ago
rinpatch 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors
5 years ago
rinpatch 7f609ee8f4 OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
5 years ago
rinpatch 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
Sachin Joshi f5ad430974 make sure the url used by proxy is same as origin url
5 years ago
Haelwenn (lanodan) Monnier e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
5 years ago
KokaKiwi a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
5 years ago
Ivan Tashkinov ad8d86e7c6 Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
Maxim Filippov 6c50fbcd14 Admin API: Allow querying user by ID
5 years ago
Eugenij 15eb1235ed Expose `skip_thread_containment` in nodeinfo
5 years ago
Eugenij 5184b0f41a Use fallback values for search queries
5 years ago
Eugenij ab50c6b3ca Add fallback value to the admin report view.
5 years ago
Roman Chvanikov d2cb18b2a3 Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov a799418573 [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
Ivan Tashkinov 2b9d914089 [#161] Refactoring, documentation.
5 years ago
Eugenij 1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
rinpatch 4c60a562a7 Fix not being able to pin unlisted posts
5 years ago
Ivan Tashkinov 5b7b1040b3 [#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
kaniini d1549a6375 Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
5 years ago
William Pitcock 034986e1fd MRF: add mediaproxy warming policy
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
Maxim Filippov 452ca5250d Merge admin and mastodon user views for reports
5 years ago
kaniini 0369a5db16 Merge branch 'idempotency-plug' into 'develop'
5 years ago
Alexander Strizhakov c6705144a2 don't delete config settings on admin update
5 years ago
Egor Kislitsyn 889a9c3a3f Polish IdempotencyPlug
5 years ago
Egor Kislitsyn 0b8aeac0f3 Remove previous idempotency implementation from `post_status`
5 years ago
Egor Kislitsyn 74132e3715 Enable IdempotencyPlug for the all API
5 years ago
Sergey Suprunenko d53fb55bb7 Return correct response when reply to a direct message is not direct itself
5 years ago
kaniini 24bcc209f9 Merge branch 'refactoring/fix_render_view' into 'develop'
5 years ago
Maksim Pechnikov 5c0f646cef fix validate_page_url
5 years ago
Roman Chvanikov a7a54068f9 Fix Controller.render/4 deprecation
5 years ago
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov 0276cf5a02 fix validate_url for private ip
5 years ago
Maksim a0c4ebb4d7 [#184] small refactoring reset password
5 years ago
Sergey Suprunenko 2c63c67512 Rework user deletion
5 years ago
Eugenij f2c03425b0 Broadcast conversation update when DM is deleted
5 years ago
kaniini 27b9605de0 Merge branch 'rich_media_titles_two' into 'develop'
5 years ago
Alex S 982cad0268 support for config groups
5 years ago
Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header'
5 years ago
Alex S 410add1c30 support for tuples with more than 2 values
5 years ago
lain 0e415921cd Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain 58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
5 years ago
Alex S f0fccb7578 fix for int and modules
5 years ago
kaniini 55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop'
5 years ago
kaniini e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop'
5 years ago
William Pitcock 127a5a7d65 change the anti-link-spam MRF implementation to use old_user? instead of the previous name
5 years ago
feld b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'"
5 years ago
William Pitcock 21dacd4b15 unbreak polls
5 years ago
William Pitcock 736d8ad6be implement anti link spam MRF
5 years ago
rinpatch df2dab69a7 Merge branch 'begone-the-dot-hack' into 'develop'
5 years ago
lain 966317e052 Merge branch 'deps/update-auto-linker' into 'develop'
5 years ago
Ivan Tashkinov 64bc7ac619 Minor edit (comment).
5 years ago
Ivan Tashkinov 9f45f93949 Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
rinpatch f30a3241d2 Deps: Update auto_linker
5 years ago
rinpatch c7acca2abb Mastodon API: Sanitize display names
5 years ago
rinpatch c4e4f7d0e4 Add proper error handling for when the post exceeds character limits
5 years ago
rinpatch dce27de733 Mastodon API: Remove the dot hack
5 years ago
rinpatch 49a49d3763 Merge branch 'removing-test-errors' into 'develop'
5 years ago
Haelwenn c34327b22e Merge branch 'fix/sanitize-report-content' into 'develop'
5 years ago
Alex S 0f59265a50 salmon fix
5 years ago
Maksim a04bf131e0 [#570] add user:notification stream
5 years ago
rinpatch bf6aa6f1a8 Fix report content stopping to be nullable
5 years ago
rinpatch 44de34d170 Credo fixes
5 years ago
rinpatch 641bcaa44e Sanitize HTML in ReportView
5 years ago
lain 135c196769 Merge branch 'bugfix/980-polls-double-vote' into 'develop'
5 years ago
lain 37ee6c6e2c Merge branch 'update/phoenix-and-plug' into 'develop'
5 years ago
kaniini 52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop'
5 years ago
Mark Felder 9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
5 years ago
lain a440cf856d Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch 62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
Maksim ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
lain eac298083f MastodonAPI: Add a way to update the background image.
5 years ago
lain 5965efb216 AccountView: Add user background.
5 years ago
Egor Kislitsyn a12f8e13c8 Improve <title> fallback; Add a test
5 years ago
Mark Felder 7363a0ea8a Revert "Only run Floki if title is missing from the map"
5 years ago
Mark Felder 97d2b1a45a Only run Floki if title is missing from the map
5 years ago
Mark Felder 097fdf6a5d Attempt to use <title> from HTML as a fallback
5 years ago
Ivan Tashkinov 4b2c29016c [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
lain 966543379d MastodonAPI Controller: Band-Aid double vote problem.
5 years ago
Egor Kislitsyn bf22ed5fbd Update `auto_linker` dependency
5 years ago
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn ad04d12de6 Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn bc8f059367 Add rate limiting for search endpoints
5 years ago
rinpatch d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
Roman Chvanikov 01fe5abad1 Resolve conflicts
5 years ago
rinpatch 92213fb87c Replace Mix.env with Pleroma.Config.get(:env)
5 years ago
kaniini 3f6da9c45a Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
5 years ago
kaniini a511d2f900 Merge branch 'improve-search' into 'develop'
5 years ago
lain e1370ba131 Utils: Use update_follow_state_for_all when appropriate.
5 years ago
lain ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain 076c9ae40e User: Remove superfluous `maybe_follow`.
5 years ago
lain 3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
Egor Kislitsyn ddd4a09b72 Fix merge conflict
5 years ago
Egor Kislitsyn cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Ivan Tashkinov 3eefb274f4 OAuth consumer: tests fix, comments, Keycloak config notes.
5 years ago
Egor Kislitsyn 93397fce3d Contain search for unauthenticated users
5 years ago
kaniini e4babb1c9f Merge branch 'explicit-addressing' into 'develop'
5 years ago
Egor Kislitsyn 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov b1b1a270e8 Fix conflict
5 years ago
lain 18c35d84fd NodeInfo: Add explicit addressing to nodeinfo.
5 years ago
Maksim Pechnikov 1e7bb69a95 update ActivityPub#fetch_activities_query
5 years ago
Maksim Pechnikov d3d1704e84 Merge branch 'develop' into issue/941
5 years ago
Maksim Pechnikov 0acfcf6c52 update ActivityPub#fetch_activities_query
5 years ago
rinpatch 17383861ed Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
5 years ago
rinpatch 29b022bb59 Restrict `get_existing_votes` to only get Create activities
5 years ago
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
William Pitcock 37a4ba0624 utils: access inReplyTo as an explicit string when fetching poll results`
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
William Pitcock 1c6cf0a348 nodeinfo: add pollLimits to metadata
5 years ago
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Roman Chvanikov 3e17610587 Add task to test emails
5 years ago
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
eugenijm f2c4c99e03 Remove repeated scope lists
5 years ago
lain 80d4d83aac CommonAPI: Add explicit addressing.
5 years ago
eugenijm 243d8ed94e Use workaround for the heavy checkmark symbol in iOS
5 years ago
Mark Felder f4e2595592 Merge branch 'develop' into update-oauth-template
5 years ago
Maksim Pechnikov 080e1aa70e add option skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch 5bd41fef8b Change query order in fetch_activities_for_context_query to make poll vote exclusion work
5 years ago
rinpatch 1fd8e19d76 Remove a TODO comment as the tests for poll view were written
5 years ago
rinpatch 2fe3a20638 Make error message about author's inability to vote more sensible
5 years ago
rinpatch e3c460353d Refresh the object in CommonAPI.vote instead of MastoAPI controller
5 years ago
William Pitcock 561a21986d formatting
5 years ago
William Pitcock 4087ccdab8 mrf: add subchain policy
5 years ago
William Pitcock edf772d41e mrf: allow a policy chain to be specified when filtering
5 years ago
kaniini 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop'
5 years ago
rinpatch 6bc9e5c020 Mastodon API: Refresh the object before rendering it after voting
5 years ago
rinpatch 444406167b Mastodon API: actually check for poll votes
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
rinpatch 300d94c628 Add poll votes
5 years ago
Sachin Joshi ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
Sachin Joshi 5534d4c676 make bulk user creation from admin works as a transaction
5 years ago
kaniini e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
5 years ago
Sergey Suprunenko 2bbc2a801f Remove all follower collections but actor's from "cc"
5 years ago
William Pitcock f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching
5 years ago
Haelwenn (lanodan) Monnier aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours
5 years ago
lambda 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop'
5 years ago
lain 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
5 years ago
rinpatch a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda 91ac8b075b Merge branch 'use-pleroma-config' into 'develop'
5 years ago
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere
5 years ago
kaniini 6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
5 years ago
Mark Felder e7edfd9fec Permit fetching statuses from API with nickname or id
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
Mark Felder 672fddb721 Default search limit should be 40
5 years ago
William Pitcock 0159a6dbe9 router: require oauth_read for searching
5 years ago
Sachin Joshi 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop'
5 years ago
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock 59a703fcbe twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants
5 years ago
William Pitcock 9bec891eb4 kill @httpoison
5 years ago
Aaron Tinio 9415932af5 Keep nodeinfo available when not federating
5 years ago
feld f916e4cdd9 Move the Cache Control header test to its own file
5 years ago
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
rinpatch 8b2d39c1ec Change the order of preloading when fetching activities for context
5 years ago
Sachin Joshi 0c53d91f3b fix merge conflict
5 years ago
rinpatch e6b175ed6c Fix credo issues
5 years ago
William Pitcock baf72d6c58 mrf: simple policy: add the ability to strip avatars and banners from user profiles
5 years ago
William Pitcock 60f882b09f activitypub: run user objects through MRF filters
5 years ago
William Pitcock 75b6c4b004 mrf: defang policy modules for filtering user profile objects
5 years ago
rinpatch ac7702f800 Exclude Answers from fetching by default
5 years ago
rinpatch 19c90d47c4 Normalize poll votes to Answer objects
5 years ago
Maksim 620908a2db [#699] add worker to clean expired oauth tokens
5 years ago
lambda ff363f70b5 Merge branch 'refactor/keys' into 'develop'
5 years ago
William Pitcock 1344c85e2f salmon: fix credo
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
5 years ago
Sachin Joshi 17bfd000d7 Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
5 years ago
William Pitcock 045803346d move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio 3ab9255eda Respond with a 404 Not implemented JSON error message
5 years ago
rinpatch 63b0b7190c MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch 5f67c26baf Accept strings in expires_in because sasuga javascript
5 years ago
rinpatch 0407ffe75f Change validation error status codes to be more appropriate
5 years ago
rinpatch ee68244141 Do not stream out poll replies
5 years ago
rinpatch d7c4d029c8 Restrict poll replies when fetching activiites for context
5 years ago
rinpatch f28747858b Actual vote count in poll view
5 years ago
rinpatch a53d062730 Fix posting non-polls from mastofe
5 years ago
rinpatch aafe30d94e Handle poll votes
5 years ago
rinpatch 3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini d4847b17ca Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
5 years ago
Aaron Tinio eb02edcad9 Add virtual :thread_muted? field
5 years ago
Sadposter daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Sadposter e81f0fc6d4
Add mascot get/set tests
5 years ago
Sadposter 54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch 6430cb1bf7 Restrict poll replies from fetch queries by default
5 years ago
rinpatch 1d90f9b969 Remove tags/mentions/rich text from poll options because Mastodon and
5 years ago
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch fd920c8973 Mastodon API: Add support for posting polls
5 years ago
William Pitcock c4a55e167a add Changelog entry
5 years ago
William Pitcock dc08159538 also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock 0da1233e8e rich media: suppress link previews if post is marked as sensitive
5 years ago
William Pitcock 78588dbd80 mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
5 years ago
Egor Kislitsyn 3b71612d3d Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3
5 years ago
lain 075eecec90 Linting.
5 years ago
lain f959bf7aa6 MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn f2936e0a07 Add `ap_id` to List
5 years ago
lain 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
lambda 1dcdcd8871 Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
5 years ago
lambda 46684db84d Update account_view.ex
5 years ago
rinpatch 642a67dd44 Render polls in statuses
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Sachin Joshi 5c028b8f92 user creation admin api will create multiple users
5 years ago
Haelwenn (lanodan) Monnier 68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
5 years ago
Aaron Tinio 70235ce840 Fix typo: s/"tags"/"tag"/g
5 years ago
Sergey Suprunenko e2b3a27204 Add Reports to Admin API
5 years ago
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
5 years ago
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import
5 years ago
lambda fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop'
5 years ago
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
William Pitcock c31026423c publisher: use the correct queue name for outgoing federation
5 years ago
Aaron Tinio 793f1834d2 Use named binding to conditionally join object
5 years ago
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains
5 years ago
rinpatch 62e42b03ab Handle incoming Question objects
5 years ago
William Pitcock a591ab6112 activity pub: remove Ecto SQL query dumps
5 years ago
William Pitcock 31db31c587 activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
5 years ago
William Pitcock de114ffbb0 activitypub: remove contain_timeline()
5 years ago
William Pitcock 0387f52138 activitypub: add restrict_thread_visibility()
5 years ago
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini 62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop'
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
lain 7a92e701b9 CommonAPI: Visibility refactor.
5 years ago
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
lain f1e67bdc31 Search: Add optional rum indexing / searching.
5 years ago
Sachin Joshi ee22fff5ac remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio 70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
lambda 692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
5 years ago
William Pitcock ac3a3abf6b clean up follow/block imports a little
5 years ago
Maksim 52297920e7 Refactoring oauth response.
5 years ago
Egor Kislitsyn e82e73478e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Mark Felder bbacdf2352 Bump Mastodon API level
5 years ago
Mark Felder 498bfdf403 Switch to Jason over Poison
5 years ago
William Pitcock 69a9e0563c user: migrate follow/blocks import to job queue
5 years ago
William Pitcock 57d11ac9db activitypub: move post rich media fetching to job queue
5 years ago
lambda b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop'
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
Sachin Joshi 7701a4c841 Make irreversible field default to false in filters
5 years ago
Egor Kislitsyn 23276e8d68 Use pseudo ap id of a list in BCC
5 years ago
William Pitcock 44b182732e nodeinfo: gather supported protocol names from federation modules
5 years ago
William Pitcock 28f7f4c6de webfinger: build the response based on enabled federation modules
5 years ago
William Pitcock 55fa4b812a federator: websub removal
5 years ago
William Pitcock c23276a59a activitypub: publisher: fixups
5 years ago
William Pitcock fedaca15a3 websub: adapt to work as a federator publishing module
5 years ago
William Pitcock 179293e51c salmon: refactor to work as a federator publishing module
5 years ago
William Pitcock 2aee62a456 federator: publisher: only attempt publishing if we know the activity is representable
5 years ago
William Pitcock 69158f1065 ostatus: only as:Public activities are representable
5 years ago
William Pitcock 85377c0b67 federator: move activitypub relaying to the AP publisher module
5 years ago
William Pitcock 676752bb83 federator: hook up Publisher.publish()
5 years ago
William Pitcock f7a6a37c4e federator: remove no longer used :publish_single_ap
5 years ago
William Pitcock 10695a28d2 federator: publisher: add publish() wrapper
5 years ago
William Pitcock 0afc8d7856 federator: publisher: integrate job queue, simplify publish_one logic
5 years ago
William Pitcock ef1f9e8d4e activitypub: split out outgoing federation into a federation module
5 years ago
William Pitcock e7d292f80e federator: add publisher module defining a contract for publishing behaviours
5 years ago
kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
5 years ago
lain 01c45ddc9e Search: Use RUM index.
5 years ago
Sachin Joshi f01f995816 make url uniform in admin api
5 years ago
Roman Chvanikov f1f7a11222 Merge develop
5 years ago
feld c953ae8c3d Initial bundle of basic AdminFE
5 years ago
rinpatch 1d78e42fd4 Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
5 years ago
Francis Dinh 2a54e8c1f5 Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
5 years ago
rinpatch e4523c3010 Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain a33bec7d58 Conversations: Import order, import as read.
5 years ago
lain e6d7f8d223 Credo fixes.
5 years ago
lain a4598b5e8b Visibility: Make it more resilient.
5 years ago
lain 920bd47055 ActivityPub: Remove leftover printf debugging.
5 years ago
lain fcf2f38d20 Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov bfeb33e951 Merge develop
5 years ago
Maksim 799e1f48b5 Refactoring functions for dealing with oauth scopes.
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
kaniini 14deed7f7d Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
5 years ago
William Pitcock d64c3b604e twitterapi: use order constraint to force descending order
5 years ago
William Pitcock 6020ff3fb6 activitypub: add optional order constraint to timeline query builder
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
rinpatch f841eb7cdb Preload bookmarks wherever the object is preloaded
5 years ago
rinpatch 06947c9147 Remove bookmarks assoc
5 years ago
kaniini a1a0df19c4 Merge branch 'docs/MRF-modules' into 'develop'
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim 1040caf096 fix format
5 years ago
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
Haelwenn (lanodan) Monnier e41a2f98d5
mrf/tag_policy.ex: Add some documentation
5 years ago
Haelwenn (lanodan) Monnier af62ace954
Add short documentation on every MRF Policy
5 years ago
rinpatch d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
lain c42ded13a2 Credo fixes.
5 years ago
feld acb04306b6 Standardize construction of websocket URL
5 years ago
lain a0c755cc4a MastodonApi: Bump api level.
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
rinpatch 38b79461df Fix embeded relationships in Mastodon API
5 years ago
Mark Felder 3c4cab9be1 Merge branch 'develop' into update-oauth-template
5 years ago
Mark Felder 9a98f48ec3 Remove incorrect statement about valid characters
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator
5 years ago
Egor Kislitsyn a3dc02d282 Add addressable lists
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Alex S bdfa3a6fa8 Merging with develop
5 years ago
rinpatch ce4825c1dc Do not normalize objects in stream_out unless the activity type is
5 years ago
Roman Chvanikov 0f0cc2703b Merge develop
5 years ago
lain b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
5 years ago
kaniini 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop'
5 years ago
rinpatch 61ca2f7a4e Fix `rights` in TwitterAPI's user entity being present only for
5 years ago
rinpatch ce3789e39a Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the
5 years ago
kaniini 002ea343f8 Merge branch 'feature/bbcode' into 'develop'
5 years ago
William Pitcock 501af917b5 add support for bbcode
5 years ago
lambda 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
5 years ago
kaniini 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop'
5 years ago
Mark Felder 24c3e2db2c Add mediaproxy whitelist capability
5 years ago
rinpatch dfc8425659 Move settings to Source subentity
5 years ago
Alex S a825056d4d test fixes
5 years ago
Alex S 85953c0836 fixes for tests
5 years ago
Alex S 3c2ae80008 unused
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
5 years ago
Alex S 1258128f4f favourites add bookmark display
5 years ago
Alex S 73d01857e3 bookmarks in separate table
5 years ago
William Pitcock 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago