Commit graph

4503 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation 2020-07-31 13:57:21 +02:00
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31 14:13:38 +03:00
lain 1dd162a5f7 SimplePolicy: Fix problem with DM leaks. 2020-07-31 09:57:30 +02:00
Haelwenn d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats

See merge request pleroma/pleroma!2816
2020-07-30 20:08:03 +00:00
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.

Closes #1993

See merge request pleroma/pleroma!2809
2020-07-30 20:01:04 +00:00
lain 781b270863 ChatMessageReferenceView: Display preview cards. 2020-07-30 19:57:26 +02:00
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
Let favourites and emoji reactions optionally be hidden

See merge request pleroma/pleroma!2804
2020-07-30 12:41:47 +00:00
lain e2e66e50d3 SimplePolicyTest: Add test for leaking DMs. 2020-07-30 14:29:00 +02:00
lain d39b72c8fa Merge branch 'feature/captcha-expose-timeout' into 'develop'
Expose seconds_valid in Pleroma Captcha API endpoint

Closes #1954

See merge request pleroma/pleroma!2812
2020-07-30 08:41:46 +00:00
Maksim Pechnikov cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency 2020-07-30 08:52:13 +03:00
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint 2020-07-29 16:07:22 -05:00
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
Alex Gleason 00d090004e
:show_reactions, refactor the other test 2020-07-29 12:50:11 -05:00
Alex Gleason 026a51cb27
:show_reactions, add CHANGELOG.md, refactor test 2020-07-29 12:45:32 -05:00
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin 2020-07-29 16:24:22 +02:00
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop'
[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763
2020-07-29 13:45:15 +00:00
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02:00
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop'
EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808
2020-07-29 12:20:04 +00:00
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop'
feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811
2020-07-29 12:16:20 +00:00
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote 2020-07-29 14:02:02 +02:00
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
lain 6a25f72a75 FrontendStatic: Work correctly for other frontend types. 2020-07-29 13:02:48 +02:00
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
2020-07-29 11:47:03 +02:00
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages. 2020-07-29 10:53:08 +02:00
Maksim Pechnikov 15b8446cdb updated dev & test packages 2020-07-29 06:47:56 +03:00
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced 2020-07-28 19:06:42 -05:00
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden 2020-07-28 14:58:30 -05:00
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration. 2020-07-28 17:35:16 +02:00
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues 2020-07-27 20:36:31 -05:00
Alex Gleason f43518eb74
Lint, fix test 2020-07-27 19:22:31 -05:00
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit 2020-07-27 15:13:34 -05:00
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-27 12:29:18 -05:00
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator. 2020-07-27 16:39:50 +02:00
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation 2020-07-27 16:19:45 +02:00
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email

See merge request pleroma/pleroma!2786
2020-07-27 12:34:36 +00:00
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00
Maksim Pechnikov 643664d583 added migrate old settings to new 2020-07-25 09:16:43 +03:00
Lain Soykaf 1dd6de03ee CommonAPI Tests: Check that undoing objects federates them as embeds. 2020-07-24 14:54:13 +02:00
Lain Soykaf 3d13fb05f8 Side Effects: On undoing, put information about the undone object. 2020-07-24 14:40:22 +02:00
Lain Soykaf 91f3cf9bc6 Pipeline: Add embedded object federation. 2020-07-24 14:06:41 +02:00
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
Allow unblocking a domain via query params

Closes #1971

See merge request pleroma/pleroma!2783
2020-07-23 20:06:11 +00:00
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change. 2020-07-23 12:59:40 -05:00
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
StatusView: Handle badly formatted emoji reactions.

Closes #1976

See merge request pleroma/pleroma!2788
2020-07-23 16:58:36 +00:00
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email 2020-07-23 16:36:27 +03:00
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting

Closes #1973

See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop'
Fix #783: Make MRF reject log as info level instead of error

Closes #783

See merge request pleroma/pleroma!2758
2020-07-23 11:08:29 +00:00
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
[#1878] fix reset confirmation email in admin section

See merge request pleroma/pleroma!2751
2020-07-23 10:56:33 +00:00
lain a81581472f Merge branch 'linkify' into 'develop'
Fix Linkify

See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
Maksim Pechnikov 7991ddad58 added warning to use old keys 2020-07-23 09:01:37 +03:00
Alex Gleason b6488a4db4
Update linkify migration tests to use config from ConfigDB 2020-07-22 16:11:53 -05:00
Alex Gleason c7a0016f9f
Migration to fix malformed Pleroma.Formatter config 2020-07-22 14:32:45 -05:00
Alex Gleason b87a1f8eaf
Refactor require_migration/1 into a test helper function 2020-07-22 14:32:44 -05:00
Alex Gleason 67389b77af
Add AutolinkerToLinkify migration test 2020-07-22 14:32:24 -05:00
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
Fix /api/pleroma/emoji/packs index endpoint.

See merge request pleroma/pleroma!2777
2020-07-22 15:09:32 +00:00
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions. 2020-07-22 14:44:06 +02:00
Maksim Pechnikov 5879d36854 fix sender for welcome email 2020-07-22 15:34:47 +03:00
Maksim Pechnikov 8d6f7aec21 Merge branch 'develop' into issue/1023 2020-07-22 09:24:16 +03:00
Maksim Pechnikov 7cafb96c02 added tests 2020-07-22 08:58:06 +03:00
Mark Felder 109836306c Test that Emoji Packs can be listed when instance is not public 2020-07-21 17:27:13 -05:00
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
AutoLinker --> Linkify, update to latest version

See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
Gopher: using atom keys in search params

See merge request pleroma/pleroma!2775
2020-07-21 19:31:03 +00:00
Ivan Tashkinov b8021016eb [#2497] Resolved merge conflicts. 2020-07-21 20:03:14 +03:00
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params 2020-07-21 16:06:46 +04:00
Alexander Strizhakov 6afc6717d6
copy tmp file if test depends on it 2020-07-21 10:31:58 +03:00
Maksim Pechnikov 3edaecae96 added welcome email 2020-07-21 09:25:53 +03:00
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	mix.lock
#	test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
Alex Gleason ae74c52e22
Test angry face in formatter D:< #1968 2020-07-18 15:26:23 -05:00
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958 2020-07-17 12:35:28 -05:00
Alex Gleason 15f8921b11
Test that unapproved users can never log in regardless of admin settings 2020-07-17 12:26:52 -05:00
Alex Gleason 5756843736
Fully delete users with status :approval_pending 2020-07-17 12:19:41 -05:00
Alex Gleason 880301985b
Formatter: Test link with local mention 2020-07-16 16:34:43 -05:00
Maksim Pechnikov 6c59fe259d Merge branch 'develop' into issue/1023 2020-07-16 08:53:21 +03:00
Alex Gleason 9ce95fa68f
Use approval_required in /api/v1/instance 2020-07-15 17:04:30 -05:00
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry 2020-07-15 13:34:27 -05:00
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:30:23 -05:00
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
Add rejection reason to our MRFs

See merge request pleroma/pleroma!2759
2020-07-15 14:00:22 +00:00
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons 2020-07-15 15:25:33 +02:00
Maksim Pechnikov 3f8bff8d6b Merge branch 'develop' into issue/sign-authority 2020-07-15 15:49:46 +03:00
href e499275076 Don't test tls_options in adapter helper test. 2020-07-15 15:26:35 +03:00
rinpatch bf3492ceb3 Connection Pool: add tests 2020-07-15 15:26:35 +03:00
rinpatch 721e89e88b Remove tests for old pool 2020-07-15 15:26:35 +03:00
Haelwenn (lanodan) Monnier e4beff90f5
Create Question: Add context field to create 2020-07-15 12:32:43 +02:00
Haelwenn (lanodan) Monnier 922ca23298
Question: Add tests on HTML tags in options
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362
2020-07-15 12:32:43 +02:00
Haelwenn (lanodan) Monnier c19bdc811e
Fix attachments in polls 2020-07-15 12:32:42 +02:00
lain 040524c09f Merge branch 'tests/apc2s-update_outbox' into 'develop'
AP C2S tests: Make sure you can't use another user's AP id

See merge request pleroma/pleroma!2767
2020-07-15 10:12:44 +00:00
Haelwenn (lanodan) Monnier 39870d99b8
transmogrifier tests: Move & enhance in specialised modules 2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier 82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert 2020-07-15 11:40:23 +02:00
Haelwenn (lanodan) Monnier 173f69c854
question_validator: fix for mastodon poll expiration
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier 10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely 2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier 7bcd7a9595
QuestionValidator: Create 2020-07-15 11:39:53 +02:00
Haelwenn (lanodan) Monnier 6d8427cca2
AP C2S tests: Make sure you can't use another user's AP id 2020-07-15 09:59:24 +02:00
Alex Gleason 0d004a9d04
Email admins when a new unapproved account is up for review 2020-07-14 20:31:20 -05:00
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-14 18:56:40 -05:00
Alex Gleason fab44f6970
Test User with confirmation_pending: true, approval_pending: true 2020-07-14 18:46:57 -05:00
Alex Gleason 20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint 2020-07-14 18:02:44 -05:00
Alex Gleason 33f1b29b2c
AdminAPI: Filter users by need_approval 2020-07-14 14:29:03 -05:00
Alex Gleason b750129da1
AdminAPI: Return approval_pending with users 2020-07-14 13:47:05 -05:00
Maksim Pechnikov 1dd767b8c7 Include port in host for signatures 2020-07-14 21:44:08 +03:00
Mark Felder 777a7edc6b Lint and fix test to match new log message 2020-07-14 13:15:37 -05:00
Alex Gleason a1570ba6ad
AdminAPI: Return registration_reason with users 2020-07-14 13:08:39 -05:00
feld 3f65f2ea79 Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754
2020-07-14 18:07:44 +00:00
feld 2909dc873b Merge branch '1940-admin-token-oauthless-auth' into 'develop'
[#1940] Reinstated OAuth-less `admin_token` authentication

Closes #1940

See merge request pleroma/pleroma!2760
2020-07-14 16:48:26 +00:00
Ivan Tashkinov 124b4709dc [#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations. 2020-07-14 19:31:05 +03:00
feld 246f49d685 Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
Transmogrifier: filtering weirdness in address fields

Closes #1916

See merge request pleroma/pleroma!2762
2020-07-14 15:17:25 +00:00
Haelwenn (lanodan) Monnier 858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil} 2020-07-14 11:04:16 +02:00
Ivan Tashkinov 9b225db7d8 [#1940] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting. 2020-07-14 11:58:41 +03:00
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence). 2020-07-19 21:35:57 +03:00
Maksim Pechnikov 3062f86613 added generated pleroma.env 2020-07-14 09:05:34 +03:00
Alex Gleason 5ddf0415c4
Accept reason in POST /api/v1/accounts and store in DB 2020-07-14 00:22:12 -05:00
= b221b640a2 Transmogrifier: filtering weirdness in address fields 2020-07-13 22:43:21 +03:00
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings 2020-07-13 13:32:21 -05:00
feld 5d215fd81f Merge branch 'config-behaviours-runtime' into 'develop'
Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request pleroma/pleroma!2755
2020-07-13 15:45:25 +00:00
feld 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741
2020-07-13 15:43:46 +00:00
Haelwenn (lanodan) Monnier 2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post 2020-07-13 15:26:30 +02:00
Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop'
ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748
2020-07-13 12:06:43 +00:00
Alex Gleason bcfd38c8f3
Make a user unapproved when registering with account_approval_required on 2020-07-12 22:55:37 -05:00
Alex Gleason e4e5577818
Prevent unapproved users from logging in 2020-07-12 22:55:26 -05:00
Alex Gleason 51ab8d0128
Add account_approval_required instance setting 2020-07-12 20:27:58 -05:00
Alex Gleason a62f17da17
Add approval_pending field to User 2020-07-12 20:27:14 -05:00
href 4347d2de5e Config/Docs: Expand behaviour suggestions at runtime 2020-07-12 17:23:33 +02:00
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
Roman Chvanikov aedbbec88a Add Pleroma.Utils.command_available?/1 and use where appropriate 2020-07-11 15:48:45 +03:00
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section 2020-07-11 07:20:35 +03:00
Mark Felder 6167593881 Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
2020-07-10 16:46:26 -05:00
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
feld ce9514000d Merge branch 'proxy-range-and-chunk' into 'develop'
ReverseProxy: Streaming and disable encoding if Range

Closes #1860 and #1823

See merge request pleroma/pleroma!2749
2020-07-10 16:18:28 +00:00
href a1dace088c ReverseProxy: Streaming and disable encoding if Range
Fixes #1823
Fixes #1860
2020-07-10 17:23:11 +02:00
lain 93e494ec21 ActivityPub: Don't rename a clashing nickname with the same ap id. 2020-07-10 14:10:44 +02:00
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-10 12:26:53 +02:00
Haelwenn 31a0ed5d01 Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`

Closes admin-fe#107 and #1788

See merge request pleroma/pleroma!2554
2020-07-10 09:22:14 +00:00
lain 4d809144d8 Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743
2020-07-10 08:56:12 +00:00
Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
#   CHANGELOG.md
2020-07-10 08:55:15 +00:00
Haelwenn 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
Improved search results for localized nickname match

See merge request pleroma/pleroma!2733
2020-07-10 08:49:14 +00:00
stwf 08211eff22 Re-enable the federated tests, increase timeout 2020-07-09 13:49:30 -04:00
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields 2020-07-09 19:21:58 +02:00
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails 2020-07-09 11:55:40 -05:00
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694
2020-07-09 13:10:05 +00:00
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
Add support for remote favicons

See merge request pleroma/pleroma!2261
2020-07-09 13:09:31 +00:00
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.

Closes #1925

See merge request pleroma/pleroma!2732
2020-07-09 12:10:26 +00:00
eugenijm c2be0da79f Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated 2020-07-09 14:57:40 +03:00
Haelwenn 68036f5a3b Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline

See merge request pleroma/pleroma!2734
2020-07-09 10:32:24 +00:00
Maksim Pechnikov 31259cabcc fix test 2020-07-09 07:16:52 +03:00
Ivan Tashkinov 123352ffa1 Removed unused trigram index on users. Fixed users_fts_index usage. 2020-07-08 22:50:15 +03:00
lain 00e54f8fe7 ActivityPub: Remove follow and fix issues. 2020-07-08 17:07:24 +02:00
lain 9dda8b5427 CommonAPI: Switch to pipeline for following. 2020-07-08 15:40:56 +02:00
lain 172f4aff8e Transmogrifier: Move following to the pipeline. 2020-07-08 14:30:53 +02:00
lain 7d0e2b3fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline 2020-07-08 13:23:07 +02:00
lain cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880 2020-07-08 13:21:58 +02:00
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting

Closes #1895

See merge request pleroma/pleroma!2731
2020-07-08 10:55:03 +00:00
Ivan Tashkinov 704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches. 2020-07-08 13:14:18 +03:00
lain c0385cf47a AccountController: Fix muting / unmuting reblogs. 2020-07-08 11:52:29 +02:00
Maksim Pechnikov e341f81785 fixed delete Like activity in remove user 2020-07-08 09:06:23 +03:00
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false 2020-07-08 06:28:40 +02:00
Haelwenn (lanodan) Monnier 6a679d80c9
Move get_favicon to Pleroma.Instances, use / 2020-07-08 06:28:39 +02:00
Haelwenn (lanodan) Monnier f6d09fafee
Add support for remote favicons 2020-07-08 06:28:39 +02:00
Haelwenn a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"

Closes #1918

See merge request pleroma/pleroma!2729
2020-07-08 03:25:30 +00:00
lain 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints

See merge request pleroma/pleroma!2327
2020-07-07 18:26:07 +00:00
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. 2020-07-07 20:37:11 +03:00
lain c8dd973af5 AccountController: Remove unused update_? routes.
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
lain 59cf78e412 AccountController: Allow removal / reset of user images. 2020-07-07 16:53:03 +02:00
lain 9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube

See merge request pleroma/pleroma!2728
2020-07-07 09:14:50 +00:00
Haelwenn fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters

Closes #1392

See merge request pleroma/pleroma!2186
2020-07-07 08:23:49 +00:00
Haelwenn (lanodan) Monnier fbb9743a70
Fix getting videos from peertube 2020-07-07 09:38:38 +02:00
Haelwenn d81acb5f62 Merge branch 'description-limits' into 'develop'
Add limits to image descriptions

See merge request pleroma/pleroma!2724
2020-07-07 03:00:52 +00:00
lain a6a12b241f FollowValidator: Add basic validation. 2020-07-06 15:57:19 +02:00
lain 4e3b3998ad BlockValidation test: Rename. 2020-07-06 15:44:35 +02:00
lain eb87430803 ObjectValidator tests: Extract block validation tests. 2020-07-06 15:14:58 +02:00
lain 410c1fab31 ObjectValidator tests: Extract update validation tests. 2020-07-06 15:13:11 +02:00
lain b2e1ea9226 ObjectValidation tests: Extract announce validation tests. 2020-07-06 15:11:49 +02:00
lain bbaf108aee ObjectValidator tests: Extract undo validation tests. 2020-07-06 15:09:41 +02:00
lain 168256dce9 ObjectValidation tests: Extract like validation tests. 2020-07-06 15:08:11 +02:00
lain e6a13d97d0 ObjectValidation tests: Extract delete validation tests. 2020-07-06 15:05:02 +02:00
lain 60d4c6c91d ObjectValidator tests: Extract emoji react testing 2020-07-06 15:02:35 +02:00
lain e0baaa967c ObjectValidator tests: Extract chat tests 2020-07-06 13:01:44 +02:00
lain 0aa4c20d78 ObjectValidator Test: Extract attachments. 2020-07-06 12:59:06 +02:00
lain 28feba8af4 Preloaders: Remove status_net preloader 2020-07-06 12:24:45 +02:00
lain 1963e143c5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api 2020-07-06 12:15:59 +02:00
lain ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json 2020-07-06 12:07:56 +02:00
lain 208baf157a ActivityPub: Add new 'capabilities' to user. 2020-07-06 11:38:40 +02:00
lain 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-06 11:27:06 +02:00
rinpatch 69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop'
Streamer: Don't filter out announce notifications.

Closes #1915

See merge request pleroma/pleroma!2719
2020-07-06 09:21:03 +00:00
lain cc8b4e48d9 InstanceView: Add chat limit, description limit 2020-07-06 11:12:37 +02:00
lain af7720237b Upload: Restrict description length 2020-07-06 11:08:13 +02:00
Alexander Strizhakov 818f3c2393
test fixes 2020-07-06 09:30:43 +03:00
Alexander Strizhakov 028a241b7d
tests fixes 2020-07-06 09:30:42 +03:00
Alexander Strizhakov 20c27bef40
renaming back and reject nil on create 2020-07-06 09:30:42 +03:00
Alexander Strizhakov 52ff75413a
Apply suggestion to test/notification_test.exs 2020-07-06 09:30:42 +03:00
Alexander Strizhakov 086a260c04
Apply suggestion to test/notification_test.exs 2020-07-06 09:30:42 +03:00
Sergey Suprunenko 8277b29790
Restrict thread statuses that contain user's irreversible filters 2020-07-06 09:30:39 +03:00
Sergey Suprunenko 5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word 2020-07-06 09:28:22 +03:00
Sergey Suprunenko 4a8c26654e
Restrict statuses that contain user's irreversible filters 2020-07-06 09:28:21 +03:00
Alexander Strizhakov 480dfafa83
don't save tesla settings into db 2020-07-06 08:48:20 +03:00
lain cf56655614 Streamer: Don't filter out announce notifications. 2020-07-04 17:11:37 +02:00
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban 2020-07-03 10:36:41 -05:00
lain c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion

See merge request pleroma/pleroma!2690
2020-07-03 15:06:33 +00:00
lain 9a27ef47f1 Merge branch '1912-leading-trailing-space-search' into 'develop'
SearchController: Trim query.

Closes #1912

See merge request pleroma/pleroma!2717
2020-07-03 14:59:12 +00:00
lain d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text 2020-07-03 16:44:31 +02:00
lain 19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop'
[#1892] Exclusion of service actors from user search results

Closes #1892

See merge request pleroma/pleroma!2708
2020-07-03 14:38:22 +00:00
lain 945e75c8e8 SearchController: Trim query. 2020-07-03 16:36:55 +02:00
lain e3b5559780 AccountController: Make setting accepts_chat_messages possible. 2020-07-03 15:54:25 +02:00
lain 4a7b89e372 ChatMessageValidator: Additional validation. 2020-07-03 15:13:27 +02:00
lain 5c0bf4c472 ActivityPub: Ingest information about chat acceptance. 2020-07-03 13:58:34 +02:00
lain 26a7cc3f00 UserView: Add acceptsChatMessages field 2020-07-03 13:38:59 +02:00
lain db76c26469 AccountViewTest: Fix test. 2020-07-03 13:24:16 +02:00
lain 3250228be9 AccountView: Add 'accepts_chat_messages' to view. 2020-07-03 13:07:33 +02:00
lain 98bfdba108 User: On registration, set accepts_chat_messages to true. 2020-07-03 12:47:05 +02:00
Ivan Tashkinov 90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results. 2020-07-03 11:02:15 +03:00
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta 2020-07-02 13:01:22 -05:00
Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop'
Don't fail fetching when the user in a replied-to message can't be fetched.

See merge request pleroma/pleroma!2711
2020-07-02 10:17:51 +00:00
lain 311b7c19d0 Streamer: Align announce streaming with polling. 2020-07-02 09:50:26 +02:00
lain 61fe94d698 SideEffects: Refactor. 2020-07-02 09:33:50 +02:00
rinpatch fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop'
ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712
2020-07-01 13:51:23 +00:00
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
2020-07-01 12:26:07 +02:00
lain ce92e6e5ce Fetcher: Work when we can't get the OP. 2020-07-01 11:48:51 +02:00
lain 8ae572d5ae Fixtures: Pretty print. 2020-07-01 11:47:45 +02:00
lain 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
2020-07-01 08:51:56 +00:00
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests 2020-06-30 15:25:10 -05:00
Ivan Tashkinov 3d2989278c [#1892] Excluded bot actors (applications, services) from search results. 2020-06-30 21:26:39 +03:00
Mark Felder d69af7f742 Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups 2020-06-30 11:40:34 +02:00
lain 2382a2a151 Preload: Load the correct instance panel 2020-06-30 11:35:54 +02:00
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.

See merge request pleroma/pleroma!2705
2020-06-29 18:06:25 +00:00
lain c01f4ca07f Notification: Remove TODO. 2020-06-29 17:52:56 +02:00
lain 90083a754d Notifications: Never return nil in the notification list. 2020-06-29 17:48:18 +02:00
Egor Kislitsyn 3aa04b81c4
Test default "content-type" for CastAndValidate 2020-06-29 19:47:04 +04:00
lain 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia

See merge request pleroma/pleroma!2702
2020-06-29 12:44:58 +00:00
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia 2020-06-29 15:25:57 +03:00
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api 2020-06-29 16:09:49 +04:00
lain 651f269568 Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.

See merge request pleroma/pleroma!2701
2020-06-29 11:16:30 +00:00
lain e64d08439e UpdateCredentialsTest: Add test for removing profile images. 2020-06-29 12:40:23 +02:00
lain 8630a6c7f5 Preloaders: Use strings as keys. 2020-06-29 11:41:00 +02:00
lain a19f8778af User preloader: Put user info at correct key 2020-06-29 11:06:20 +02:00
lain 577da132da Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679
2020-06-29 08:39:51 +00:00
Mark Felder ce85db41a3 Lint 2020-06-26 14:35:04 -05:00
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting 2020-06-26 19:52:20 +02:00
Mark Felder 69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline

See merge request pleroma/pleroma!2685
2020-06-26 17:41:00 +00:00
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.

Closes #1258

See merge request pleroma/pleroma!2686
2020-06-26 16:59:46 +00:00
Mark Felder fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings 2020-06-26 10:23:19 -05:00
lain a5bbfa21a1 StaticFE: Prioritize json in requests. 2020-06-26 16:27:39 +02:00
lain f378e93bf4 AccountController: Return scope in proper format. 2020-06-26 16:15:27 +02:00
lain a2002ebb63 Preloading: Fix nodeinfo url. 2020-06-26 14:48:23 +02:00
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff. 2020-06-26 14:47:38 +02:00
lain 7ed2296416 Nodeinfo: Add chat information back in. 2020-06-26 13:04:15 +02:00
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set. 2020-06-26 12:06:00 +02:00
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks. 2020-06-26 11:58:40 +02:00
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field 2020-06-26 05:48:25 +02:00
feld 8288419686 Merge branch 'preload-data' into 'develop'
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381
2020-06-25 21:35:39 +00:00
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings 2020-06-25 14:26:21 -05:00
lain 04abee782b AntiSpamLinkPolicy: Exempt local users. 2020-06-25 12:40:39 +02:00
lain 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3

See merge request pleroma/pleroma!2683
2020-06-25 10:14:19 +00:00
lain 84f9ca1956 Blocking: Don't federate if the options is set. 2020-06-25 12:03:14 +02:00
lain 44bb7cfccd ActivityPub: Remove block. 2020-06-25 11:51:33 +02:00
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks. 2020-06-25 11:33:54 +02:00
lain 89e5b2046b ObjectValidator: Basic Block support. 2020-06-25 11:13:35 +02:00
lain d137f934df Transmogrifier Test: Extract block handling. 2020-06-25 10:54:00 +02:00
lain 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop'
Filter outstanding follower requests from deactivated accounts

Closes #1771

See merge request pleroma/pleroma!2682
2020-06-25 06:50:44 +00:00
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3 2020-06-25 07:12:29 +03:00
Mark Felder 67ab580553 Filter outstanding follower requests from deactivated accounts 2020-06-24 17:18:53 -05:00
lain 35f6770436 StatusView: Add pleroma.parent_visible 2020-06-24 13:29:08 +02:00
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance

See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
lain 65f3eb333b Apply suggestion to test/http/tzdata_test.exs 2020-06-24 08:50:33 +00:00
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
lain 98af7b59e4 Merge branch 'update-validator' into 'develop'
Update validator

See merge request pleroma/pleroma!2668
2020-06-23 18:10:33 +00:00
Roman Chvanikov 1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
lain b7f297f0bd Merge branch 'issue/1798' into 'develop'
[#1798] fixed migration the settings to DB

See merge request pleroma/pleroma!2655
2020-06-23 10:54:15 +00:00
lain adc199c6a8 ActivityPubControllerTest: Capture error log 2020-06-23 12:04:51 +02:00
lain d93e01137b ActivityPubControllerTest: Testing changes. 2020-06-23 11:43:20 +02:00
lain 2737809bbf An act of desperation. 2020-06-23 11:03:32 +02:00
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-23 10:17:12 +02:00
Maksim Pechnikov 84aa9c78dd fix tests 2020-06-23 09:08:24 +03:00
Maksim Pechnikov 2715c40e1d added tests 2020-06-23 06:59:00 +03:00
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670
2020-06-22 15:40:09 +00:00
Egor Kislitsyn 7e6f43c0d7
Add is_muted to notifications 2020-06-22 19:03:04 +04:00
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app 2020-06-22 17:27:49 +03:00
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665
2020-06-22 12:25:12 +00:00
lain e785cd5cae ActivityPub: Remove update and switch to pipeline. 2020-06-22 13:59:45 +02:00
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"

Closes #1865

See merge request pleroma/pleroma!2650
2020-06-22 11:34:07 +00:00
lain 1e7ca24430 Update Handling Test: Fix for re-used update ids. 2020-06-22 13:23:21 +02:00
lain 31a4d42ce0 SideEffects: Handle user updating. 2020-06-22 13:15:37 +02:00
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.

Closes #1883

See merge request pleroma/pleroma!2666
2020-06-22 10:00:13 +00:00
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination

Closes #1854

See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles. 2020-06-22 10:35:11 +02:00
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE 2020-06-20 13:53:57 +03:00
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
Support 'bot' field in account update_credentials

Closes #1600 and #1467

See merge request pleroma/pleroma!2662
2020-06-20 09:57:12 +00:00
lain 7d542450b1 Merge branch 'develop' into '1865-media-only'
# Conflicts:
#   CHANGELOG.md
2020-06-20 09:33:18 +00:00
Alexander Strizhakov 1a704e1f1e
fix for packs pagination 2020-06-20 10:56:28 +03:00
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
2020-06-20 00:08:26 +02:00
feld f928267773 Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API

See merge request pleroma/pleroma!2648
2020-06-19 20:38:22 +00:00
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials 2020-06-19 21:18:07 +02:00
lain 75670a99e4 UpdateValidator: Only allow updates from the user themselves. 2020-06-19 16:38:57 +02:00
lain abdb540d45 ObjectValidators: Add basic UpdateValidator. 2020-06-19 15:30:30 +02:00
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. 2020-06-19 16:14:06 +03:00
lain 7e488cd4a7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-19 14:56:50 +02:00
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files 2020-06-19 10:17:24 +03:00
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action 2020-06-18 18:50:03 +03:00
Alexander Strizhakov 3becdafd33
emoji packs pagination 2020-06-18 14:32:21 +03:00
Maksim Pechnikov e4c61f1741 added test 2020-06-18 05:45:15 +03:00
Maksim Pechnikov 4044f24e2e fix test 2020-06-18 05:06:28 +03:00
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url 2020-06-17 13:13:55 -05:00
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders

See merge request pleroma/pleroma!2652
2020-06-17 15:53:24 +00:00
Maksim 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs 2020-06-17 13:14:01 +00:00
Maksim 078d687e6e Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs 2020-06-17 12:58:50 +00:00
Maksim 2991aae4c4 Apply suggestion to test/web/media_proxy/invalidations/script_test.exs 2020-06-17 12:58:38 +00:00
Maksim 11b22a4229 Apply suggestion to test/web/media_proxy/invalidations/http_test.exs 2020-06-17 12:58:33 +00:00
Maksim 6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:28 +00:00
Maksim 793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:16 +00:00
Maksim 1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs 2020-06-17 12:58:08 +00:00
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop'
Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647
2020-06-16 18:10:00 +00:00
Alexander Strizhakov b66e6eb521
fixes for tests 2020-06-16 19:03:45 +03:00
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders 2020-06-16 17:50:33 +03:00
Alexander Strizhakov e1603ac8fe
fix attemps to merge map 2020-06-16 15:54:22 +03:00
Alexander Strizhakov 23decaab81
fix for updated hackney
warning: :hackney_connect.partial_chain/1 is undefined or private
2020-06-16 15:54:22 +03:00
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples 2020-06-16 15:53:28 +03:00
lain 015f9258a9 Transmogrifier: Extract user update handling tests. 2020-06-16 14:48:46 +02:00
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'. 2020-06-16 13:08:27 +02:00
stwf faba1a6e33 fix tests 2020-06-15 12:25:03 -04:00
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Egor Kislitsyn bd63089a63
Fix tests 2020-06-15 16:20:05 +04:00
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-15 16:03:40 +04:00
Maksim Pechnikov 62b8c31b7a added tests 2020-06-15 14:55:00 +03:00
lain b7df7436c8 Conversations: Return last dm for conversation, not last message. 2020-06-15 12:27:13 +02:00
Maksim Pechnikov 2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page 2020-06-14 18:27:11 +03:00
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop'
StatusController: Correctly paginate favorites.

Closes #1851

See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser 2020-06-13 12:08:46 +03:00
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop'
ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
Global status expiration

See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
Mark Felder 34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa 2020-06-12 08:43:50 -05:00
Maksim Pechnikov f9dcf15ecb added admin api for MediaProxy cache invalidation 2020-06-12 14:49:54 +03:00
Ivan Tashkinov 2188097066 [#1794] Fixes URI query handling for hashtags extraction in search. 2020-06-12 14:25:41 +03:00
Haelwenn (lanodan) Monnier 40970f6bb9
New mix task: pleroma.user reset_mfa <nickname> 2020-06-11 22:54:48 +02:00
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard 2020-06-11 17:57:31 +04:00