Alexander Strizhakov
5ae9b05600
separate test file for featured collection
4 years ago
Alexander Strizhakov
8f0778166c
moving fixture into mastodon folder
4 years ago
Alexander Strizhakov
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
4 years ago
Alexander Strizhakov
d1d2744ee3
featured_address valition in AddRemoveValidator
4 years ago
Alexander Strizhakov
ff612750b1
validator renaming & add validation for target
4 years ago
Alexander Strizhakov
17f28c0507
mastodon pins
4 years ago
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
4 years ago
Alex Gleason
b6a69b5efd
Return token's primary key with POST /oauth/token
4 years ago
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.
4 years ago
Alexander Strizhakov
d7e51206a2
respect content-type header in finger request
4 years ago
rinpatch
a9bc652ab9
Merge branch 'mediaproxy-decode' into 'develop'
...
Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364
4 years ago
rinpatch
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
4 years ago
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
4 years ago
Haelwenn (lanodan) Monnier
55bdfb075c
OpenAPI: TwitterAPI Util Controller
4 years ago
Haelwenn (lanodan) Monnier
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
4 years ago
Haelwenn (lanodan) Monnier
e4743847a1
OpenAPI: PleromaAPI UserImport Controller
4 years ago
Haelwenn (lanodan) Monnier
ef5de5eb39
OpenAPI: MastodonAPI Status Controller
4 years ago
Haelwenn (lanodan) Monnier
0c7c6463d1
OpenAPI: MastodonAPI Account Controller, excluding OAuth
4 years ago
Haelwenn (lanodan) Monnier
3a8404820d
Verify MastoFE Controller put_settings response
4 years ago
Haelwenn (lanodan) Monnier
e47f83cfc8
OpenAPI: MastodonAPI Conversation Controller
4 years ago
Haelwenn (lanodan) Monnier
3123ecdd6e
OpenAPI: MastodonAPI Media Controller
4 years ago
Haelwenn (lanodan) Monnier
7eecc3b61d
OpenAPI: MastodonAPI Timeline Controller
4 years ago
Haelwenn (lanodan) Monnier
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
4 years ago
Ivan Tashkinov
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Haelwenn
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
4 years ago
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder
eaaa20e0f1
Make tests use it
4 years ago
Ivan Tashkinov
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
4 years ago
lain
13aa98d689
Merge branch 'mergeback/2.3.0' into 'develop'
...
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
4 years ago
lain
2e296c079f
Revert "StatusController: Deactivate application support for now."
...
This reverts commit 024c11c18d
.
4 years ago
Mark Felder
913d53b7d7
Remove useless header on the get request
4 years ago
Mark Felder
ccbf162088
Actually test viewing status after ingestion
4 years ago
Mark Felder
f0208980e4
Test both ingestion of post in the status controller and the correct response during the view
4 years ago
Egor Kislitsyn
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
4 years ago
lain
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
4 years ago
Ivan Tashkinov
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alex Gleason
7ebbe11e75
user_agent_mock --> request_mock
4 years ago
Alex Gleason
1dc5794e29
Never forward the client's user-agent through the media proxy
4 years ago
Mark Felder
b1e1db82bc
Store application details in the object under the generator key, not application key
4 years ago
lain
e8d88a72cf
Merge branch 'fix/warning-in-test' into 'develop'
...
warning fix
See merge request pleroma/pleroma!3350
4 years ago
lain
4a9d3a1f28
Merge branch 'features/reports-enhancements' into 'develop'
...
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
4 years ago
Alexander Strizhakov
f85ed1c521
warning fix
4 years ago
lain
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
4 years ago
lain
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
Haelwenn (lanodan) Monnier
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
lain
d0823d7f1e
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
...
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
4 years ago
Mark Felder
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
Mark Felder
902d4e4a4a
Leave a note for future explorers
4 years ago
Mark Felder
2da71a526f
No need to filter out Mix.env() from the API routes.
4 years ago
Mark Felder
6b87dfad5d
Filter out MIX_ENV from route list and add a test
4 years ago
Ivan Tashkinov
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
Ivan Tashkinov
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
Haelwenn (lanodan) Monnier
7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
4 years ago
Mark Felder
63739c5a58
Tests to validate client disclosure obeys user setting
4 years ago
Mark Felder
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
4 years ago
Alexander Strizhakov
1e6c27181e
expires_in in scheduled status params
4 years ago
rinpatch
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.
4 years ago
Haelwenn (lanodan) Monnier
ff72ce31ca
Enhance reports in Pleroma API: index, show
4 years ago
Haelwenn
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
4 years ago
rinpatch
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
4 years ago
rinpatch
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
4 years ago
rinpatch
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
4 years ago
Ivan Tashkinov
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov
1dac7d1462
[ #3213 ] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
4 years ago
Egor Kislitsyn
cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
Mark Felder
fb2a8e7ccd
Additional validation so we don't get caught off guard with a nil response
...
if CommonAPI ever prevents us from injecting this data
4 years ago
Mark Felder
3554a65f45
Inject fake application metadata and validate it is stripped by transmogrifier
4 years ago
rinpatch
db716f860a
Merge branch 'not-used-mock' into 'develop'
...
Not used mock
See merge request pleroma/pleroma!3313
4 years ago
rinpatch
76414ad277
Merge branch 'bugfix/answer-outbox' into 'develop'
...
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
4 years ago
Mark Felder
bd3d0e8b57
Use a custom oauth token so we can predict and validate the client_name and website
4 years ago
Mark Felder
333ff527fd
Validate client application metadata is retained in the object
4 years ago
Ivan Tashkinov
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
4 years ago
Ivan Tashkinov
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
Alexander Strizhakov
b5d001fc8c
not used mock
4 years ago
rinpatch
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
4 years ago
feld
593c0851d9
Merge branch 'develop' into 'new-user-emails'
4 years ago
Haelwenn
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
4 years ago
Mark Felder
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
4 years ago
Haelwenn (lanodan) Monnier
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
4 years ago
Ivan Tashkinov
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
4 years ago
Mark Felder
6a3e75c8e6
Lint
4 years ago
Mark Felder
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.
4 years ago
Mark Felder
d047372291
Merge branch 'develop' into fix/reports-from-admins
4 years ago
feld
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
4 years ago
Haelwenn
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
4 years ago
Haelwenn (lanodan) Monnier
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
4 years ago
Mark Felder
5bb5949048
Validate admin making report doesn't get their own report notification, but other admins do
4 years ago
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
feld
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
4 years ago
feld
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
4 years ago
Haelwenn (lanodan) Monnier
fb25231fbe
Add test for Answer presence into an authenticated /outbox
4 years ago
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
feld
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
4 years ago
feld
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
4 years ago
Mark Felder
28d2917c3a
Merge branch 'develop' into fix/majic-nits
4 years ago
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
aacd1c90b7
fix for test warnings
4 years ago
Alexander Strizhakov
0dc68c157f
fix for scheduled post with poll
4 years ago
Alexander Strizhakov
fdf1dfed56
only_remote -> remote renaming
4 years ago
Alexander Strizhakov
77f0a0af7d
more tests and update for docs and changelog
4 years ago
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov
b6a72680e2
added only_media flag to home timeline
4 years ago
Alexander Strizhakov
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
Ivan Tashkinov
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
4 years ago
Ivan Tashkinov
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
Ivan Tashkinov
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
4 years ago
Alexander Strizhakov
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
Ivan Tashkinov
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
Mark Felder
5fcab23aa3
Improve error message for ConfigDB
4 years ago
Mark Felder
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
4 years ago
Egor Kislitsyn
a51d903e0c
Make sure active_user_count/1 counts only local users
4 years ago
Ivan Tashkinov
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 .
4 years ago
Egor Kislitsyn
bddb01bded
Add tests
4 years ago
Egor Kislitsyn
793fc77b16
Add active user count
4 years ago
lain
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
4 years ago
Alexander Strizhakov
d4158e8bf0
added total
...
to the instance adminAPI endpoint
4 years ago
Alexander Strizhakov
6806c03e85
added total
...
to the user statuses adminAPI endpoint
4 years ago
feld
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
4 years ago
Mark Felder
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
lain
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
4 years ago
Haelwenn
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
4 years ago
Ivan Tashkinov
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
6bfd497f4a
Include own_votes in the poll data
4 years ago
Ivan Tashkinov
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
4 years ago
Mark Felder
80ccdb56f6
Make tag urls absolute
4 years ago
Mark Felder
42e49529c2
Test URL formatting
4 years ago
Mark Felder
0c485d5555
Improve description
4 years ago
eugenijm
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
eugenijm
133644dfa2
Ability to set the Service-Worker-Allowed header
4 years ago
Ivan Tashkinov
ca7f240643
[ #3213 ] Ignoring of blank elements from objects.data->tag.
4 years ago
Ivan Tashkinov
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
4 years ago
Ivan Tashkinov
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
ba40af054c
Merge branch 'test-cases-mox-setup' into 'develop'
...
Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263
4 years ago
feld
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
4 years ago
Mark Felder
9988d9261c
Add bucket_namespace to be extra certain truncated_namespace works
4 years ago
Mark Felder
dfc4cb6ebd
Special handling for unconfirmed users based on instance config no longer needed.
4 years ago
Mark Felder
5d344e5c79
Only need to test if unconfirmed users are successfully deleted
...
It's no longer possible to have an active user account with User.is_confirmed == false
4 years ago
Mark Felder
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
4 years ago
Ivan Tashkinov
318d6dde1c
Mox mode setup tweak; refactoring.
4 years ago
feld
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
Egor Kislitsyn
51d5951c02
Test that only author can reblog a private status
4 years ago
Egor Kislitsyn
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
Lain Soykaf
bdfd72630f
ListController: Fix being unable to add / remove users.
4 years ago