Fawksie/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
10625 commits 6 branches 75 tags 300 MiB
Commit graph

337 commits

Author SHA1 Message Date
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies 2020-05-18 20:58:59 +04:00
lain
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
lain
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
Alexander Strizhakov
0321a3e078
test naming fix 2020-05-18 10:34:50 +03:00
Alexander Strizhakov
b1aa402229
removing 410 status 2020-05-18 10:34:50 +03:00
Alexander Strizhakov
e7bc2f980c
account visibility 2020-05-18 10:34:49 +03:00
Ivan Tashkinov
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
lain
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
Ivan Tashkinov
af9dfdce6b MediaController OAuth scope assignments fix. 
Typo fix (`def get_media` instead of `def show`).
 2020-05-17 08:46:43 +03:00
Egor Kislitsyn
bb03dfdb03
Do not require description in update action 2020-05-14 16:29:32 +04:00
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec 2020-05-14 16:18:30 +04:00
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints 2020-05-14 10:14:28 +02:00
lain
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
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
Ivan Tashkinov
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
lain
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
lain
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
Alexander Strizhakov
12635bc156
don't use global mocks in setup callbacks 2020-05-13 11:38:22 +03:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
lain
dfb90a1fd6 Transmogrifier: Add tests for certain announces 2020-05-12 12:50:48 +02:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
Ivan Tashkinov
14a49a0483 [#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications. 2020-05-09 18:05:44 +03:00
Ivan Tashkinov
b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
Maksim Pechnikov
b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController 2020-05-07 14:04:48 +04:00
lain
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
Maksim Pechnikov
bd261309cc added unread_notifications_count for /api/v1/accounts/verify_credentials 2020-05-06 15:08:38 +03:00
Maksim Pechnikov
8b97b6f5ba Merge branch 'develop' into issue/1276-2 2020-05-06 14:47:50 +03:00
lain
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
lain
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
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
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
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
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
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
Maksim Pechnikov
fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03: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
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
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
Maksim Pechnikov
a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors 2020-04-29 21:26:07 +04:00
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController 2020-04-28 21:27:54 +04:00
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController 2020-04-28 16:50:37 +04:00
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema 2020-04-27 22:55:05 +04: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
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
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples 2020-04-24 15:16:15 +04: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
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account 2020-04-22 20:18:12 +04:00
lain
5b39526198 AccountController: Use code 400 for self-follow. 2020-04-22 15:04:26 +02:00
lain
c10485db16 StatusController: Ignore nil scheduled_at parameters. 2020-04-22 14:26:19 +02:00
lain
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
Egor Kislitsyn
736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
lain
28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop' 
Cleanup SubscriptionController

See merge request pleroma/pleroma!2393
 2020-04-20 13:01:17 +00:00
Egor Kislitsyn
163341857a
Improve OpenAPI errors 2020-04-17 19:27:22 +04:00
Haelwenn
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
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController 2020-04-15 23:14:47 +04:00
Maksim Pechnikov
4b3b1fec4e added an endpoint for getting unread notification count 2020-04-15 21:19:43 +03:00
Ivan Tashkinov
bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
lain
4576520461 Revert "Merge branch 'issue/1276' into 'develop'" 
This reverts merge request !1877
 2020-04-14 16:32:22 +00:00
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account 2020-04-14 19:45:22 +04:00
Haelwenn
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
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController 2020-04-13 21:21:04 +04:00
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements 2020-04-13 18:17:09 +04:00
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows 2020-04-13 18:17:09 +04:00
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock 2020-04-13 18:17:08 +04:00
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute 2020-04-13 18:17:08 +04:00
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow 2020-04-13 18:17:08 +04:00
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow 2020-04-13 18:17:08 +04:00
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists 2020-04-13 18:17:07 +04:00
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following 2020-04-13 18:17:07 +04:00
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers 2020-04-13 18:17:07 +04:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses 2020-04-13 18:17:07 +04:00
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships 2020-04-13 18:16:07 +04:00
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope 2020-04-13 18:16:07 +04:00
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials 2020-04-13 18:16:07 +04:00
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create 2020-04-13 17:38:59 +04:00
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
rinpatch
5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-04-11 19:46:04 +00:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04:00
lain
d2e21fbc96 Merge branch 'open-api' into 'develop' 
Add OpenAPI

Closes pleroma-meta#19

See merge request pleroma/pleroma!2345
 2020-04-09 09:48:56 +00:00
rinpatch
d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation 
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
 2020-04-08 22:58:31 +03:00
rinpatch
dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop' 
Use Pleroma.Formatter.linkify/2 instead

See merge request pleroma/pleroma!2352
 2020-04-07 11:41:10 +00:00