Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1
3 years ago
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
3 years ago
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
3 years ago
Alex Gleason
d61a5515e6
ConnectionPoolTest: tag erratic test
3 years ago
Alex Gleason
479fc5fff8
EnsureStaffPrivilegedPlug: add tests
3 years ago
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
3 years ago
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
3 years ago
Alex Gleason
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
3 years ago
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
3 years ago
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
Alex Gleason
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
3 years ago
Alex Gleason
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
3 years ago
Alex Gleason
2ce7dae6de
Skip erratic tests
3 years ago
Alex Gleason
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
3 years ago
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
3 years ago
Alex Gleason
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
Tusooa Zhu
8376e83f61
Lint
3 years ago
Tusooa Zhu
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
3 years ago
Tusooa Zhu
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
3 years ago
Tusooa Zhu
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.
3 years ago
FloatingGhost
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
3 years ago
lain
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
3 years ago
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
3 years ago
FloatingGhost
de60b1f3c1
make search provider configurable
3 years ago
Alex Gleason
938c95d75d
VideoHandlingTest: remove nil values
3 years ago
Haelwenn
ecab82dea7
Apply alexgleason's suggestion(s) to 1 file(s)
3 years ago
Alex Gleason
2936adbbce
Fix VideoHandlingTest
3 years ago
Alex Gleason
da83839dc1
AttachmentValidator: ingest width and height
3 years ago
Alex Gleason
494149f173
Transmogrifier: test fix_attachments/1
3 years ago
FloatingGhost
0fab887eee
make linter happy
3 years ago
FloatingGhost
429407ba0a
Make deactivated user check into a subquery
...
Fixes #2792
3 years ago
Alex Gleason
01cc099c8e
VideoHandlingTest: remove nil values
3 years ago
Haelwenn
992d9287d0
Apply alexgleason's suggestion(s) to 1 file(s)
3 years ago
Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
3 years ago
Alex Gleason
335684182a
Fix VideoHandlingTest
3 years ago
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height
3 years ago
Alex Gleason
d9349bc52f
Transmogrifier: test fix_attachments/1
3 years ago
marcin mikołajczak
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
marcin mikołajczak
3892bd353b
Add test for following with subscription
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
FloatingGhost
db46913dcc
make linter happy
3 years ago
FloatingGhost
cd8bdbc761
Make deactivated user check into a subquery
...
Fixes #2792
3 years ago
Alex Gleason
ba2ed3c255
Fix frontend_status_plug_test.exs
3 years ago
Alex Gleason
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
3 years ago
Alex Gleason
5da4f33bf1
Restore POST /auth/password
3 years ago
Alex Gleason
6519f59d91
v2 Suggestions: return `is_suggested` through the API
3 years ago
Alex Gleason
e5a7547fbe
v2 Suggestions: also filter out users you follow
3 years ago
Alex Gleason
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
3 years ago
Alex Gleason
aee55b9a8b
v2 Suggestions: dismiss a suggestion
3 years ago
Alex Gleason
6c0484d571
AdminAPI: suggest a user through the API
3 years ago
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response
3 years ago
Alex Gleason
7e1caddc58
v2 Suggestions: return empty array
3 years ago
Alex Gleason
720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest
3 years ago
Alex Gleason
cb9359335f
Expose /manifest.json for PWA
3 years ago
marcin mikołajczak
cb76faece9
Update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
marcin mikołajczak
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
Alibek Omarov
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
3 years ago
lain
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
3 years ago
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
3 years ago
lain
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
3 years ago
lain
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
3 years ago
Lain Soykaf
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.
3 years ago
Lain Soykaf
2dea4a8c04
StealEmojiPolicyTest: Make mocks explicit.
3 years ago
Haelwenn (lanodan) Monnier
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)
3 years ago
Haelwenn (lanodan) Monnier
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`
3 years ago
Haelwenn
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
3 years ago
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
Tusooa Zhu
198250dcef
Allow users to remove their emails if instance does not need email to register
3 years ago
Sean King
33f063204e
Add unit test for Pleroma API app controller
3 years ago
Ilja
20084329ea
Selecting MRF policies didn't work as intended any more
...
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
3 years ago
Ilja
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
3 years ago
Haelwenn
bc62a35282
Merge branch 'features/ingestion-no-nil' into 'develop'
...
ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506
3 years ago
Haelwenn
6633ec816f
Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
...
Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509
3 years ago
Alex Gleason
b11dbbf403
UserController: fall back to frontend when user isn't found
3 years ago
Haelwenn
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
3 years ago
Ilja
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
3 years ago
Haelwenn
773708cfe8
Merge branch 'builder-note' into 'develop'
...
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511
3 years ago
Alex Gleason
ba6049aa81
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
3 years ago
Alex Gleason
a2eacfc525
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
3 years ago
Ilja
5049b4272e
Selecting MRF policies didn't work as intended any more
...
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
3 years ago
Haelwenn (lanodan) Monnier
0e2aebd036
TwitterAPI: Make change_email require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
3 years ago
Haelwenn (lanodan) Monnier
3961422f85
TwitterAPI: Make change_password require body params instead of query
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
3 years ago
Haelwenn (lanodan) Monnier
8baaa36a16
ObjectAgePolicy: Fix pattern matching on published
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
3 years ago
Haelwenn (lanodan) Monnier
61d233921c
ObjectValidator.stringify_keys: filter out nil values
3 years ago
Haelwenn
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
3 years ago
Haelwenn (lanodan) Monnier
197cdebca9
TwitterAPI: Make change_email require body params instead of query
3 years ago
Haelwenn (lanodan) Monnier
09dcb2b522
TwitterAPI: Make change_password require body params instead of query
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740
3 years ago
Haelwenn (lanodan) Monnier
c64eae40a2
ObjectAgePolicy: Fix pattern matching on published
3 years ago
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
Sean King
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Ilja
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"}}}}`
3 years ago
Ilja
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
3 years ago
Ilja
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.
3 years ago
Ilja
c0489f9fac
Fixed deprecation warning checks
...
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
3 years ago
Ilja
b674ba658b
make linter happy
3 years ago
Ilja
3c5a497b19
Deprecate transparency_exclusions
...
* Give deprecation message
* Rewrite configs
3 years ago
Ilja
dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
3 years ago