Alex Gleason
3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
2021-07-17 15:03:43 -05:00
Alex Gleason
bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
2021-07-17 15:00:15 -05:00
Alex Gleason
54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
2021-07-17 14:55:05 -05:00
Alex Gleason
f67d00d12b
Add Instance.delete_users_and_activities/1 to delete all content from a remote instance
2021-07-17 14:06:35 -05:00
Alex Gleason
c136dc0987
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-07-17 13:53:19 -05:00
Alex Gleason
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
Alex Gleason
1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
2021-07-14 09:02:55 -05:00
Alex Gleason
167e14416b
AdminAPI: add date to users
2021-07-14 08:54:59 -05:00
Alex Gleason
deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
2021-07-13 22:47:47 -05:00
Alex Gleason
5e88796784
AdminAPI: sort user results by ID descending
2021-07-13 22:47:02 -05:00
Alex Gleason
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
2021-07-12 22:11:32 -05:00
Alex Gleason
9bc1e79c56
Moderators: add UserIsStaffPlug
2021-07-12 21:57:52 -05:00
Haelwenn
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
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
Sean King
9758f636b2
Delete MastoFE Controller Test
2021-07-10 11:13:25 -06:00
Sean King
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
Alex Gleason
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
2021-06-30 02:02:30 -05:00
Alex Gleason
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
2021-06-30 02:02:24 -05:00
Alex Gleason
43800d83f4
Deletions: allow deactivated users to be deleted
2021-06-30 01:32:28 -05:00
Alex Gleason
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
2021-06-29 23:56:19 -05:00
Alex Gleason
be2da95c36
Correctly purge a remote user
2021-06-29 21:45:38 -05:00
feld
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
2021-06-23 20:17:01 +00:00
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
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
1175023687
Merge branch 'metadata-for-all' into 'develop'
...
Support metadata for video files too
See merge request pleroma/pleroma!3441
2021-06-08 20:30:55 +00:00
Mark Felder
3121ed1325
Blurhash varies slightly by computer generating it, so just validate it wasn't nil
2021-06-08 14:53:03 -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
Mark Felder
f1abe39f6f
Update test names and verify blurhash is correctly generated for images
2021-06-08 14:05:13 -05:00
Mark Felder
1c4c73c6a0
Add test for AnalyzeMetadata upload filter fetching dimensions from a video
2021-06-08 14:02:56 -05:00
Alex Gleason
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
Alex Gleason
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
feld
5b9e13fc0d
Merge branch 'fix/clear_config_warning' into 'develop'
...
Fix warning for misuse of clear_config/2
See merge request pleroma/pleroma!3446
2021-06-04 20:55:21 +00:00
Mark Felder
d5daf59f88
Fix warning for misuse of clear_config/2
...
The old warning message was producing an improperly formatted suggestion.
2021-06-04 15:48:26 -05:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
Haelwenn
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
Haelwenn (lanodan) Monnier
eb7313b0d3
Pipeline Ingestion: Page
2021-06-04 20:06:33 +02:00
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
2021-06-04 17:37:30 +00:00
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05:00
io
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
Haelwenn (lanodan) Monnier
24d66b60a0
request_builder_test: mode :read got removed
2021-06-03 19:11:17 +02:00
Haelwenn (lanodan) Monnier
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
Mark Felder
d9513b11d3
Forgot to move migration test when rebasing
2021-06-01 11:49:47 -05:00
Mark Felder
9ce2c017c0
We want clear_config/2 in all tests now
2021-06-01 11:49:47 -05:00
Roman Chvanikov
d7dfa6d27c
Update test for RenameInstanceChat migration
2021-06-01 11:49:47 -05:00
Mark Felder
01f796f8bb
Add a test for the migration
2021-06-01 11:49:47 -05:00
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
Alex Gleason
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
Haelwenn
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
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
Alex Gleason
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
Alex Gleason
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
Alex Gleason
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
2021-05-28 13:51:21 -05:00
Alex Gleason
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
Haelwenn
f34e22bba2
Merge branch 'feat/expose_email_to_self' into 'develop'
...
Expose user email address to user/owner; not publicly.
See merge request pleroma/pleroma!3412
2021-05-26 18:04:23 +00:00
Mark Felder
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
Mark Felder
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
Mark Felder
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
Alex Gleason
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
Alex Gleason
4c060ae733
Ingest remote attachment width/height
2021-05-12 15:38:49 -05:00
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
Alex Gleason
1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
2021-05-05 14:50:54 -05:00
Alex Gleason
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
feld
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
Alex Gleason
c80b1aaf51
Don't crash when email settings are invalid
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-03 14:43:14 -05:00
Alex Gleason
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-04-30 14:21:17 -05:00
Alex Gleason
c16c7fdb87
SimplePolicy: filter string Objects
2021-04-30 14:20:54 -05:00
Alex Gleason
3d742c3c1a
SimplePolicy: filter nested objects
2021-04-30 14:20:37 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
Alex Gleason
a8fa00ef66
Fix failing remote mentions test, valid TLDs
2021-04-30 12:55:43 -05:00
Alex Gleason
53760d2cda
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
2021-04-30 12:51:18 -05:00
Alex Gleason
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -05:00
Alex Gleason
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
rinpatch
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
rinpatch
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
rinpatch
0ababdc068
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
...
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
2021-04-16 09:50:26 +00:00
Sean King
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
Sean King
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
Sean King
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
Alexander Strizhakov
681a42c359
release runtime provider fix for paths
2021-04-08 15:45:31 +03:00
Haelwenn (lanodan) Monnier
5ef4659b37
test/pleroma/web/common_api_test.exs: Strip : around emoji key-name
2021-04-05 19:25:55 +02:00
Haelwenn (lanodan) Monnier
6d6bef64bf
fetcher_test: Remove assert on fake Create having an ap_id
2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier
53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier
0b88accae6
fetcher_test: Fix missing mock function
2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier
b0c778fde7
NoteHandlingTest: remove fix_explicit_addressing-related test
2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier
d1205406d9
ActivityPubControllerTest: Apply same addr changes to object
2021-04-05 19:19:12 +02:00
Haelwenn (lanodan) Monnier
641184fc7a
recipients fixes/hardening for CreateGenericValidator
2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier
c944932674
Pipeline Ingestion: Note
2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier
e2a3365b5c
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier
e56779dd8d
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
2021-04-05 19:19:11 +02:00
Haelwenn (lanodan) Monnier
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
Alexander Strizhakov
4d046afd27
tests for release config provider
2021-03-27 09:05:33 +03:00
Alexander Strizhakov
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
5ae9b05600
separate test file for featured collection
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
8f0778166c
moving fixture into mastodon folder
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
16c96966e9
not needed
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
d1d2744ee3
featured_address valition in AddRemoveValidator
2021-03-25 13:03:40 +03:00
Alexander Strizhakov
ff612750b1
validator renaming & add validation for target
2021-03-25 13:03:40 +03:00
Alexander Strizhakov
17f28c0507
mastodon pins
2021-03-25 13:03:40 +03:00
Alexander Strizhakov
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
Alex Gleason
b6a69b5efd
Return token's primary key with POST /oauth/token
2021-03-24 12:50:05 -05:00
feld
caadde3b04
Merge branch 'fix/2585-config-migration-dir' into 'develop'
...
migrating config to tmp folder
Closes #2585
See merge request pleroma/pleroma!3379
2021-03-23 17:46:52 +00:00
Alexander Strizhakov
03843a5386
migrating config to tmp folder
2021-03-23 14:29:02 +03:00
rinpatch
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
Alexander Strizhakov
d7e51206a2
respect content-type header in finger request
2021-03-19 18:53:55 +03:00
rinpatch
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
rinpatch
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
rinpatch
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
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
Haelwenn (lanodan) Monnier
55bdfb075c
OpenAPI: TwitterAPI Util Controller
2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier
e4743847a1
OpenAPI: PleromaAPI UserImport Controller
2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier
ef5de5eb39
OpenAPI: MastodonAPI Status Controller
2021-03-15 06:47:07 +01:00
Haelwenn (lanodan) Monnier
0c7c6463d1
OpenAPI: MastodonAPI Account Controller, excluding OAuth
2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier
3a8404820d
Verify MastoFE Controller put_settings response
2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier
e47f83cfc8
OpenAPI: MastodonAPI Conversation Controller
2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier
3123ecdd6e
OpenAPI: MastodonAPI Media Controller
2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier
7eecc3b61d
OpenAPI: MastodonAPI Timeline Controller
2021-03-15 06:47:06 +01:00
Haelwenn (lanodan) Monnier
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
2021-03-15 06:44:05 +01:00
Ivan Tashkinov
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
Haelwenn
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
