030183b35f
AttachmentValidator: Use custom ecto type and regex for "mediaType"
2022-03-17 22:37:26 +01:00
31ff467eff
Use `types` for filtering notifications
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 21:15:44 +01:00
ffe081bf44
Use reject_follow_request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 19:18:15 +01:00
6754d1f272
POST /api/v1/accounts/:id/remove_from_followers
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 16:52:33 +01:00
eb1a29640f
Add pagination to AdminAPI.AnnouncementController.index
2022-03-08 21:26:05 -05:00
11a1996bf5
Implement update announcement admin api
2022-03-08 20:55:41 -05:00
881179ec72
Remove GET /api/v1/announcements/:id
2022-03-08 19:22:28 -05:00
d569694ae9
Show only visible announcements in MastodonAPI
2022-03-08 19:20:29 -05:00
cf8334dbc1
Add starts_at, ends_at and all_day parameters
2022-03-08 19:12:01 -05:00
2b39b36e49
Implement POST /api/v1/announcements/:id/dismiss
2022-03-08 16:59:20 -05:00
aa1fff279e
Implement GET /api/v1/announcements/:id
2022-03-08 16:19:35 -05:00
5169ad8f14
Implement announcement read relationships
2022-03-08 13:09:49 -05:00
d7af67012f
Implement first pass of announcement admin api
...
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
2022-03-08 01:01:27 -05:00
4458db3201
Merge branch 'fix_test_get_user_apps' into 'develop'
...
Fix test get_user_apps/1
See merge request pleroma/pleroma!3636
2022-03-06 18:40:49 +00:00
79ccb6b999
Support fallbacking to other languages
2022-03-06 11:43:31 -05:00
cd42e2bed0
Lint
2022-03-03 09:49:55 -05:00
aca11fb70e
Support multiple locales from userLanguage cookie
2022-03-03 02:31:36 -05:00
7ea330b4fe
Support multiple locales formally
...
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.
[0]: https://github.com/elixir-gettext/gettext/issues/303
2022-03-03 02:03:44 -05:00
bc59da96c5
Add test for fallbacking to a general language
2022-03-02 20:04:30 -05:00
8de573b047
Fallback to a variant if the language in general is not supported
...
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.
Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
2022-03-02 19:59:11 -05:00
e644f8dea5
Allow user to register with custom language
2022-03-02 01:41:13 -05:00
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
6ba93c2cb3
Fix test get_user_apps/1
...
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.
When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827 ), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.
The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.
AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
2022-02-22 18:56:26 +01:00
0fd3695b9c
Prefer userLanguage cookie over Accept-Language header in detecting locale
...
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-02-21 18:02:19 -05:00
e473bcf7a0
Max media attachment count
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
7c044a1841
FilterControllerTest: tag erratic test
2022-02-02 13:10:39 -06:00
d1cc9e4eaf
Fix tests matching on "warn"
...
Moving it to "warning" would break tests on 1.12.x
2022-02-02 12:45:26 -06:00
bd81af731e
Tag erratic test
2022-02-02 12:29:53 -06:00
2d77976305
Add tests for mismatched context in replies
2022-02-02 12:19:35 -06:00
5a4e3aa715
Test that a Create/Note from Roadhouse validates
2022-02-02 11:02:23 -06:00
61dfeca1cc
Test that a Note from Roadhouse validates
2022-02-02 10:38:30 -06:00
3bf257171f
ForceMentionsInContent: improve display of Markdown posts
2022-01-27 14:15:06 -06:00
27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts
2022-01-26 21:24:26 -06:00
0604b0dd09
ForceMentionsInContent: don't mention self
2022-01-25 12:33:47 -06:00
0f4e0e667e
Merge branch 'recipients-inline' into 'develop'
...
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request pleroma/pleroma!3620
2022-01-25 17:43:39 +00:00
65b4d2ce84
ForceMentionsInContent: fix order of mentions
2022-01-25 10:42:34 -06:00
ab12a05a43
AccountView: Add test for show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:34:36 +01:00
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format
2022-01-24 20:03:43 -06:00
e3d394eef6
Birthdays: Fix tests, add test for misskey
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:41:21 +01:00
0266bc3c96
Birthdays: hide_birthday -> show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:13:33 +01:00
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates
2022-01-22 14:24:50 -06:00
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06:00
7a015b1fe2
Make test less erratic by adding five second tolerance
2022-01-22 12:07:54 -07:00
f5d4ef50b4
FilterTest: tag erratic test
2022-01-22 12:13:09 -06:00
6ffe43af70
Merge branch 'private-pins' into 'develop'
...
Support private pinned posts from Mastodon
See merge request pleroma/pleroma!3611
2022-01-20 23:18:24 +00:00
00523bdf5e
Test pinned private statuses in AccountController
2022-01-20 16:54:43 -06:00
88c21b9282
Support private pinned posts from Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-20 12:35:32 +01:00
a02cfd7f52
Add ForceMentionsInContentPolicy
...
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
2022-01-19 21:04:57 +03:00
dfb2808535
Birth dates: Add tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 23:15:31 +01:00
397f67fef8
Format code, expose instance configuration related to birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 18:18:38 +01:00
eedf551eed
Add more tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 22:41:34 +01:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
cd3175c7fe
Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'
...
Escape unicode RTL overrides in rich media parser tests
See merge request pleroma/pleroma!3598
2022-01-11 13:39:23 +03:00
fd043b0ab3
Escape unicode RTL overrides in rich media parser tests
...
Elixir 1.13 does not allow them in raw form anymore, resulting in errors
like this when running the test:
== Compilation error in file test/pleroma/web/rich_media/parser_test.exs ==
** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-10 17:51:53 +03:00
2ae867842b
StreamerTest: tag erratic test
2021-12-31 10:29:50 -06:00
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:27:27 +01:00
f734579965
MastoAPI: Add `GET /api/v1/accounts/lookup`
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:11:17 +01:00
3fd13b70ec
Test that the target account is re-fetched in move_account
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
eb383ef8d3
Make move_account endpoint process non-existent users properly
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
4f44fd32ea
Federate unfollow activity in move_following properly
...
0: Use the CommonAPI unfollow function to make sure the
unfollow activity is federated.
1: Limit the follow and unfollow to local followers only,
while let the romote servers decide whether to move their followers.
Ref: emit-move
2021-12-28 01:11:08 -05:00
e41eee5ed1
Make Move activity federate properly
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
54d7b4354c
Add deleting alias endpoint
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
c1aa3c98ac
Add get and add aliases endpoints
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
0af77b20c1
Implement moving account
...
Ref: emit-move
2021-12-28 01:10:34 -05:00
5c80d4087d
PleromaAPI.AppView: add test
2021-12-27 18:52:34 -06:00
cb2a072e62
Apps: add test for get_user_apps/1
2021-12-27 18:29:03 -06:00
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
479fc5fff8
EnsureStaffPrivilegedPlug: add tests
2021-12-27 10:39:59 -06:00
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
2021-12-26 02:35:17 +00:00
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
2021-12-25 20:11:14 -06:00
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-23 16:00:16 +00:00
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
2021-12-22 04:14:31 +00:00
2ce7dae6de
Skip erratic tests
2021-12-21 22:04:15 -06:00
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
2021-12-19 18:18:59 +00:00
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
2021-12-19 11:33:10 -06:00
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
8376e83f61
Lint
2021-12-17 16:52:50 -05:00
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17 16:44:22 -05:00
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17 14:44:28 -05:00
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
01cc099c8e
VideoHandlingTest: remove nil values
2021-12-07 21:55:54 -05:00
992d9287d0
Apply alexgleason's suggestion(s) to 1 file(s)
2021-12-07 22:53:36 +00:00
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -05:00
335684182a
Fix VideoHandlingTest
2021-12-07 13:35:34 -05:00
3f03d71ea6
AttachmentValidator: ingest width and height
2021-12-07 12:59:03 -05:00
d9349bc52f
Transmogrifier: test fix_attachments/1
2021-12-07 01:10:47 -05:00
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:24:12 +01:00
3892bd353b
Add test for following with subscription
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:15:03 +01:00
db46913dcc
make linter happy
2021-12-06 11:50:51 +00:00
cd8bdbc761
Make deactivated user check into a subquery
...
Fixes #2792
2021-12-06 11:44:17 +00:00
ba2ed3c255
Fix frontend_status_plug_test.exs
2021-12-03 07:56:26 -06:00
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
2021-12-03 00:11:38 -06:00
5da4f33bf1
Restore POST /auth/password
2021-12-03 00:10:57 -06:00
6519f59d91
v2 Suggestions: return `is_suggested` through the API
2021-11-26 23:10:01 -06:00
e5a7547fbe
v2 Suggestions: also filter out users you follow
2021-11-26 21:46:08 -06:00
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
2021-11-26 21:09:37 -06:00
aee55b9a8b
v2 Suggestions: dismiss a suggestion
2021-11-26 20:19:29 -06:00
6c0484d571
AdminAPI: suggest a user through the API
2021-11-26 15:19:01 -06:00
b17360cd7c
v2 Suggestions: rudimentary API response
2021-11-26 14:34:10 -06:00
7e1caddc58
v2 Suggestions: return empty array
2021-11-25 14:57:36 -06:00
720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest
2021-11-24 17:58:58 -06:00
cb9359335f
Expose /manifest.json for PWA
2021-11-24 17:50:55 -06:00
cb76faece9
Update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 17:51:00 +01:00
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 16:56:26 +01:00
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
2021-11-15 14:31:27 +00:00
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
2021-11-15 14:24:13 +00:00
bd77243981
Merge branch 'userfeed-fe-fallback' into 'develop'
...
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
2021-11-15 10:48:56 +00:00
871936b3ca
MediaProxyCacheControllerTest: Fix unstable tests.
...
Cachex order isn't stable, so we can not depend on the order in
tests. This adds some sorting to make the tests stable.
2021-11-14 11:45:38 +01:00
2dea4a8c04
StealEmojiPolicyTest: Make mocks explicit.
2021-11-14 11:44:24 +01:00
23161526d4
object_validators: Group common fields in CommonValidations
...
Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
(Well IIRC we don't or barely support bto/bcc anyway)
2021-10-10 02:50:06 +02:00
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06 08:11:05 +02:00
92a8ff59aa
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
...
Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522
2021-10-06 05:44:44 +00:00
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
198250dcef
Allow users to remove their emails if instance does not need email to register
2021-09-05 21:27:02 -04:00
33f063204e
Add unit test for Pleroma API app controller
2021-08-28 23:18:12 -06:00
53b0dd4ecc
List available frontends also when no static/frontends folder is present yet
...
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
2021-08-28 18:23:49 +02:00
bc62a35282
Merge branch 'features/ingestion-no-nil' into 'develop'
...
ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506
2021-08-28 16:07:35 +00:00
b11dbbf403
UserController: fall back to frontend when user isn't found
2021-08-17 18:32:32 -05:00
84ec0fbeaa
Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'
...
List available frontends also when no static/frontends folder is present yet
Closes admin-fe#201
See merge request pleroma/pleroma!3510
2021-08-14 18:42:12 +00:00
f9bafc17fb
List available frontends also when no static/frontends folder is present yet
...
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
2021-08-14 18:42:12 +00:00
773708cfe8
Merge branch 'builder-note' into 'develop'
...
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511
2021-08-14 18:32:40 +00:00
ba6049aa81
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
2021-08-14 11:24:55 -05:00
a2eacfc525
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
2021-08-14 11:01:06 -05:00
0e2aebd036
TwitterAPI: Make change_email require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:57:11 +02:00
3961422f85
TwitterAPI: Make change_password require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:56:59 +02:00
8baaa36a16
ObjectAgePolicy: Fix pattern matching on published
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
2021-08-13 17:56:46 +02:00
61d233921c
ObjectValidator.stringify_keys: filter out nil values
2021-08-11 21:38:10 +02:00
7c1243178b
Merge branch 'bugfix/change_password' into 'develop'
...
TwitterAPI: Make change_password require body params instead of query
Closes #2740
See merge request pleroma/pleroma!3503
2021-08-10 18:40:13 +00:00
197cdebca9
TwitterAPI: Make change_email require body params instead of query
2021-08-10 20:33:00 +02:00
09dcb2b522
TwitterAPI: Make change_password require body params instead of query
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740
2021-08-10 20:01:11 +02:00
c64eae40a2
ObjectAgePolicy: Fix pattern matching on published
2021-08-10 07:41:06 +02:00
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06:00
03030b47c2
quarantine instances info
...
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
2021-08-06 07:59:53 +02:00
47fc57bbcc
Change what nodeinfo returns without breaking backwards compatibility
...
* Only for SimplePolicy for now
* I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info
2021-08-06 07:59:53 +02:00
7fdc3cde06
Return maps in node_info
...
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
2021-08-06 07:59:53 +02:00
dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
2021-08-06 07:59:52 +02:00
27fe7b0274
Make quarentine work with list of tuples instead of strings
2021-08-06 07:59:52 +02:00
dd947d9bc8
Add tests for setting `:instance, :quarantined_instances`
...
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
2021-08-06 07:59:52 +02:00
4ba0beb60c
Make mrfSimple work with tuples
...
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
2021-08-06 07:58:58 +02:00
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
2021-08-04 11:48:57 -05:00
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
2021-07-18 11:10:23 -05:00
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
2021-07-17 15:03:43 -05:00
bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
2021-07-17 15:00:15 -05:00
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
2021-07-17 14:55:05 -05:00
25676c84be
Create AdminAPI.InstanceController
2021-07-17 13:05:25 -05:00
feld
3f58213646
Merge branch 'admin-api-users-sort' into 'develop'
...
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
2021-07-14 14:39:14 +00:00
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
2021-07-14 09:02:55 -05:00
167e14416b
AdminAPI: add date to users
2021-07-14 08:54:59 -05:00
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
2021-07-13 22:47:47 -05:00
5e88796784
AdminAPI: sort user results by ID descending
2021-07-13 22:47:02 -05:00
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
2021-07-12 22:11:32 -05:00
9bc1e79c56
Moderators: add UserIsStaffPlug
2021-07-12 21:57:52 -05:00
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
2021-07-12 05:05:49 +00:00
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
9758f636b2
Delete MastoFE Controller Test
2021-07-10 11:13:25 -06:00
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
fc6ab78a84
Add test on changing [:instance, :upload_limit]
2021-06-22 12:25:25 +02:00
feld
406dadb56b
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
...
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
2021-06-10 15:03:58 +00:00
Mark Felder
f37db23848
Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy
2021-06-09 11:46:31 -05:00
Mark Felder
dc8fe91dec
Metadata.Utils.attachment_url/1 was used in this test too
2021-06-09 10:06:44 -05:00
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
2021-06-09 04:23:02 +02:00
Mark Felder
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
2021-06-08 16:58:33 -05:00
Mark Felder
d4ac9445cd
Twittercard metadata for images should also include dimensions if available
2021-06-08 16:19:12 -05:00
Mark Felder
5de65ce3e8
Set the correct height/width if the data is available when generating twittercard metadata
2021-06-08 15:59:55 -05:00
feld
939b3bfe43
Merge branch 'improve-og-embed' into 'develop'
...
Improve opengraph embeds
See merge request pleroma/pleroma!3442
2021-06-08 19:26:17 +00:00
1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
...
Speeds up recompilation by reducing compile-time cycles
2021-06-07 18:18:39 -05:00
Mark Felder
017f947fc1
Channel name was incorrect. We left it as chat:public for backwards compatibility.
2021-06-07 16:10:24 -05:00
Mark Felder
a5ae0432ed
Test was named incorrectly and did not execute
2021-06-07 16:09:47 -05:00
Mark Felder
f5ef7fe43b
Fix test warnings
2021-06-07 16:06:53 -05:00
Mark Felder
264458531a
Formatting
2021-06-07 15:47:50 -05:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
eb7313b0d3
Pipeline Ingestion: Page
2021-06-04 20:06:33 +02:00
2c401dafa1
Improve opengraph embeds
...
This brings them more in line with Mastodon.
- Deduplicates display name from the title and content
- Removes arbitrary limits on the size of the embedded image
- Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.
2021-06-04 05:33:35 +00:00
Mark Felder
9ce2c017c0
We want clear_config/2 in all tests now
2021-06-01 11:49:47 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
2021-06-01 11:33:11 -05:00
feld
0ddf492c5d
Merge branch 'cycles-base-url' into 'develop'
...
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
2021-06-01 16:15:27 +00:00
c4b4258374
Merge branch 'features/validators-note' into 'develop'
...
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
2021-06-01 01:51:38 +00:00
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
...
Move as_local_public/0 to stop making modules depend on Web at compile-time
2021-05-31 13:39:15 -05:00
feld
8871ca5aa3
Merge branch 'cycles-router-api-routes' into 'develop'
...
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
2021-05-28 19:06:49 +00:00
feld
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
2021-05-28 13:51:21 -05:00
c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
...
Reduce recompilation time by breaking compile-time cycles
2021-05-28 13:51:01 -05:00
Mark Felder
4694853766
Provide totalItems field for featured collections
2021-05-27 12:17:31 -05:00
Mark Felder
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
4c060ae733
Ingest remote attachment width/height
2021-05-12 15:38:49 -05:00
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
2021-05-05 14:50:54 -05:00
50e3750758
Add notice compatibility routes for other frontends
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-04-30 14:21:17 -05:00
c16c7fdb87
SimplePolicy: filter string Objects
2021-04-30 14:20:54 -05:00
3d742c3c1a
SimplePolicy: filter nested objects
2021-04-30 14:20:37 -05:00
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
a8fa00ef66
Fix failing remote mentions test, valid TLDs
2021-04-30 12:55:43 -05:00
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
15f87cf658
Merge branch 'features/ingestion-ecto-tag' into 'develop'
...
TagValidator: New
See merge request pleroma/pleroma!3244
2021-04-16 09:55:55 +00:00
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
2021-04-15 23:12:42 -06:00
Mark Felder
f95b52255b
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
2021-04-14 09:39:57 -05:00
Mark Felder
905efc57e9
Initial test validating the AdminAPI issue
2021-04-13 14:39:28 -05:00
Mark Felder
cdd271b065
Fix assignment / assertion
2021-04-13 10:55:54 -05:00
Mark Felder
9fbcdc15b1
Validate custom instance thumbnail set via AdminAPI produces correct URL
2021-04-13 10:52:53 -05:00
5ef4659b37
test/pleroma/web/common_api_test.exs: Strip : around emoji key-name
2021-04-05 19:25:55 +02:00
53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
2021-04-05 19:19:12 +02:00
b0c778fde7
NoteHandlingTest: remove fix_explicit_addressing-related test
2021-04-05 19:19:12 +02:00
d1205406d9
ActivityPubControllerTest: Apply same addr changes to object
2021-04-05 19:19:12 +02:00
641184fc7a
recipients fixes/hardening for CreateGenericValidator
2021-04-05 19:19:11 +02:00
c944932674
Pipeline Ingestion: Note
2021-04-05 19:19:11 +02:00
e2a3365b5c
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
2021-04-05 19:19:11 +02:00
e56779dd8d
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
2021-04-05 19:19:11 +02:00
5ae27c8451
pipeline_test: Fix usage of %Activity{}
2021-04-01 14:18:40 +02:00
Mark Felder
16a7ffb1ea
Fix function calls due to module name change
2021-03-30 11:10:44 -05:00
Mark Felder
bfcdcd4f69
Temp file leaked, oops
2021-03-30 11:10:44 -05:00
Mark Felder
03f38ac4eb
Prefer FollowBot naming convention vs Followbot
2021-03-30 11:10:44 -05:00
Mark Felder
fef4f3772c
More tests to validate Followbot is behaving
2021-03-30 11:10:44 -05:00
Mark Felder
f73d166785
Only need to validate a follow request is generated for now
2021-03-30 11:10:44 -05:00
5ae9b05600
separate test file for featured collection
2021-03-25 13:03:41 +03:00
8f0778166c
moving fixture into mastodon folder
2021-03-25 13:03:41 +03:00
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
d1d2744ee3
featured_address valition in AddRemoveValidator
2021-03-25 13:03:40 +03:00
ff612750b1
validator renaming & add validation for target
2021-03-25 13:03:40 +03:00
17f28c0507
mastodon pins
2021-03-25 13:03:40 +03:00
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
b6a69b5efd
Return token's primary key with POST /oauth/token
2021-03-24 12:50:05 -05:00
d3660b24d3
Copy emoji in the subject from parent post
...
Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.
2021-03-22 21:20:47 +03:00
d7e51206a2
respect content-type header in finger request
2021-03-19 18:53:55 +03:00
a9bc652ab9
Merge branch 'mediaproxy-decode' into 'develop'
...
Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364
2021-03-19 08:52:12 +00:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
67bde35e71
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
...
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
2021-03-19 08:36:26 +00:00
55bdfb075c
OpenAPI: TwitterAPI Util Controller
2021-03-15 06:47:07 +01:00
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
2021-03-15 06:47:07 +01:00
e4743847a1
OpenAPI: PleromaAPI UserImport Controller
2021-03-15 06:47:07 +01:00
ef5de5eb39
OpenAPI: MastodonAPI Status Controller
2021-03-15 06:47:07 +01:00
0c7c6463d1
OpenAPI: MastodonAPI Account Controller, excluding OAuth
2021-03-15 06:47:06 +01:00
3a8404820d
Verify MastoFE Controller put_settings response
2021-03-15 06:47:06 +01:00
e47f83cfc8
OpenAPI: MastodonAPI Conversation Controller
2021-03-15 06:47:06 +01:00
3123ecdd6e
OpenAPI: MastodonAPI Media Controller
2021-03-15 06:47:06 +01:00
7eecc3b61d
OpenAPI: MastodonAPI Timeline Controller
2021-03-15 06:47:06 +01:00
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
2021-03-15 06:44:05 +01:00
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
2021-03-10 03:24:40 +00:00
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Mark Felder
eaaa20e0f1
Make tests use it
2021-03-05 13:21:22 -06:00
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
Mark Felder
913d53b7d7
Remove useless header on the get request
2021-03-02 14:04:50 -06:00
Mark Felder
ccbf162088
Actually test viewing status after ingestion
2021-03-02 12:33:32 -06:00
Mark Felder
f0208980e4
Test both ingestion of post in the status controller and the correct response during the view
2021-03-02 12:29:16 -06:00
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
2021-03-02 20:49:17 +04:00
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
Mark Felder
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
e8d88a72cf
Merge branch 'fix/warning-in-test' into 'develop'
...
warning fix
See merge request pleroma/pleroma!3350
2021-02-28 16:53:05 +00:00
4a9d3a1f28
Merge branch 'features/reports-enhancements' into 'develop'
...
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
2021-02-28 16:45:15 +00:00
f85ed1c521
warning fix
2021-02-28 19:41:25 +03:00
050c4b1f14
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
...
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
2021-02-28 16:18:23 +00:00
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
d0823d7f1e
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
...
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
2021-02-27 19:40:38 +00:00
Mark Felder
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
Mark Felder
902d4e4a4a
Leave a note for future explorers
2021-02-25 13:06:43 -06:00
Mark Felder
2da71a526f
No need to filter out Mix.env() from the API routes.
2021-02-25 13:04:08 -06:00
Mark Felder
6b87dfad5d
Filter out MIX_ENV from route list and add a test
2021-02-25 09:23:10 -06:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
2021-02-21 23:41:28 +01:00
Mark Felder
63739c5a58
Tests to validate client disclosure obeys user setting
2021-02-18 17:23:17 -06:00
Mark Felder
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
2021-02-18 16:35:03 -06:00
1e6c27181e
expires_in in scheduled status params
2021-02-18 14:59:22 +03:00
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
ff72ce31ca
Enhance reports in Pleroma API: index, show
2021-02-17 18:46:53 +01:00
e7b1f0f5f4
Merge branch 'feat/chat-list-pagination' into 'develop'
...
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
2021-02-17 15:36:59 +00:00
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
2021-02-17 15:14:27 +00:00
264cb2c77f
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
...
[#2510 ] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
2021-02-17 13:08:51 +00:00
d7ad288c84
Chats: Introduce /api/v2/pleroma/chats which implements pagination
...
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
2021-02-17 16:03:24 +03:00
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-02-16 23:23:49 +03:00
1dac7d1462
[ #3213 ] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
2021-02-15 21:13:14 +03:00
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
Mark Felder
fb2a8e7ccd
Additional validation so we don't get caught off guard with a nil response
...
if CommonAPI ever prevents us from injecting this data
2021-02-12 13:15:33 -06:00
Mark Felder
3554a65f45
Inject fake application metadata and validate it is stripped by transmogrifier
2021-02-12 13:05:12 -06:00
db716f860a
Merge branch 'not-used-mock' into 'develop'
...
Not used mock
See merge request pleroma/pleroma!3313
2021-02-12 08:52:04 +00:00
76414ad277
Merge branch 'bugfix/answer-outbox' into 'develop'
...
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
2021-02-12 08:48:51 +00:00
Mark Felder
bd3d0e8b57
Use a custom oauth token so we can predict and validate the client_name and website
2021-02-11 15:53:10 -06:00
Mark Felder
333ff527fd
Validate client application metadata is retained in the object
2021-02-11 15:07:21 -06:00
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
b5d001fc8c
not used mock
2021-02-10 18:44:49 +03:00
a853218701
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
...
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
2021-02-09 19:29:43 +00:00
Mark Felder
55a13fc360
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
...
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
2021-02-08 20:00:47 +01:00
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
feld
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
2021-02-04 14:33:59 +00:00
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
2021-02-04 14:26:03 +00:00
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
feld
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
2021-02-03 14:22:23 +00:00
feld
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
fb25231fbe
Add test for Answer presence into an authenticated /outbox
2021-02-03 12:07:18 +01:00
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
2021-02-02 18:35:08 +00:00
feld
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
2021-02-02 18:15:00 +00:00
Mark Felder
28d2917c3a
Merge branch 'develop' into fix/majic-nits
2021-02-02 12:01:48 -06:00
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
0dc68c157f
fix for scheduled post with poll
2021-02-01 18:22:26 +03:00
fdf1dfed56
only_remote -> remote renaming
2021-02-01 14:11:12 +03:00
77f0a0af7d
more tests and update for docs and changelog
2021-02-01 14:11:12 +03:00
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
b6a72680e2
added only_media flag to home timeline
2021-02-01 14:11:11 +03:00
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
2021-02-01 14:11:11 +03:00
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
2021-01-31 23:06:38 +03:00
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +03:00
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
2021-01-31 20:37:33 +03:00
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
2021-01-29 00:17:33 +03:00
Mark Felder
5fcab23aa3
Improve error message for ConfigDB
2021-01-28 14:59:23 -06:00
Mark Felder
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
2021-01-28 14:03:29 -06:00
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
2021-01-28 19:49:43 +03:00
bddb01bded
Add tests
2021-01-27 18:20:07 +04:00
793fc77b16
Add active user count
2021-01-27 18:20:06 +04:00
7f07871639
Merge branch 'chore/tests-use-clear_config' into 'develop'
...
Convert tests to all use clear_config instead of Pleroma.Config.put
See merge request pleroma/pleroma!3282
2021-01-27 11:33:27 +00:00
d4158e8bf0
added total
...
to the instance adminAPI endpoint
2021-01-27 07:45:06 +03:00
6806c03e85
added total
...
to the user statuses adminAPI endpoint
2021-01-27 07:45:02 +03:00
feld
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
Mark Felder
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
2021-01-26 11:58:43 -06:00
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
2021-01-26 14:24:32 +00:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
Haelwenn (lanodan) Monnier
feld