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
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
2021-06-30 02:02:30 -05:00
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
2021-06-30 02:02:24 -05:00
43800d83f4
Deletions: allow deactivated users to be deleted
2021-06-30 01:32:28 -05:00
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
2021-06-29 23:56:19 -05:00
be2da95c36
Correctly purge a remote user
2021-06-29 21:45:38 -05:00
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
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
fc6ab78a84
Add test on changing [:instance, :upload_limit]
2021-06-22 12:25:25 +02:00
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
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
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
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
2021-06-08 16:58:33 -05:00
d4ac9445cd
Twittercard metadata for images should also include dimensions if available
2021-06-08 16:19:12 -05:00
5de65ce3e8
Set the correct height/width if the data is available when generating twittercard metadata
2021-06-08 15:59:55 -05:00
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
3121ed1325
Blurhash varies slightly by computer generating it, so just validate it wasn't nil
2021-06-08 14:53:03 -05:00
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
f1abe39f6f
Update test names and verify blurhash is correctly generated for images
2021-06-08 14:05:13 -05:00
1c4c73c6a0
Add test for AnalyzeMetadata upload filter fetching dimensions from a video
2021-06-08 14:02:56 -05:00
1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
...
Speeds up recompilation by reducing compile-time cycles
2021-06-07 18:18:39 -05:00
017f947fc1
Channel name was incorrect. We left it as chat:public for backwards compatibility.
2021-06-07 16:10:24 -05:00
a5ae0432ed
Test was named incorrectly and did not execute
2021-06-07 16:09:47 -05:00
f5ef7fe43b
Fix test warnings
2021-06-07 16:06:53 -05:00
264458531a
Formatting
2021-06-07 15:47:50 -05:00
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
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
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
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
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
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05: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
24d66b60a0
request_builder_test: mode :read got removed
2021-06-03 19:11:17 +02:00
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
d9513b11d3
Forgot to move migration test when rebasing
2021-06-01 11:49:47 -05:00
9ce2c017c0
We want clear_config/2 in all tests now
2021-06-01 11:49:47 -05:00
d7dfa6d27c
Update test for RenameInstanceChat migration
2021-06-01 11:49:47 -05:00
01f796f8bb
Add a test for the migration
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
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
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
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
4694853766
Provide totalItems field for featured collections
2021-05-27 12:17:31 -05:00
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
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -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
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
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
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
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
53760d2cda
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
2021-04-30 12:51:18 -05:00
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -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
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
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
2021-04-15 23:12:42 -06:00
f95b52255b
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
2021-04-14 09:39:57 -05:00
905efc57e9
Initial test validating the AdminAPI issue
2021-04-13 14:39:28 -05:00
cdd271b065
Fix assignment / assertion
2021-04-13 10:55:54 -05:00
9fbcdc15b1
Validate custom instance thumbnail set via AdminAPI produces correct URL
2021-04-13 10:52:53 -05:00
681a42c359
release runtime provider fix for paths
2021-04-08 15:45:31 +03:00
5ef4659b37
test/pleroma/web/common_api_test.exs: Strip : around emoji key-name
2021-04-05 19:25:55 +02:00
6d6bef64bf
fetcher_test: Remove assert on fake Create having an ap_id
2021-04-05 19:19:12 +02:00
53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
2021-04-05 19:19:12 +02:00
0b88accae6
fetcher_test: Fix missing mock function
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
16a7ffb1ea
Fix function calls due to module name change
2021-03-30 11:10:44 -05:00
bfcdcd4f69
Temp file leaked, oops
2021-03-30 11:10:44 -05:00
03f38ac4eb
Prefer FollowBot naming convention vs Followbot
2021-03-30 11:10:44 -05:00
fef4f3772c
More tests to validate Followbot is behaving
2021-03-30 11:10:44 -05:00
f73d166785
Only need to validate a follow request is generated for now
2021-03-30 11:10:44 -05:00
4d046afd27
tests for release config provider
2021-03-27 09:05:33 +03:00
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03: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
16c96966e9
not needed
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
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
03843a5386
migrating config to tmp folder
2021-03-23 14:29:02 +03: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
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
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
eaaa20e0f1
Make tests use it
2021-03-05 13:21:22 -06:00
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
13aa98d689
Merge branch 'mergeback/2.3.0' into 'develop'
...
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
2021-03-03 15:07:50 +00:00
2e296c079f
Revert "StatusController: Deactivate application support for now."
...
This reverts commit 024c11c18d
2021-03-03 15:33:06 +01:00
913d53b7d7
Remove useless header on the get request
2021-03-02 14:04:50 -06:00
ccbf162088
Actually test viewing status after ingestion
2021-03-02 12:33:32 -06:00
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
7ebbe11e75
user_agent_mock --> request_mock
2021-03-01 21:05:52 +01:00
1dc5794e29
Never forward the client's user-agent through the media proxy
2021-03-01 21:05:46 +01:00
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
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
840686ecd5
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
...
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
2021-02-26 16:49:11 +00:00
2217b35bd4
Merge branch 'ecto-rollback-in-test-env' into 'develop'
...
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
2021-02-26 16:47:53 +00:00
902d4e4a4a
Leave a note for future explorers
2021-02-25 13:06:43 -06:00
2da71a526f
No need to filter out Mix.env() from the API routes.
2021-02-25 13:04:08 -06:00
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
63739c5a58
Tests to validate client disclosure obeys user setting
2021-02-18 17:23:17 -06:00
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
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
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
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
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
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
a5bee1bf35
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
...
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
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
6a3e75c8e6
Lint
2021-02-05 09:00:17 -06:00
c361440396
Add basic test to validate the registration email is dispatched when the others are disabled
...
Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.
2021-02-04 17:56:46 -06:00
d047372291
Merge branch 'develop' into fix/reports-from-admins
2021-02-04 12:37:20 -06:00
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
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
5bb5949048
Validate admin making report doesn't get their own report notification, but other admins do
2021-02-03 12:54:53 -06:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
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
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
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
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
28d2917c3a
Merge branch 'develop' into fix/majic-nits
2021-02-02 12:01:48 -06:00
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
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
aacd1c90b7
fix for test warnings
2021-02-01 19:33:40 +03: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
5fcab23aa3
Improve error message for ConfigDB
2021-01-28 14:59:23 -06:00
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
2021-01-28 14:03:29 -06:00
a51d903e0c
Make sure active_user_count/1 counts only local users
2021-01-28 22:23:10 +04: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
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
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
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
f868dcf3ac
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
2021-01-25 10:48:28 -06:00
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
2021-01-25 19:46:36 +03:00
5e8da27e14
Provide pleroma.user mix task for both activate and deactivate
2021-01-25 10:36:51 -06:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
6bfd497f4a
Include own_votes in the poll data
2021-01-22 09:47:59 -06:00
Alex Gleason