67ab580553
Filter outstanding follower requests from deactivated accounts
2020-06-24 17:18:53 -05:00
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
65f3eb333b
Apply suggestion to test/http/tzdata_test.exs
2020-06-24 08:50:33 +00:00
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
2020-06-24 09:12:32 +03:00
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
2020-06-23 18:10:33 +00:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
b7f297f0bd
Merge branch 'issue/1798' into 'develop'
...
[#1798 ] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
2020-06-23 10:54:15 +00:00
adc199c6a8
ActivityPubControllerTest: Capture error log
2020-06-23 12:04:51 +02:00
d93e01137b
ActivityPubControllerTest: Testing changes.
2020-06-23 11:43:20 +02:00
2737809bbf
An act of desperation.
2020-06-23 11:03:32 +02:00
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
84aa9c78dd
fix tests
2020-06-23 09:08:24 +03:00
2715c40e1d
added tests
2020-06-23 06:59:00 +03:00
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
2020-06-22 15:40:09 +00:00
7e6f43c0d7
Add `is_muted` to notifications
2020-06-22 19:03:04 +04:00
b0a40fc2e4
added verify RUM settings before start app
2020-06-22 17:27:49 +03:00
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
2020-06-22 12:25:12 +00:00
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
2020-06-22 13:59:45 +02:00
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
2020-06-22 11:34:07 +00:00
1e7ca24430
Update Handling Test: Fix for re-used update ids.
2020-06-22 13:23:21 +02:00
31a4d42ce0
SideEffects: Handle user updating.
2020-06-22 13:15:37 +02:00
282f492cd5
Merge branch '1883-mrf-chat' into 'develop'
...
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
2020-06-22 10:00:13 +00:00
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
2020-06-22 10:35:11 +02:00
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
31761340fe
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
...
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
2020-06-20 09:57:12 +00:00
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
1a704e1f1e
fix for packs pagination
2020-06-20 10:56:28 +03:00
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
2020-06-20 00:08:26 +02:00
feld
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
2020-06-19 20:38:22 +00:00
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
2020-06-19 16:38:57 +02:00
abdb540d45
ObjectValidators: Add basic UpdateValidator.
2020-06-19 15:30:30 +02:00
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
7e488cd4a7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-19 14:56:50 +02:00
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
e4c61f1741
added test
2020-06-18 05:45:15 +03:00
4044f24e2e
fix test
2020-06-18 05:06:28 +03:00
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
2020-06-17 13:13:55 -05:00
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
2020-06-17 15:53:24 +00:00
96493da7bd
Apply suggestion to test/web/media_proxy/invalidation_test.exs
2020-06-17 13:14:01 +00:00
078d687e6e
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
2020-06-17 12:58:50 +00:00
2991aae4c4
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
2020-06-17 12:58:38 +00:00
11b22a4229
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
2020-06-17 12:58:33 +00:00
6d33a3a51b
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:28 +00:00
793a53f1ec
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:16 +00:00
1b45bc7b2a
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:08 +00:00
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
2020-06-16 18:10:00 +00:00
b66e6eb521
fixes for tests
2020-06-16 19:03:45 +03:00
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
e1603ac8fe
fix attemps to merge map
2020-06-16 15:54:22 +03:00
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
2020-06-16 15:54:22 +03:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
015f9258a9
Transmogrifier: Extract user update handling tests.
2020-06-16 14:48:46 +02:00
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
bd63089a63
Fix tests
2020-06-15 16:20:05 +04:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
26f710b9e3
Merge branch 'develop' into preload-data
2020-06-12 16:52:52 -05:00
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
5d87405b51
ActivityPubTest: Update test for atomized parameters.
2020-06-10 16:55:30 +02:00
570123ae21
Add test
2020-06-10 16:53:24 +02:00
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
2020-06-10 12:05:45 +00:00
600e2ea073
ActivityPubTest: Make test easier to understand.
2020-06-10 12:15:56 +02:00
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
3dd1de61a7
Add `url` field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
2020-06-09 09:20:55 +02:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
c450b248cc
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
...
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
2020-06-08 10:54:43 +00:00
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
8d9e586887
Delete pending follow requests on user deletion
2020-06-07 17:31:37 +02:00
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
2020-06-07 15:38:33 +02:00
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
2020-06-07 14:52:56 +02:00
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
9189b489ee
Migrations: Move Notification migration code to helper
2020-06-06 15:33:02 +02:00
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +02:00
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
2020-06-06 09:46:07 +02:00
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
2020-06-05 16:47:02 +02:00
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
2020-06-05 12:26:07 +02:00
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
aa2ac76510
Notification: Don't break on figuring out the type of old EmojiReactions
2020-06-04 20:40:46 +02:00
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
2020-06-04 21:36:26 +04:00
74edd4f391
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-04 19:24:07 +02:00
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
9a53f619e0
Apply suggestion to test/chat_message_reference_test.exs
2020-06-04 15:16:15 +00:00
41503b1673
Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
2020-06-04 15:16:10 +00:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
a42d135cce
test fix
2020-06-04 10:51:24 -04:00
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
5d7dda883e
SideEffectsTest: More tests.
2020-06-04 14:46:41 +02:00
a8132690bd
Fix credo
2020-06-04 13:46:13 +04:00
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
c020fd4352
ChatMessageReferenceView: Return read status as `unread`.
2020-06-03 18:58:58 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
2020-06-03 16:45:04 +02:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
2591745fc2
ChatMessageReferences: Move tests
2020-06-03 12:56:39 +02:00
f3ccd50a33
ChatMessageReferences: Adjust views
2020-06-03 12:49:53 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
2020-06-02 16:30:03 +00:00
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
38dce485c4
Notification: Add function to backfill notification types
2020-06-02 14:50:10 +02:00
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
37542a9dfa
Activity: Remove notifications-related functions.
2020-06-02 14:22:16 +02:00
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
2020-06-02 11:32:03 +00:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
2020-06-02 08:49:24 +00:00
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 10:43:13 +02:00
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
8ff3425828
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-01 13:34:13 +02:00
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
2020-06-01 13:17:56 +02:00
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
2020-05-30 15:51:19 +00:00
b973d0b2f0
Fix config setting to not affect other tests
2020-05-30 16:47:09 +03:00
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
2020-05-30 15:36:55 +03:00
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
2c9465cc51
SafeText: Let through basic html.
2020-05-30 12:17:18 +02:00
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
2020-05-30 08:51:38 +03:00
0a83af330b
fix unused var warning
2020-05-29 23:05:03 +03:00
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
9ca978494f
Add test for stream boosts of mastodon user
2020-05-30 00:31:20 +09:00
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
2020-05-29 16:14:45 +02:00
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
863c02b25d
SideEffects: Stream out chat messages.
2020-05-29 15:44:03 +02:00
c86a88edec
Streamer: Add a chat message stream.
2020-05-29 15:24:41 +02:00
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
2020-05-29 10:42:49 +00:00
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
2020-05-29 09:46:31 +00:00
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
2020-05-28 23:11:12 +04:00
d1ee3527ef
Move config actions to AdminAPI.ConfigController
2020-05-28 22:23:15 +04:00
4c82f657c5
Formatting
2020-05-28 13:22:28 -05:00
1d30608e20
Merge branch 'fix/1557-gets-local-pack' into 'develop'
...
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
2020-05-28 17:08:30 +00:00
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
ae05792d2a
get-packs for local generated pack
2020-05-28 19:41:34 +03:00
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
455a402c8a
HTTP Security plug: rewrite &csp_string/0
...
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
2020-05-27 21:31:47 +03:00
8f6d428880
AccountView: Use mediaproxy URLs for emojis
...
Also use atom keys in emoji maps instead of binaries
Closes #1810
2020-05-27 19:44:02 +03:00
78c46fb7ba
MediaProxy test: use config macros instead of directly putting values
...
They were not properly cleaned later and caused trouble for another tests
2020-05-27 19:34:56 +03:00
48fd9be65a
Exclude post actor from to of relay announce
2020-05-27 23:51:15 +09:00
d35be02e70
Merge branch 'refactor-add-mention-step-one' into 'develop'
...
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
2020-05-27 14:17:12 +00:00
91f73a7592
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
2020-05-27 13:45:14 +00:00
b8e029b5ea
Notification: Actually preload objects.
2020-05-27 12:41:06 +02:00
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
3601c0015c
Merge branch '1808-pleroma-sucks' into 'develop'
...
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
2020-05-26 15:57:01 +00:00
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
644195e31e
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
...
[#1501 ] Made user feed contain public and unlisted activities
Closes #1501
See merge request pleroma/pleroma!2584
2020-05-26 10:56:40 +00:00
8f08384d80
another view for account in admin-fe status_show
2020-05-26 13:48:39 +03:00
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
2020-05-25 23:27:47 +03:00
e32b7ae044
Skip failing `:crypt` test on mac
2020-05-25 23:01:37 +04:00
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
2020-05-25 22:04:06 +04:00
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
2020-05-25 17:27:45 +02:00
2c25087d20
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 16:52:03 +02:00
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
2020-05-25 15:08:43 +02:00
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
2020-05-25 16:51:16 +04:00
f20dff451e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
2020-05-25 14:01:16 +02:00
5d5db7e5b7
StealEmojiPolicyTest: Clean up.
2020-05-25 14:00:18 +02:00
2dff376041
StealEmojiPolicyTest: Fix flaky test.
2020-05-25 13:58:14 +02:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
aeb0875025
StealEmojiPolicyTest: Fix flaky test.
2020-05-25 13:48:47 +02:00
ec470c4c77
Merge branch 'openapi/admin/status' into 'develop'
...
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
2020-05-25 11:40:54 +00:00
3bec0d2e50
Factory: Set users to be ap_enabled by default.
2020-05-25 12:59:42 +02:00
0c970a9d44
UserTest: Add test for user refreshing.
2020-05-25 12:49:38 +02:00
d0c26956da
User: Don't error out if we want to refresh a user but can't
2020-05-25 12:46:14 +02:00
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
2020-05-24 19:05:57 +00:00
ddbbefeb2e
Merge branch 'feature/configure-filename-truncate' into 'develop'
...
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
2020-05-22 16:05:35 +00:00
cc82229ba7
Add filename_display_max_length config
2020-05-22 18:19:25 +03:00
91c8467582
OStatusController: Add Mastodon activity compat route.
2020-05-22 17:11:59 +02:00
355aa3bdc7
ActivityPubController: Add Mastodon activity compat route.
2020-05-22 17:06:12 +02:00
8a4bd9e5d1
OStatusController: Add Mastodon compatibility route for objects.
2020-05-22 16:47:22 +02:00
1fa7aa9fc5
Merge branch 'emoji-react-better-errors' into 'develop'
...
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
2020-05-22 14:36:08 +00:00
ba106aa9c8
Fix notifications mark as read API
2020-05-22 18:15:36 +04:00
ca755f9a73
ActivityPubController: Add Mastodon compatibility route.
2020-05-22 16:15:29 +02:00
bcb549531f
EmojiReactionController: Return more appropriate error.
2020-05-22 14:38:28 +02:00
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
2020-05-22 05:47:53 +00:00
a57e7f3503
Merge branch '1113-op-mentioning' into 'develop'
...
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
2020-05-22 05:22:07 +00:00
3a1e810aaa
[ #2497 ] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
2020-05-21 21:47:32 +03:00
e0d1a942a6
Merge branch 'issue/1707' into 'develop'
...
[#1707 ] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
2020-05-21 14:32:49 +00:00
ab1154e13f
Merge branch 'admin-logo-upload' into 'develop'
...
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
2020-05-21 14:30:34 +00:00
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
2020-05-21 13:30:09 +00:00
283fb1e05b
Merge branch 'issue/749' into 'develop'
...
[#749 ] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
2020-05-21 13:27:44 +00:00
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
c4a5cead51
UploadTest: Fix test.
2020-05-21 15:17:39 +02:00
cc0d462e91
Attachments: Have the mediaType on the root, too.
2020-05-21 15:08:56 +02:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
bf1b221f94
Credo fixes for the credo god.
2020-05-21 14:12:32 +02:00
cdc6ba8d7b
AnnounceValidator: Check for announcability
2020-05-21 13:58:18 +02:00
c76267afb9
Credo fixes.
2020-05-21 13:31:52 +02:00
23e248694d
Announcements: Fix all tests.
2020-05-21 13:16:21 +02:00
d9d425708e
SideEffects: Builed out Announce effects.
2020-05-21 12:43:09 +02:00
9de9760aa6
Move status actions to AdminAPI.StatusController
2020-05-21 13:52:30 +04:00
9bc5e18ade
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
2020-05-21 08:06:57 +03:00
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
2020-05-21 04:41:42 +03:00
c96f425cb0
fixed `mix pleroma.instance gen`
2020-05-20 21:30:41 +03:00
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
39031f4860
Pipeline: Don't federate if federation is disabled.
2020-05-20 16:36:55 +02:00
e42bc5f557
Announcements: Handle through common pipeline.
2020-05-20 15:44:37 +02:00
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
2020-05-20 12:08:28 +00:00
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
2020-05-20 14:02:40 +02:00
423ea497bb
Merge branch 'feature/1734-user-deletion' into 'develop'
...
User deletion
Closes #1734
See merge request pleroma/pleroma!2493
2020-05-20 11:43:49 +00:00
eb5f428565
CommonAPI: Change public->private implicit addressing.
...
This will not add the OP to the `to` field anymore when going from
public to private.
2020-05-20 13:38:47 +02:00
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
2020-05-20 15:15:13 +04:00
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
2020-05-20 15:15:13 +04:00
9a5de0f454
Move reaction actions to EmojiReactionController
2020-05-20 15:15:13 +04:00
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
2020-05-20 10:53:54 +00:00
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
5a149e5788
Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
...
Add OpenAPI spec for PleromaAPI.ScrobbleController
See merge request pleroma/pleroma!2559
2020-05-20 04:00:46 +00:00
2328eff09c
UserTest: Hide warning in tests.
2020-05-19 14:36:13 +02:00
6609714d66
Move Scrobble views to ScrobbleView
2020-05-19 16:26:06 +04:00
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
2020-05-19 16:26:06 +04:00
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
2020-05-19 09:41:57 +00:00
41f8f17260
fix api/v1/accounts/update_credentials
2020-05-19 09:42:41 +03:00
5f0a3ac74d
added tests
2020-05-19 06:05:09 +03:00
d19c716770
AttachmentValidator: Handle empty mediatypes
2020-05-18 20:17:28 +02:00
fe5d423b43
Add OpenAPI spec for MascotController
2020-05-18 22:01:18 +04:00
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
2020-05-18 20:58:59 +04:00
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
2020-05-18 18:45:33 +02:00
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-18 18:38:32 +02:00
aef31c69df
Rename EmojiAPIController to EmojiPackController
2020-05-18 19:43:25 +04:00
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
2020-05-18 19:43:23 +04:00
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
2020-05-18 19:28:46 +04:00
0d5bce018d
AnnounceValidator: Validate for existing announce
2020-05-18 16:54:10 +02:00
17a8342c1e
ObjectValidators: Add basic Announce validator.
2020-05-18 16:45:11 +02:00
63ab2743ce
TransmogrifierTest: Fix tests.
2020-05-18 15:47:26 +02:00
7d381b16b7
Transmogrifier Test: Extract Announce handling.
2020-05-18 14:48:37 +02:00
215daabdb4
copyright update
2020-05-18 15:15:51 +03:00
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
2020-05-18 13:29:30 +02:00
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
2020-05-18 10:57:59 +00:00
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
0321a3e078
test naming fix
2020-05-18 10:34:50 +03:00
1671864d88
return :visible instead of boolean
2020-05-18 10:34:50 +03:00
b1aa402229
removing 410 status
2020-05-18 10:34:50 +03:00
e7bc2f980c
account visibility
2020-05-18 10:34:49 +03:00
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18 09:51:53 +03:00
baf051a59e
SideEffects: Don't update unread count for actor in chatmessages.
2020-05-17 12:22:26 +02:00
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-17 12:14:49 +02:00
8bfd9710ae
Pleroma Authenticator: Also update passwords here.
2020-05-17 11:53:17 +02:00
bfdd90f6d7
AuthenticationPlug: Also update crypt passwords.
2020-05-17 11:40:25 +02:00
baef35bcc8
Authentication Plug: Update bcrypt password on login.
2020-05-17 10:31:01 +02:00
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
2020-05-17 08:46:43 +03:00
d96f8f17e8
Merge branch 'features/mastoapi_v2_media' into 'develop'
...
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
2020-05-16 17:13:38 +00:00
d15aa9d950
Merge branch 'develop' into 'remove-twitter-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2020-05-16 17:07:09 +00:00
978ccf8f97
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-16 16:14:50 +03:00
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
2020-05-16 12:28:24 +02:00
3c29f4f957
returning partial chain
2020-05-15 16:16:02 +03:00
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-05-14 20:19:56 +03:00
e455ca3f3e
Merge branch 'feature/database-configuration-whitelist' into 'develop'
...
Database configuration whitelist
See merge request pleroma/pleroma!2522
2020-05-14 16:07:37 +00:00
4157c459b8
Merge branch 'bcrypt-auth' into 'develop'
...
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
2020-05-14 14:36:56 +00:00
bb03dfdb03
Do not require `description` in `update` action
2020-05-14 16:29:32 +04:00
0f885b4b86
Fix OpenAPI spec
2020-05-14 16:18:30 +04:00
20cbfb5cb5
Allow whitelisting whole groups
2020-05-14 12:43:53 +01:00
3342846ac2
ChatView: Add update_at field.
2020-05-14 13:20:28 +02:00
cb363f0183
MastodonAPI: /api/v2/media endpoints
2020-05-14 10:14:28 +02:00
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
2020-05-13 10:53:56 -05:00
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
2020-05-13 19:06:46 +04:00
da550be066
Merge branch 'fix/1742-random-failing-tests' into 'develop'
...
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
2020-05-13 13:38:32 +00:00
0f0acc740d
Chat: Allow posting without content if an attachment is present.
2020-05-13 15:31:28 +02:00
06cad239e5
InstanceView: Add pleroma chat messages to nodeinfo
2020-05-13 14:05:22 +02:00
3cff4e24cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-13 12:44:16 +02:00
bcadbf964a
Add OpenAPI spec for SuggestionController
2020-05-13 14:15:24 +04:00
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
2020-05-13 12:42:36 +03:00
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
fbe3d3aa5f
ignore order
2020-05-13 11:38:23 +03:00
2c356a4bac
don't use async with global mocks
2020-05-13 11:38:23 +03:00
12635bc156
don't use global mocks in setup callbacks
2020-05-13 11:38:22 +03:00
b962b24e6f
don't run in async if tests depend on env config
2020-05-13 11:38:22 +03:00
ec27f346ee
correct order for publised in assert
2020-05-13 11:38:22 +03:00
e0944dee99
make test fail everytime
2020-05-13 11:38:22 +03:00
712055612f
don't run tests which change env in async
2020-05-13 11:38:22 +03:00
4ba913d641
{:error, :enoent} s3 fix
...
s3 tests were executed before temp file was uploaded
2020-05-13 11:38:21 +03:00
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
7803a85d2c
Add OpenAPI spec for StatusController
2020-05-13 00:25:21 +04:00
a2fcfc78c9
Filter config descriptions by config whitelist
2020-05-12 21:07:33 +01:00
2b18b8a263
Merge branch 'streamer-get-topic' into 'develop'
...
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
68cca29dcf
Fix typo in test
2020-05-12 18:51:10 +02:00
24c8c13640
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
...
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
4cc71aad65
Merge branch '1748-remote-following-follower-count' into 'develop'
...
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
2020-05-12 16:44:58 +00:00
620247a015
Add database configuration whitelist
2020-05-12 17:12:27 +01:00
e6d8cacf2d
Expand and authorize streams in Streamer directly
2020-05-12 18:04:47 +02:00
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
2020-05-12 16:43:04 +02:00
e44166b510
Credo fixes.
2020-05-12 14:44:11 +02:00
ec72cba43e
Chat Controller: Add basic error handling.
2020-05-12 13:23:09 +02:00
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
b5aa204eb8
ChatController: Support deletion of chat messages.
2020-05-12 13:13:03 +02:00
dfb90a1fd6
Transmogrifier: Add tests for certain announces
2020-05-12 12:50:48 +02:00
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
2020-05-12 12:29:37 +02:00
d0ba1844b0
ActivityPub: Fix non-federating blocks.
2020-05-12 10:52:46 +02:00
63477d07ad
unsubscribes of friends when user deactivated
2020-05-12 08:14:42 +03:00
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
2020-05-11 23:21:53 +03:00
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-11 17:14:58 +02:00
679afb2de4
SideEffects test: Add test for favorite deletion.
2020-05-11 15:38:19 +02:00
5367a00257
Deletion: Handle the case of pruned objects.
2020-05-11 15:06:23 +02:00
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
fdb98715b8
Chat: Fix wrong query.
2020-05-11 10:58:14 +02:00
1b1dfb54eb
Credo fixes.
2020-05-10 13:28:05 +02:00
8d5597ff68
ChatController: Add GET /chats/:id
2020-05-10 13:26:14 +02:00
f335e1404a
ChatView: Add the last message to the view.
2020-05-10 13:00:01 +02:00
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-10 12:32:57 +02:00
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
2020-05-09 18:05:44 +03:00
5c368b004b
Fix refresh_counter_cache test
2020-05-09 11:49:54 +03:00
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
2020-05-08 23:06:47 +03:00
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
03529f6a05
Transmogrifier: Don't modify attachments for chats.
2020-05-08 18:26:35 +02:00
570940a3fd
Merge branch 'bugfix/fix-like-notifications' into 'develop'
...
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
2020-05-08 15:00:43 +00:00
287f781808
user deletion
2020-05-08 17:11:17 +03:00
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
2020-05-08 10:41:41 +00:00
7e9aaa0d02
Transmogrifier tests: Remove more double tests.
2020-05-08 11:43:07 +02:00
f1274c3326
Transmogrifier tests: Remove double tests.
2020-05-08 11:41:13 +02:00
4d71c4b805
fixed 'source' object in verify_credentials
2020-05-08 12:35:34 +03:00
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
2020-05-08 09:23:01 +00:00
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
...
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
2020-05-08 09:04:24 +00:00
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
...
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
2020-05-07 22:29:16 +00:00
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 18:53:34 +02:00
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
2020-05-07 14:28:10 +00:00
ea01e647df
Test Direct, Public, and Favorite notifications with privacy option
2020-05-07 09:13:43 -05:00
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 15:03:12 +02:00
788b7e7bbd
Merge fixes.
2020-05-07 14:52:37 +02:00
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
2020-05-07 14:45:20 +02:00
f57fa2a00d
Notifications: Simplify recipient calculation for some Activities.
...
Fixes the 'getting notfications for other people's posts' bug.
2020-05-07 12:43:30 +02:00
dc4a448f48
Add OpenAPI spec for SearchController
2020-05-07 14:04:48 +04:00
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
2020-05-07 09:19:45 +00:00
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
2020-05-07 09:13:32 +00:00
9491ba3e49
Streamer rework
2020-05-07 09:13:32 +00:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
a2580adc91
Hide the sender when privacy option is enabled
2020-05-06 16:42:27 -05:00
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 17:36:08 +02:00
473b0d9f3d
Merge branch 'feature/delete-validator' into 'develop'
...
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
2020-05-06 14:32:58 +00:00
fc9d0b6eec
Credo fixes.
2020-05-06 16:31:21 +02:00
20baa2eaf0
ChatMessages: Add attachments.
2020-05-06 16:12:36 +02:00
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
2020-05-06 15:08:38 +03:00
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
07e7c80bc9
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
...
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
2020-05-06 09:14:05 +00:00
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
c3f1ce80eb
Merge branch 'fix/1726-user-pagination' into 'develop'
...
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
2020-05-06 09:01:42 +00:00
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
9637cded21
Chat: Fix missing chat id on second 'get'
2020-05-05 20:07:47 +02:00
0a1394cc1a
Add OpenAPI spec for PollController
2020-05-05 20:14:22 +04:00
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
2020-05-05 18:02:24 +02:00
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
2020-05-05 16:42:34 +02:00
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
2020-05-05 16:17:09 +02:00
3a45952a3a
Add OpenAPI spec for ConversationController
2020-05-05 17:44:46 +04:00
46aae346f8
Move single used schemas to Filter operation schema
2020-05-05 17:41:01 +04:00
7e7a3e1544
Add OpenAPI spec for FilterController
2020-05-05 17:41:01 +04:00
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
2020-05-05 17:40:00 +04:00
88a14da817
Add OpenAPI spec for InstanceController
2020-05-05 17:24:16 +04:00
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
2020-05-05 15:08:41 +02:00
5ec6aad567
Add OpenAPI spec for ListController
2020-05-05 17:05:34 +04:00
babcae7130
Move single used schemas to Marker operation schema
2020-05-05 16:45:34 +04:00
8096565653
Add OpenAPI spec for MarkerController
2020-05-05 16:44:16 +04:00
d861b0790a
Add OpenAPI spec for SubscriptionController
2020-05-05 16:43:00 +04:00
f1da8882f9
UndoValidator: Add UndoValidator.
2020-05-05 14:17:47 +02:00
33f2976020
Merge branch 'feature/1737-magic-key-field' into 'develop'
...
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
2020-05-05 12:10:10 +00:00
8b2457bdbf
Transmogrifier tests: Extract Undo handling
2020-05-05 13:25:34 +02:00
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
db55dc9445
ActivityPub: Remove `react_with_emoji`.
2020-05-05 12:28:28 +02:00
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
2020-05-05 12:11:46 +02:00
142bf0957c
Transmogrifier: Extract EmojiReact tests.
2020-05-05 11:20:53 +02:00
c297667f16
Merge branch 'fix/issue-1729' into 'develop'
...
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
2020-05-05 08:21:39 +00:00
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-05 10:19:01 +02:00
6400998820
AP C2S: Restrict creation to `Note`s for now.
2020-05-05 10:12:37 +02:00
6a2905ccf0
WebFinger Test: Add back test.
2020-05-05 09:55:33 +02:00
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
2020-05-04 23:36:00 +02:00
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 19:24:04 +02:00
0f9bed022f
LikeValidator: Fix up context.
2020-05-04 17:18:17 +02:00
e03c301ebe
LikeValidator: Fix up missing recipients.
2020-05-04 17:08:31 +02:00
335aabc39c
Transmogrifier tests: Extract like tests.
2020-05-04 14:45:28 +02:00
ec24c70db8
ActivityPub: Don't fetch `Application` follower counts.
2020-05-04 14:22:54 +02:00
b04328c3de
ChatController: Add mark_as_read
2020-05-04 13:10:36 +02:00
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
a7966f2080
Webfinger: Request account info with the acct scheme
2020-05-03 13:48:01 +02:00
6c337489f4
Various testing fixes in relation to user deletion.
2020-05-03 13:01:19 +02:00
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-03 12:55:29 +02:00
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
2020-05-03 12:51:28 +02:00
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
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`
2020-05-02 19:05:13 +03:00
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
2020-05-02 18:28:04 +03:00
cf5ca7e45b
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
2020-05-02 07:39:19 +03:00
e7b1df7252
Fix sporadic test compilation failure caused by unused alias
2020-05-01 22:50:40 +03:00
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
a912f72a36
Signature: Handle non-ap ids in key ids.
...
Mastodon and Gab sometimes send the format `acct:name@server`.
2020-05-01 15:54:38 +02:00
aea781cbd8
credo fix
2020-05-01 16:31:05 +03:00
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
2020-05-01 13:09:36 +00:00
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
2020-05-01 12:48:56 +00:00
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
2020-05-01 12:38:46 +00:00
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
2020-05-01 14:30:39 +02:00
ebbd9c7f36
AdminAPIController: Refactor.
2020-05-01 14:22:39 +02:00
51f1dbf0a2
User deletion mix task: Use common pipeline.
2020-05-01 14:05:25 +02:00
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-01 13:35:42 +02:00
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
2020-05-01 13:34:47 +02:00
ecf37b46d2
pagination fix for service users filters
2020-05-01 14:31:24 +03:00
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
da4b79a56d
Merge branch 'tests/more-apc2s' into 'develop'
...
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
2020-04-30 22:19:26 +00:00
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
2020-04-30 22:44:31 +02:00
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
2020-04-30 21:23:18 +02:00
a81342a234
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
...
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
2020-04-30 18:38:52 +00:00
999d639873
ActivityPub: Remove `delete` function.
...
This is handled by the common pipeline now.
2020-04-30 20:13:47 +02:00
5da08c2b73
SideEffects: Fix comment
2020-04-30 19:53:30 +02:00
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
2020-04-30 19:47:13 +02:00
f1523f9acd
Increase tests on AP C2S
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-04-30 18:56:57 +02:00
ab60ee1776
SideEffects: On deletion, reduce the User note count.
2020-04-30 18:19:39 +02:00
3d0dc58e2e
SideEffectsTest: Test streaming.
2020-04-30 18:10:36 +02:00
315b773dd9
ObjectValidator: Refactor.
2020-04-30 17:58:31 +02:00
4500fdc04c
DeleteValidator: Add internal helper field after validation.
2020-04-30 17:53:02 +02:00
143353432a
StreamerTest: Separate deletion test.
2020-04-30 17:52:29 +02:00
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
2c4844237f
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
2020-04-30 18:19:51 +03:00
c9bfa51ea9
Credo fixes.
2020-04-30 15:58:37 +02:00
417eed4a2b
SideEffects: Handle deletions.
2020-04-30 15:57:27 +02:00
1fb383f368
DeleteValidator: Deleting a user is valid.
2020-04-30 15:42:30 +02:00
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
2020-04-30 15:26:23 +02:00
ddb757f743
emoji api packs changes in routes with docs update
2020-04-30 16:09:18 +03:00
342f55fb92
refactor emoji api with fixes
2020-04-30 15:45:52 +03:00
db184a8eb4
DeleteValidator: Mastodon sends unaddressed deletes.
2020-04-30 14:37:14 +02:00
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
bd219ba7e8
Transmogrifier Tests: Extract deletion tests.
2020-04-30 14:14:00 +02:00
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
2020-04-30 10:29:46 +00:00
9c1adb35de
Merge branch 'develop' into openapi/notifications
2020-04-30 13:52:07 +04:00
1898054da4
Merge branch 'develop' into openapi/reports
2020-04-30 13:51:27 +04:00
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
503de4b8df
ObjectValidator: Add validation for `Delete`s.
2020-04-29 19:09:51 +02:00
b8056e69e0
Object Validator Types: Add Recipients.
2020-04-29 19:08:08 +02:00
20587aa931
Chat message creation: Check actor.
2020-04-29 14:53:53 +02:00
a88734a0a2
Transmogrifier: Fetch missing actors for chatmessages.
2020-04-29 14:25:33 +02:00
e055b8d203
Pipeline: Always run common_pipeline in a transaction for now.
2020-04-29 13:45:50 +02:00
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-29 13:19:04 +02:00
7bd187bc5e
added test
2020-04-29 08:13:10 +03:00
5238ae3dd3
Add OpenAPI spec for NotificationController
2020-04-28 21:27:54 +04:00
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
dedffd100c
Pipeline: Unify, refactor, DRY.
2020-04-28 17:29:54 +02:00
abd0928229
CreateChatMessageValidator: Validate object existence
2020-04-28 16:45:28 +02:00
6aa116eca7
Create activity handling: Flip it and reverse it
...
Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object.
2020-04-28 16:26:19 +02:00
560f2c1979
Add OpenAPI spec for ReportController
2020-04-28 16:50:37 +04:00
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-28 14:16:21 +02:00
12bb7fc0dc
Merge branch 'openapi/account' into 'develop'
...
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
2020-04-28 11:57:16 +00:00
906cf53ab9
Recipient Type: Cast all elements as ObjectIDs.
2020-04-28 13:38:02 +02:00
764b4f95a8
Merge branch 'develop' into global-status-expiration
2020-04-28 14:13:53 +04:00
9994768312
Merge branch 'mongoose-secure' into 'develop'
...
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
2020-04-28 09:18:59 +00:00
ea5142b94b
convert markdown content to html
2020-04-28 09:32:43 +03:00
5ff20793e7
formating
2020-04-28 01:29:31 +02:00
dda65f7799
Move single used schemas to operation schema
2020-04-27 22:55:05 +04:00
d607b4d840
mongooseim test: explicitly set password for the deactivated used
2020-04-27 19:32:58 +02:00
935ca2c132
requested changes to mongoose test
2020-04-27 19:16:05 +02:00
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
2020-04-27 20:46:52 +04:00
5c7cc10917
add tests for deactivated users for mongoose auth
2020-04-27 18:31:00 +02:00
ad82a216ff
Chat API: Align more to Pleroma/Mastodon API.
2020-04-27 17:48:34 +02:00
49e673dfea
ChatView: Add actor_account_id
2020-04-27 16:08:03 +02:00
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
2020-04-27 14:28:08 +02:00
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
d2bbea1a80
ChatControllerTest: Use new schema testing functions.
2020-04-27 12:19:27 +02:00
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-27 12:07:08 +02:00
b4139cc547
[ #2409 ] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
2020-04-24 22:25:27 +03:00
8addbd948c
Merge branch 'bugfix/announce-race-condition' into 'develop'
...
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
2020-04-24 16:58:24 +00:00
c30b3b2dc5
Merge branch 'reply-filtering-refactor' into 'develop'
...
Reply filtering refactor
See merge request pleroma/pleroma!2424
2020-04-24 16:32:13 +00:00
d89cd0a197
Reply Filtering: Refactor.
2020-04-24 18:25:26 +02:00
d862c7156a
Merge branch 'openapi-improvements' into 'develop'
...
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
2020-04-24 16:10:43 +00:00
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
2020-04-24 16:52:38 +03:00
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
cb12585098
Announcements: Prevent race condition.
2020-04-24 14:37:53 +02:00
bbf8554c97
ActivitPub: Remove `like` function.
...
We don't need another way to build likes.
2020-04-24 13:48:13 +02:00
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
2020-04-24 15:16:15 +04:00
1e28d34592
ChatMessage: Correctly ingest emoji tags.
2020-04-23 16:19:49 +02:00
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-23 15:47:08 +02:00
1b5f8d19ee
Merge branch 'bugfix/repeating-announce' into 'develop'
...
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
2020-04-23 12:40:38 +00:00
7d38197894
CommonAPI: Don't make repeating announces possible
2020-04-23 13:33:30 +02:00
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
2020-04-23 11:22:30 +00:00
850377a7b8
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
...
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
2020-04-22 19:26:32 +00:00
af27e4dffd
Merge branch 'bugfix/1670-user-count' into 'develop'
...
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
2020-04-22 17:37:09 +00:00
f5bda09de6
Stats: Use `invisible` property for filtering.
2020-04-22 19:02:22 +02:00
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-22 20:00:51 +03:00
e62173dfc8
SideEffects: Run in transaction.
...
This fixes race conditions.
2020-04-22 18:40:53 +02:00
6c26feed01
Merge branch 'develop' into openapi/account
2020-04-22 20:18:12 +04:00
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
28f8fcf8b0
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
2020-04-22 15:46:04 +00:00
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
2020-04-22 15:33:04 +00:00
238058ecae
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
...
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
2020-04-22 15:31:51 +00:00
6db52c3b36
Fix Oban warning
...
Warning example:
[warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
2020-04-22 19:27:28 +04:00
e7771424a8
Fix blocks import
2020-04-22 19:27:28 +04:00
88b82e5c3e
Fix follow import
2020-04-22 19:27:28 +04:00
7a3a88a13e
Streamer: Stream boosts to the boosting user.
2020-04-22 17:21:13 +02:00
1855c597c2
Merge branch 'feature/voters-count' into 'develop'
...
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
2020-04-22 15:12:19 +00:00
2e73c19edc
Merge branch 'worker-messages' into 'develop'
...
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
2020-04-22 15:09:10 +00:00
8b88e2a6e2
Stats: Ignore internal users for user count.
2020-04-22 15:31:37 +02:00
5b39526198
AccountController: Use code 400 for self-follow.
2020-04-22 15:04:26 +02:00
69ecc39038
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
...
Fix migrate to db config
Closes #1689
See merge request pleroma/pleroma!2394
2020-04-22 12:41:31 +00:00
c10485db16
StatusController: Ignore nil scheduled_at parameters.
2020-04-22 14:26:19 +02:00
5102468d0f
Polls: Persist and show voters' count
2020-04-22 14:06:39 +02:00
923513b641
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
f719a5b23a
WebPush: Return proper values for jobs.
2020-04-22 13:28:34 +02:00
2e62a63749
ChatMessageValidator: Validation changes
...
Don't validate if the recipient is blocking the actor.
2020-04-22 12:48:52 +02:00
6c8390fa4d
ChatControllerTest: Credo fixes.
2020-04-21 18:32:30 +02:00
66c2eb670b
ChatController: Validate parameters.
2020-04-21 18:23:00 +02:00
97ad0c4597
Chats: Add API specs.
2020-04-21 17:51:06 +02:00
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 14:24:27 +02:00
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00:00
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 12:00:33 +02:00
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-21 08:20:50 +03:00
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
b5df4a98e4
ChatMessageView: Support emoji.
2020-04-20 14:38:53 +02:00
7e53da250e
ChatMessage: Support emoji.
2020-04-20 14:08:54 +02:00
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-20 12:37:17 +02:00
970b74383b
Credo fixes.
2020-04-20 12:29:19 +02:00
5b6818b3e5
CommonAPI: Obey local limit for chat messages.
2020-04-20 12:08:47 +02:00
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
2020-04-20 11:45:11 +02:00
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
163341857a
Improve OpenAPI errors
2020-04-17 19:27:22 +04:00
c845820911
Notifications: Create a chat notification.
2020-04-17 16:55:01 +02:00
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
26d9c83316
SideEffects: Test for notification creation.
2020-04-17 15:50:15 +02:00
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
2020-04-17 15:37:54 +02:00
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
d45ae64858
ChatController: Use OAuth scopes.
2020-04-17 13:04:46 +02:00
6cda360fea
don't restart postgrex
2020-04-17 12:45:13 +03:00
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
2020-04-17 09:02:10 +00:00
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
304ea09f4c
fix for logger configuration
2020-04-17 08:42:48 +03:00
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
f8c3ae7a62
ChatController: Handle pagination.
2020-04-16 18:43:31 +02:00
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
2020-04-16 17:50:24 +02:00
4d330d9df1
fix for use of published from different entities
2020-04-16 18:05:36 +03:00
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
41fdcb7282
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-16 15:28:08 +02:00
ca598e9c27
AccountView: Return user ap_id.
2020-04-16 15:27:35 +02:00
e2ced04917
ChatMessages: Better validation.
2020-04-16 15:21:47 +02:00
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
2020-04-16 12:56:29 +02:00
cf4ebba774
Cleanup SubscriptionController
2020-04-15 23:14:47 +04:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
2020-04-15 21:19:16 +03:00
6ace22b56a
Chat: Add views, don't return them in timeline queries.
2020-04-15 18:23:16 +02:00
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
2020-04-15 19:20:34 +03:00
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
2020-04-13 21:21:04 +04:00
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
2020-04-13 18:17:09 +04:00
ab185d3ea4
Add spec for AccountController.follows
2020-04-13 18:17:09 +04:00
68a979b824
Add specs for AccountController.block and AccountController.unblock
2020-04-13 18:17:08 +04:00
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
2020-04-13 18:17:08 +04:00
aa958a6dda
Add spec for AccountController.unfollow
2020-04-13 18:17:08 +04:00
854780c72b
Add spec for AccountController.follow
2020-04-13 18:17:08 +04:00
1b680a98ae
Add spec for AccountController.lists
2020-04-13 18:17:07 +04:00
Mark Felder
feld