worst/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
9721 commits 4 branches 72 tags 292 MiB
Commit graph

2754 commits

Author SHA1 Message Date
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
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
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 Deletes. 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
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
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
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
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
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
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
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
26d9c83316 SideEffects: Test for notification creation. 2020-04-17 15:50:15 +02: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
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
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
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
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03: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
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
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
feld
bf3afbc1a1 Merge branch 'logger-configuration' into 'develop' 
Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365
 2020-04-14 15:11:25 +00:00
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
278b3fa0ad
Add spec for AccountController.show 2020-04-13 18:16: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
f80116125f
Add spec for AccountController.verify_credentials 2020-04-13 17:38:59 +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
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe 2020-04-13 08:56:28 +03:00
Maksim Pechnikov
c5c09fc61b fix mediaType of object 2020-04-13 07:02:57 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy 2020-04-12 20:26:35 -05: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
rinpatch
c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation 
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).

Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.

I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
 2020-04-11 22:31:46 +03:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04:00
Haelwenn
4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop' 
bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316
 2020-04-10 04:31:13 +00:00
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data 2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields 2020-04-10 06:20:02 +02:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04:00
lain
b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' 
Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344
 2020-04-09 10:42:43 +00:00
Alexander Strizhakov
9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:50 +00:00
Alexander Strizhakov
365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:44 +00: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
Maksim Pechnikov
2b7d7bbd2d Merge branch 'develop' into issue/1276 2020-04-07 14:09:43 +03:00
kPherox
06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs 2020-04-07 08:44:53 +00:00
lain
1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' 
Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313
 2020-04-06 12:51:35 +00:00
lain
349b9d86dc Merge branch 'remake-remodel-2' into 'develop' 
Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315
 2020-04-06 11:59:01 +00:00
Ivan Tashkinov
fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled). 2020-04-06 10:20:44 +03:00
Ivan Tashkinov
3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses 
# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex
 2020-04-02 19:38:39 +03:00
Ivan Tashkinov
aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests. 2020-04-02 19:23:30 +03:00
Maksim Pechnikov
dbcfac11b4 Merge branch 'develop' into issue/1276 2020-04-02 14:47:17 +03:00
Egor Kislitsyn
23219e6fb3
Add OpenAPI 2020-04-01 23:13:08 +04:00
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint 2020-04-01 20:26:33 +03:00
Ivan Tashkinov
98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 
# Conflicts:
#	CHANGELOG.md
 2020-04-01 20:08:14 +03:00
feld
ef7d2b0f11 Merge branch 'gun' into 'develop' 
Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
 2020-04-01 17:05:09 +00:00
Ivan Tashkinov
2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. 
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
 2020-04-01 19:49:09 +03:00
rinpatch
bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop' 
Restrict remote users from indexing

Closes #1601

See merge request pleroma/pleroma!2341
 2020-04-01 12:55:52 +00:00
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing 2020-04-01 09:57:12 +03:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1 2020-03-31 23:55:29 +02:00
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1 2020-03-31 23:54:20 +02:00
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels 2020-03-31 23:54:20 +02:00
kPherox
dbf9d719f9
split test for update profile fields 2020-04-01 02:52:30 +09:00
lain
aebec1bac9 Validator Test: Small refactor. 2020-03-31 17:47:34 +02:00
Alexander Strizhakov
df5f89c0d6
test for default features and changelog entry 2020-03-31 18:22:25 +03:00
lain
643f15e77b Validators: ObjectID is an http uri. 2020-03-31 16:11:38 +02:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint 2020-03-30 13:51:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Haelwenn
e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop' 
Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
 2020-03-29 19:18:22 +00:00
