9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
2020-08-19 14:10:11 +02:00
4727030f59
fixes for mix tasks
...
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
2020-08-19 11:06:03 +03:00
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
3998ef9d64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
2020-08-18 13:31:42 +02:00
566749f77a
Merge branch 'purge-user' into 'develop'
...
Purge a local user upon deletion, fixes #2062
Closes #2062
See merge request pleroma/pleroma!2898
2020-08-18 11:31:13 +00:00
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
2020-08-18 12:38:13 +02:00
72cbe20a58
Purge most user fields upon deletion, "right to be forgotten" #859
2020-08-17 23:44:44 -05:00
c12c576ee2
Also purge bio and display name
2020-08-17 22:11:45 -05:00
d55faa2f8f
Purge a local user upon deletion, fixes #2062
2020-08-17 21:52:28 -05:00
2f8c3c842d
common_fixes: Remove Utils.make_date call
2020-08-18 02:24:48 +02:00
c9d6638461
common_fixes: Get fixes common from Audio and Question
2020-08-18 02:24:48 +02:00
2bc08d5573
Pipeline Ingestion: Audio
2020-08-18 02:02:34 +02:00
b1fc4fe0ca
fetcher: fallback to [] when to/cc is nil
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063
2020-08-18 02:02:20 +02:00
7a273087ed
object_validators: Use ecto_types where available
2020-08-17 23:47:00 +02:00
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
e154fcf525
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
...
[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
2020-08-17 12:26:53 +00:00
317b6c6c52
Start :ssl if not started when running migration or rollback
2020-08-17 17:34:03 +10:00
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +03:00
0865f36965
Mark notifications about statuses from muted users as read automatically
2020-08-15 15:27:41 +02:00
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
76ce3a1c9e
Mogrifun: Add a line about the purpose of the module.
2020-08-14 18:27:18 +02:00
9b055f7211
fix cron wroker
2020-08-13 21:03:15 +03:00
3515cb5c3a
fix Cron.PurgeExpiredActivitiesWorker
2020-08-13 21:01:21 +03:00
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
4f3c955f26
side_effects: Fix typo on notification
2020-08-13 18:10:43 +02:00
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
29a7bcd5bb
reverting pinned posts in filtering
2020-08-12 20:01:21 +03:00
3ab83f837e
don't load pinned activities in due_expirations
2020-08-12 19:46:47 +03:00
98058bd06e
Merge branch 'develop' into fix/activity-expirations-again
2020-08-12 09:42:28 -05:00
f50c653c8d
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-12 17:13:01 +03:00
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
2020-08-12 15:07:46 +02:00
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
eec1ba232c
don't expire pinned posts
2020-08-12 15:15:17 +03:00
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
76462efbfa
fix job monitor
2020-08-11 22:06:33 +03:00
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02:00
724ed354f2
Ensure only Note objects are set to expire
2020-08-11 11:28:22 -05:00
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
2020-08-11 15:41:19 +02:00
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
2020-08-11 15:13:29 +03:00
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
2020-08-11 09:18:56 +00:00
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 10:55:10 +02:00
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
78484fe0ef
Merge branch 'admin-active-filter' into 'develop'
...
Admin API: Filter out unapproved users when the `active` filter is on
Closes #2037
See merge request pleroma/pleroma!2872
2020-08-10 17:16:38 +00:00
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
2020-08-10 11:32:24 -05:00
249f21dcbb
Admin API: Filter out unapproved users when the `active` filter is on
2020-08-10 18:27:39 +04:00
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
2020-08-10 13:59:38 +00:00
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
e08ea01d09
Limit expirations for each cron execution to 50.
...
This should prevent servers from being crushed. 50/min is a pretty good rate.
2020-08-08 12:49:02 -05:00
cf4c97242b
Ensure we only expire Create activities with the Mix task
2020-08-08 12:40:52 -05:00
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
e5ab5fbe76
Mix task frontend: Read the docs.
2020-08-07 15:01:08 +02:00
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02:00
135ae4e35a
[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
2020-08-06 16:00:00 +03:00
10b0e55acf
Merge branch 'whole-word-filter-hotfix' into 'develop'
...
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
2020-08-06 08:35:39 +00:00
24ce9c011c
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 19:33:51 +00:00
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-08-05 13:08:31 -05:00
ad9c925efb
Speed up instance timeline query
2020-08-05 13:08:13 -05:00
2a4bca5bd7
Comments are good when they're precise...
2020-08-05 11:40:09 -05:00
7569f225f1
Move checks to application startup
2020-08-05 19:38:55 +03:00
81126b0142
Add email to user account only if it exists in LDAP
2020-08-05 11:36:12 -05:00
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
9d7ce1a6d0
CommonValidations: More refactors.
2020-08-05 17:56:12 +02:00
3655175639
CommonValidations: Refactor `same_domain?`
2020-08-05 17:36:27 +02:00
9c96fc052a
CommonValidations: Extract modification right checker
2020-08-05 17:26:53 +02:00
8c57a299b4
Handle non-list keys in Config.fetch/1
2020-08-05 18:23:12 +03:00
2192d1e492
Permit LDAP users to register without capturing their password hash
...
We don't need it, and local auth fallback has been removed.
2020-08-05 10:07:31 -05:00
2299bfe4c1
Merge branch 'develop' into refactor/config-get
2020-08-05 17:46:24 +03:00
5221879c35
Fix linting.
2020-08-05 15:40:32 +02:00
0f9aecbca4
Remove fallback to local database when LDAP is unavailable.
...
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
2020-08-05 08:18:16 -05:00
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
2020-08-05 08:15:57 -05:00
f889400d05
Questions: Move fixes to validators.
2020-08-05 14:51:33 +02:00
b5f0cef156
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 11:33:21 +00:00
70522989d9
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 11:14:58 +00:00
00c4c6a382
CommonValidations: Remove superfluous function
...
The `is_active` functionality was integrated into the presence
checker.
2020-08-05 12:24:34 +02:00
6f60ac9f41
Refactor config
2020-08-05 13:00:49 +03:00
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-05 11:12:14 +02:00
f341a8e142
Update filter_view.ex to return whole_word actual value
2020-08-05 02:01:27 +00:00
577b11167c
templates/layout/app.html.eex: fix link color
2020-08-05 00:01:30 +02:00
b1b6a7dfa8
Merge branch 'deactivated-user-posts' into 'develop'
...
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
2020-08-04 19:17:30 +00:00
fede37e4c6
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
...
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
2020-08-04 19:16:38 +00:00
91fbb5b21f
Fix ActivityExpirationPolicy
2020-08-04 18:26:37 +04:00
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-04 15:28:41 +02:00
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
2020-08-04 14:29:16 +02:00
1a00713744
CommonValidations: Treat deactivated users as not present.
2020-08-04 14:17:03 +02:00
56e9bf3393
Unify Config.get behaviour for atom/list key param
2020-08-04 14:35:47 +03:00
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
4f57e85ab9
Email blacklist: Update phrasing again
2020-08-03 22:20:49 -05:00
058daf498f
Email blacklist: Update response phrasing
2020-08-03 19:57:53 -05:00
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00
016d8d6c56
Consolidate construction of Rich Media Parser HTTP requests
2020-08-03 12:37:31 -05:00
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
5876d5123c
Merge branch 'object-age-fix' into 'develop'
...
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
2020-08-03 12:50:10 +00:00
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
2020-08-03 14:12:32 +02:00
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
70951d042b
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
...
[#1985 ] Prevented force login on registration if account approval and/or email confirmation needed
Closes #1985
See merge request pleroma/pleroma!2823
2020-08-01 15:58:17 +00:00
45be1fe00e
ConnectionPool: fix gun open errors being returned without an error tuple
...
When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.
Closes #2008
2020-08-01 18:02:26 +03:00
4bf44b7d65
Don't override user-agent header if it's been set
2020-08-01 10:04:25 +03:00
7e01339ddd
Frontend mix task: Support installation from local file.
2020-07-31 17:58:50 +02:00
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
2020-07-31 13:57:21 +02:00
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
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
2020-07-31 09:57:30 +02:00
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
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
a3c37379e9
ChatMessage schema: Add preview cards.
2020-07-30 19:57:45 +02:00
781b270863
ChatMessageReferenceView: Display preview cards.
2020-07-30 19:57:26 +02:00
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
2e20ceee52
Mix tasks: Add frontend task to download and install frontends.
...
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-07-30 14:12:41 +02:00
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
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
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
2020-07-29 14:42:09 +02:00
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
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
2e27847573
feed/user_controller: Return 404 when the user is remote
2020-07-29 14:02:02 +02:00
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
66974e17a0
Endpoint: Serve a dynamically configured admin interface
2020-07-29 13:03:04 +02:00
6a25f72a75
FrontendStatic: Work correctly for other frontend types.
2020-07-29 13:02:48 +02:00
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
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
2020-07-29 10:53:08 +02:00
2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
2020-07-28 20:32:58 -05:00
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
dab1d8c98e
gun ConnectionPool: Re-add a missing cast for remove_client
2020-07-28 23:48:41 +03:00
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
4ce6179dc7
gun ConnectionPool: replace casts with calls
...
The slowdown from this is most likely immesurable, however it eliminates
possible false positives when tracking dead clients.
2020-07-28 20:49:48 +03:00
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
2020-07-28 17:35:16 +02:00
14c28dcbd1
InstanceStatic: Refactor.
2020-07-28 15:44:47 +02:00
e5ac9534aa
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
...
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
2020-07-28 07:41:44 +00:00
f688c8df82
Fix User.registration_reason HTML sanitizing issues
2020-07-27 20:36:31 -05:00
f43518eb74
Lint, fix test
2020-07-27 19:22:31 -05:00
6f44a0ee84
Add configurable registration_reason limit
2020-07-27 15:13:34 -05:00
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
e1a1c8e7de
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
2020-07-27 16:35:47 +00:00
4a6389316d
masto_fe_view: Remove @default_settings
2020-07-27 17:59:13 +02:00
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
2020-07-27 16:39:50 +02:00
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
2020-07-27 16:19:45 +02:00
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
0d5d1c62ef
Apply 1 suggestion(s) to 1 file(s)
2020-07-27 12:24:41 +00:00
64b21cee14
Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
...
ReverseProxy: Fix a gun connection leak when there is an error with no body
See merge request pleroma/pleroma!2798
2020-07-27 08:20:46 +00:00
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
6bf8eee5f9
ReverseProxy tesla client: remove handling of old_conn
...
This is no longer relevant because we use a custom
FollowRedirects middleware now
2020-07-26 20:52:00 +03:00
d4fbec62a3
ReverseProxy: Fix a gun connection leak when there is an error with no
...
body
- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk
2020-07-26 19:30:17 +03:00
6107440ea0
OpenAPI: remove accidentally pasted buffer data
2020-07-26 13:59:46 +00:00
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
2020-07-26 13:54:56 +00:00
65a1b048a8
Ensure Oban is available during mix tasks.
...
Fixes: mix pleroma.user rm username
2020-07-24 12:06:56 -05:00
9be6668236
Fix mix tasks that make HTTP calls by starting the Gun connection pool
2020-07-24 12:05:42 -05:00
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
2020-07-24 14:40:22 +02:00
91f3cf9bc6
Pipeline: Add embedded object federation.
2020-07-24 14:06:41 +02:00
61ef1fca4b
remove duplicate module
2020-07-24 08:35:06 +03:00
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
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
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
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
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
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
2020-07-23 15:08:30 +03:00
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
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
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
7991ddad58
added warning to use old keys
2020-07-23 09:01:37 +03:00
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
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
db0224d174
added check user email for welcome email
2020-07-22 16:00:49 +03:00
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
8d6f7aec21
Merge branch 'develop' into issue/1023
2020-07-22 09:24:16 +03:00
341a8f3500
Skip the correct plug
2020-07-21 17:26:59 -05:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
2020-07-21 16:25:45 -05:00
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
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
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
204dddcfaa
Pleroma.Formatter can have partial updates
2020-07-20 13:45:05 -05:00
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
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
4bac25e6f5
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
2020-07-18 13:17:38 +02:00
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
2020-07-17 18:54:30 +00:00
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
5756843736
Fully delete users with status :approval_pending
2020-07-17 12:19:41 -05:00
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
af376cbffb
using atom keys in search params
2020-07-17 18:06:05 +03:00
62438530e2
TOTP length is configurable, so we can't hardcode this here.
2020-07-17 08:19:49 -05:00
5e74556703
Sanitize `reason` param in POST /api/v1/accounts
2020-07-16 20:25:53 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
3be64556db
Improve TOTP token and recovery input fields in OAuth login
2020-07-16 13:11:03 -05:00
16da9f5cfd
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:28 +00:00
c72676d22f
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:17 +00:00
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03:00
4e0e19a706
update task messages
2020-07-16 08:52:14 +03:00
9ce95fa68f
Use `approval_required` in /api/v1/instance
2020-07-15 17:04:30 -05:00
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
2020-07-15 13:34:27 -05:00
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
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
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
7115c5f82e
ConnectionPool.Worker: do not stop with an error when there is a timeout
...
This produced error log messages about GenServer termination
every time the connection was not open due to a timeout.
Instead we stop with `{:shutdown, <gun_error>}` since shutting down
when the connection can't be established is normal behavior.
2020-07-15 15:58:08 +03:00
6d583bcc3b
Set a default timeout for Gun adapter timeout
2020-07-15 15:26:35 +03:00
afd378f84c
host is now useless
2020-07-15 15:26:35 +03:00
ce1a42bd04
Simplify TLS opts
...
- `verify_fun` is not useful now
- use `customize_check_hostname` (OTP 20+ so OK)
- `partial_chain` is useless as of OTP 21.1 (wasn't there, but hackney/..
uses it)
2020-07-15 15:26:35 +03:00
53ba6815b1
parentheses...
2020-07-15 15:26:35 +03:00
23d714ed30
Fix race in enforcer/reclaimer start
2020-07-15 15:26:35 +03:00
6a0f2bdf8c
Ensure connections error get known by the caller
2020-07-15 15:26:35 +03:00
46dd276d68
ConnectionPool.Worker: Open gun conn in continue instead of init
2020-07-15 15:26:35 +03:00
a705637dcf
Connection Pool: fix LRFU implementation to not actually be LRU
...
The numbers of the native time unit were so small the CRF was always 1,
making it an LRU. This commit switches the time to miliseconds and changes
the time delta multiplier to the one yielding mostly highest hit rates according
to the paper
2020-07-15 15:26:35 +03:00
9b73c35ca8
Request limiter setup: consider {:error, :existing} a success
...
When the application restarts (which happens after certain config
changes), the limiters are not destroyed, so `ConcurrentLimiter.new`
will produce {:error, :existing}
2020-07-15 15:26:35 +03:00
12fa5541f0
FollowRedirects: Unconditionally release the connection if there is an error
...
There is no need for streaming the body if there is no body
2020-07-15 15:26:35 +03:00
37f1e781cb
Gun adapter helper: fix wildcard cert issues on OTP 23
...
See https://bugs.erlang.org/browse/ERL-1260 for more info.
The ssl match function is basically copied from mint, except
that `:string.lowercase/1` was replaced by `:string.casefold`.
It was a TODO in mint's code, so might as well do it since we don't need
to support OTP <20.
Closes #1834
2020-07-15 15:26:35 +03:00
007843b75e
Add documentation for new connection pool settings and remove some
...
`:retry_timeout` and `:retry` got removed because reconnecting on failure is
something the new pool intentionally doesn't do.
`:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because
the settings are very different in their behaviour.
`:checkin_timeout` got removed in favor of `:connection_acquisition_wait`,
I didn't reuse the key because the settings are somewhat different.
I didn't do any migrations/deprecation warnings/changelog entries because
these settings were never in stable.
2020-07-15 15:26:35 +03:00
7882f28569
Use erlang monotonic time for CRF calculation
2020-07-15 15:26:35 +03:00
00926a63fb
Adapter Helper: Use built-in ip address type
2020-07-15 15:26:35 +03:00
4128e3a84a
HTTP: Implement max request limits
2020-07-15 15:26:35 +03:00
94c8f3cfaf
Use a custom pool-aware FollowRedirects middleware
2020-07-15 15:26:35 +03:00
281ddd5e37
Connection pool: fix connections being supervised by gun_sup
2020-07-15 15:26:35 +03:00
1b15cb066c
Connection pool: Add client death tracking
...
While running this in production I noticed a number of ghost
processes with all their clients dead before they released the connection,
so let's track them to log it and remove them from clients
2020-07-15 15:26:35 +03:00
e94ba05e52
Connection pool: Fix a possible infinite recursion if the pool is exhausted
2020-07-15 15:26:35 +03:00
7738fbbaf5
Connection pool: implement logging and telemetry events
2020-07-15 15:26:25 +03:00
0ffde499b8
Connection Pool: register workers using :via
2020-07-15 15:24:47 +03:00
ec9d0d146b
Connection pool: Fix race conditions in limit enforcement
...
Fixes race conditions in limit enforcement by putting worker processes
in a DynamicSupervisor
2020-07-15 15:17:27 +03:00
d08b157699
Connection pool: check that there actually is a result
...
Sometimes connections died before being released to the pool, resulting
in MatchErrors
2020-07-15 15:17:27 +03:00
fffbcffb8c
Connection Pool: don't enforce pool limits if no new connection needs to be opened
2020-07-15 15:17:27 +03:00
58a4f350a8
Refactor gun pooling and simplify adapter option insertion
...
This patch refactors gun pooling to use Elixir process registry and
simplifies adapter option insertion.
Having the pool use process registry instead of a GenServer has a number of advantages:
- Simpler code: the initial implementation adds about half the lines of code it deletes
- Concurrency: unlike a GenServer, ETS-based registry can handle multiple checkout/checkin
requests at the same time
- Precise and easy idle connection clousure: current proposal for closing idle connections in
the GenServer-based pool needs to filter through all connections once a minute and compare their
last active time with closing time. With Elixir process registry this can be done
by just using `Process.send_after`/`Process.cancel_timer` in the worker process.
- Lower memory footprint: In my tests `gun-memory-leak` branch uses about 290mb on peak load (250 connections)
and 235mb on idle (5-10 connections). Registry-based pool uses 210mb on idle and 240mb on peak load
2020-07-15 15:17:27 +03:00
e4beff90f5
Create Question: Add context field to create
2020-07-15 12:32:43 +02:00
bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
2020-07-15 12:32:42 +02:00
c19bdc811e
Fix attachments in polls
2020-07-15 12:32:42 +02:00
d713930ea7
Fixup for EctoType module move
2020-07-15 11:40:24 +02:00
435a65b976
QuestionValidator: Use AttachmentValidator
2020-07-15 11:40:24 +02:00
fe6924d00d
CreateGenericValidator: add expires_at
2020-07-15 11:40:24 +02:00
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
2020-07-15 11:40:23 +02:00
4f70fd4105
question_validator: remove conversation field
2020-07-15 11:39:56 +02:00
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
47ba796f41
create_question_validator: remove validate_recipients_match
2020-07-15 11:39:55 +02:00
ad867ccfa1
fetcher: Reinject Question through validator
2020-07-15 11:39:55 +02:00
6b9c4bc1f1
fetcher: more descriptive variable names
2020-07-15 11:39:55 +02:00
4644a8bd10
Fix multiple-choice poll detection
2020-07-15 11:39:55 +02:00
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
2020-07-15 11:39:54 +02:00
89a2433154
QuestionOptionsValidator: inline schema for replies
2020-07-15 11:39:54 +02:00
c5efaf6b00
AnswerValidator: Create
2020-07-15 11:39:54 +02:00
7bcd7a9595
QuestionValidator: Create
2020-07-15 11:39:53 +02:00
0d004a9d04
Email admins when a new unapproved account is up for review
2020-07-14 20:31:20 -05:00
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
df3d1bf5e5
Add :approval_pending to User @type account_status
2020-07-14 18:56:36 -05:00
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
2020-07-14 18:02:44 -05:00
33f1b29b2c
AdminAPI: Filter users by `need_approval`
2020-07-14 14:29:03 -05:00
b750129da1
AdminAPI: Return `approval_pending` with users
2020-07-14 13:47:05 -05:00
1dd767b8c7
Include port in host for signatures
2020-07-14 21:44:08 +03:00
777a7edc6b
Lint and fix test to match new log message
2020-07-14 13:15:37 -05:00
37297a8482
Improve error messages
2020-07-14 13:12:16 -05:00
a1570ba6ad
AdminAPI: Return `registration_reason` with users
2020-07-14 13:08:39 -05:00
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
63798e89de
Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'
...
Fix in-db configuration in dev environment
See merge request pleroma/pleroma!2764
2020-07-14 18:05:36 +00:00
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
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
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
e6ccc25565
Fix in-db configuration in dev environment
...
Previously, in-db configuration only worked when `warnings_as_errors`
was disabled because re-compiling scrubbers on application restart
created a warning about module conflicts. This patch fixes that
by enabling `ignore_module_conflict` option of the compiler at runtime,
and enables `warnings_as_errors` in prod since there is no reason
to keep it disabled anymore.
2020-07-14 13:16:54 +03:00
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
2020-07-14 11:04:16 +02:00
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
cf3f8cb72a
[ #1940 ] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
2020-07-19 21:35:57 +03:00
3062f86613
added generated `pleroma.env`
2020-07-14 09:05:34 +03:00
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
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
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
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
63fef0c0fb
Merge branch 'chore/improve-database-config-docs' into 'develop'
...
Improve database config migration and add documentation
See merge request pleroma/pleroma!2756
2020-07-13 15:42:20 +00:00
d1cd3f4ec0
Lint
2020-07-13 10:32:17 -05:00
e1908a5270
Pick up env for both source and OTP installs
2020-07-13 08:39:56 -05:00
ce243b107f
Use Logger.info for {:reject, reason}
2020-07-13 15:26:31 +02:00
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
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
bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
2020-07-12 22:55:37 -05:00
e4e5577818
Prevent unapproved users from logging in
2020-07-12 22:55:26 -05:00
51ab8d0128
Add `account_approval_required` instance setting
2020-07-12 20:27:58 -05:00
a62f17da17
Add `approval_pending` field to User
2020-07-12 20:27:14 -05:00
46b123cded
Still allow passing the arg, but fallback to MIX_ENV
2020-07-12 10:59:12 -05:00
133004e22d
Improve database config migration and add documentation
2020-07-12 10:38:07 -05:00
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
2020-07-12 17:23:33 +02:00
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
3116a75e80
Check if mogrify available before calling it
2020-07-11 18:22:03 +03:00
523f1b93a4
Remove Logger requirement
2020-07-11 18:15:51 +03:00
45bd64e2a7
Error in Filter.Exiftool if exiftool not found
2020-07-11 18:11:23 +03:00
aedbbec88a
Add Pleroma.Utils.command_available?/1 and use where appropriate
2020-07-11 15:48:45 +03:00
62fc8eab0d
fix reset confirmation email in admin section
2020-07-11 07:20:35 +03:00
b329f05ed6
Remove unused @types
2020-07-10 17:08:54 -05:00
9e45672674
Add a moduledoc
2020-07-10 17:07:28 -05:00
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
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
2020-07-10 11:34:53 -05:00
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
72b3dbf4d1
Credo line length complaint
2020-07-10 11:04:19 -05:00
a1dace088c
ReverseProxy: Streaming and disable encoding if Range
...
Fixes #1823
Fixes #1860
2020-07-10 17:23:11 +02:00
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
2020-07-10 14:10:44 +02:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
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
48f98a2748
Merge branch 'mix-tasks-improvement' into 'develop'
...
Mix tasks improvement
See merge request pleroma/pleroma!2723
2020-07-10 08:58:44 +00:00
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
2020-07-10 08:55:15 +00:00
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
cc7153cd82
user: Add support for custom emojis in profile fields
2020-07-09 19:21:58 +02:00
2b979cc90c
Add AdminFE reports URL to report emails
2020-07-09 11:55:40 -05:00
79707e879d
cleap up
2020-07-09 19:13:16 +03:00
d5fcec8315
fix for info after tag/untag user
2020-07-09 18:59:48 +03:00
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
2020-07-09 09:08:59 -05:00
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
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
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
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
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
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
2020-07-09 09:37:52 +00:00
4cbafcef0c
load default config in mix tasks
2020-07-09 11:17:43 +03:00
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
2020-07-08 22:50:15 +03:00
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
2020-07-08 17:07:24 +02:00
9dda8b5427
CommonAPI: Switch to pipeline for following.
2020-07-08 15:40:56 +02:00
b28cc15459
don't restart pleroma in mix tasks
2020-07-08 15:58:47 +03:00
72ad3a66f4
don't fully start pleroma in mix tasks
2020-07-08 15:58:47 +03:00
172f4aff8e
Transmogrifier: Move following to the pipeline.
2020-07-08 14:30:53 +02:00
29fa75d00d
Notification: For follows, notify the followed.
2020-07-08 14:29:29 +02:00
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
2020-07-08 13:23:07 +02:00
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
2020-07-08 13:21:58 +02:00
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
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
a6495f4a68
[ #1895 ] credo fix.
2020-07-08 12:54:23 +03:00
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
3f8370a285
[ #1895 ] Applied code review suggestion.
2020-07-08 12:36:44 +03:00
e341f81785
fixed delete `Like` activity in remove user
2020-07-08 09:06:23 +03:00
31fef95e35
Add changelog and documentation
2020-07-08 06:29:24 +02:00
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
2020-07-08 06:28:40 +02:00
8c9df2d2e6
instance: Prevent loop of updates
2020-07-08 06:28:40 +02:00
013e2c5057
Use instances table instead of Cachex
2020-07-08 06:28:39 +02:00
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
2020-07-08 06:28:39 +02:00
f6d09fafee
Add support for remote favicons
2020-07-08 06:28:39 +02:00
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
db13acf242
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
...
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
2020-07-08 03:05:20 +00:00
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
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
2020-07-07 20:37:11 +03:00
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
2020-07-07 11:21:05 -05:00
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
59cf78e412
AccountController: Allow removal / reset of user images.
2020-07-07 16:53:03 +02:00
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
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
fbb9743a70
Fix getting videos from peertube
2020-07-07 09:38:38 +02:00
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
da4029391d
IO list, not concatenation
2020-07-06 11:28:08 -05:00
65843d92c4
Simplify the logic
2020-07-06 10:59:41 -05:00
a6a12b241f
FollowValidator: Add basic validation.
2020-07-06 15:57:19 +02:00
28feba8af4
Preloaders: Remove status_net preloader
2020-07-06 12:24:45 +02:00
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
2020-07-06 12:15:59 +02:00
158c26d7dd
StaticFE Plug: Use phoenix helper to get the requested format.
2020-07-06 12:11:10 +02:00
ed4f9f6a29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
2020-07-06 12:07:56 +02:00
208baf157a
ActivityPub: Add new 'capabilities' to user.
2020-07-06 11:38:40 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
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
cc8b4e48d9
InstanceView: Add chat limit, description limit
2020-07-06 11:12:37 +02:00
af7720237b
Upload: Restrict description length
2020-07-06 11:08:13 +02:00
20c27bef40
renaming back and reject nil on create
2020-07-06 09:30:42 +03:00
771748db1f
Apply suggestion to lib/pleroma/filter.ex
2020-07-06 09:30:41 +03:00
6558f31cda
don't filter notifications for follow and move types
2020-07-06 09:30:41 +03:00
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word
2020-07-06 09:28:22 +03:00
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +03:00
480dfafa83
don't save tesla settings into db
2020-07-06 08:48:20 +03:00
fc1f34b851
Delete activity before sending response to client
2020-07-06 00:01:25 +03:00
9faa632037
[ #2497 ] Fixed merge issue.
2020-07-05 19:02:43 +03:00
af612bd006
Ensure all CSP parameters for remote hosts have a scheme
2020-07-05 10:11:43 -05:00
cf56655614
Streamer: Don't filter out announce notifications.
2020-07-04 17:11:37 +02:00
e9a28078ad
Rename function and clarify that CSP is only strict with MediaProxy enabled
2020-07-03 17:18:22 -05:00
eaa59daa4c
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
...
Our CSP rules are lax when MediaProxy enabled, but lenient otherwise.
This fixes broken captcha on instances not using MediaProxy.
2020-07-03 17:06:20 -05:00
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
2020-07-03 10:36:41 -05:00
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
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
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
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
945e75c8e8
SearchController: Trim query.
2020-07-03 16:36:55 +02:00
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
4a7b89e372
ChatMessageValidator: Additional validation.
2020-07-03 15:13:27 +02:00
3ca9af1f9f
Account Schema: Add `accepts_chat_messages`
2020-07-03 14:31:04 +02:00
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
2020-07-03 13:58:34 +02:00
26a7cc3f00
UserView: Add acceptsChatMessages field
2020-07-03 13:38:59 +02:00
37fdb05058
User, Migration: Change `accepts_chat_messages` to be nullable
...
This is to model the ambiguous state of most users.
2020-07-03 13:12:23 +02:00
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
2020-07-03 13:07:33 +02:00
98bfdba108
User: On registration, set `accepts_chat_messages` to true.
2020-07-03 12:47:05 +02:00
86151b23a6
Merge branch '1910-migration-fix' into 'develop'
...
Notification Backfill: Explicitly select the needed fields.
Closes #1910
See merge request pleroma/pleroma!2715
2020-07-03 10:44:19 +00:00
59b426ebef
Notification Backfill: Explicitly select the needed fields.
...
Prevents a crashing migration when we change user fields.
2020-07-03 11:25:12 +02:00
90764670dc
[ #1892 ] Excluded internal users (applications) from user search results, reinstated service actors in search results.
2020-07-03 11:02:15 +03:00
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
d44ec2bf4c
Remove camelCase from the keys
2020-07-02 12:55:08 -05:00
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
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
bad08f34ca
Credo fixes.
2020-07-02 09:57:31 +02:00
311b7c19d0
Streamer: Align announce streaming with polling.
2020-07-02 09:50:26 +02:00
61fe94d698
SideEffects: Refactor.
2020-07-02 09:33:50 +02:00
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
ce92e6e5ce
Fetcher: Work when we can't get the OP.
2020-07-01 11:48:51 +02:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
5a8e0208b1
Add fields limits to instance metadata, add tests
2020-06-30 15:25:10 -05:00
0883a706dc
Merge branch 'develop' into activation-meta
2020-06-30 15:09:03 -05:00
3d2989278c
[ #1892 ] Excluded bot actors (applications, services) from search results.
2020-06-30 21:26:39 +03:00
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
8b7055e25e
Credo fixes
2020-06-30 11:55:58 +02:00
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
2020-06-30 11:40:34 +02:00
2382a2a151
Preload: Load the correct instance panel
2020-06-30 11:35:54 +02:00
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
09c5991f82
Apply suggestion to lib/pleroma/notification.ex
2020-06-29 16:04:14 +00:00
90083a754d
Notifications: Never return `nil` in the notification list.
2020-06-29 17:48:18 +02:00
979f02ec94
Fix CastAndValidate plug
2020-06-29 17:33:00 +04:00
67d92ac7b7
Remove `/statusnet/config`
2020-06-29 17:00:37 +04:00
8693e01799
Fix warning
2020-06-29 16:29:51 +04:00
6512ef6879
excluding attachment links from RichMedia
2020-06-29 15:25:57 +03:00
4a306720e8
Merge branch 'develop' into remove-twitter-api
2020-06-29 16:09:49 +04:00
59540131c1
Credo fixes.
2020-06-29 14:09:03 +02:00
f308196b75
Token Response: Remove empty file.
2020-06-29 13:52:50 +02:00
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
bb168ed94a
OAuth: Extract view-type functions to a view.
2020-06-29 13:39:09 +02:00
8630a6c7f5
Preloaders: Use strings as keys.
2020-06-29 11:41:00 +02:00
a19f8778af
User preloader: Put user info at correct key
2020-06-29 11:06:20 +02:00
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
9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
2020-06-29 03:31:33 +02:00
1566543bec
object/fetcher: Pass full Transmogrifier error
2020-06-26 20:10:47 +02:00
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
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
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
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
b950fb01db
Merge branch 'develop' into refactor/notification_settings
2020-06-26 10:23:19 -05:00
a5bbfa21a1
StaticFE: Prioritize json in requests.
2020-06-26 16:27:39 +02:00
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
a2002ebb63
Preloading: Fix nodeinfo url.
2020-06-26 14:48:23 +02:00
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
2020-06-26 14:47:38 +02:00
7ed2296416
Nodeinfo: Add chat information back in.
2020-06-26 13:04:15 +02:00
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
2020-06-26 12:06:00 +02:00
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
2020-06-26 11:58:40 +02:00
27c33f216a
activity_draft: Add source field
2020-06-26 05:48:25 +02:00
d6c958b4c2
nodeinfo: Fix MRF transparency
2020-06-26 05:33:59 +02:00
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
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
04abee782b
AntiSpamLinkPolicy: Exempt local users.
2020-06-25 12:40:39 +02:00
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
84f9ca1956
Blocking: Don't federate if the options is set.
2020-06-25 12:03:14 +02:00
44bb7cfccd
ActivityPub: Remove `block`.
2020-06-25 11:51:33 +02:00
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
2020-06-25 11:33:54 +02:00
89e5b2046b
ObjectValidator: Basic `Block` support.
2020-06-25 11:13:35 +02:00
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
439a1a0218
added wrapper Pleroma.HTTP for ExAws.S3
2020-06-25 07:12:29 +03:00
67ab580553
Filter outstanding follower requests from deactivated accounts
2020-06-24 17:18:53 -05:00
cc837f9d15
fixed config/descpiption.exs
2020-06-24 21:21:33 +03:00
aae1af8cf1
fix for emoji pagination in pack show
2020-06-24 18:06:30 +03:00
4c5fb831b3
Status schema: Add parent_visible.
2020-06-24 14:33:00 +02:00
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
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
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
2020-06-24 09:12:32 +03:00
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
2020-06-23 18:10:33 +00:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
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
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
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
aee815b478
ObjectValidator: Clarify type of object.
2020-06-23 12:37:05 +02:00
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
2715c40e1d
added tests
2020-06-23 06:59:00 +03:00
c116b6d6d6
ActivityPubController: Update upload_media @doc
...
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
2020-06-23 04:42:44 +02:00
d21ef5e66b
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
...
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
2020-06-23 01:55:33 +00:00
df5e048cbb
Do not need a function to provide fallback value with default defined in config.exs
2020-06-22 17:39:02 -05:00
98f014d3be
Merge branch 'warning/mastofe-settings-blob' into 'develop'
...
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
2020-06-22 21:59:21 +00:00
8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob
2020-06-22 23:45:29 +02:00
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
b3a549e916
Update NotificationOperation spec
2020-06-22 19:18:33 +04:00
7e6f43c0d7
Add `is_muted` to notifications
2020-06-22 19:03:04 +04:00
b0a40fc2e4
added verify RUM settings before start app
2020-06-22 17:27:49 +03:00
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
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
b05f795326
Credo fixes
2020-06-22 14:02:29 +02:00
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
2020-06-22 13:59:45 +02:00
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
9438f83f83
Transmogrifier: Handle `Update` with the pipeline.
2020-06-22 13:16:05 +02:00
31a4d42ce0
SideEffects: Handle user updating.
2020-06-22 13:15:37 +02:00
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
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
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
2020-06-22 10:35:11 +02:00
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 10:59:08 +00:00
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
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
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 09:39:50 +00:00
4cb7b1ebc6
Apply suggestion to lib/mix/tasks/pleroma/config.ex
2020-06-20 09:34:34 +00:00
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
1a704e1f1e
fix for packs pagination
2020-06-20 10:56:28 +03:00
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
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
ac0344dd24
Only accounts with Service actor_type are considered as bots
2020-06-19 21:19:00 +02:00
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
2020-06-19 16:38:57 +02:00
cafdf18408
Merge branch '1873-pagination-fixes' into 'develop'
...
[#1873 ] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
2020-06-19 13:42:57 +00:00
372533b7c3
Merge branch 'dry-up-follower-update' into 'develop'
...
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
2020-06-19 13:40:34 +00:00
abdb540d45
ObjectValidators: Add basic UpdateValidator.
2020-06-19 15:30:30 +02:00
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
c9b5e3feda
revert 'database' option to rejected keys
2020-06-18 05:29:31 +03:00
4044f24e2e
fix test
2020-06-18 05:06:28 +03:00
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
c08c9db0c1
Remove misleading is_ prefix from boolean function
2020-06-17 13:02:01 -05:00
71a5d9bffb
Empty list as default
2020-06-17 12:54:02 -05:00
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
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
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
2020-06-17 18:47:59 +04:00
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:38 +00:00
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:32 +00:00
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
2020-06-17 12:56:30 +00:00
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
a77b0388f4
credo fix
2020-06-17 10:31:06 +03:00
02a5648feb
fixed migration the settings to DB
2020-06-17 09:15:35 +03:00
5c0e1039ce
Chunk the notification type backfill migration
...
Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.
This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.
2020-06-16 23:53:13 +03:00
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
39f7fc5b8e
Update majic & call plug before OpenApiSpex
2020-06-16 19:00:54 +02:00
b66e6eb521
fixes for tests
2020-06-16 19:03:45 +03:00
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
ec1452fd1c
Pleroma.MIME: use gen_magic
2020-06-16 15:15:50 +02:00
32c6576b60
naming
2020-06-16 15:54:22 +03:00
e1603ac8fe
fix attemps to merge map
2020-06-16 15:54:22 +03:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
b023110799
fixed a visibility of functions
2020-06-15 20:48:22 +03:00
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
e1ee8bc1da
User: update_follower_count refactor.
2020-06-15 14:29:34 +02:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
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
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
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
26f710b9e3
Merge branch 'develop' into preload-data
2020-06-12 16:52:52 -05:00
90676bdfe3
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
...
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
2020-06-12 20:43:59 +03:00
cd2df734dd
Merge branch 'bugfix/csp-unproxied' into 'develop'
...
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
2020-06-12 20:43:36 +03:00
e313aa0977
static-fe.css: Restore and move to /priv/static/static-fe
2020-06-12 20:42:43 +03:00
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
8efd1614ec
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-12 18:57:46 +03:00
8b8b8599e9
Fix atom leak in Rich Media Parser
2020-06-12 18:51:42 +03:00
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
2020-06-12 18:39:51 +04:00
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
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
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
1419c67f4d
Merge branch 'feature/cli-reload-emoji' into 'develop'
...
Add command to reload emoji packs from cli for OTP users
Closes #1814
See merge request pleroma/pleroma!2639
2020-06-12 13:32:59 +00:00
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04:00
7f7a1a4676
Check for media proxy base_url, not Upload base_url
2020-06-11 11:05:22 -05:00
8a59fde0e5
Merge branch 'develop' into fix/csp-mediaproxy-base-url
2020-06-11 10:25:00 -05:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 18:56:46 +00:00
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
99afc7f4e4
HTTP security plug: add media proxy base url host to csp
2020-06-10 20:09:16 +03:00
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
2020-06-10 12:05:45 +00:00
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
86fec45f40
ControllerHelper: Fix wrong comparison.
2020-06-10 11:09:45 +02:00
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:12:29 +00:00
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:35 +00:00
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:26 +00:00
1b746cfbbb
Merge branch 'add-url-to-admin-account-view' into 'develop'
...
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
2020-06-09 12:59:14 +00:00
3dd1de61a7
Add `url` field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
40d5058cc4
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:21:44 +02:00
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
2020-06-09 09:20:55 +02:00
fc04a138d4
Apply suggestion to lib/pleroma/notification.ex
2020-06-08 20:01:37 +00:00
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
...
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
2020-06-08 21:04:30 +02:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
c450b248cc
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
...
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
2020-06-08 10:54:43 +00:00
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
ada9d15eee
Merge branch 'recipients-query-speedup' into 'develop'
...
Greatly speed up recipients query
See merge request pleroma/pleroma!2558
2020-06-08 01:32:35 +03:00
c29ad60c20
Activity.Queries: Use correct actor restriction.
2020-06-08 01:20:13 +03:00
e9aa6a3fa4
ActivityPub: Change ordering to `nulls last` in favorites query
...
This makes it use our existing index and speeds up the query.
2020-06-08 01:19:57 +03:00
3687788cf2
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
2020-06-08 00:58:31 +03:00
f10b40828f
[stable rewrite]: fix streamer streaming out announces from a muted thread
...
Use parent object instead of activity because context is null of Announce activity from Mastodon.
2020-06-08 00:58:31 +03:00
9396b2f8cf
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-08 00:58:31 +03:00
a51284b60a
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
2020-06-08 00:58:30 +03:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
8d9e586887
Delete pending follow requests on user deletion
2020-06-07 17:31:37 +02:00
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
2020-06-07 15:38:33 +02:00
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
2020-06-07 14:52:56 +02:00
1a11f0e453
Chats: Change id to flake id.
2020-06-07 14:25:30 +02:00
0365053c8d
AttachmentValidator: Check if the mime type is valid.
2020-06-07 09:19:00 +02:00
40fc4e974e
Notfication: Add validation of notification types
2020-06-06 16:59:08 +02:00
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
f77d4a302d
Credo fixes.
2020-06-06 15:51:08 +02:00
9189b489ee
Migrations: Move Notification migration code to helper
2020-06-06 15:33:02 +02:00
9fa3f0b156
Notification: Change type of `type` to an enum.
2020-06-06 13:08:45 +02:00
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +02:00
137adef6e0
ChatMessageReference: Use FlakeId.Ecto.Type
...
No need for compat because this is brand new.
2020-06-06 10:42:24 +02:00
239d03499e
Chat: creation_cng -> changeset
...
Make our usage of this more uniform.
2020-06-06 10:38:45 +02:00
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
2020-06-06 09:46:07 +02:00
167812a3f2
Fix pagination
2020-06-05 23:18:29 +04:00
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
f24d2f714f
Credo fixes
2020-06-05 17:18:48 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-05 14:48:02 +00:00
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
2020-06-05 16:47:02 +02:00
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +02:00
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
2020-06-05 12:26:07 +02:00
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
aa2ac76510
Notification: Don't break on figuring out the type of old EmojiReactions
2020-06-04 20:40:46 +02:00
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
2020-06-04 21:36:26 +04:00
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
5677b21e82
clean up
2020-06-03 17:24:35 -04:00
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
e46aecda55
Notification: Fix notifications backfill for compacted activities
2020-06-03 20:51:59 +02:00
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
c020fd4352
ChatMessageReferenceView: Return read status as `unread`.
2020-06-03 18:58:58 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
2020-06-03 16:45:04 +02:00
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
2020-06-03 14:04:12 +00:00
903955b189
FollowingRelationship: Remove meaningless change
2020-06-03 14:40:44 +02:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
2591745fc2
ChatMessageReferences: Move tests
2020-06-03 12:56:39 +02:00
8a43611e01
Use AdminAPI.StatusView in api/admin/users
2020-06-03 14:53:46 +04:00
f3ccd50a33
ChatMessageReferences: Adjust views
2020-06-03 12:49:53 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
2020-06-02 16:30:03 +00:00
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00:00
2c6ebe709a
Credo fixes
2020-06-02 15:14:52 +02:00
6cd2fa2a4c
Migrations: Add a migration to backfill notification types.
2020-06-02 15:13:19 +02:00
38dce485c4
Notification: Add function to backfill notification types
2020-06-02 14:50:10 +02:00
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
37542a9dfa
Activity: Remove notifications-related functions.
2020-06-02 14:22:16 +02:00
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
2020-06-02 11:32:03 +00:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
2020-06-02 08:49:24 +00:00
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 10:43:13 +02:00
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
8ff3425828
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-01 13:34:13 +02:00
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
2020-06-01 13:17:56 +02:00
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
954acdda20
Add `account_activation_required` to /api/v1/instance
2020-05-31 11:36:49 -05:00
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
2020-05-30 15:51:19 +00:00
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
2020-05-30 15:36:55 +03:00
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
2c9465cc51
SafeText: Let through basic html.
2020-05-30 12:17:18 +02:00
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
2020-05-30 08:51:38 +03:00
d23b3701d8
Merge branch 'bugfix/csp-unproxied' into 'develop'
...
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
2020-05-29 21:23:49 +00:00
109af93227
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
2020-05-29 21:15:07 +00:00
660d49227b
Merge branch 'connect-src' into 'develop'
...
Add blob: to connect-src CSP, fixes #1827
Closes #1827
See merge request pleroma/pleroma!2608
2020-05-29 19:26:54 +00:00
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
d38f28870e
Add blob: to connect-src CSP
2020-05-29 11:08:17 -05:00
219d2b3146
Merge branch 'fix-streaming' into 'develop'
...
Fix argument error in streamer
See merge request pleroma/pleroma!2609
2020-05-29 15:42:43 +00:00
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
2020-05-29 15:33:35 +00:00
de0e262839
Fix argument error in streamer
...
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
2020-05-30 00:31:18 +09:00
da1e31fae3
http_security_plug.ex: Fix non-proxied media
2020-05-29 17:20:09 +02:00
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
2020-05-29 16:14:45 +02:00
2c18830d0d
Bugfix: router: allow basic_auth for outbox
2020-05-29 16:14:45 +02:00
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
3898dd69a6
SideEffects: Ensure a chat is present before streaming something out.
2020-05-29 16:05:02 +02:00
767ce8b803
StreamerView: Actually send Chats, not ChatMessages.
2020-05-29 16:02:45 +02:00
863c02b25d
SideEffects: Stream out chat messages.
2020-05-29 15:44:03 +02:00
c86a88edec
Streamer: Add a chat message stream.
2020-05-29 15:24:41 +02:00
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
2020-05-29 10:42:49 +00:00
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
228ff3760e
Use `User.is_internal_user?` instead
2020-05-29 19:07:05 +09:00
9df5b1e6ae
Don't make relay announce notification
2020-05-29 19:06:38 +09:00
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
2020-05-29 09:46:31 +00:00
27180611df
HTTP Security plug: make starting csp string generation more readable
2020-05-29 12:32:48 +03:00
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
2020-05-28 23:11:12 +04:00
d1ee3527ef
Move config actions to AdminAPI.ConfigController
2020-05-28 22:23:15 +04:00
1d30608e20
Merge branch 'fix/1557-gets-local-pack' into 'develop'
...
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
2020-05-28 17:08:30 +00:00
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
ae05792d2a
get-packs for local generated pack
2020-05-28 19:41:34 +03:00
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
92fba24c74
Alpha sort
2020-05-27 17:17:06 -05:00
30f96b19c1
Abstract out the database maintenance. I'd like to use this from AdminFE too.
2020-05-27 16:40:51 -05:00
0d57e06626
Make clearer that this is time and resource consuming
2020-05-27 16:31:37 -05:00
73ca57e4f1
Make it obvious a full vacuum can take a while
2020-05-27 16:27:29 -05:00
a2f57bd82b
Permit easy access to vaccum full and analyze via a mix task
2020-05-27 16:27:07 -05:00
95f6240889
Fix minor spelling error
2020-05-27 14:34:37 -05:00
29ff6d414b
HTTP security plug: Harden img-src and media-src when MediaProxy is enabled
2020-05-27 21:41:19 +03:00
455a402c8a
HTTP Security plug: rewrite &csp_string/0
...
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
2020-05-27 21:31:47 +03:00
8f6d428880
AccountView: Use mediaproxy URLs for emojis
...
Also use atom keys in emoji maps instead of binaries
Closes #1810
2020-05-27 19:44:02 +03:00
48fd9be65a
Exclude post actor from to of relay announce
2020-05-27 23:51:15 +09:00
d35be02e70
Merge branch 'refactor-add-mention-step-one' into 'develop'
...
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
2020-05-27 14:17:12 +00:00
lain
Alexander Strizhakov
Maksim Pechnikov
Haelwenn (lanodan) Monnier
Haelwenn
Ivan Tashkinov
Alex Gleason
Hugo Müller-Downing
Sergey Suprunenko
feld
Mark Felder
Egor Kislitsyn
Roman Chvanikov
MK Fain
Karol Kosek
rinpatch
Ilja
Alibek Omarov
href
KokaKiwi
=
eugenijm
stwf
kPherox