479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
98f8851f29
Use the image thumbnail for rich metadata (OGP/Twittercards)
2020-08-22 15:12:11 -05:00
0922791e4d
updated errors on add emoji
2020-08-22 10:56:26 +03:00
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
4e6eb22b4a
Try to warm the cache with the preview image if preview proxy enabled
2020-08-21 12:19:35 -05:00
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
aa0a5ffb48
[ #2497 ] Media preview proxy: added `quality` config setting, adjusted width/height defaults.
2020-08-21 08:59:08 +03:00
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
02ad1cd8e9
[ #2497 ] Media preview proxy: added Content-Disposition header with filename to response.
2020-08-20 09:58:50 +03:00
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
2020-08-19 21:36:26 +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
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
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
2020-08-18 12:38:13 +02: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
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
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
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
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
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
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02: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
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05: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
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
81126b0142
Add email to user account only if it exists in LDAP
2020-08-05 11:36:12 -05: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
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
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
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
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
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
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
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
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
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
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
2020-07-28 17:35:16 +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
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
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05: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
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
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
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
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
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02: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
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04: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
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
d0eb43b58b
Add account aliases
2020-07-17 16:17:49 -05: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
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05: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
9ce95fa68f
Use `approval_required` in /api/v1/instance
2020-07-15 17:04:30 -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
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
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
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
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
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
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
2020-07-14 11:04:16 +02: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
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
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
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
62fc8eab0d
fix reset confirmation email in admin section
2020-07-11 07:20:35 +03: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
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
2020-07-10 08:55:15 +00:00
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -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
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
172f4aff8e
Transmogrifier: Move following to the pipeline.
2020-07-08 14:30:53 +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
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
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
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
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
cc8b4e48d9
InstanceView: Add chat limit, description limit
2020-07-06 11:12:37 +02:00
20c27bef40
renaming back and reject nil on create
2020-07-06 09:30:42 +03:00
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +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
cf56655614
Streamer: Don't filter out announce notifications.
2020-07-04 17:11:37 +02: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
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
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
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
2020-07-03 13:07:33 +02: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
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
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
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
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
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
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
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
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
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
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
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
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00: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
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
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
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
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
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
faba1a6e33
fix tests
2020-06-15 12:25:03 -04: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
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
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
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
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04: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
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
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
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
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +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
0365053c8d
AttachmentValidator: Check if the mime type is valid.
2020-06-07 09:19:00 +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
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +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
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
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
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
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
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
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
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
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03: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
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
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
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
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
95f6240889
Fix minor spelling error
2020-05-27 14:34:37 -05: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
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27 10:55:42 +00:00
c6290be682
Fix typo
2020-05-27 14:42:21 +04:00
b9e2678b9e
Merge branch 'fav-speedup' into 'develop'
...
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
2020-05-27 08:02:00 +00:00
7e13200869
ActivityPub: Change ordering to `nulls last` in favorites query
...
This makes it use our existing index and speeds up the query.
2020-05-27 09:46:12 +02:00
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
2020-05-26 13:45:54 +02:00
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
8f08384d80
another view for account in admin-fe status_show
2020-05-26 13:48:39 +03:00
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
2020-05-25 23:27:47 +03:00
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
2020-05-25 22:04:06 +04:00
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
2020-05-25 17:27:45 +02:00
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
2020-05-25 15:08:43 +02:00
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
2020-05-25 16:51:16 +04:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
ec470c4c77
Merge branch 'openapi/admin/status' into 'develop'
...
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
2020-05-25 11:40:54 +00:00
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
2020-05-24 19:05:57 +00:00
ddbbefeb2e
Merge branch 'feature/configure-filename-truncate' into 'develop'
...
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
2020-05-22 16:05:35 +00:00
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
2020-05-22 15:44:10 +00:00
cc82229ba7
Add filename_display_max_length config
2020-05-22 18:19:25 +03:00
91c8467582
OStatusController: Add Mastodon activity compat route.
2020-05-22 17:11:59 +02:00
355aa3bdc7
ActivityPubController: Add Mastodon activity compat route.
2020-05-22 17:06:12 +02:00
8a4bd9e5d1
OStatusController: Add Mastodon compatibility route for objects.
2020-05-22 16:47:22 +02:00
1fa7aa9fc5
Merge branch 'emoji-react-better-errors' into 'develop'
...
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
2020-05-22 14:36:08 +00:00
ba106aa9c8
Fix notifications mark as read API
2020-05-22 18:15:36 +04:00
ca755f9a73
ActivityPubController: Add Mastodon compatibility route.
2020-05-22 16:15:29 +02:00
bcb549531f
EmojiReactionController: Return more appropriate error.
2020-05-22 14:38:28 +02:00
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
2020-05-22 05:47:53 +00:00
a57e7f3503
Merge branch '1113-op-mentioning' into 'develop'
...
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
2020-05-22 05:22:07 +00:00
610343edb3
[ #2497 ] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
2020-05-21 17:35:42 +03:00
ab1154e13f
Merge branch 'admin-logo-upload' into 'develop'
...
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
2020-05-21 14:30:34 +00:00
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
2020-05-21 13:30:09 +00:00
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
cdc6ba8d7b
AnnounceValidator: Check for announcability
2020-05-21 13:58:18 +02:00
c76267afb9
Credo fixes.
2020-05-21 13:31:52 +02:00
23e248694d
Announcements: Fix all tests.
2020-05-21 13:16:21 +02:00
d9d425708e
SideEffects: Builed out Announce effects.
2020-05-21 12:43:09 +02:00
9de9760aa6
Move status actions to AdminAPI.StatusController
2020-05-21 13:52:30 +04:00
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
2020-05-21 04:41:42 +03:00
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
1871a5ddb4
[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
2020-05-20 20:26:43 +03:00
39031f4860
Pipeline: Don't federate if federation is disabled.
2020-05-20 16:36:55 +02:00
e42bc5f557
Announcements: Handle through common pipeline.
2020-05-20 15:44:37 +02:00
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
2020-05-20 12:08:28 +00:00
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
2020-05-20 14:02:40 +02:00
eb5f428565
CommonAPI: Change public->private implicit addressing.
...
This will not add the OP to the `to` field anymore when going from
public to private.
2020-05-20 13:38:47 +02:00
26f01744bc
Add `background_image` to `InstanceOperation`
2020-05-20 15:18:58 +04:00
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
2020-05-20 15:15:13 +04:00
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
2020-05-20 15:15:13 +04:00
9a5de0f454
Move reaction actions to EmojiReactionController
2020-05-20 15:15:13 +04:00
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
2020-05-20 10:53:54 +00:00
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
8a6ddf26ac
InstanceOperation: Add background image to example
2020-05-20 12:12:07 +02:00
47ed9ee441
Fix summary
2020-05-19 17:29:58 +04:00
6609714d66
Move Scrobble views to ScrobbleView
2020-05-19 16:26:06 +04:00
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
2020-05-19 16:26:06 +04:00
e4c720f14c
Fix typo
2020-05-19 14:59:50 +04:00
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
2020-05-19 09:41:57 +00:00
41f8f17260
fix api/v1/accounts/update_credentials
2020-05-19 09:42:41 +03:00
5f0a3ac74d
added tests
2020-05-19 06:05:09 +03:00
d19c716770
AttachmentValidator: Handle empty mediatypes
2020-05-18 20:17:28 +02:00
fe5d423b43
Add OpenAPI spec for MascotController
2020-05-18 22:01:18 +04:00
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
2020-05-18 20:58:59 +04:00
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
2020-05-18 18:45:33 +02:00
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-18 18:38:32 +02:00
5735b5c8be
Fixed missing support for `with_muted` param in direct timeline.
2020-05-18 19:00:00 +03:00
aef31c69df
Rename EmojiAPIController to EmojiPackController
2020-05-18 19:43:25 +04:00
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
2020-05-18 19:43:23 +04:00
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
2020-05-18 19:28:46 +04:00
0d5bce018d
AnnounceValidator: Validate for existing announce
2020-05-18 16:54:10 +02:00
17a8342c1e
ObjectValidators: Add basic Announce validator.
2020-05-18 16:45:11 +02:00
7d381b16b7
Transmogrifier Test: Extract Announce handling.
2020-05-18 14:48:37 +02:00
215daabdb4
copyright update
2020-05-18 15:15:51 +03:00
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
2020-05-18 13:29:30 +02:00
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
2020-05-18 10:57:59 +00:00
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
1671864d88
return :visible instead of boolean
2020-05-18 10:34:50 +03:00
b1aa402229
removing 410 status
2020-05-18 10:34:50 +03:00
e7bc2f980c
account visibility
2020-05-18 10:34:49 +03:00
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18 09:51:53 +03:00
c33a4315fb
updated docs
2020-05-18 06:48:19 +03:00
baf051a59e
SideEffects: Don't update unread count for actor in chatmessages.
2020-05-17 12:22:26 +02:00
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-17 12:14:49 +02:00
8bfd9710ae
Pleroma Authenticator: Also update passwords here.
2020-05-17 11:53:17 +02:00
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
2020-05-17 08:46:43 +03:00
3f8d68bdf3
added example cache purge script
2020-05-17 05:56:20 +03:00
d96f8f17e8
Merge branch 'features/mastoapi_v2_media' into 'develop'
...
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
2020-05-16 17:13:38 +00:00
d15aa9d950
Merge branch 'develop' into 'remove-twitter-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2020-05-16 17:07:09 +00:00
978ccf8f97
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-16 16:14:50 +03:00
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
2020-05-16 12:28:24 +02:00
cb40602a16
added media proxy invalidation
2020-05-15 21:39:42 +03:00
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
1d18721a3c
Chats: Add updated_at to Schema and docs.
2020-05-15 13:18:41 +02:00
e090191d03
[OpenAPI] Mark all not required request fields as nullable
2020-05-15 14:55:41 +04:00
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-05-14 20:19:56 +03:00
f1f588fd52
[ #2497 ] Added support for :eimp for image resizing.
2020-05-14 20:18:31 +03:00
e455ca3f3e
Merge branch 'feature/database-configuration-whitelist' into 'develop'
...
Database configuration whitelist
See merge request pleroma/pleroma!2522
2020-05-14 16:07:37 +00:00
4157c459b8
Merge branch 'bcrypt-auth' into 'develop'
...
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
2020-05-14 14:36:56 +00:00
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
2020-05-14 08:57:38 -05:00
bb03dfdb03
Do not require `description` in `update` action
2020-05-14 16:29:32 +04:00
0f885b4b86
Fix OpenAPI spec
2020-05-14 16:18:30 +04:00
20cbfb5cb5
Allow whitelisting whole groups
2020-05-14 12:43:53 +01:00
3342846ac2
ChatView: Add update_at field.
2020-05-14 13:20:28 +02:00
5c6f575315
Style fixes
2020-05-14 12:15:48 +01:00
099e314a1b
Add OpenAPISpex for MediaController
2020-05-14 12:13:25 +02:00
359d7b0a6d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:09:11 +00:00
1c2629328d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:07:09 +00:00
cb363f0183
MastodonAPI: /api/v2/media endpoints
2020-05-14 10:14:28 +02:00
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
2020-05-13 18:56:45 +03:00
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
2020-05-13 19:06:46 +04:00
0f0acc740d
Chat: Allow posting without content if an attachment is present.
2020-05-13 15:31:28 +02:00
59b6d5f2aa
[ #2456 ] Changed `embed_relationships` param to `with_relationships`.
2020-05-13 15:08:07 +03:00
06cad239e5
InstanceView: Add pleroma chat messages to nodeinfo
2020-05-13 14:05:22 +02:00
3cff4e24cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-13 12:44:16 +02:00
bcadbf964a
Add OpenAPI spec for SuggestionController
2020-05-13 14:15:24 +04:00
33b798425f
[ #2456 ] Post-merge fix.
2020-05-13 12:50:52 +03:00
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
2020-05-13 12:42:36 +03:00
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
79ad12064d
Fix format
2020-05-13 01:59:17 +04:00
cb1a3e196c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:43 +00:00
5a2333925c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:36 +00:00
822e9c09aa
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:21 +00:00
40646a7e0e
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:14:52 +00:00
0bb164a3e1
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:12:22 +00:00
648cc0d72d
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:09:26 +00:00
7803a85d2c
Add OpenAPI spec for StatusController
2020-05-13 00:25:21 +04:00
a2fcfc78c9
Filter config descriptions by config whitelist
2020-05-12 21:07:33 +01:00
bfb48e3db6
[ #2456 ] OpenAPI: added `embed_relationships` param definition.
2020-05-12 20:55:01 +03:00
2b18b8a263
Merge branch 'streamer-get-topic' into 'develop'
...
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
24c8c13640
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
...
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
63a1a82f38
[ #2456 ] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12 19:14:35 +03:00
620247a015
Add database configuration whitelist
2020-05-12 17:12:27 +01:00
e6d8cacf2d
Expand and authorize streams in Streamer directly
2020-05-12 18:04:47 +02:00
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
2020-05-12 16:43:04 +02:00
ec72cba43e
Chat Controller: Add basic error handling.
2020-05-12 13:23:09 +02:00
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
b5aa204eb8
ChatController: Support deletion of chat messages.
2020-05-12 13:13:03 +02:00
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
2020-05-12 12:29:37 +02:00
d0ba1844b0
ActivityPub: Fix non-federating blocks.
2020-05-12 10:52:46 +02:00
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
2020-05-11 23:21:53 +03:00
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-11 17:14:58 +02:00
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +02:00
5367a00257
Deletion: Handle the case of pruned objects.
2020-05-11 15:06:23 +02:00
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
8d5597ff68
ChatController: Add GET /chats/:id
2020-05-10 13:26:14 +02:00
172d9b1193
Chat: Add last_message to schema.
2020-05-10 13:08:01 +02:00
f335e1404a
ChatView: Add the last message to the view.
2020-05-10 13:00:01 +02:00
1054e89762
ChatOperation: Add media id to example
2020-05-10 12:30:24 +02:00
b960a9430d
[ #2456 ] credo fix.
2020-05-10 09:35:12 +03:00
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
ac4250a18c
[ #2456 ] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.
2020-05-09 19:03:07 +03:00
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
2020-05-09 18:05:44 +03:00
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
2020-05-08 23:06:47 +03:00
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
03529f6a05
Transmogrifier: Don't modify attachments for chats.
2020-05-08 18:26:35 +02:00
d0bf8cfb8f
Credo fixes.
2020-05-08 14:11:58 +02:00
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
2020-05-08 10:41:41 +00:00
4d71c4b805
fixed 'source' object in verify_credentials
2020-05-08 12:35:34 +03:00
6acbe45eb2
Builder: Extract common features of likes and reactions.
2020-05-08 11:30:31 +02:00
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
2020-05-08 09:23:01 +00:00
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
...
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
2020-05-08 09:04:24 +00:00
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
...
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
2020-05-07 22:29:16 +00:00
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 18:53:34 +02:00
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
2020-05-07 14:28:10 +00:00
516ff945ce
Merge branch 'openapi/search' into 'develop'
...
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
2020-05-07 13:38:34 +00:00
eb1f2fcbc6
Streamer: Fix wrong argument order when rendering activities to authenticated user
...
Closes #1747
2020-05-07 16:13:24 +03:00
d11eea62b1
Credo fixes
2020-05-07 15:09:37 +02:00
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 15:03:12 +02:00
788b7e7bbd
Merge fixes.
2020-05-07 14:52:37 +02:00
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
2020-05-07 14:45:20 +02:00
3f867d8e9b
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
2020-05-07 10:48:09 +00:00
dc4a448f48
Add OpenAPI spec for SearchController
2020-05-07 14:04:48 +04:00
cdca62e8d4
Add schema for Tag
2020-05-07 14:04:07 +04:00
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
2020-05-07 09:19:45 +00:00
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
2020-05-07 09:13:32 +00:00
9491ba3e49
Streamer rework
2020-05-07 09:13:32 +00:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
a2580adc91
Hide the sender when privacy option is enabled
2020-05-06 16:42:27 -05:00
57736c1833
Privacy option affects all push notifications, not just Direct Messages
2020-05-06 16:30:05 -05:00
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 17:36:08 +02:00
473b0d9f3d
Merge branch 'feature/delete-validator' into 'develop'
...
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
2020-05-06 14:32:58 +00:00
fc9d0b6eec
Credo fixes.
2020-05-06 16:31:21 +02:00
20baa2eaf0
ChatMessages: Add attachments.
2020-05-06 16:12:36 +02:00
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
2020-05-06 15:08:38 +03:00
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
06c69c0a0a
Fix description
2020-05-06 14:18:19 +04:00
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
07e7c80bc9
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
...
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
2020-05-06 09:14:05 +00:00
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
c3f1ce80eb
Merge branch 'fix/1726-user-pagination' into 'develop'
...
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
2020-05-06 09:01:42 +00:00
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
6ba25d1197
Add Attachment schema
2020-05-05 23:42:24 +04:00
0a1394cc1a
Add OpenAPI spec for PollController
2020-05-05 20:14:22 +04:00
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
2020-05-05 18:02:24 +02:00
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
2020-05-05 16:42:34 +02:00
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
2020-05-05 16:17:09 +02:00
3a45952a3a
Add OpenAPI spec for ConversationController
2020-05-05 17:44:46 +04:00
32ca9f2c59
Render mastodon-like errors in FilterController
2020-05-05 17:41:16 +04:00
46aae346f8
Move single used schemas to Filter operation schema
2020-05-05 17:41:01 +04:00
7e7a3e1544
Add OpenAPI spec for FilterController
2020-05-05 17:41:01 +04:00
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
2020-05-05 17:40:00 +04:00
42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
88a14da817
Add OpenAPI spec for InstanceController
2020-05-05 17:24:16 +04:00
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
2020-05-05 15:08:41 +02:00
f2bf4390f4
Fix descriptions for List API spec
2020-05-05 17:05:35 +04:00
5ec6aad567
Add OpenAPI spec for ListController
2020-05-05 17:05:34 +04:00
babcae7130
Move single used schemas to Marker operation schema
2020-05-05 16:45:34 +04:00
8096565653
Add OpenAPI spec for MarkerController
2020-05-05 16:44:16 +04:00
d861b0790a
Add OpenAPI spec for SubscriptionController
2020-05-05 16:43:00 +04:00
f1da8882f9
UndoValidator: Add UndoValidator.
2020-05-05 14:17:47 +02:00
33f2976020
Merge branch 'feature/1737-magic-key-field' into 'develop'
...
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
2020-05-05 12:10:10 +00:00
5482a1f6ef
Merge branch 'openapi/validation-plug' into 'develop'
...
Ignore unexpected query params and ENUM values
Closes #1719
See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
d201527004
Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex
2020-05-05 11:17:44 +00:00
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
db55dc9445
ActivityPub: Remove `react_with_emoji`.
2020-05-05 12:28:28 +02:00
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
2020-05-05 12:11:46 +02:00
f21f538293
LikeValidator: Add defaults for recipients back in.
2020-05-05 10:38:59 +02:00
c297667f16
Merge branch 'fix/issue-1729' into 'develop'
...
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
2020-05-05 08:21:39 +00:00
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-05 10:19:01 +02:00
6400998820
AP C2S: Restrict creation to `Note`s for now.
2020-05-05 10:12:37 +02:00
f897da2115
WebFinger: Add back in subscribe_address.
...
It's used for remote following.
2020-05-05 09:36:38 +02:00
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
2020-05-04 23:36:00 +02:00
e55fd530bc
Render better errors for ENUM validation
2020-05-04 22:33:34 +04:00
f070b5569c
Add a config option to enable strict validation
2020-05-04 22:33:05 +04:00
4b9ab67aa8
Ignore unexpected ENUM values in query string
2020-05-04 21:46:25 +04:00
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 19:24:04 +02:00
bfbff7d826
Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex
2020-05-04 16:38:23 +00:00
d08c63500b
Ignore unexpected query params
2020-05-04 20:16:44 +04:00
3559dd1085
Transmogrifier: Rely on LikeValidator.
2020-05-04 17:18:38 +02:00
0f9bed022f
LikeValidator: Fix up context.
2020-05-04 17:18:17 +02:00
e03c301ebe
LikeValidator: Fix up missing recipients.
2020-05-04 17:08:31 +02:00
13ab8defc0
Pipeline: Move transctioning to common pipeline.
2020-05-04 14:34:19 +02:00
ec24c70db8
ActivityPub: Don't fetch `Application` follower counts.
2020-05-04 14:22:54 +02:00
b04328c3de
ChatController: Add mark_as_read
2020-05-04 13:10:36 +02:00
30590cf46b
CommonAPI: Refactor for readability
2020-05-04 12:53:40 +02:00
57e6f2757a
ChatOperation: Make simple schema into inline schema
2020-05-04 12:47:23 +02:00
dcf535fe77
Credo fixes.
2020-05-04 11:32:11 +02:00
651935f137
Schemas: Refactor to our naming scheme.
2020-05-04 11:08:00 +02:00
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
9249742f13
Types.Recipients: Simplify reducer.
2020-05-03 15:28:24 +02:00
a35b76431c
Credo fixes.
2020-05-03 14:58:24 +02:00
a7966f2080
Webfinger: Request account info with the acct scheme
2020-05-03 13:48:01 +02:00
1974d0cc42
DeleteValidator: The deleted activity id is an object id
2020-05-03 13:02:57 +02:00
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-03 12:55:29 +02:00
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
2020-05-03 12:51:28 +02:00
f20a1a27ef
DeleteValidator: Improve code readability
2020-05-03 12:19:01 +02:00
370e313e2d
Only update follower/following stats for actor types of users and bots.
2020-05-02 13:28:10 -05:00
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
2020-05-02 19:05:13 +03:00
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
2020-05-02 18:28:04 +03:00
0dfb5ad0ad
Merge branch 'bugfix/static-fe.css' into 'develop'
...
static-fe.css: Restore and move to /priv/static/static-fe
See merge request pleroma/pleroma!2458
2020-05-02 06:37:33 +00:00
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
2020-05-02 08:28:42 +02:00
c18ef452b0
OpenAPI: Add `follow_request` to notification types
...
Closes #1731
2020-05-01 23:14:20 +03:00
85105f7aae
OpenAPI: Remove max pagination limit from the spec
...
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
2020-05-01 21:33:34 +03:00
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
2020-05-01 13:09:36 +00:00
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
2020-05-01 12:48:56 +00:00
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
2020-05-01 12:38:46 +00:00
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
2020-05-01 14:30:39 +02:00
ebbd9c7f36
AdminAPIController: Refactor.
2020-05-01 14:22:39 +02:00
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
2020-05-01 13:35:42 +02:00
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
2020-05-01 13:34:47 +02:00
ecf37b46d2
pagination fix for service users filters
2020-05-01 14:31:24 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
2020-04-30 22:44:31 +02:00
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
2020-04-30 21:23:18 +02:00
a81342a234
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
...
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
2020-04-30 18:38:52 +00:00
999d639873
ActivityPub: Remove `delete` function.
...
This is handled by the common pipeline now.
2020-04-30 20:13:47 +02:00
5da08c2b73
SideEffects: Fix comment
2020-04-30 19:53:30 +02:00
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
2020-04-30 19:47:13 +02:00
60db58a1c6
Credo fixes.
2020-04-30 18:38:37 +02:00
ab60ee1776
SideEffects: On deletion, reduce the User note count.
2020-04-30 18:19:39 +02:00
c832d96fc9
SideEffects: Stream out deletes.
2020-04-30 17:58:09 +02:00
4500fdc04c
DeleteValidator: Add internal helper field after validation.
2020-04-30 17:53:02 +02:00
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
2c4844237f
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
2020-04-30 18:19:51 +03:00
4a487e4d0b
fix for auth check
2020-04-30 17:50:57 +03:00
14c6672193
AP C2S: Use common pipelin for deletes.
2020-04-30 16:49:41 +02:00
fdd8e7f276
CommonAPI: Use common pipeline for deletions.
2020-04-30 16:15:38 +02:00
417eed4a2b
SideEffects: Handle deletions.
2020-04-30 15:57:27 +02:00
1fb383f368
DeleteValidator: Deleting a user is valid.
2020-04-30 15:42:30 +02:00
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
2020-04-30 15:26:23 +02:00
36abeedf9f
error rename
2020-04-30 16:09:22 +03:00
ddb757f743
emoji api packs changes in routes with docs update
2020-04-30 16:09:18 +03:00
342f55fb92
refactor emoji api with fixes
2020-04-30 15:45:52 +03:00
db184a8eb4
DeleteValidator: Mastodon sends unaddressed deletes.
2020-04-30 14:37:14 +02:00
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
42ce7c5164
ObjectValidator: Add actor fetcher.
2020-04-30 14:13:08 +02:00
64bb72f98a
Typo fix.
2020-04-30 13:57:47 +02:00
ad2182bbd2
Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex
2020-04-30 11:38:26 +00:00
9c1adb35de
Merge branch 'develop' into openapi/notifications
2020-04-30 13:52:07 +04:00
1898054da4
Merge branch 'develop' into openapi/reports
2020-04-30 13:51:27 +04:00
8cf3a32463
Add exlude_replies to OpenAPI spec for account timelines
2020-04-30 00:49:59 +03:00
b68d56c816
Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_response.ex
2020-04-29 19:49:13 +00:00
145d35ff70
Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
2020-04-29 19:49:03 +00:00
589ce1e96b
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-04-29 19:47:16 +00:00
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
2f77842bd3
Fix account registration when captcha is enabled but not provided
2020-04-29 21:26:07 +04:00
503de4b8df
ObjectValidator: Add validation for `Delete`s.
2020-04-29 19:09:51 +02:00
78c864cbee
LikeValidator: Use Recipients Type.
2020-04-29 19:08:36 +02:00
b8056e69e0
Object Validator Types: Add Recipients.
2020-04-29 19:08:08 +02:00
20587aa931
Chat message creation: Check actor.
2020-04-29 14:53:53 +02:00
a88734a0a2
Transmogrifier: Fetch missing actors for chatmessages.
2020-04-29 14:25:33 +02:00
53e3063bd0
Transmogrifier: Remove ChatMessageHandling module.
2020-04-29 13:52:23 +02:00
e055b8d203
Pipeline: Always run common_pipeline in a transaction for now.
2020-04-29 13:45:50 +02:00
67659afe48
ChatOperation: Refactor.
2020-04-29 13:34:43 +02:00
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-29 13:19:04 +02:00
5238ae3dd3
Add OpenAPI spec for NotificationController
2020-04-28 21:27:54 +04:00
4c0e53367a
[ #2349 ] Post-merge fix.
2020-04-28 20:04:25 +03:00
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
dedffd100c
Pipeline: Unify, refactor, DRY.
2020-04-28 17:29:54 +02:00
abd0928229
CreateChatMessageValidator: Validate object existence
2020-04-28 16:45:28 +02:00
6aa116eca7
Create activity handling: Flip it and reverse it
...
Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object.
2020-04-28 16:26:19 +02:00
560f2c1979
Add OpenAPI spec for ReportController
2020-04-28 16:50:37 +04:00
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-28 14:16:21 +02:00
12bb7fc0dc
Merge branch 'openapi/account' into 'develop'
...
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
2020-04-28 11:57:16 +00:00
f8e56d4271
SideEffects: Use Object.normalize to get the object.
2020-04-28 13:43:58 +02:00
906cf53ab9
Recipient Type: Cast all elements as ObjectIDs.
2020-04-28 13:38:02 +02:00
764b4f95a8
Merge branch 'develop' into global-status-expiration
2020-04-28 14:13:53 +04:00
9994768312
Merge branch 'mongoose-secure' into 'develop'
...
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
2020-04-28 09:18:59 +00:00
ea5142b94b
convert markdown content to html
2020-04-28 09:32:43 +03:00
5ff20793e7
formating
2020-04-28 01:29:31 +02:00
dda65f7799
Move single used schemas to operation schema
2020-04-27 22:55:05 +04:00
cc1e2e8d0f
requested changes to mongoose_im_controller.ex
2020-04-27 19:11:03 +02:00
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
2020-04-27 20:46:52 +04:00
5c7cc10917
add tests for deactivated users for mongoose auth
2020-04-27 18:31:00 +02:00
a626cb682c
secure mongoose auth endpoint
2020-04-27 17:55:33 +02:00
3d040b1a87
Credo fixes.
2020-04-27 17:55:29 +02:00
ad82a216ff
Chat API: Align more to Pleroma/Mastodon API.
2020-04-27 17:48:34 +02:00
49e673dfea
ChatView: Add actor_account_id
2020-04-27 16:08:03 +02:00
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
2020-04-27 14:28:08 +02:00
00e956528b
Credo fixes.
2020-04-27 14:02:11 +02:00
15ba3700af
Chat Schemas: Inline unimportant Schemas.
2020-04-27 12:45:59 +02:00
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-27 12:07:08 +02:00
e16437ff19
[ #1706 ] Formatting fix.
2020-04-25 18:42:08 +03:00
0d05e1fe39
[ #1706 ] Prevented error on unresolved activity actors for timeline actions.
2020-04-25 18:24:10 +03:00
b4139cc547
[ #2409 ] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
2020-04-24 22:25:27 +03:00
8addbd948c
Merge branch 'bugfix/announce-race-condition' into 'develop'
...
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
2020-04-24 16:58:24 +00:00
c30b3b2dc5
Merge branch 'reply-filtering-refactor' into 'develop'
...
Reply filtering refactor
See merge request pleroma/pleroma!2424
2020-04-24 16:32:13 +00:00
d89cd0a197
Reply Filtering: Refactor.
2020-04-24 18:25:26 +02:00
d862c7156a
Merge branch 'openapi-improvements' into 'develop'
...
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
2020-04-24 16:10:43 +00:00
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
2020-04-24 16:52:38 +03:00
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
cb12585098
Announcements: Prevent race condition.
2020-04-24 14:37:53 +02:00
1df6af2a4c
Credo fixes.
2020-04-24 13:59:48 +02:00
bbf8554c97
ActivitPub: Remove `like` function.
...
We don't need another way to build likes.
2020-04-24 13:48:13 +02:00
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
2020-04-24 15:16:15 +04:00
89f38d94c7
[ #2409 ] Fixed before-action callback results persistence.
2020-04-23 21:47:33 +03:00
1e28d34592
ChatMessage: Correctly ingest emoji tags.
2020-04-23 16:19:49 +02:00
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-23 15:47:08 +02:00
1b5f8d19ee
Merge branch 'bugfix/repeating-announce' into 'develop'
...
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
2020-04-23 12:40:38 +00:00
7d38197894
CommonAPI: Don't make repeating announces possible
2020-04-23 13:33:30 +02:00
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
2020-04-23 11:22:30 +00:00
9cf4c4fa73
Remove vapidPublicKey from Nodeinfo
2020-04-23 14:12:42 +04:00
850377a7b8
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
...
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
2020-04-22 19:26:32 +00:00
1bcbdc7a9f
SideEffects: Use less cryptic syntax.
2020-04-22 21:21:21 +02:00
e62173dfc8
SideEffects: Run in transaction.
...
This fixes race conditions.
2020-04-22 18:40:53 +02:00
1b06a27746
Update Flake ID description
2020-04-22 20:20:19 +04:00
6c26feed01
Merge branch 'develop' into openapi/account
2020-04-22 20:18:12 +04:00
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
2020-04-22 18:50:25 +03:00
28f8fcf8b0
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
2020-04-22 15:46:04 +00:00
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
2020-04-22 15:33:04 +00:00
238058ecae
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
...
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
2020-04-22 15:31:51 +00:00
e7771424a8
Fix blocks import
2020-04-22 19:27:28 +04:00
88b82e5c3e
Fix follow import
2020-04-22 19:27:28 +04:00
7a3a88a13e
Streamer: Stream boosts to the boosting user.
2020-04-22 17:21:13 +02:00
1855c597c2
Merge branch 'feature/voters-count' into 'develop'
...
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
2020-04-22 15:12:19 +00:00
2e73c19edc
Merge branch 'worker-messages' into 'develop'
...
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
2020-04-22 15:09:10 +00:00
452072ec95
static_fe: Add microformats2 classes
2020-04-22 16:02:40 +02:00
5b39526198
AccountController: Use code 400 for self-follow.
2020-04-22 15:04:26 +02:00
c10485db16
StatusController: Ignore nil scheduled_at parameters.
2020-04-22 14:26:19 +02:00
5102468d0f
Polls: Persist and show voters' count
2020-04-22 14:06:39 +02:00
923513b641
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
f719a5b23a
WebPush: Return proper values for jobs.
2020-04-22 13:28:34 +02:00
2e62a63749
ChatMessageValidator: Validation changes
...
Don't validate if the recipient is blocking the actor.
2020-04-22 12:48:52 +02:00
11433cd38d
Add OpenAPI schema for FlakeID
2020-04-21 23:54:45 +04:00
f0238d010a
Improve OpenAPI schema
...
- Removes unneeded wrapping in examples
- Adds `:format` attributes
2020-04-21 23:30:24 +04:00
66c2eb670b
ChatController: Validate parameters.
2020-04-21 18:23:00 +02:00
97ad0c4597
Chats: Add API specs.
2020-04-21 17:51:06 +02:00
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 14:24:27 +02:00
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00:00
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 12:00:33 +02:00
e57c1b60e4
Merge branch 'accept-deletes' into 'develop'
...
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
2020-04-20 18:30:01 +00:00
7e456ac7f6
Merge branch 'router-cleanup' into 'develop'
...
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
2020-04-20 18:29:03 +00:00
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
ed3974af24
Add OpenAPI spec for `AccountController.identity_proofs` operation
2020-04-20 18:40:02 +04:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
258d897579
Cleanup and DRY the Router
2020-04-20 16:39:20 +04:00
b5df4a98e4
ChatMessageView: Support emoji.
2020-04-20 14:38:53 +02:00
7e53da250e
ChatMessage: Support emoji.
2020-04-20 14:08:54 +02:00
b836d3d104
ChatMessageValidator: Require `published` field
2020-04-20 13:14:59 +02:00
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-20 12:37:17 +02:00
970b74383b
Credo fixes.
2020-04-20 12:29:19 +02:00
5b6818b3e5
CommonAPI: Obey local limit for chat messages.
2020-04-20 12:08:47 +02:00
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
2020-04-20 11:45:11 +02:00
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
2020-04-18 06:59:23 +00:00
24f760c2f7
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-04-17 22:48:37 +00:00
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
2020-04-17 23:57:22 +02:00
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
163341857a
Improve OpenAPI errors
2020-04-17 19:27:22 +04:00
c845820911
Notifications: Create a chat notification.
2020-04-17 16:55:01 +02:00
e0d7847bc5
Merge branch 'sideeffects-test' into 'develop'
...
SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399
2020-04-17 14:03:04 +00:00
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
26d9c83316
SideEffects: Test for notification creation.
2020-04-17 15:50:15 +02:00
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
2020-04-17 13:40:25 +00:00
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
2020-04-17 15:37:54 +02:00
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
2020-04-17 14:32:15 +02:00
d45ae64858
ChatController: Use OAuth scopes.
2020-04-17 13:04:46 +02:00
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
f8c3ae7a62
ChatController: Handle pagination.
2020-04-16 18:43:31 +02:00
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
2020-04-16 17:50:24 +02:00
4d330d9df1
fix for use of published from different entities
2020-04-16 18:05:36 +03:00
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
ca598e9c27
AccountView: Return user ap_id.
2020-04-16 15:27:35 +02:00
e2ced04917
ChatMessages: Better validation.
2020-04-16 15:21:47 +02:00
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
2020-04-16 12:56:29 +02:00
cf4ebba774
Cleanup SubscriptionController
2020-04-15 23:14:47 +04:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
2020-04-15 21:19:16 +03:00
6ace22b56a
Chat: Add views, don't return them in timeline queries.
2020-04-15 18:23:16 +02:00
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
2020-04-15 19:20:34 +03:00
65f04b7806
Fix credo warning
2020-04-15 17:16:32 +04:00
16f4787bf7
Add a TODO note
2020-04-15 16:51:37 +04:00
0e647ff55a
Abstract pagination params in OpenAPI spec
2020-04-15 16:45:45 +04:00
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
8ed162b655
Fix formatting
2020-04-15 15:57:00 +04:00
5a2e45a218
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 11:29:10 +00:00
81a4c15816
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:48:52 +00:00
a45bd91d4e
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:48:32 +00:00
bfa26b0937
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:30:19 +00:00
a794ba655f
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:27:01 +00:00
a7feca1604
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:26:53 +00:00
d3e876aeee
Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
2020-04-15 10:26:44 +00:00
96eae62995
Merge branch 'fix/openapi-form-mimetype' into 'develop'
...
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
2020-04-14 22:01:24 +00:00
cc4ff19e34
openapi: add application/x-www-form-urlencoded to body types
...
Closes #1683
2020-04-15 00:49:21 +03:00
3bf78f2be7
Fix Oban not receiving :ok from RichMediaHelper job
2020-04-14 11:43:53 -05:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
2020-04-13 21:21:04 +04:00
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
2020-04-13 18:17:09 +04:00
ab185d3ea4
Add spec for AccountController.follows
2020-04-13 18:17:09 +04:00
68a979b824
Add specs for AccountController.block and AccountController.unblock
2020-04-13 18:17:08 +04:00
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
2020-04-13 18:17:08 +04:00
aa958a6dda
Add spec for AccountController.unfollow
2020-04-13 18:17:08 +04:00
854780c72b
Add spec for AccountController.follow
2020-04-13 18:17:08 +04:00
1b680a98ae
Add spec for AccountController.lists
2020-04-13 18:17:07 +04:00
e105cc12b6
Add spec for AccountController.following
2020-04-13 18:17:07 +04:00
bd6e2b300f
Add spec for AccountController.followers
2020-04-13 18:17:07 +04:00
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
dc8fa04192
Merge branch 'develop' into global-status-expiration
2020-04-13 14:12:51 +04:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-04-10 20:00:05 +04:00
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
2020-04-10 04:31:13 +00:00
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
2cc6841424
ChatController: Basic message posting.
2020-04-09 17:18:31 +02:00
e8fd0dd689
ChatController: Basic support for returning messages.
2020-04-09 16:59:49 +02:00
68abea313d
ChatController: Add creation and return of chats.
2020-04-09 15:13:55 +02:00
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
2020-04-09 17:08:43 +04:00
ac672a9d6b
[ #1559 ] Addressed code review requests.
2020-04-09 15:13:37 +03:00
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-09 13:25:27 +02:00
8e637ae1a7
CommonAPI: Basic ChatMessage support.
2020-04-09 13:20:16 +02:00
2e78686686
SideEffects: Handle ChatMessage creation.
2020-04-09 12:44:20 +02:00
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
f20a19de85
typo fix
2020-04-09 13:28:54 +03:00
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:36 +00:00
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:31 +00:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
3775683a04
ChatMessage: Basic incoming handling.
2020-04-08 15:55:43 +02:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Mark Felder