Alex Gleason
ba6049aa81
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
3 years ago
Sam Therapy
b901b73057
Add Admin-FE menu for StealEmojiPolicy
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
Alex Gleason
01175ef498
Streamer: fix crash in MastodonAPI.StatusView
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
3 years ago
Haelwenn (lanodan) Monnier
27e1e4c742
Activity.Search: fallback on status resolution on DB Timeout
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
3 years ago
Alex Gleason
e117551169
AdminAPI: hotfix for nil report objects
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
3 years ago
Haelwenn (lanodan) Monnier
bb2d5879cc
maybe_notify_subscribers: Don't create notifications from ingested replies
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
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
kPherox
34606d609d
fix: stream out Create Activity
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
3 years ago
Haelwenn
61ba54897e
Merge branch 'streamer-crash-fix' into 'develop'
...
Streamer crash fix
See merge request pleroma/pleroma!3508
3 years ago
Alex Gleason
b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
3 years ago
rinpatch
7afabe1cc6
Merge branch 'bugfix/status-search-fallback' into 'develop'
...
Activity.Search: resolve status on DB Timeout
Closes #2566
See merge request pleroma/pleroma!3507
3 years ago
Haelwenn (lanodan) Monnier
6455b967ec
Activity.Search: fallback on status resolution on DB Timeout
3 years ago
Haelwenn
3a7b54be4a
Merge branch 'nil-report-object-hotfix' into 'develop'
...
AdminAPI: hotfix for nil report objects
See merge request pleroma/pleroma!3504
3 years ago
Haelwenn (lanodan) Monnier
61d233921c
ObjectValidator.stringify_keys: filter out nil values
3 years ago
Haelwenn
3ca39ccf69
Merge branch 'bugfix/subscriptions-replies' into 'develop'
...
maybe_notify_subscribers: Normalize Object to check inReplyTo presence
Closes #2732
See merge request pleroma/pleroma!3505
3 years ago
Haelwenn (lanodan) Monnier
436fac3bac
maybe_notify_subscribers: Don't create notifications from ingested messages
3 years ago
Alex Gleason
7247c29653
AdminAPI: hotfix for nil report objects
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
8679a57a71
Merge branch 'bugfix/object-age-create' into 'develop'
...
ObjectAgePolicy: Fix pattern matching on published
See merge request pleroma/pleroma!3500
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
f4af74b0fc
Merge branch 'fix/streaming-api-for-create-activity' into 'develop'
...
fix: stream out Create Activity
Closes #2691
See merge request pleroma/pleroma!3499
3 years ago
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
kPherox
ee5def34da
fix: stream out Create Activity
3 years ago
Sean King
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Egor Kislitsyn
ad09bdb376
Improve readability
3 years ago
Ilja
b0926a71b2
Make transparency_exclusions use tuples in admin-fe
...
* Make it use tuples
* I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase
3 years ago
Ilja
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
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
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
Ilja
e0c7d77197
Deprecate and rewrite settings for quarentine settings
...
* This is for the settings, not yet a DB migration
3 years ago
Ilja
27fe7b0274
Make quarentine work with list of tuples instead of strings
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
Ilja
647087d7fd
Deprectate strings for SimplePolicy
...
When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead
3 years ago
sadposter
daab1eaa65
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason
44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
sadposter
2519d4eb1a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason
7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
3 years ago
Alex Gleason
9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
3 years ago
sadposter
de69585eaa
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Haelwenn
7acdab1f30
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
...
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
3 years ago
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason
70f1496eb8
Poll notification: only notify local users
3 years ago
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason
6a6e42c9bf
PollWorker defensive checks
3 years ago
Alex Gleason
cbd1a10c16
Poll notification: notify for polls even when block_from_strangers is set
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
f67d00d12b
Add Instance.delete_users_and_activities/1 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
Alex Gleason
e40b58fd56
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
3 years ago
Alex Gleason
9a0cb34c8c
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
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
5d279a22b1
Merge develop branch upstream
3 years ago
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
3 years ago
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
3 years ago
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
3 years ago
Alex Gleason
01c2d2a296
Also purge the user in User.perform/2
3 years ago
Alex Gleason
c6d4133727
Deletions: purge the user immediately
3 years ago
Alex Gleason
be2da95c36
Correctly purge a remote user
3 years ago
sadposter
f191021f52
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
sadposter
e56c319e8f
merge
3 years ago
Alex Gleason
281806de75
Activity deletion: fix FunctionClauseError #2686
3 years ago
feld
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
3 years ago
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
3 years ago
Haelwenn (lanodan) Monnier
fc6ab78a84
Add test on changing [:instance, :upload_limit]
3 years ago
Haelwenn (lanodan) Monnier
a851a24036
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
...
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5
.
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
202ee5fd77
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
3 years ago
Alex Gleason
15e2aaa9f6
Fix compile cycle in Pleroma.Tests.AuthTestController
3 years ago
Mark Felder
6aa7fc15df
Formatting of the comment
3 years ago
Mark Felder
5f7901cc48
Credo
3 years ago
Mark Felder
2a47156b87
Lint
3 years ago
Mark Felder
86bcb87e6c
Fix incorrectly ordered arguments to the function and not properly merging lists.
3 years ago
Mark Felder
2cf648d419
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
3 years ago
Mark Felder
19a49dd757
Remove Metadata.Utils.attachment_url/1
...
This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.
3 years ago
Haelwenn (lanodan) Monnier
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
3 years ago
Haelwenn
53cf801c30
Merge branch 'cycles-plug-deps' into 'develop'
...
Refactor skipped plugs into Pleroma.Web functions
See merge request pleroma/pleroma!3463
3 years ago