lain
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
lain
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
lain
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
lain
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
lain
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
lain
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
lain
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
lain
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
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
Egor Kislitsyn
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
Egor Kislitsyn
0a1394cc1a
Add OpenAPI spec for PollController
2020-05-05 20:14:22 +04:00
lain
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
2020-05-05 18:02:24 +02:00
lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
2020-05-05 16:42:34 +02:00
lain
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
2020-05-05 16:17:09 +02:00
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
2020-05-05 17:44:46 +04:00
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
2020-05-05 17:41:01 +04:00
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
2020-05-05 17:41:01 +04:00
lain
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
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
2020-05-05 17:40:00 +04:00
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
2020-05-05 17:24:16 +04:00
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
lain
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
2020-05-05 15:08:41 +02:00
Egor Kislitsyn
5ec6aad567
Add OpenAPI spec for ListController
2020-05-05 17:05:34 +04:00
Egor Kislitsyn
babcae7130
Move single used schemas to Marker operation schema
2020-05-05 16:45:34 +04:00
Egor Kislitsyn
8096565653
Add OpenAPI spec for MarkerController
2020-05-05 16:44:16 +04:00
Egor Kislitsyn
d861b0790a
Add OpenAPI spec for SubscriptionController
2020-05-05 16:43:00 +04:00
lain
f1da8882f9
UndoValidator: Add UndoValidator.
2020-05-05 14:17:47 +02:00
rinpatch
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
lain
8b2457bdbf
Transmogrifier tests: Extract Undo handling
2020-05-05 13:25:34 +02:00
lain
db55dc9445
ActivityPub: Remove react_with_emoji
.
2020-05-05 12:28:28 +02:00
lain
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
2020-05-05 12:11:46 +02:00
lain
142bf0957c
Transmogrifier: Extract EmojiReact tests.
2020-05-05 11:20:53 +02:00
lain
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
lain
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-05 10:19:01 +02:00
lain
6400998820
AP C2S: Restrict creation to Note
s for now.
2020-05-05 10:12:37 +02:00
lain
6a2905ccf0
WebFinger Test: Add back test.
2020-05-05 09:55:33 +02:00
lain
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
2020-05-04 23:36:00 +02:00
lain
0f9bed022f
LikeValidator: Fix up context.
2020-05-04 17:18:17 +02:00
lain
e03c301ebe
LikeValidator: Fix up missing recipients.
2020-05-04 17:08:31 +02:00
lain
335aabc39c
Transmogrifier tests: Extract like tests.
2020-05-04 14:45:28 +02:00
lain
ec24c70db8
ActivityPub: Don't fetch Application
follower counts.
2020-05-04 14:22:54 +02:00
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
lain
a7966f2080
Webfinger: Request account info with the acct scheme
2020-05-03 13:48:01 +02:00
lain
6c337489f4
Various testing fixes in relation to user deletion.
2020-05-03 13:01:19 +02:00
lain
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-03 12:55:29 +02:00
lain
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
2020-05-03 12:51:28 +02:00
rinpatch
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
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize
2020-05-02 19:05:13 +03:00
rinpatch
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
Ivan Tashkinov
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
Ivan Tashkinov
cf5ca7e45b
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
2020-05-02 07:39:19 +03:00
rinpatch
e7b1df7252
Fix sporadic test compilation failure caused by unused alias
2020-05-01 22:50:40 +03:00
Ivan Tashkinov
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
lain
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
Alexander Strizhakov
aea781cbd8
credo fix
2020-05-01 16:31:05 +03:00
lain
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
lain
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
lain
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
lain
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
2020-05-01 14:30:39 +02:00
lain
ebbd9c7f36
AdminAPIController: Refactor.
2020-05-01 14:22:39 +02:00
lain
51f1dbf0a2
User deletion mix task: Use common pipeline.
2020-05-01 14:05:25 +02:00
lain
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
lain
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-01 13:35:42 +02:00
lain
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
2020-05-01 13:34:47 +02:00
Alexander Strizhakov
ecf37b46d2
pagination fix for service users filters
2020-05-01 14:31:24 +03:00
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
lain
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
Lain Soykaf
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
2020-04-30 22:44:31 +02:00
lain
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
2020-04-30 21:23:18 +02:00
lain
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
lain
999d639873
ActivityPub: Remove delete
function.
...
This is handled by the common pipeline now.
2020-04-30 20:13:47 +02:00
lain
5da08c2b73
SideEffects: Fix comment
2020-04-30 19:53:30 +02:00
lain
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
2020-04-30 19:47:13 +02:00
Haelwenn (lanodan) Monnier
f1523f9acd
Increase tests on AP C2S
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-04-30 18:56:57 +02:00
lain
ab60ee1776
SideEffects: On deletion, reduce the User note count.
2020-04-30 18:19:39 +02:00
lain
3d0dc58e2e
SideEffectsTest: Test streaming.
2020-04-30 18:10:36 +02:00
lain
315b773dd9
ObjectValidator: Refactor.
2020-04-30 17:58:31 +02:00
lain
4500fdc04c
DeleteValidator: Add internal helper field after validation.
2020-04-30 17:53:02 +02:00
lain
143353432a
StreamerTest: Separate deletion test.
2020-04-30 17:52:29 +02:00
eugenijm
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
Ivan Tashkinov
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
lain
c9bfa51ea9
Credo fixes.
2020-04-30 15:58:37 +02:00
lain
417eed4a2b
SideEffects: Handle deletions.
2020-04-30 15:57:27 +02:00
lain
1fb383f368
DeleteValidator: Deleting a user is valid.
2020-04-30 15:42:30 +02:00
lain
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
2020-04-30 15:26:23 +02:00
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
2020-04-30 16:09:18 +03:00
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes
2020-04-30 15:45:52 +03:00
lain
db184a8eb4
DeleteValidator: Mastodon sends unaddressed deletes.
2020-04-30 14:37:14 +02:00
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
lain
bd219ba7e8
Transmogrifier Tests: Extract deletion tests.
2020-04-30 14:14:00 +02:00
lain
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
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
2020-04-30 13:52:07 +04:00
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
2020-04-30 13:51:27 +04:00
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
lain
503de4b8df
ObjectValidator: Add validation for Delete
s.
2020-04-29 19:09:51 +02:00
lain
b8056e69e0
Object Validator Types: Add Recipients.
2020-04-29 19:08:08 +02:00
Maksim Pechnikov
7bd187bc5e
added test
2020-04-29 08:13:10 +03:00
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
2020-04-28 21:27:54 +04:00
Ivan Tashkinov
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
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
2020-04-28 16:50:37 +04:00
rinpatch
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
lain
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
Maksim Pechnikov
ea5142b94b
convert markdown content to html
2020-04-28 09:32:43 +03:00
fence
5ff20793e7
formating
2020-04-28 01:29:31 +02:00
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
2020-04-27 22:55:05 +04:00
fence
d607b4d840
mongooseim test: explicitly set password for the deactivated used
2020-04-27 19:32:58 +02:00
fence
935ca2c132
requested changes to mongoose test
2020-04-27 19:16:05 +02:00
Egor Kislitsyn
2efc00b3cf
Use json_response_and_validate_schema/2
in tests to validate OpenAPI schema
2020-04-27 20:46:52 +04:00
fence
5c7cc10917
add tests for deactivated users for mongoose auth
2020-04-27 18:31:00 +02:00
lain
3635a9c9c2
InstanceController: Add extensions to /api/v1/instance
2020-04-27 14:28:08 +02:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
Ivan Tashkinov
b4139cc547
[ #2409 ] Made GET /api/v1/accounts/:id/favourites
auth-optional, adjusted tests.
2020-04-24 22:25:27 +03:00
rinpatch
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
lain
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
lain
d89cd0a197
Reply Filtering: Refactor.
2020-04-24 18:25:26 +02:00
lain
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
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
2020-04-24 16:52:38 +03:00
Alexander
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
lain
cb12585098
Announcements: Prevent race condition.
2020-04-24 14:37:53 +02:00
lain
bbf8554c97
ActivitPub: Remove like
function.
...
We don't need another way to build likes.
2020-04-24 13:48:13 +02:00
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
2020-04-24 15:16:15 +04:00
rinpatch
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
lain
7d38197894
CommonAPI: Don't make repeating announces possible
2020-04-23 13:33:30 +02:00
rinpatch
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
lain
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
Haelwenn
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
lain
f5bda09de6
Stats: Use invisible
property for filtering.
2020-04-22 19:02:22 +02:00
Ivan Tashkinov
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
lain
e62173dfc8
SideEffects: Run in transaction.
...
This fixes race conditions.
2020-04-22 18:40:53 +02:00
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
2020-04-22 20:18:12 +04:00
Ivan Tashkinov
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
Haelwenn
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
Haelwenn
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
Haelwenn
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
Egor Kislitsyn
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
Egor Kislitsyn
e7771424a8
Fix blocks import
2020-04-22 19:27:28 +04:00
Egor Kislitsyn
88b82e5c3e
Fix follow import
2020-04-22 19:27:28 +04:00
lain
7a3a88a13e
Streamer: Stream boosts to the boosting user.
2020-04-22 17:21:13 +02:00
Haelwenn
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
Haelwenn
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
lain
8b88e2a6e2
Stats: Ignore internal users for user count.
2020-04-22 15:31:37 +02:00
lain
5b39526198
AccountController: Use code 400 for self-follow.
2020-04-22 15:04:26 +02:00
lain
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
lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
2020-04-22 14:26:19 +02:00
lain
5102468d0f
Polls: Persist and show voters' count
2020-04-22 14:06:39 +02:00
lain
923513b641
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
lain
f719a5b23a
WebPush: Return proper values for jobs.
2020-04-22 13:28:34 +02:00
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00