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
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +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
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
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02: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
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
5677b21e82
clean up
2020-06-03 17:24:35 -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
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
2020-06-03 14:04:12 +00:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
8a43611e01
Use AdminAPI.StatusView in api/admin/users
2020-06-03 14:53:46 +04: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
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04: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
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +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
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00: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
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04: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
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
954acdda20
Add `account_activation_required` to /api/v1/instance
2020-05-31 11:36:49 -05: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
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
de0e262839
Fix argument error in streamer
...
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
2020-05-30 00:31:18 +09:00
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
2020-05-29 16:14:45 +02:00
2c18830d0d
Bugfix: router: allow basic_auth for outbox
2020-05-29 16:14:45 +02:00
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
3898dd69a6
SideEffects: Ensure a chat is present before streaming something out.
2020-05-29 16:05:02 +02:00
767ce8b803
StreamerView: Actually send Chats, not ChatMessages.
2020-05-29 16:02: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
228ff3760e
Use `User.is_internal_user?` instead
2020-05-29 19:07:05 +09:00
9df5b1e6ae
Don't make relay announce notification
2020-05-29 19:06:38 +09: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
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
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
95f6240889
Fix minor spelling error
2020-05-27 14:34:37 -05: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
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
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27 10:55:42 +00:00
c6290be682
Fix typo
2020-05-27 14:42:21 +04:00
b9e2678b9e
Merge branch 'fav-speedup' into 'develop'
...
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
2020-05-27 08:02:00 +00:00
7e13200869
ActivityPub: Change ordering to `nulls last` in favorites query
...
This makes it use our existing index and speeds up the query.
2020-05-27 09:46:12 +02:00
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
2020-05-26 13:45:54 +02: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
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
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
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
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +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
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
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
2020-05-22 15:44:10 +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
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
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +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
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
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
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
26f01744bc
Add `background_image` to `InstanceOperation`
2020-05-20 15:18:58 +04: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
8a6ddf26ac
InstanceOperation: Add background image to example
2020-05-20 12:12:07 +02:00
47ed9ee441
Fix summary
2020-05-19 17:29:58 +04: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
e4c720f14c
Fix typo
2020-05-19 14:59:50 +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
5735b5c8be
Fixed missing support for `with_muted` param in direct timeline.
2020-05-18 19:00:00 +03: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
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
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
c33a4315fb
updated docs
2020-05-18 06:48:19 +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
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
3f8d68bdf3
added example cache purge script
2020-05-17 05:56:20 +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
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
2020-05-16 12:28:24 +02:00
cb40602a16
added media proxy invalidation
2020-05-15 21:39:42 +03:00
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
1d18721a3c
Chats: Add updated_at to Schema and docs.
2020-05-15 13:18:41 +02:00
e090191d03
[OpenAPI] Mark all not required request fields as nullable
2020-05-15 14:55:41 +04: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
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
2020-05-14 08:57:38 -05: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
5c6f575315
Style fixes
2020-05-14 12:15:48 +01:00
099e314a1b
Add OpenAPISpex for MediaController
2020-05-14 12:13:25 +02:00
359d7b0a6d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:09:11 +00:00
1c2629328d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:07:09 +00: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
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
2020-05-13 18:56:45 +03:00
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
2020-05-13 19:06:46 +04:00
0f0acc740d
Chat: Allow posting without content if an attachment is present.
2020-05-13 15:31:28 +02:00
59b6d5f2aa
[ #2456 ] Changed `embed_relationships` param to `with_relationships`.
2020-05-13 15:08:07 +03: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
33b798425f
[ #2456 ] Post-merge fix.
2020-05-13 12:50:52 +03: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
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
79ad12064d
Fix format
2020-05-13 01:59:17 +04:00
cb1a3e196c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:43 +00:00
5a2333925c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:36 +00:00
822e9c09aa
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:21 +00:00
40646a7e0e
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:14:52 +00:00
0bb164a3e1
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:12:22 +00:00
648cc0d72d
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:09:26 +00: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
bfb48e3db6
[ #2456 ] OpenAPI: added `embed_relationships` param definition.
2020-05-12 20:55:01 +03: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
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
63a1a82f38
[ #2456 ] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12 19:14:35 +03: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
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
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
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
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-11 17:14:58 +02:00
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +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
8d5597ff68
ChatController: Add GET /chats/:id
2020-05-10 13:26:14 +02:00
172d9b1193
Chat: Add last_message to schema.
2020-05-10 13:08:01 +02:00
f335e1404a
ChatView: Add the last message to the view.
2020-05-10 13:00:01 +02:00
1054e89762
ChatOperation: Add media id to example
2020-05-10 12:30:24 +02:00
b960a9430d
[ #2456 ] credo fix.
2020-05-10 09:35:12 +03:00
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
ac4250a18c
[ #2456 ] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.
2020-05-09 19:03:07 +03:00
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
2020-05-09 18:05:44 +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
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
d0bf8cfb8f
Credo fixes.
2020-05-08 14:11:58 +02: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
4d71c4b805
fixed 'source' object in verify_credentials
2020-05-08 12:35:34 +03:00
6acbe45eb2
Builder: Extract common features of likes and reactions.
2020-05-08 11:30:31 +02: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
516ff945ce
Merge branch 'openapi/search' into 'develop'
...
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
2020-05-07 13:38:34 +00:00
eb1f2fcbc6
Streamer: Fix wrong argument order when rendering activities to authenticated user
...
Closes #1747
2020-05-07 16:13:24 +03:00
d11eea62b1
Credo fixes
2020-05-07 15:09:37 +02: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
3f867d8e9b
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
2020-05-07 10:48:09 +00:00
dc4a448f48
Add OpenAPI spec for SearchController
2020-05-07 14:04:48 +04:00
cdca62e8d4
Add schema for Tag
2020-05-07 14:04:07 +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
57736c1833
Privacy option affects all push notifications, not just Direct Messages
2020-05-06 16:30:05 -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
06c69c0a0a
Fix description
2020-05-06 14:18:19 +04: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
6ba25d1197
Add Attachment schema
2020-05-05 23:42:24 +04: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
32ca9f2c59
Render mastodon-like errors in FilterController
2020-05-05 17:41:16 +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
42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +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
f2bf4390f4
Fix descriptions for List API spec
2020-05-05 17:05:35 +04: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
5482a1f6ef
Merge branch 'openapi/validation-plug' into 'develop'
...
Ignore unexpected query params and ENUM values
Closes #1719
See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
d201527004
Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex
2020-05-05 11:17:44 +00: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
f21f538293
LikeValidator: Add defaults for recipients back in.
2020-05-05 10:38:59 +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
f897da2115
WebFinger: Add back in subscribe_address.
...
It's used for remote following.
2020-05-05 09:36:38 +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
e55fd530bc
Render better errors for ENUM validation
2020-05-04 22:33:34 +04:00
f070b5569c
Add a config option to enable strict validation
2020-05-04 22:33:05 +04:00
4b9ab67aa8
Ignore unexpected ENUM values in query string
2020-05-04 21:46:25 +04:00
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 19:24:04 +02:00
bfbff7d826
Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex
2020-05-04 16:38:23 +00:00
d08c63500b
Ignore unexpected query params
2020-05-04 20:16:44 +04:00
3559dd1085
Transmogrifier: Rely on LikeValidator.
2020-05-04 17:18:38 +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
13ab8defc0
Pipeline: Move transctioning to common pipeline.
2020-05-04 14:34:19 +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
30590cf46b
CommonAPI: Refactor for readability
2020-05-04 12:53:40 +02:00
57e6f2757a
ChatOperation: Make simple schema into inline schema
2020-05-04 12:47:23 +02:00
dcf535fe77
Credo fixes.
2020-05-04 11:32:11 +02:00
651935f137
Schemas: Refactor to our naming scheme.
2020-05-04 11:08:00 +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
9249742f13
Types.Recipients: Simplify reducer.
2020-05-03 15:28:24 +02:00
a35b76431c
Credo fixes.
2020-05-03 14:58:24 +02:00
a7966f2080
Webfinger: Request account info with the acct scheme
2020-05-03 13:48:01 +02:00
1974d0cc42
DeleteValidator: The deleted activity id is an object id
2020-05-03 13:02:57 +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
f20a1a27ef
DeleteValidator: Improve code readability
2020-05-03 12:19:01 +02:00
370e313e2d
Only update follower/following stats for actor types of users and bots.
2020-05-02 13:28:10 -05: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
0dfb5ad0ad
Merge branch 'bugfix/static-fe.css' into 'develop'
...
static-fe.css: Restore and move to /priv/static/static-fe
See merge request pleroma/pleroma!2458
2020-05-02 06:37:33 +00:00
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
2020-05-02 08:28:42 +02:00
c18ef452b0
OpenAPI: Add `follow_request` to notification types
...
Closes #1731
2020-05-01 23:14:20 +03:00
85105f7aae
OpenAPI: Remove max pagination limit from the spec
...
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
2020-05-01 21:33:34 +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
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
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
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03: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
60db58a1c6
Credo fixes.
2020-04-30 18:38:37 +02:00
ab60ee1776
SideEffects: On deletion, reduce the User note count.
2020-04-30 18:19:39 +02:00
c832d96fc9
SideEffects: Stream out deletes.
2020-04-30 17:58:09 +02:00
4500fdc04c
DeleteValidator: Add internal helper field after validation.
2020-04-30 17:53:02 +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
4a487e4d0b
fix for auth check
2020-04-30 17:50:57 +03:00
14c6672193
AP C2S: Use common pipelin for deletes.
2020-04-30 16:49:41 +02:00
fdd8e7f276
CommonAPI: Use common pipeline for deletions.
2020-04-30 16:15:38 +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
36abeedf9f
error rename
2020-04-30 16:09:22 +03: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
42ce7c5164
ObjectValidator: Add actor fetcher.
2020-04-30 14:13:08 +02:00
64bb72f98a
Typo fix.
2020-04-30 13:57:47 +02:00
ad2182bbd2
Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex
2020-04-30 11:38:26 +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
lain
feld