itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
9499 commits 3 branches 2 tags 276 MiB
Commit graph

5918 commits

Author SHA1 Message Date
lain
a88734a0a2 Transmogrifier: Fetch missing actors for chatmessages. 2020-04-29 14:25:33 +02:00
lain
53e3063bd0 Transmogrifier: Remove ChatMessageHandling module. 2020-04-29 13:52:23 +02:00
lain
e055b8d203 Pipeline: Always run common_pipeline in a transaction for now. 2020-04-29 13:45:50 +02:00
lain
67659afe48 ChatOperation: Refactor. 2020-04-29 13:34:43 +02:00
lain
0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-29 13:19:04 +02:00
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController 2020-04-28 21:27:54 +04:00
Ivan Tashkinov
4c0e53367a [#2349] Post-merge fix. 2020-04-28 20:04:25 +03: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
lain
dedffd100c Pipeline: Unify, refactor, DRY. 2020-04-28 17:29:54 +02:00
lain
abd0928229 CreateChatMessageValidator: Validate object existence 2020-04-28 16:45:28 +02:00
lain
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
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController 2020-04-28 16:50:37 +04:00
lain
b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-28 14:16:21 +02: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
f8e56d4271 SideEffects: Use Object.normalize to get the object. 2020-04-28 13:43:58 +02:00
lain
906cf53ab9 Recipient Type: Cast all elements as ObjectIDs. 2020-04-28 13:38:02 +02: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
cc1e2e8d0f requested changes to mongoose_im_controller.ex 2020-04-27 19:11:03 +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
fence
a626cb682c secure mongoose auth endpoint 2020-04-27 17:55:33 +02:00
lain
3d040b1a87 Credo fixes. 2020-04-27 17:55:29 +02:00
lain
ad82a216ff Chat API: Align more to Pleroma/Mastodon API. 2020-04-27 17:48:34 +02:00
lain
49e673dfea ChatView: Add actor_account_id 2020-04-27 16:08:03 +02:00
lain
3635a9c9c2 InstanceController: Add extensions to /api/v1/instance 2020-04-27 14:28:08 +02:00
lain
00e956528b Credo fixes. 2020-04-27 14:02:11 +02:00
lain
15ba3700af Chat Schemas: Inline unimportant Schemas. 2020-04-27 12:45:59 +02:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account 2020-04-27 14:33:00 +04:00
lain
c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-27 12:07:08 +02:00
Alex Gleason
1bd9749a8f
Let blob: pass CSP 2020-04-26 00:29:42 -05:00
Ivan Tashkinov
e16437ff19 [#1706] Formatting fix. 2020-04-25 18:42:08 +03:00
Ivan Tashkinov
0d05e1fe39 [#1706] Prevented error on unresolved activity actors for timeline actions. 2020-04-25 18:24:10 +03: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
1df6af2a4c Credo fixes. 2020-04-24 13:59:48 +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
Ivan Tashkinov
89f38d94c7 [#2409] Fixed before-action callback results persistence. 2020-04-23 21:47:33 +03:00
lain
1e28d34592 ChatMessage: Correctly ingest emoji tags. 2020-04-23 16:19:49 +02:00
lain
ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-23 15:47:08 +02: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
lain
1bcbdc7a9f SideEffects: Use less cryptic syntax. 2020-04-22 21:21:21 +02: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
1b06a27746
Update Flake ID description 2020-04-22 20:20:19 +04: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
Ivan Tashkinov
2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. 2020-04-22 18:50:25 +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
Ivan Tashkinov
b03aeae8b9 Apply suggestion to lib/pleroma/notification.ex 2020-04-22 15:31:41 +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
Karol Kosek
452072ec95
static_fe: Add microformats2 classes 2020-04-22 16:02:40 +02: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
lain
2e62a63749 ChatMessageValidator: Validation changes 
Don't validate if the recipient is blocking the actor.
 2020-04-22 12:48:52 +02:00
Egor Kislitsyn
11433cd38d
Add OpenAPI schema for FlakeID 2020-04-21 23:54:45 +04:00
Egor Kislitsyn
f0238d010a
Improve OpenAPI schema 
- Removes unneeded wrapping in examples
- Adds `:format` attributes
 2020-04-21 23:30:24 +04:00
lain
66c2eb670b ChatController: Validate parameters. 2020-04-21 18:23:00 +02:00
lain
97ad0c4597 Chats: Add API specs. 2020-04-21 17:51:06 +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
lain
a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 14:24:27 +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
lain
5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 12:00:33 +02:00
Ivan Tashkinov
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
rinpatch
e57c1b60e4 Merge branch 'accept-deletes' into 'develop' 
Always accept deletions through SimplePolicy, add :reject_deletes group

See merge request pleroma/pleroma!2371
 2020-04-20 18:30:01 +00:00
rinpatch
7e456ac7f6 Merge branch 'router-cleanup' into 'develop' 
Cleanup and DRY the Router

See merge request pleroma/pleroma!2406
 2020-04-20 18:29:03 +00:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
Egor Kislitsyn
ed3974af24 Add OpenAPI spec for AccountController.identity_proofs operation 2020-04-20 18:40:02 +04: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
Ilja
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
Egor Kislitsyn
258d897579 Cleanup and DRY the Router 2020-04-20 16:39:20 +04:00
lain
b5df4a98e4 ChatMessageView: Support emoji. 2020-04-20 14:38:53 +02:00
lain
7e53da250e ChatMessage: Support emoji. 2020-04-20 14:08:54 +02:00
lain
b836d3d104 ChatMessageValidator: Require published field 2020-04-20 13:14:59 +02:00
lain
139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
lain
970b74383b Credo fixes. 2020-04-20 12:29:19 +02:00
lain
5b6818b3e5 CommonAPI: Obey local limit for chat messages. 2020-04-20 12:08:47 +02:00
lain
ce23673ca1 ChatMessageValidator: Don't validate messages that are too long. 2020-04-20 11:45:11 +02:00
rinpatch
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
Haelwenn
79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
 2020-04-18 06:59:23 +00:00
Haelwenn
24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex 2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
Ivan Tashkinov
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
Egor Kislitsyn
163341857a
Improve OpenAPI errors 2020-04-17 19:27:22 +04:00
lain
c845820911 Notifications: Create a chat notification. 2020-04-17 16:55:01 +02:00
rinpatch
e0d7847bc5 Merge branch 'sideeffects-test' into 'develop' 
SideEffects: Test for notification creation.

See merge request pleroma/pleroma!2399
 2020-04-17 14:03:04 +00:00
lain
8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
lain
26d9c83316 SideEffects: Test for notification creation. 2020-04-17 15:50:15 +02:00
rinpatch
6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398
 2020-04-17 13:40:25 +00:00
lain
372614cfd3 ChatView: Add a mastodon api representation of the recipient. 2020-04-17 15:37:54 +02:00
Ivan Tashkinov
6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications 
# Conflicts:
#	CHANGELOG.md
 2020-04-17 16:23:58 +03:00
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
lain
d45ae64858 ChatController: Use OAuth scopes. 2020-04-17 13:04:46 +02:00
Alexander Strizhakov
6cda360fea
don't restart postgrex 2020-04-17 12:45:13 +03: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
Haelwenn
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
Haelwenn
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
Alexander Strizhakov
304ea09f4c
fix for logger configuration 2020-04-17 08:42:48 +03:00
rinpatch
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
rinpatch
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
rinpatch
942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
lain
f8c3ae7a62 ChatController: Handle pagination. 2020-04-16 18:43:31 +02:00
lain
e983f70884 ChatMessagesHandling: Strip HTML of incoming messages. 2020-04-16 17:50:24 +02:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities 2020-04-16 18:05:36 +03:00
rinpatch
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
rinpatch
77ee64b993 user: remove blank? 2020-04-16 17:54:57 +03:00
lain
41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-16 15:28:08 +02:00
lain
ca598e9c27 AccountView: Return user ap_id. 2020-04-16 15:27:35 +02:00
lain
e2ced04917 ChatMessages: Better validation. 2020-04-16 15:21:47 +02:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
lain
3d4eca5dd4 CommonAPI: Escape HTML for chat messages. 2020-04-16 12:56:29 +02:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController 2020-04-15 23:14:47 +04:00
Ivan Tashkinov
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
lain
6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02: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
Haelwenn
b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop' 
remote_ip plug adds remote_ip_found flag

Closes #1659

See merge request pleroma/pleroma!2390
 2020-04-15 15:26:55 +00:00
Egor Kislitsyn
65f04b7806
Fix credo warning 2020-04-15 17:16:32 +04:00
Egor Kislitsyn
16f4787bf7
Add a TODO note 2020-04-15 16:51:37 +04:00
Egor Kislitsyn
0e647ff55a
Abstract pagination params in OpenAPI spec 2020-04-15 16:45:45 +04:00
lain
44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
Egor Kislitsyn
8ed162b655 Fix formatting 2020-04-15 15:57:00 +04:00