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
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
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
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
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
dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
3 years ago
Ilja
27fe7b0274
Make quarentine work with list of tuples instead of strings
3 years ago
Ilja
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
3 years ago
Ilja
4ba0beb60c
Make mrfSimple work with tuples
...
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
3 years ago
Alex Gleason
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
3 years ago
Alex Gleason
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
3 years ago
Alex Gleason
bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
3 years ago
Alex Gleason
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
3 years ago
Alex Gleason
25676c84be
Create AdminAPI.InstanceController
3 years ago
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
3 years ago
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
3 years ago
Alex Gleason
167e14416b
AdminAPI: add date to users
3 years ago
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
3 years ago
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
3 years ago
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
3 years ago
Haelwenn
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
3 years ago
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
3 years ago
Sean King
9758f636b2
Delete MastoFE Controller Test
3 years ago
Sean King
5d279a22b1
Merge develop branch upstream
3 years ago
Haelwenn (lanodan) Monnier
fc6ab78a84
Add test on changing [:instance, :upload_limit]
3 years ago
feld
406dadb56b
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
...
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
3 years ago
Mark Felder
f37db23848
Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy
3 years ago
Mark Felder
dc8fe91dec
Metadata.Utils.attachment_url/1 was used in this test too
3 years ago
Haelwenn (lanodan) Monnier
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
3 years ago
Mark Felder
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
3 years ago