nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
13378 commits 2 branches 0 tags 272 MiB
Commit graph

5115 commits

Author SHA1 Message Date
Ivan Tashkinov 882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-03-02 08:26:30 +03:00
Alex Gleason 7ebbe11e75 user_agent_mock --> request_mock 2021-03-01 21:05:52 +01:00
Alex Gleason 1dc5794e29 Never forward the client's user-agent through the media proxy 2021-03-01 21:05:46 +01:00
Mark Felder b1e1db82bc Store application details in the object under the generator key, not application key 2021-03-01 11:29:10 -06:00
lain 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
lain 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
Alexander Strizhakov f85ed1c521
warning fix 2021-02-28 19:41:25 +03:00
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
 2021-02-28 16:18:23 +00:00
lain 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
Haelwenn (lanodan) Monnier 3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy 2021-02-27 21:26:17 +01:00
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
 2021-02-27 19:40:38 +00:00
Mark Felder d35b6254b4 Store the client application data in ActivityStreams format 2021-02-26 18:14:57 -06:00
feld 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
feld 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
Mark Felder 902d4e4a4a Leave a note for future explorers 2021-02-25 13:06:43 -06:00
Mark Felder 2da71a526f No need to filter out Mix.env() from the API routes. 2021-02-25 13:04:08 -06:00
Mark Felder 6b87dfad5d Filter out MIX_ENV from route list and add a test 2021-02-25 09:23:10 -06:00
Ivan Tashkinov 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
Ivan Tashkinov 77f3da0358 [#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management. 2021-02-23 13:52:28 +03:00
Haelwenn (lanodan) Monnier 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
Mark Felder 63739c5a58 Tests to validate client disclosure obeys user setting 2021-02-18 17:23:17 -06:00
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 2021-02-18 16:35:03 -06:00
Alexander Strizhakov 1e6c27181e
expires_in in scheduled status params 2021-02-18 14:59:22 +03:00
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.
 2021-02-17 20:47:38 +03:00
Haelwenn (lanodan) Monnier ff72ce31ca
Enhance reports in Pleroma API: index, show 2021-02-17 18:46:53 +01:00
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
 2021-02-17 15:36:59 +00:00
rinpatch 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
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
 2021-02-17 13:08:51 +00:00
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
 2021-02-17 16:03:24 +03:00
Ivan Tashkinov 111bfdd3a0 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-02-16 23:23:49 +03:00
Ivan Tashkinov 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
Egor Kislitsyn cf6d3db58f
Add API endpoint to remove a conversation 2021-02-15 21:48:13 +04:00
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
 2021-02-12 13:15:33 -06:00
Mark Felder 3554a65f45 Inject fake application metadata and validate it is stripped by transmogrifier 2021-02-12 13:05:12 -06:00
rinpatch 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
rinpatch 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
Mark Felder 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
Mark Felder 333ff527fd Validate client application metadata is retained in the object 2021-02-11 15:07:21 -06:00
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
 2021-02-11 19:31:57 +03:00
Ivan Tashkinov df89b5019b [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring. 2021-02-11 15:02:50 +03:00
Alexander Strizhakov b5d001fc8c
not used mock 2021-02-10 18:44:49 +03:00
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
 2021-02-09 19:29:43 +00:00
feld 593c0851d9 Merge branch 'develop' into 'new-user-emails' 2021-02-08 16:01:50 -06:00
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
 2021-02-08 21:49:20 +00:00
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
 2021-02-08 15:32:47 -06:00
Haelwenn (lanodan) Monnier 8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints 2021-02-08 20:00:47 +01:00
Ivan Tashkinov 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
Mark Felder 6a3e75c8e6 Lint 2021-02-05 09:00:17 -06:00
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.
 2021-02-04 17:56:46 -06:00
Mark Felder d047372291 Merge branch 'develop' into fix/reports-from-admins 2021-02-04 12:37:20 -06:00
feld 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
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
 2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier 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
Mark Felder 887db076b5 Load an emoji.txt specific to the test env 2021-02-03 16:40:59 -06:00
Mark Felder 5bb5949048 Validate admin making report doesn't get their own report notification, but other admins do 2021-02-03 12:54:53 -06:00
feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' 
# Conflicts:
#   CHANGELOG.md
 2021-02-03 14:23:23 +00:00
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
 2021-02-03 14:22:23 +00:00
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
 2021-02-03 14:21:57 +00:00
Haelwenn (lanodan) Monnier fb25231fbe
Add test for Answer presence into an authenticated /outbox 2021-02-03 12:07:18 +01:00
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
 2021-02-03 09:31:38 +03:00
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
 2021-02-02 18:35:08 +00:00
feld 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
Mark Felder 28d2917c3a Merge branch 'develop' into fix/majic-nits 2021-02-02 12:01:48 -06:00
feld 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
feld cd5ff7a943 Merge branch 'develop' into 'feature/2164-unify-api-arguments' 
# Conflicts:
#   CHANGELOG.md
 2021-02-02 17:11:38 +00:00
Alexander Strizhakov aacd1c90b7
fix for test warnings 2021-02-01 19:33:40 +03:00
Alexander Strizhakov 0dc68c157f
fix for scheduled post with poll 2021-02-01 18:22:26 +03:00
Alexander Strizhakov fdf1dfed56
only_remote -> remote renaming 2021-02-01 14:11:12 +03:00
Alexander Strizhakov 77f0a0af7d
more tests and update for docs and changelog 2021-02-01 14:11:12 +03:00
Alexander Strizhakov 2cb6dc5a3a
list timeline filtration by params 2021-02-01 14:11:12 +03:00
Alexander Strizhakov b6a72680e2
added only_media flag to home timeline 2021-02-01 14:11:11 +03:00
Alexander Strizhakov c3110c46f3
expanding filtration for home timeline 
added local & remote statuses filtration for home timeline
 2021-02-01 14:11:11 +03:00
Ivan Tashkinov 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
Ivan Tashkinov 1b49b8efe5 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 
# Conflicts:
#	CHANGELOG.md
 2021-01-31 20:38:58 +03:00
Ivan Tashkinov 6fd4163ab6 [#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering. 2021-01-31 20:37:33 +03:00
Alexander Strizhakov c369d2b930
support for with_relationships parameter 
in /api/v1/mutes and /api/v1/accounts/:id endpoints
 2021-01-29 08:41:21 +03:00
Ivan Tashkinov 380d0cce6b [#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test. 2021-01-29 00:17:33 +03:00
Mark Felder 5fcab23aa3 Improve error message for ConfigDB 2021-01-28 14:59:23 -06:00
Mark Felder 9272cef500 Switch to a build of Majic that does not try to fix extensions by default 2021-01-28 14:03:29 -06:00
Egor Kislitsyn a51d903e0c
Make sure active_user_count/1 counts only local users 2021-01-28 22:23:10 +04:00
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.
 2021-01-28 19:49:43 +03:00
Egor Kislitsyn bddb01bded
Add tests 2021-01-27 18:20:07 +04:00
Egor Kislitsyn 793fc77b16
Add active user count 2021-01-27 18:20:06 +04:00
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
 2021-01-27 11:33:27 +00:00
Alexander Strizhakov d4158e8bf0
added total 
to the instance adminAPI endpoint
 2021-01-27 07:45:06 +03:00
Alexander Strizhakov 6806c03e85
added total 
to the user statuses adminAPI endpoint
 2021-01-27 07:45:02 +03:00
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
 2021-01-26 18:14:01 +00:00
Mark Felder e854c35e65 Convert tests to all use clear_config instead of Pleroma.Config.put 2021-01-26 11:58:43 -06:00
lain 229acae6c3 Merge branch 'develop' into '2435-list-multiple-users' 
# Conflicts:
#   CHANGELOG.md
 2021-01-26 14:24:32 +00:00
Alexander Strizhakov 875fbaae35
support for expires_in/expires_at in filters 2021-01-26 08:27:45 +03:00
Haelwenn 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
Mark Felder 0b19534475 Merge branch 'develop' into docs/apache-config 2021-01-25 17:00:26 -06:00
Ivan Tashkinov 694d98be55 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-01-25 21:24:07 +03:00
Mark Felder f868dcf3ac Ensure consistent behavior between pleroma.user activate/deactivate mix tasks 2021-01-25 10:48:28 -06:00
Alexander Strizhakov 3f3d64acbf
little refactor and tests 
for voted & own_votes fields in polls
 2021-01-25 19:46:36 +03:00
Mark Felder 5e8da27e14 Provide pleroma.user mix task for both activate and deactivate 2021-01-25 10:36:51 -06:00
Mark Felder 537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field 2021-01-25 09:45:06 -06:00
Mark Felder 6bfd497f4a Include own_votes in the poll data 2021-01-22 09:47:59 -06:00
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
 2021-01-22 10:05:28 +03:00
Mark Felder 80ccdb56f6 Make tag urls absolute 2021-01-21 16:49:19 -06:00