Maksim Pechnikov
dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
Ivan Tashkinov
dfbc05d496 Misc refactoring / tweaks (ThreadMute.exists?/2). 2020-03-27 08:01:03 +03:00
lain
0adaab8e75 Bump copyright dates. 2020-03-26 15:37:42 +01:00
Ivan Tashkinov
ff1baae7e9 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering 2020-03-25 20:41:17 +03:00
Ivan Tashkinov
460e41585c Further preloading (more endpoints), refactoring, tests. 2020-03-25 20:33:34 +03:00
Egor Kislitsyn
9081a071ee
Add a test for accounts/update_credentials 2020-03-25 18:46:17 +04:00
Haelwenn (lanodan) Monnier
03a18cf037
node_info_test: Bump default features list 2020-03-24 20:39:19 +01:00
Haelwenn (lanodan) Monnier
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions 2020-03-24 20:32:49 +01:00
Haelwenn (lanodan) Monnier
64165d1df9
node_info_test.exs: Add test on the default feature list 2020-03-24 20:21:27 +01:00
Ivan Tashkinov
8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering 2020-03-24 22:15:37 +03:00
Ivan Tashkinov
13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related). 2020-03-24 22:14:26 +03:00
feld
8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop' 
Fix activity deletion

Closes #1640

See merge request pleroma/pleroma!2328
 2020-03-24 19:10:32 +00:00
lain
1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop' 
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`

See merge request pleroma/pleroma!2149
 2020-03-24 17:34:13 +00:00
Egor Kislitsyn
4a2538967c
Support pagination in conversations 2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion 2020-03-24 17:38:18 +04:00
lain
eec1fcaf55 Home timeline tests: Add failing test for relationships 2020-03-23 15:58:55 +01:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
 2020-03-22 16:41:01 +01:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
lain
d74405fc1a Merge branch 'fix-feed-pagination' into 'develop' 
Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281
 2020-03-20 16:57:51 +00:00
Ivan Tashkinov
1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). 2020-03-20 18:33:00 +03:00
Ivan Tashkinov
0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements 
# Conflicts:
#	test/web/mastodon_api/controllers/account_controller_test.exs
 2020-03-20 18:08:23 +03:00
lain
6c1232b486 NotificationController: Fix test. 2020-03-20 15:00:28 +01:00
lain
1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-20 14:52:58 +01:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity 2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR 2020-03-19 19:10:03 +01:00
lain
3c2c32b460 Merge branch 'remake-remodel' into develop 2020-03-19 18:00:55 +01:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP 2020-03-19 15:39:11 +01:00
Ivan Tashkinov
ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
Haelwenn (lanodan) Monnier
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media 2020-03-17 14:00:19 +01:00
eugenijm
13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. 2020-03-16 20:42:37 +03:00
eugenijm
d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password 2020-03-16 20:32:07 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter 2020-03-16 20:07:45 +03:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Alexander Strizhakov
89e4b3ebbd
fix for content-type header for tag feed 2020-03-16 12:59:18 +03:00
Alexander Strizhakov
91870c8995
adding rss for user feed 2020-03-16 12:45:31 +03:00
Alexander Strizhakov
26e2076659
fix for feed page pagination 2020-03-16 12:33:55 +03:00
Haelwenn (lanodan) Monnier
0ac6e29654 static_fe: Sanitize HTML in posts 
Note: Seems to have different sanitization with TwitterCard generator giving
the following:

<meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">
 2020-03-15 20:44:04 +01:00
lain
fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' 
[#1560] Restricted AP- & OStatus-related routes for non-federating instances

Closes #1560

See merge request pleroma/pleroma!2235
 2020-03-15 19:15:20 +00:00
Haelwenn
d84670b9e1 Merge branch 'f' into 'develop' 
rip out fetch_initial_posts

Closes #1422 and #1595

See merge request pleroma/pleroma!2297
 2020-03-15 16:14:54 +00:00
Haelwenn
67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' 
rate limiter: disable based on if remote ip was found, not on if the plug was enabled

Closes #1620

See merge request pleroma/pleroma!2296
 2020-03-15 14:22:10 +00:00
rinpatch
e87a32bcd7 rip out fetch_initial_posts 
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
 2020-03-15 15:59:17 +03:00
Ivan Tashkinov
ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 
# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex
 2020-03-14 15:37:02 +03:00