Commit Graph

1602 Commits

Author SHA1 Message Date
href 30dc81667c Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
lambda 262cc6d44b Merge branch 'fix/double-rt-or-fav' into 'develop'
Prevent accidental double RTs or favorites

See merge request pleroma/pleroma!542
2018-12-14 08:26:08 +00:00
eal 61ad2ce422 TwitterAPI: Include favorited post in json 2018-12-14 08:24:18 +02:00
eal 1ca080c862 Prevent accidental double RTs or favorites 2018-12-14 07:56:49 +02:00
raeno c5c3ad90d0 Fix tests. Remove oembed template 2018-12-14 03:00:50 +01:00
raeno b5de7c4c4d Remove oembed for now, will submit it in another MR. Fix warnings 2018-12-13 22:34:15 +01:00
raeno 8902942128 WIP. Implement oembed route and handle both json/xml for "Note" type activity 2018-12-13 22:17:53 +01:00
Ivan Tashkinov 18b9467d1a [#114] Removed `email_invite` implementation (to be addressed separately). 2018-12-13 16:22:42 +03:00
Ivan Tashkinov 00744c6b03 [#114] Initial implementation of user email invitations. 2018-12-13 14:30:48 +03:00
href 7d9ddbe689
Allow underscores in usernames.
Fixes #429.
2018-12-12 18:57:33 +01:00
Ivan Tashkinov 4e7d98922e [#114] Added tests for "POST /api/account/password_reset". 2018-12-12 17:04:52 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
lambda 0863ec2737 Merge branch 'fix_empty_bio_crash' into 'develop'
Fixes #415. Do not crash during registration when hasn't filled bio field

Closes #415

See merge request pleroma/pleroma!529
2018-12-10 19:08:35 +00:00
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop'
[#272] fix hashtags in api

See merge request pleroma/pleroma!510
2018-12-10 19:05:16 +00:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
raeno 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio 2018-12-10 01:01:43 +04:00
Maksim Pechnikov 9442588ae9 fix hashtags in api response 2018-12-09 11:24:46 +03:00
href bdc8112e40
Media proxy: fix url encoding 2018-12-07 21:57:59 +01:00
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00
Ivan Tashkinov 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. 2018-12-06 22:26:25 +03:00
Ivan Tashkinov abbf347dc7 [#394] View tests fix. 2018-12-06 20:38:52 +03:00
Ivan Tashkinov 22830c8fc9 [#394] Formatting fix. 2018-12-06 20:13:07 +03:00
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
kaniini ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.

See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
Ivan Tashkinov 3e90f688f1 [#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
2018-12-06 10:26:17 +03:00
kaniini 48a0315646 Merge branch 'follower-hiding' into 'develop'
Network hiding

Closes #356

See merge request pleroma/pleroma!490
2018-12-05 21:41:53 +00:00
lain 76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding 2018-12-05 21:27:56 +01:00
lain 3ea4476445 MastodonAPI: Show users their own network. 2018-12-05 21:25:06 +01:00
Vald 3c8ffe7ed3 resolved activity view test 2018-12-06 01:54:04 +05:30
Vald 028904c333 lint 2018-12-06 01:46:53 +05:30
Vald 911a877576 resolved api and controller test failures 2018-12-06 01:46:30 +05:30
lain fdac215091 TwitterAPI: Show users their own network. 2018-12-05 21:14:06 +01:00
Vald 743a09132b linting 2018-12-06 01:28:52 +05:30
Vald 812b20d49f resolved formatter_test failures 2018-12-06 01:27:08 +05:30
lain 839526a913 TwitterAPI: Add network hiding. 2018-12-05 19:22:40 +01:00
Maksim Pechnikov c524c50509 fix/273 2018-12-05 17:32:06 +03:00
Ivan Tashkinov ba345e4c29 [#210] Formatting fix. 2018-12-05 13:43:00 +03:00
Ivan Tashkinov 848151f7cb [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
Ivan Tashkinov 53797d19c5 [#210] Test update (replaced bang- with non-bang method). 2018-12-05 11:56:31 +03:00
William Pitcock 0f061bea0c tests: add regression test for bug #408 2018-12-05 03:41:32 +00:00
Maksim Pechnikov a9e3e387c9 add test 2018-12-04 20:37:13 +03:00
Ivan Tashkinov 44ab3dbe2c [#210] Refactoring. 2018-12-04 19:45:09 +03:00
Ivan Tashkinov 826fc446d5 [#210] TwitterAPI: implemented /api/media/metadata/create
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
Maksim Pechnikov 50e72f6c48 remove httpoison_mock 2018-12-04 18:09:22 +03:00
Maksim Pechnikov dd8aee332c formatting the code 2018-12-04 17:48:55 +03:00
Maksim Pechnikov 5c6d47614d all tests passed 2018-12-04 17:44:15 +03:00
Maksim Pechnikov a9e4a97586 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 7ec64ac33f update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 80bfdb4e7d update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 6cfdc11e32 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov c508d41c34 add http requests mock 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 87109482f3 status_code -> status 2018-12-04 14:04:06 +03:00
Maksim Pechnikov ec34de0c1f WebSub fix test 2018-12-04 14:03:32 +03:00
William Pitcock d6ab701a14 formatting 2018-12-04 05:01:21 +00:00
William Pitcock 419d4bd5e4 tests: add tests for Object.normalize() 2018-12-04 05:00:11 +00:00
William Pitcock f0439617ef tests: some minor cleanups 2018-12-04 04:52:09 +00:00
William Pitcock f85949cc69 object: factor out fetching functions into Pleroma.Object.Fetcher module 2018-12-04 04:52:09 +00:00
William Pitcock e8caecb5c7 object: move object containment out of transmogrifier into it's own module 2018-12-04 04:52:09 +00:00
William Pitcock fe000f82f8 tests: activitypub: fix broken test due to invalid child object 2018-12-04 04:52:09 +00:00
William Pitcock f7e15d3257 tests: fix a lot of the remaining test failures 2018-12-04 04:52:09 +00:00
William Pitcock 4ca4c83871 tests: fix most remaining failures 2018-12-04 04:52:09 +00:00
William Pitcock e8570758f9 twitterapi: fix remaining test failures 2018-12-04 04:52:09 +00:00
William Pitcock 6f5f589f73 test: fix mastodon api test failure 2018-12-04 04:52:09 +00:00
lambda 88b05aeabb Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register

See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
Maxim Filippov 4b70e5eae9 Parse bio for MastodonAPI 2018-12-03 18:59:50 +03:00
Maxim Filippov 8148943368 Format files 2018-12-02 22:08:53 +03:00
Maxim Filippov ce98d5eb9b Parse user's bio on register 2018-12-02 22:03:53 +03:00
lain 8c9a4e8b40 TwitterAPI: Implement hide_network. 2018-12-02 18:14:13 +01:00
lain 2a639de9b3 MastodonApi: Implement hide_network. 2018-12-02 17:48:00 +01:00
lain 6be0ab1e55 Hide network in ap. 2018-12-02 17:35:32 +01:00
lain 91065e1968 Fix background updating / handling. 2018-12-02 11:20:38 +01:00
lain f18b86fd5f More fixes for Info schema. 2018-12-01 12:46:08 +01:00
lain 93f2dc19d9 TwitterAPI: Fix banner and background update. 2018-12-01 12:01:22 +01:00
lain 347df6421d Fix masto api user updating. 2018-12-01 10:40:01 +01:00
lain c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
lain 1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01:00
href e9982c521b
Upload filter: anonymize filename
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
kaniini ca24ad2a2b Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads

See merge request pleroma/pleroma!470
2018-11-30 18:15:44 +00:00
href 253da275bd
Pleroma.Config.delete/1 2018-11-30 18:27:27 +01:00
href 65e7307d68
Upload: bring back base_url 2018-11-30 18:02:50 +01:00
href 1d537bc74f
remove eal
i like you eal don't take it personally<3
2018-11-30 18:02:49 +01:00
href 02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain 48b95a9b95 Assorted fixes. 2018-11-30 17:08:02 +01:00
lain d407f662af Fix TwitterApiController. 2018-11-30 17:07:37 +01:00
lain a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
lain 6ac5d48575 More fixes 2018-11-29 00:25:43 +01:00
KokaKiwi 87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01:00
lain e002858071 Fix ostatus test. 2018-11-27 18:37:46 +01:00
lain 3c61df6b9e Webfinger fixes. 2018-11-27 18:31:44 +01:00
lain 5bd3b3a215 More and more fixes. 2018-11-27 18:21:05 +01:00
lain badbe2656c More fixes. 2018-11-27 18:12:03 +01:00
lain f983c1d0c6 Fix CommonApi tests. 2018-11-27 17:31:14 +01:00
Haelwenn (lanodan) Monnier cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket 2018-11-24 08:51:35 +01:00
kaniini 675653ceb7 Merge branch 'feature/admin-api' into 'develop'
Add a admin API

See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
lain 0bea0308f1 Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-11-20 20:16:16 +01:00
lain 0896cf4c0f Fix most mastodon api bugs. 2018-11-20 20:12:39 +01:00
William Pitcock 5b3480d896 tests: fix up some more broken mastodon api testcases 2018-11-20 19:08:41 +00:00
Haelwenn c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop'
Federator: add retry queue.

See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
William Pitcock c196754b4d mastodon api: account view: fix tests 2018-11-20 18:54:48 +00:00
lain 2887f4ff1d Fix formatter tests. 2018-11-20 19:07:01 +01:00
href 7f4c3a1e99
mediaproxy: fix empty url & add some tests 2018-11-20 17:50:03 +01:00
eal 689b46efc8 RetryQueue: tiny refractor, add tests 2018-11-19 18:08:41 +02:00
lain fbb70d25fe Several twitter api fixes. 2018-11-18 22:36:47 +01:00
lain 40d9d2098c Fix user updating from AP. 2018-11-18 22:15:03 +01:00
lain fc3bcf335e Fix following locked users. 2018-11-18 18:53:50 +01:00
lain d5af41b577 Fix note count update. 2018-11-18 18:52:21 +01:00
lain 6f90ceb2ed Fix follower count test. 2018-11-18 18:49:17 +01:00
lain 8e3d8bde04 Fix user deactivation test. 2018-11-18 18:40:58 +01:00
lain 5c8f07f0a8 Fix note counting. 2018-11-18 18:17:56 +01:00
lain 47d883d3ab Fix User deactivation. 2018-11-18 18:06:02 +01:00
William Pitcock f6be980f4f activitypub: object view: avoid leaking private details 2018-11-17 22:30:53 +00:00
William Pitcock 98795172a7 ostatus controller: respond with AS2 objects instead of activities to notice URIs 2018-11-17 22:10:15 +00:00
William Pitcock e10f839e9b tests: federator: fix formatting 2018-11-17 21:41:08 +00:00
William Pitcock dfcfb184b1 activitypub: transmogrifier: make deletes secure 2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier 52681f7fd0
Web.AdminAPI.AdminAPIControllerTest: New Test 2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier 76bd80d462
test/plugs/user_is_admin_plug_test: New test 2018-11-17 22:12:13 +01:00
William Pitcock b1a6e8d80d test: add sanity tests for federator handling of AP docs 2018-11-17 21:01:19 +00:00
William Pitcock 55640c4804 tests: add a test to verify the general fake direction protection works in all cases 2018-11-17 20:31:20 +00:00
William Pitcock dc1d8e13b4 tests: add a testcase for user collision 2018-11-17 20:20:45 +00:00
William Pitcock 1a940cb46e tests: add tests for contain_origin_from_id() 2018-11-17 20:16:03 +00:00
William Pitcock b483ae0a72 tests: add a second spoofing variant 2018-11-17 18:25:32 +00:00
William Pitcock 9c8adfb6ef test: fix more test defects 2018-11-17 18:16:55 +00:00
William Pitcock d9cb081f07 tests: add additional spoofing tests 2018-11-17 18:12:11 +00:00
William Pitcock 2ab8e28728 transmogrifier tests: fix defective spoofing test 2018-11-17 18:11:46 +00:00
William Pitcock 010fcb73d7 test: httpoison mock: add second spoofing activity test 2018-11-17 18:11:17 +00:00
lain f87b315618 TwitterAPI: Fix dm_timeline displaying only half of the conversation. 2018-11-16 19:47:36 +01:00
lambda 2f639ea129 Merge branch 'feature/pleromafe-usersearch' into 'develop'
Add Twitter / Pleroma API user search

See merge request pleroma/pleroma!452
2018-11-16 18:13:47 +00:00
lain e8d8c84f79 Add better test for user search functionlity. 2018-11-16 18:31:32 +01:00
AkiraFukushima 62944b47fb Reset http security settings to fix plug test 2018-11-17 00:45:21 +09:00
lain 27aa136aac Format. 2018-11-14 20:41:12 +01:00
lain 7b170cd616 Add Pleroma user search api for PleromaFE. 2018-11-14 20:33:23 +01:00
lain ea9a776d7b TwitterApi: Add direct message endpoint 2018-11-13 20:08:50 +01:00
lain 2cf40237ff MastodonAPI: Add pagination to private messages. 2018-11-13 19:46:34 +01:00
scarlett 0ce5623134 Merge branch 'twitter-api-null-display-name' into 'develop'
Twitter API: Fall back to user.nickname if user has no name

Closes #375

See merge request pleroma/pleroma!444
2018-11-12 17:08:54 +00:00
scarlett db78c72868 Twitter API: Add tests for nil names. 2018-11-12 17:02:01 +00:00
William Pitcock ee5932a504 http security: allow referrer-policy to be configured 2018-11-12 15:14:46 +00:00
William Pitcock fe67665e19 rename CSPPlug to HTTPSecurityPlug. 2018-11-12 15:08:02 +00:00
William Pitcock 54fdce9107 tests: add tests for CSPPlug 2018-11-11 07:26:31 +00:00
William Pitcock 69b8c0e299 tests: add test for internal data stripping 2018-11-10 12:24:25 +00:00
kaniini c9c1f9dee2 Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
ostatus: only federate activities concerning note objects

See merge request pleroma/pleroma!437
2018-11-10 11:50:02 +00:00
kaniini 99a8ef967e Merge branch 'tests/prismo-url-map' into 'develop'
Test that prismo url-map transforms into a string

See merge request pleroma/pleroma!414
2018-11-10 11:17:12 +00:00
William Pitcock 1d9fcbf2ba add missing prismo testcase data 2018-11-10 11:11:01 +00:00
William Pitcock c9df011215 tests: add tests for new OStatus.is_representable? function 2018-11-10 10:39:42 +00:00
William Pitcock dfc26d0fdd tests: add testing for new notification behavior 2018-11-09 09:37:12 +00:00
William Pitcock 719a8a1f82 tests: flip testing to/cc for mentions 2018-11-08 19:17:15 +00:00
lambda 59cf7cf235 Merge branch 'small-jsonld-refactor' into 'develop'
Small jsonld refactor

See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
lain 34bd411781 Unify json ld header handling. 2018-11-08 16:39:38 +01:00
lain 3b02fd9fb7 Small refactor. 2018-11-08 16:05:28 +01:00
kaniini 4d627a5117 Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
qvitter notifications: add new "read notifications" API

See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
kaniini b451a92d78 Merge branch 'runtime-config' into 'develop'
Runtime configuration

See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
William Pitcock d675b8a16f tests: add tests for twitterapi endpoint 2018-11-06 23:25:16 +00:00
William Pitcock 50bf174651 tests: add tests for Notification.set_read_up_to() 2018-11-06 23:02:55 +00:00
href 5bb88fd174
Runtime configuration
Related to #85

Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
kaniini 0f3e78addb Merge branch 'runtime-router' into 'develop'
Runtime configured router

See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
href 7d328c658d
Small wrapper module around Application.get_env/put_env
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
href 36ca3c1b3e
format 2018-11-06 15:17:29 +01:00
href 2bc924ba45
Get rid of Pleroma.Config in favor of Application
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
href 013f7ba8c1
Add federating plug & public tests 2018-11-06 14:45:04 +01:00
lain 2fedd93931 Fix formatting. 2018-11-03 16:40:57 +01:00
lain 81af7fd02d Test for null-content activities. 2018-11-03 16:28:29 +01:00
lain 7dfe611620 Test for case-insensitive mastodon hashtag timelines. 2018-11-03 11:41:40 +01:00
lain 45ebc8dd9a Check for empty string in_reply_to ids. 2018-11-02 17:33:51 +01:00
Haelwenn (lanodan) Monnier c5f26f3ce2
Test that prismo url-map transforms into a string 2018-11-01 11:30:50 +01:00
Lee Starnes 585b29337c Ensure filters have a filter_id 2018-11-01 09:17:02 +00:00
lain 1e9ced5af4 Test Relay, switch to runtime configuration. 2018-11-01 09:01:43 +00:00
lain 9b77030d3c Add basic configuration management module. 2018-11-01 09:01:03 +00:00
William Pitcock 2b3a40d038 object: split object_cache from user_cache 2018-11-01 08:41:46 +00:00
William Pitcock 2c092ed355 test: fixup test breakage caused by User.delete() harmonization 2018-11-01 08:23:49 +00:00
William Pitcock 21dafa7cd0 tests: add tests for User + cache interactions 2018-11-01 08:11:02 +00:00
William Pitcock f55fc68f76 tests: add tests for object deletion 2018-11-01 07:37:07 +00:00
scarlett b92e38d2d4 Add user reactivation task. 2018-10-29 23:13:15 +00:00
William Pitcock 2ac13061af testsuite: formatting 2018-10-26 06:37:00 +00:00
William Pitcock 0d0c1dcf44 tests: add testsuite for broken thread filter 2018-10-26 06:35:06 +00:00
William Pitcock b1d1f9bc27 tests: add test for user inbox 2018-10-25 05:24:17 +00:00
William Pitcock 6cfba7db8d tests: twitterapi: add additional fields 2018-10-25 04:06:42 +00:00
William Pitcock 9563f3766d tests: update for new in_reply_to_screen_name field 2018-10-25 03:03:44 +00:00
eal 5e9a0e2460 Fix some typos in the list test. 2018-10-20 13:03:45 +03:00
AkiraFukushima a249cbf187 Add a test for List.get_lists_account_belongs 2018-10-19 21:24:15 +09:00
William Pitcock 958c5e02e8 tests: add a testcase for matching osada users in the formatter 2018-10-17 19:27:05 +00:00
Haelwenn (lanodan) Monnier eacab0fb05
Delete Tokens and Authorizations on password change
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
2018-10-14 02:14:54 +02:00
William Pitcock ebc32045f0 test: add regression test for #316 2018-10-11 10:35:32 +00:00
William Pitcock 497814cbbb test: update test for new html scrub policy 2018-10-05 21:11:22 +00:00
William Pitcock b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding

Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
2018-09-28 17:32:27 +02:00
Haelwenn 34b6d444d6 Merge branch 'feature/twitter_api/fields' into 'develop'
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360
2018-09-28 09:25:27 +00:00
Haelwenn (lanodan) Monnier a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields 2018-09-28 11:17:33 +02:00
Haelwenn (lanodan) Monnier 82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" 2018-09-28 10:44:45 +02:00
William Pitcock d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs 2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor 2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier 2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg) 2018-09-27 20:00:47 +02:00
William Pitcock 85b59d07b6 test: add smoketests for the scrubbing policies 2018-09-22 03:45:37 +00:00
William Pitcock 56577d8b48 twitter api: add no_rich_text option to userview for account prefs 2018-09-22 03:24:40 +00:00
William Pitcock bd03644ca8 test: add tests for new User.html_filter_policy() 2018-09-22 03:02:05 +00:00
William Pitcock 200ab27e7a test: add test proving that users are refreshed when stale 2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false) 2018-09-20 16:24:29 +02:00
Haelwenn (lanodan) Monnier 43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count 2018-09-20 16:10:46 +02:00
shadowfacts 85b8590109 Update status_view_test.exs 2018-09-10 23:40:29 +00:00
William Pitcock a4fe14de02 tests: break the cycle using pleroma.factory 2018-09-09 12:56:25 +00:00
William Pitcock fc92bb28b4 tests: try breaking the cycle a different way 2018-09-09 12:43:58 +00:00
William Pitcock 33a5294fad test: user enabled plug tests: fix circular reference 2018-09-09 12:23:48 +00:00
lambda 045953225e Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
auth overhaul and legacy GS auth

See merge request pleroma/pleroma!331
2018-09-08 09:20:34 +00:00
Martin Kühl 619f67768a Mastodon API: Add unsupported attributes to relationship responses
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
2018-09-07 16:12:44 +02:00
lain d22af29bb4 Fix warning. 2018-09-05 22:42:50 +02:00
lain 44b094908c Update legacy passwords automatically. 2018-09-05 22:30:14 +02:00
Martin Kühl ff38ffd9f8 Fix the tests 2018-09-05 22:20:59 +02:00
lain e601165426 Add UserEnabledPlug. 2018-09-05 21:53:53 +02:00
lain 5ce1ebb179 Add SetUserSessionIdPlug. 2018-09-05 21:42:42 +02:00
Haelwenn 4a3dbd9d4e Merge branch 'fix/sign-in-with-toot' into 'develop'
Fix sign-in and sign-out with Toot!

See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
lain 12bc73dd28 Add EnsureUserKeyPlug, smaller fixes 2018-09-05 19:06:28 +02:00
lain 32465b9939 Simplify AuthenticationPlug 2018-09-05 18:53:38 +02:00
lain 9a96c93be7 Add SessionAuthenticationPlug. 2018-09-05 18:37:02 +02:00
lain a3f54fca4d Add LegacyAuthenticationPlug 2018-09-05 18:17:33 +02:00
lain 3cf17dc402 Add EnsureAuthenticatedPlug 2018-09-05 17:59:19 +02:00
lain faf5347748 Add UserFetcherPlug. 2018-09-05 17:44:38 +02:00
lain 42bd985e66 Add BasicAuthDecoderPlug 2018-09-05 17:30:05 +02:00
Moon Man 1a8bc26e52 auth against sha512-crypt password hashes, upgrade to pbkdf2 2018-09-05 00:21:44 -04:00
kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
William Pitcock d3f6814feb tests: add test for staffAccounts presence in nodeinfo 2018-09-03 14:48:36 +00:00
kaniini 1c9e539b47 Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
kaniini 7ca2a2ddea Merge branch 'nil-bio-emojis' into 'develop'
add nil clause for Formatter.get_emoji/1 to return an empty result

Closes #274

See merge request pleroma/pleroma!315
2018-09-03 05:54:11 +00:00
kaniini b7923aa304 Merge branch 'hotfix_broken_likes' into 'develop'
hotfix for broken like completely breaking the notifications API

See merge request pleroma/pleroma!284
2018-09-02 12:37:00 +00:00
William Pitcock 834515fb51 formatter: don't add XSS emoji 2018-09-02 00:04:09 +00:00
William Pitcock 303af9ba4c tests: add regression tests 2018-09-01 23:33:10 +00:00
Martin Kühl b60d232719 AccountView: `sensitive` is supposed to be a boolean, not a string 2018-09-01 23:10:48 +02:00
Will Pearson 0c2a0e3551 Specify default scope in verify_credentials
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.

Currently, Pleroma hardcodes this value to "public".

This patch changes it to the user's default_scope value.
2018-08-31 21:04:46 -07:00
Thurloat a9c0f395cb add nil clause for Formatter.get_emoji/1 to return an empty result 2018-08-31 14:29:23 -03:00
lambda 58539e1357 Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
2018-08-31 09:51:20 +00:00
William Pitcock e7871ed05e tests: add tests for evil HTML filtering 2018-08-31 03:34:56 +00:00
William Pitcock 9cac7c957c test: add testcase proving lists system does not leak non-public posts 2018-08-29 08:50:23 +00:00
Henry Jameson 0f1c629d65 better solution, added test. 2018-08-27 17:07:26 +03:00
Haelwenn (lanodan) Monnier 6e030129fb
[MastodonAPI] Add filters 2018-08-27 15:09:05 +02:00
Haelwenn (lanodan) Monnier d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field 2018-08-27 15:09:04 +02:00
lambda 46c7c2380c Merge branch 'feature/relay' into 'develop'
message relay

Closes #144

See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
kaniini 63094cfd3e Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.

Closes #202

See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00
William Pitcock 86dca39640 tests: fix formatting 2018-08-26 23:19:45 +00:00
William Pitcock 504a25f812 tests: add notification smoketests (ref #265) 2018-08-26 22:42:02 +00:00
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay'
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
William Pitcock aab2bdddf4 twitter api: provide object descriptions as attachment description field 2018-08-25 00:12:58 +00:00
William Pitcock a8bd120ea6 tests: formatting 2018-08-24 18:33:36 +00:00
William Pitcock 14d1187702 test: add testcase for formatter issue #163 2018-08-24 18:22:46 +00:00
William Pitcock bc36d40bee tests: add a testcase for verifying that objects without a valid ID are always rejected 2018-08-23 01:25:27 +00:00
kaniini f6b06d2ac8 Merge branch 'feature/peertube_2' into 'develop'
rebase/update of feature/peertube

See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
kaniini a6d4cc8917 Merge branch 'sanitize-bio' into 'develop'
mastodon api: sanitize the bio HTML

See merge request pleroma/pleroma!282
2018-08-21 16:56:24 +00:00
Haelwenn (lanodan) Monnier 74c74decf5
Basic peertube support. 2018-08-21 18:24:09 +02:00
ensra 2b5db840ee attempt to add html validation to mastodon api test case 2018-08-21 15:41:32 +01:00
ensra e883587cc3 this should be looking at the follower's bio, not the user's bio.
fixes test.
2018-08-21 15:25:21 +01:00
ensra f533daffdb sync bio sanitization code in tests 2018-08-21 15:24:06 +01:00
kaniini 183ccd1812 Merge branch 'dev-lanodan-url-regex' into 'develop'
lib/pleroma/formatter.ex: Fix URL regex

Closes #127

See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
kaniini 5fbb14f5ec Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg

See merge request pleroma/pleroma!272
2018-08-16 15:20:15 +00:00
kaniini 38361e7b5e Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
Fix: Output repeats at ActivityPub outbox

Closes #191

See merge request pleroma/pleroma!175
2018-08-16 15:19:46 +00:00
kaniini 8dc715b30b Merge branch 'fix/normalize-file-extension' into 'develop'
Normalize file extension for uploaded files

Closes #218

See merge request pleroma/pleroma!233
2018-08-16 15:17:17 +00:00
William Pitcock 8058443674 testsuite: add puckipedia test fixture 2018-08-16 15:10:57 +00:00
William Pitcock b8560e5ed5 testsuite: formatting 2018-08-14 17:15:33 +00:00
William Pitcock 7fbcd4caaf test: add kroeg fixtures 2018-08-14 17:09:17 +00:00
eal 92caa2632b Use Image type for emoji icons. 2018-08-13 16:21:18 +03:00
eal f9d13558c8 CommonAPI: add emoji to user source data on update 2018-08-13 15:27:20 +03:00
lambda 13440a80e1 Merge branch 'feature/invites' into 'develop'
Invites

Closes #108

See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
eal ed9738e031 Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
eal cee63ad3f7 TwitterAPI user view: add screen_name_html and description_html. 2018-08-08 08:38:25 +03:00
William Pitcock 3026177206 test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed 2018-08-06 11:29:03 +00:00
William Pitcock aea23468c6 test: nickname is no longer a required field 2018-08-06 08:46:06 +00:00
Haelwenn (lanodan) Monnier 32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link 2018-07-30 22:01:48 +02:00
Haelwenn (lanodan) Monnier 1a2255ef7e
[Pleroma.FormatterTest]: .add_links: Add a space before the dot
A dot is legal in the url, even at the end, so I moved it for the test
2018-07-30 22:01:48 +02:00
hakabahitoyo 9c1b6f11c5 improve test 2018-07-21 02:57:56 +09:00
hakabahitoyo 908cefd84a debug 2018-07-21 02:19:20 +09:00
hakabahitoyo 9c2afb2e71 improve test 2018-07-21 01:44:35 +09:00
lambda 41b0ecef95 Merge branch 'tests/plume' into 'develop'
Articles/Notes with a actor list outside object

See merge request pleroma/pleroma!252
2018-07-19 07:35:34 +00:00
lambda 54963a6379 Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.

Closes #206

See merge request pleroma/pleroma!251
2018-07-19 07:31:33 +00:00
William Pitcock 18cac1e36b test: mastodon attachments: update for added description field 2018-07-17 03:40:48 +00:00
William Pitcock 489453c246 tests: verify media description api support is working 2018-07-17 03:40:47 +00:00
Haelwenn (lanodan) Monnier 24b5a75d09
Add test for Plume Articles 2018-07-12 23:08:28 +02:00
William Pitcock f1a29fc43c test: ostatus controller: add AS2 fetching tests 2018-07-12 20:32:56 +00:00
William Pitcock 4fb64c1d86 testsuite: twitter api: add summary where necessary 2018-07-12 16:12:25 +00:00
lambda fe4387077a Merge branch 'feature/default-scope' into 'develop'
default scope setting

See merge request pleroma/pleroma!239
2018-07-12 05:59:12 +00:00
lambda 4a922305af Merge branch 'feature/article-support' into 'develop'
article support (plume, etc)

See merge request pleroma/pleroma!240
2018-07-12 05:58:39 +00:00
William Pitcock 8546551257 activitypub: switch to using x509 representation for public keys instead of pkcs#1 2018-07-12 03:30:22 +00:00
William Pitcock 66819ea784 twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic 2018-06-27 13:38:07 +00:00
William Pitcock 32211c4ada tests: add default_scope where appropriate 2018-06-27 13:17:07 +00:00
lambda fc012491a5 Merge branch 'fix/mutes.json-emptyarray' into 'develop'
Return empty array from /api/qvitter/mutes.json

See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
Vivian Lim 6160a1b3c0 mix format 2018-06-24 15:24:41 -07:00
Vivian Lim 1299bccc7d return unquoted empty array from /api/qvitter/mutes.json 2018-06-23 23:20:30 -07:00
Vivian Lim 6316003946 fixes- found that TwitterAPI.Controller adds .json suffix already 2018-06-23 23:05:54 -07:00
Haelwenn (lanodan) Monnier 359093d73b
Fake 2.4.0 API 2018-06-23 16:12:57 +02:00
Francis Dinh 082920044a Normalize file extension for uploaded files 2018-06-21 14:04:12 -04:00
lambda be800d7936 Merge branch 'bugfix/block-follow-relationships' into 'develop'
fix follow relationship leaks when blocked

See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
William Pitcock 590e8d5555 tests: fix a completely bogus mastodon api test 2018-06-19 08:53:54 +00:00
William Pitcock 3707a7fa42 tests: transmogrifier: ensure incoming blocks have the same effect as local blocks 2018-06-19 00:59:28 +00:00
William Pitcock e9ed7eb963 tests: prove that the block code is properly destroying follow relationships 2018-06-19 00:59:27 +00:00
William Pitcock a2c6778ce6 tests: add regression test for contentMap-only posts 2018-06-18 22:14:51 +00:00
Haelwenn (lanodan) Monnier 72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads 2018-06-15 22:14:17 +02:00
Francis Dinh 0a95b5594b Add missing file extension if file does not have one 2018-06-14 12:16:34 -04:00
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce

See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
Francis Dinh fc15f30a3c fixup test 2018-06-13 21:45:27 -04:00
Francis Dinh 1555c66650 Add unretweet TwAPI endpoint and cleanup AP.unannounce 2018-06-13 21:33:36 -04:00
Henry Jameson 9c1cf1befb formatting 2018-06-12 15:01:40 +03:00
Henry Jameson f42ffbe9a8 Initial invites support + tests. 2018-06-12 14:55:16 +03:00
lambda 3f42806b1b Merge branch 'develop' into 'develop'
Dedupe uploads

See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00
lambda 564c73ab24 Merge branch 'feature/list-streaming' into 'develop'
MastoAPI: Add streaming for lists.

See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
William Pitcock c773f42ca4 tests: update twitterapi user view tests for new locked variable 2018-06-11 22:15:53 +00:00
William Pitcock f8e0942745 twitter api: add approve/deny endpoints 2018-06-11 22:15:53 +00:00
William Pitcock d116af3bee tests: add tests for /api/pleroma/friend_requests 2018-06-11 22:15:53 +00:00
William Pitcock 993312cdb3 twitterapi: add profile setting for locked/unlocked accounts 2018-06-11 22:15:53 +00:00
William Pitcock a0c5b42e29 tests: assert the state prior to mutating it as well as afterward 2018-06-11 22:15:53 +00:00
William Pitcock c99b9b9d92 testsuite: add mastodon api tests 2018-06-11 22:15:53 +00:00
lambda 7f79b467b1 Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks

See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
William Pitcock 299ef74f2e tests: add regression test for locking/unlocking account updates 2018-06-08 02:52:34 +00:00
Sir_Boops 3f0440ac3c
Dedupe uploads 2018-06-06 13:25:44 -06:00
lambda 0a0c6bf394 Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements

See merge request pleroma/pleroma!195
2018-06-06 16:44:44 +00:00
William Pitcock 1620ec502c testsuite: update fixture URIs that were http 2018-06-06 16:36:58 +00:00
D Anzorge 2cebaa7d3a Add OAuth controller tests
Tests for Pleroma.Web.OAuth.OAuthController
2018-06-06 03:18:11 +02:00
eal 4856962434 MastoAPI: add domain blocking. 2018-06-03 22:21:23 +03:00
lain 8073af6e10 Better error handling for OstatusController. 2018-06-03 21:04:44 +02:00
eal 87566b6e2f user.ex: add domain blocks. 2018-06-03 22:01:37 +03:00
lain 06439f64d0 Better error handling for ActivityPubController 2018-06-03 19:58:59 +02:00
lain 4856ba596f Better error handling for MastodonApiController. 2018-06-03 19:28:11 +02:00
lain 0f70e83e8c Better error handling in TwitterApiController. 2018-06-03 19:11:22 +02:00
lambda 98b8f08783 Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
TwitterAPI: fix "Follows you" being shown for the wrong user.

Closes pleroma-fe#89

See merge request pleroma/pleroma!185
2018-06-01 08:51:04 +00:00
eal 935e544e19 TwitterAPI: fix "Follows you" being shown for the wrong user. 2018-05-31 15:27:42 +03:00
lain 349400c06a Fix url guessing attacks. 2018-05-30 20:00:27 +02:00
eal 5d3fdbc082 MastoAPI: Add streaming for lists. 2018-05-30 16:48:59 +03:00
William Pitcock f569b67cda tests: update for html changes 2018-05-27 13:03:34 +00:00
lain 841ee8e3e4 Simplify DM query.
Should also use indexes better.
2018-05-26 16:25:32 +02:00
lain 4b3ec53514 Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api 2018-05-26 16:00:59 +02:00
lain 745072b2cc Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop 2018-05-26 15:15:52 +02:00
lain 0a6c897c94 Formatting. 2018-05-26 15:11:50 +02:00
lain bfce29866f Make Mastodon follow hack more explicit. 2018-05-26 15:07:21 +02:00
lain 3839a11ef5 Don't treat remote accepts/rejects as local.
Also, use specialized functions to get safe data.
2018-05-26 14:07:46 +02:00
William Pitcock 1db0dc3072 tests: add tests to verify the accept request is discarded if no follow activity could be found 2018-05-26 11:20:53 +00:00
William Pitcock 7cf3cf77cf activitypub transmogrifier: cleanups and tests for incoming accepts/rejects 2018-05-25 12:53:12 +00:00
William Pitcock 1f3eb0f470 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest) 2018-05-25 06:12:30 +00:00
William Pitcock 1d88abf2d4 user: do not allow refollowing somebody who has blocked a user 2018-05-25 03:18:35 +00:00
William Pitcock 8d2ee70da1 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest) 2018-05-25 03:18:34 +00:00
lambda f3a71f2986 Merge branch 'feature/lists' into 'develop'
Mastodon List API

See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
lambda c2dcd767cf Merge branch 'feature/incoming-remote-unfollow' into 'develop'
Add support for incoming remote unfollows and blocks/unblocks

See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
lambda c41012053a Merge branch 'feature/change-password' into 'develop'
Feature/change password

See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00
eal 3dbd9809d4 MastoAPI: add lists. 2018-05-24 15:34:39 +03:00
lain 1cd6194dee More efficient queries. 2018-05-24 12:44:26 +02:00
lain 0b5bc62b33 Don't save double tags in AP objects we create
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
lambda 06c97f211f Merge branch 'feature/deps-migration' into 'develop'
Migrate to comeonin 4 and Cachex 3

See merge request pleroma/pleroma!162
2018-05-23 09:03:11 +00:00
Francis Dinh 72b93d13f8 Hook up block/unblock to TwitterAPI 2018-05-22 05:41:17 -04:00
Francis Dinh b2c6ae7d82 Hook up unfollow and (un)block to MastoAPI + tests 2018-05-22 04:27:40 -04:00
csaurus 4fd9df100f Merge branch 'develop' into feature/mstdn-direct-api 2018-05-21 20:19:37 -04:00
Syldexia 69aa7c213a Fixed test 2018-05-21 23:06:03 +01:00
Syldexia d0690622cd Added endpoint for changing passwords 2018-05-21 23:06:03 +01:00
William Pitcock 75cfd9d34d webfinger: fix finding the XRD uri for statusnet instances 2018-05-21 12:41:31 +00:00
Francis Dinh d045b96f95 Add tests for incoming unfollow over OStatus 2018-05-21 05:11:13 -04:00
Francis Dinh cc5373b846 Fix unblock handling 2018-05-21 05:00:58 -04:00
Francis Dinh 89c5de9096 Fix unfollows 2018-05-20 21:01:14 -04:00
Francis Dinh 56de0216ae pass user to User.blocks?/2 instead of ap_id 2018-05-20 19:45:05 -04:00
Francis Dinh 1afd6d37bd Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
2018-05-20 19:17:15 -04:00
Thog e55c6f311b
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
lain 413de8e4bc More fixes. 2018-05-20 19:26:09 +02:00
lain ff007af0c2 Return visilility in twitter api, too. 2018-05-20 18:01:24 +02:00
lain 434601a5c3 Return private / direct posts on user timelines, too. 2018-05-20 16:15:18 +02:00
lambda 8b0c222b43 Merge branch 'feature/account-deletion' into 'develop'
Feature/account deletion

Closes #115

See merge request pleroma/pleroma!157
2018-05-20 10:57:19 +00:00
Francis Dinh d46393f6ef Fix test for blocks 2018-05-20 02:15:56 -04:00
Francis Dinh 1e43de0f86 Formatting and add tests for blocks/unblocks 2018-05-19 21:23:52 -04:00
Thog 6f39ecc41b
Support Undo like activities (Fix #139) 2018-05-19 22:14:15 +02:00
Syldexia d1366f8d46 Modified deleting an account to run as a task 2018-05-19 13:35:49 +01:00
lambda 7831b38705 Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
webfinger: handle application/ld+json links

See merge request pleroma/pleroma!159
2018-05-19 09:31:08 +00:00
lain df95118c81 Fix linking problem. 2018-05-19 11:27:14 +02:00
William Pitcock 725b05d04a run mix format 2018-05-19 08:48:15 +00:00
William Pitcock 6e8de2faae run mix format 2018-05-19 08:37:04 +00:00
William Pitcock 4033ed6714 tests: add test for hubzilla follow activity too 2018-05-19 03:28:32 -05:00
William Pitcock 19c96c8a19 tests: add tests for Transmogrifier.maybe_fix_user_object() 2018-05-19 03:28:30 -05:00
William Pitcock f32e19f668 webfinger: add tests 2018-05-19 01:28:27 -05:00
Francis Dinh 8d11bae0d5 Revert "Undo formatting in user.ex"
This reverts commit e6dc15b96c.
2018-05-17 23:55:00 -04:00
Francis Dinh e6dc15b96c Undo formatting in user.ex 2018-05-17 23:53:34 -04:00
Francis Dinh d8c842a771 Add support for incoming remote unfollows 2018-05-17 22:15:57 -04:00
lain 1d4bbec6b3 Fix User search.
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.
2018-05-16 17:55:20 +02:00
csaurus d0ad13c12e Add direct_note[_activity]_factory and a couple tests 2018-05-14 21:54:25 -04:00
csaurus 987a52cf6f Post direct status test 2018-05-13 21:21:42 -04:00
Syldexia 98b36d359a Fixed formatting and test 2018-05-13 15:43:42 +01:00
Syldexia 5bfb7b4ce6 Moved account deletion stuff to somewhere that hopefully makes more sense 2018-05-13 14:36:02 +01:00
Syldexia a16117225f Added endpoint for user account deletion 2018-05-13 14:35:48 +01:00
lain 89954a2ce7 Fix format. 2018-05-13 13:02:24 +02:00
lain c7a85de35c Revert "Remove 'unlisted' handling for now."
This reverts commit 1027d1f696.
2018-05-13 12:38:13 +02:00
lain 1027d1f696 Remove 'unlisted' handling for now.
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
2018-05-13 12:07:11 +02:00
lambda aeff2d6474 Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats

Closes #69

See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
lain ec531ca281 Add test. 2018-05-13 11:18:48 +02:00
Francis Dinh 694e376954 Update test fixture 2018-05-12 11:10:49 -04:00
Francis Dinh 16b793656d Add tests for unrepeats 2018-05-11 15:30:47 -04:00
Pierrick Brun 89603eda9e do not create notification for yourself 2018-05-11 11:31:17 +02:00
lambda 6c2903d9a1 Merge branch 'feld-warnings' into 'develop'
Clean up warnings

See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
lain 9810153aeb Streamer: Don't send out stream events for blocked users. 2018-05-05 13:40:47 +02:00
lain c464355d1a Idempotency: Use special cache, keep for 6 hours. 2018-05-05 11:15:57 +02:00
Mark Felder ab4aa5720a Fix a bunch of unused variable warnings 2018-05-04 20:59:01 +00:00
lain 90c4bed0af Don't expire idempotency cache for five minutes. 2018-05-04 21:15:39 +02:00
lain fcd3eca167 MastodonAPI: Support idempotency key. 2018-05-04 20:30:29 +02:00
Francis Dinh 8b4ee0ea51 Fix formatting 2018-05-04 03:19:48 -04:00
lain bc215f5684 Fix format. 2018-04-29 11:28:26 +02:00
lambda b7584edcea Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>

See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
lambda a7a40bb8f1 Merge branch 'fix/blocked-user-boosts' into 'develop'
ActivityPub.ex: do not return boosted statuses from blocked users.

See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
Wim Vanderbauwhede 6908f29e0a Added a test (written by @andrewzah) for the MR 2018-04-28 12:01:43 +01:00
Francis Dinh 2d775bf1be Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats 2018-04-25 01:58:50 -04:00
Francis Dinh e981280fa7 Formatting fixes 2018-04-25 01:43:45 -04:00
Francis Dinh 9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-25 00:46:28 -04:00
Dashie 9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete 2018-04-24 11:34:18 +02:00
Francis Dinh 8c0806539c Embed announce activity data instead of linking to it 2018-04-22 21:28:51 -04:00
lain 0574df273c Small cleanup. 2018-04-22 10:01:10 +02:00
lain 114ca9e069 Merge branch 'develop' into fix/note-count-not-updating 2018-04-22 09:56:24 +02:00
lain 0c221943ef Formatter: Use proper escaping for links. 2018-04-21 18:27:31 +02:00
eal 22bfeac256 Update note count in ActivityPub.create. 2018-04-21 12:58:04 +03:00
lain 9e6ae44729 Formatting fixes. 2018-04-21 09:43:53 +02:00
Francis Dinh f0798440de Use correct activity for undo 2018-04-20 23:22:16 -04:00
Francis Dinh c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-20 16:48:18 -04:00
lain a61e8ac154 Formatting. 2018-04-20 13:10:57 +02:00
eal fa37acfcc7 TwitterAPI: Add Qvitter notification endpoint. 2018-04-19 21:46:59 +03:00
Francis Dinh 7b4f55238e Handle unrepeats via the TwitterAPI 2018-04-18 06:00:40 -04:00
Francis Dinh 687db1bc3a Expose unannounce activity so that it can be tested 2018-04-18 03:39:42 -04:00
Francis Dinh 42279f54cf Return target status in MastoAPI endpoint instead of reblog activity 2018-04-16 23:30:52 -04:00
Francis Dinh 5b0d0b9ab2 Add unreblogging tests 2018-04-14 22:34:06 -04:00
eal 48380aeccc ActivityPub.ex: do not return boosted statuses from blocked users. 2018-04-14 14:26:20 +03:00
Gian Sass 2de2e29df2 Oops 2018-04-11 15:51:02 -04:00
Gian Sass 3a5c0465eb Add unit test for pinned statuses 2018-04-11 15:48:32 -04:00
lain 70bcdf32bd Only search in public data for now.
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
2018-04-07 16:40:45 +02:00
lain 60f92e406c Accept port number in urls. 2018-04-06 16:35:54 +02:00
lain 81600c94f4 Handle + in links. 2018-04-04 11:29:03 +02:00
lain 806550c921 Use user url in mention if we have it. 2018-04-03 18:32:46 +02:00
lain b3b7ab5d9a Load all users at once in timelines. 2018-04-02 16:35:41 +02:00
lain 360c51f1f5 Use context_ids directly if we have them. 2018-04-02 15:28:35 +02:00
lain bc31bee7c4 Generates contexts and ids on insertion time. 2018-04-02 15:17:09 +02:00
lain a4db3a732f Pre-fetch conversation ids. 2018-04-02 14:46:56 +02:00
lain 0a14d155d6 Fail faster. 2018-04-02 13:13:14 +02:00
lain 1b57522bba Fix some test stuff. 2018-04-02 13:13:04 +02:00
lain 2222e5599c Don't fetch anything except ap_id for follower / following
collections.

Should speed up the queries because ecto doesn't have to parse the json.
2018-03-31 20:02:09 +02:00
lain 802736679c Remove unused ActivityRepresenter module. 2018-03-30 16:50:30 +02:00
lain e90f8f6c4b TwApi ActivityView: Add delete activities. 2018-03-30 15:32:43 +02:00
lain 1f32ba052c TwApi ActivityView: Add follows. 2018-03-30 15:17:13 +02:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain c1d529ee94 TwApi ActivityView: Add announces. 2018-03-30 14:46:36 +02:00
lain 1f1caab138 TwApi ActivityView: Add Like rendering. 2018-03-30 13:49:09 +02:00
lain 361016349f Add ActivityViewTest. 2018-03-30 12:57:55 +02:00
lain e30752bc79 Add basic activity view. 2018-03-27 22:24:19 +02:00
lain 37e5014d3e Reduce OP fetching queries. 2018-03-27 18:18:24 +02:00
lain ff7afe46b9 Don't try to fetch OP if none is there. 2018-03-27 17:43:08 +02:00
Francis Dinh 9556c8f6e7 Forgot to fix one of the links in a test 2018-03-27 02:08:46 -04:00
Francis Dinh 5ba2f4b6d8 Update tests to reflect hashtag link changes 2018-03-27 02:07:07 -04:00
William Pitcock 2aea3bc632 activitypub transmogrifier: rewrite incoming hashtags 2018-03-24 16:42:17 -05:00
lain e3a81fe58f Fetch the same data from json webfinger as from xml webfinger. 2018-03-24 14:45:54 +01:00
lain eb7ce61ca5 Fix hashtags. 2018-03-24 11:03:10 +01:00
lain 5da2355e71 For outgoing objects, fake mastodon style ap id for ostatus. 2018-03-23 16:07:02 +01:00
lain 32ae918843 Clear caches on test. 2018-03-22 12:44:32 +01:00
William Pitcock ff7afc0465 tests: webfinger: test quering a JSON response for activitypub actor URI 2018-03-22 00:36:13 -05:00
William Pitcock 8aa639a450 webfinger: support JSON output 2018-03-22 00:35:51 -05:00
lain ec83175100 Use connection pools. 2018-03-19 17:42:09 +01:00
William Pitcock 0ee6e8af26 mastodon api tests: invalidate user cache prior to importing a test reply
This is needed to ensure the user cache does not throw nil when creating the mentions
list.

Signed-off-by: lain <lain@soykaf.club>
2018-03-16 11:25:41 +01:00
William Pitcock 59a76ea464 activitypub transmogrifier: rewrite non-http URLs using the object's external URL
Signed-off-by: lain <lain@soykaf.club>
2018-03-14 08:53:29 +01:00
lain 368e085144 Don't validate on missing public key. 2018-03-11 14:47:37 +01:00
lain f29902a241 More signature debugging. 2018-03-11 14:37:23 +01:00
lain 611ca385de Merge branch 'develop' into feature/activitypub 2018-03-08 12:37:06 +01:00
lain a91adb146e add test file. 2018-03-07 15:46:53 +01:00
lain fcf1937a40 Correctly handle unlisted messages coming in through Ostatus. 2018-03-07 15:45:13 +01:00
lain b82637f32d Don't use special query for feed. 2018-03-06 16:04:29 +01:00
lain d2ad99298e Handle incoming deletes. 2018-03-03 18:38:40 +01:00
lain e9de04b74b Add support for outgoing update. 2018-02-25 21:08:32 +01:00
lain f61fd00db5 Make likes and announces public. 2018-02-25 18:20:06 +01:00
lain 8a47974217 Fix specs. 2018-02-25 18:11:03 +01:00
lain 4ea2a41014 Fix more specs. 2018-02-25 17:48:31 +01:00
lain d3b0167854 Fix salmon tests. 2018-02-25 17:06:12 +01:00
lain 4d13cc0dc6 Fix specs. 2018-02-25 16:52:33 +01:00
lain 8e7f63afde Fix specs. 2018-02-25 16:40:37 +01:00
lain e3629af4da Handle remote update activities. 2018-02-25 16:14:25 +01:00
lain b76de1ecd3 Some fixes to AP fetching. 2018-02-25 10:56:01 +01:00
lain e5fcc51a06 Remove unneccesary subscriptions on update. 2018-02-24 17:36:02 +01:00
lain fb02300234 Pleroma AP detection mechanism. 2018-02-24 13:06:53 +01:00
lain 01d5ef65fa More fixes to user upgrading. 2018-02-24 10:42:47 +01:00
lain aa79d64e0d Correctly stitch mastodon -> ostatus replies. 2018-02-23 15:00:41 +01:00
lain eb3f14da86 Missing test skeleton. 2018-02-23 08:49:57 +01:00
lain 37e406ae36 Get avatar and banner from AP users. 2018-02-22 08:14:15 +01:00
lain 4816b09fa7 Add user upgrade function. 2018-02-21 22:21:40 +01:00
Ekaterina Vaartis ec07e087bc Make user bio optional 2018-02-21 23:31:57 +03:00
lain 94db9ac4db Merge branch 'develop' into feature/activitypub 2018-02-21 18:34:19 +01:00
lain 810cf8618f ActivityPub: Fetch missing activities on reply. 2018-02-21 15:22:24 +01:00
lain 5bc810c452 Add moderator function. 2018-02-20 18:44:50 +01:00
lain 95f7e7e2d5 Add some more tests. 2018-02-20 18:42:41 +01:00
lain 297a2c7d3f Ignore duplicate create activities. 2018-02-19 17:37:45 +01:00
lain 6b6ab592ab AP: Fix incoming conversations. 2018-02-19 10:39:03 +01:00
lain 539340d914 Handle sensitive property. 2018-02-18 14:14:16 +01:00
lain 20e6190ead Transmogrify outgoing nsfw. 2018-02-18 14:07:13 +01:00
lain 8ca66b5961 ActivityPub: Add conversation id. 2018-02-18 13:58:52 +01:00
lain 6ab0aba50a Transmogrify outgoing hashtags. 2018-02-18 13:51:03 +01:00
lain 6046f10431 Actually fix incoming attachments. 2018-02-18 13:06:51 +01:00
lain 77c6c424a6 ActivityPub: Make fake Create activities for objects without one. 2018-02-18 11:24:54 +01:00
lain fc9d361d17 Add mock. 2018-02-18 10:21:19 +01:00
lain 81ea359a7c ActivityPub: Handle incoming announces. 2018-02-17 21:57:31 +01:00
lain e3732ea3bc Add test fixtures. 2018-02-17 21:56:52 +01:00
lain 5e36b750c1 ActivityPub: Fetch an object from an id. 2018-02-17 21:56:33 +01:00
lain e1b12a7782 ActivityPub: Handle incoming likes. 2018-02-17 20:13:12 +01:00
lain ab27c90c9f ActivityPub: Handle attachments. 2018-02-17 18:38:58 +01:00
lain fb7b926be3 Handle black name fields on incoming users. 2018-02-17 18:15:48 +01:00
lain 7b26443a76 ActivityPub: Send out Accept after Follow. 2018-02-17 16:08:55 +01:00
lain e7b73359e3 ActivityPub: Partly handle incoming follows. 2018-02-17 14:55:44 +01:00
lain 5682e48a25 ActivityPub: tags -> tag. 2018-02-17 14:20:53 +01:00
lain 05ba6ca1b8 Do some transmogrifying for the output. 2018-02-17 14:11:20 +01:00
lain 5a371892a0 Fix specs. 2018-02-17 10:26:44 +01:00
lain dea29d707c Add post activity fixture. 2018-02-17 09:48:42 +01:00
lain 5454ec6a6c ActivityPubController: Handle inbox data. 2018-02-15 20:00:43 +01:00
lain ef0300889d Transmogrifier: Handle basic notice creation. 2018-02-15 20:00:06 +01:00
lain a15f572800 OstatusTest: Remove insert_or_update test (moved to User). 2018-02-15 19:59:40 +01:00
lain ae26604378 ActivityPub: Refactor create function. 2018-02-15 19:59:35 +01:00
lain 0aa56a853b UserTest: Move insert_or_update test. 2018-02-15 19:58:12 +01:00
lain b331cb449a Merge branch 'develop' into feature/activitypub 2018-02-12 10:24:15 +01:00
lain 1bc34de4df Add missing support file. 2018-02-12 10:23:21 +01:00
lain 26ccb768d3 Make test output easier to read. 2018-02-12 10:14:11 +01:00
lain 33a5d0a238 Fix some test warnings. 2018-02-12 09:33:01 +01:00
lain 3c80d9b277 Fix spec. 2018-02-12 08:15:03 +01:00
lain 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon. 2018-02-11 20:43:33 +01:00
lain ce31f3a922 Twitter Representers: Handle Mastodon attachments. 2018-02-11 17:21:06 +01:00
Roger Braun ae1ec858f4 Basic AP user building. 2018-02-11 17:20:43 +01:00
Roger Braun c1d26751e6 Mocks: Add mastodon user json example. 2018-02-11 17:19:06 +01:00
Roger Braun 52200998c9 Merge branch 'develop' into feature/activitypub 2018-02-11 09:50:55 +01:00
lambda 61c16193de Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
Hakaba Hitoyo ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images 2018-02-03 20:43:14 +09:00
eal 29be70c008 Add remote following of local profiles. 2018-02-02 00:14:05 +02:00
eal ab83e0de6d TwitterAPI: Add is_local to user view. 2018-02-01 21:41:19 +02:00
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop 2018-01-30 12:20:39 +01:00
Roger Braun 4501094606 Make specs less breaky. 2018-01-30 12:20:14 +01:00
Roger Braun 1bb3ba02f3 Fix specs. 2018-01-30 12:17:01 +01:00
eal b3e7d7ae6d Fetch external profile in the background. 2018-01-16 15:31:03 +02:00
eal 80f6ac412a Merge branch 'default-pictures' into 'develop'
Add a default profile picture and banner.

See merge request pleroma/pleroma!48
2018-01-15 20:26:49 +00:00
eal 14b086eec2 Add a default profile picture and banner.
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
eal 6e1cb86166 Fix instance test. 2018-01-14 08:28:35 +02:00
Lain Iwakura 2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-12-19 16:15:45 +01:00
Lain Iwakura f1f79c0dca Fix timelines in subway tooter. 2017-12-19 16:15:07 +01:00
lambda 29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop'
Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41
2017-12-18 22:44:15 +00:00
Lain Iwakura 47887ac848 MastoAPI: Fix always-sensitive bugs. 2017-12-18 16:56:03 +01:00
eal 1969773fb4 Fix follower/following lists.
Add tests.
2017-12-18 16:37:26 +02:00
Lain Iwakura 4a13b84887 Add recipients field to activities.
Also do some very basic checks for AP message insertion.
2017-12-12 18:07:14 +01:00
eal 9223038319 Fix some more tests. 2017-12-11 21:01:36 +02:00
Lain Iwakura e2e6365035 ActivityPub: Add controller tests. 2017-12-11 18:22:48 +01:00
Lain Iwakura da005d3332 ActivityPub: Add Objects View. 2017-12-11 18:19:46 +01:00
eal 79b3397c17 Fix tests. 2017-12-11 18:41:03 +02:00
Roger Braun c3bcafc51b HTTPSig: Add method to validate conn 2017-12-11 10:37:40 +01:00
Roger Braun 30e9b22f96 Merge branch 'develop' into feature/activitypub 2017-12-09 11:00:56 +01:00
Roger Braun d5a13c10ac Merge branch 'feature/user_deletion' into develop 2017-12-09 10:10:45 +01:00
Lain Iwakura bad499b3fd Basic user deletion. 2017-12-08 17:50:11 +01:00
eal a3e68f0233 Allow parentheses in links. 2017-12-07 21:38:31 +02:00
Lain Iwakura 6df6ad0b42 User deletion: Remove relationships. 2017-12-07 18:13:05 +01:00
Lain Iwakura a78ae2a685 Don't follow deactivated users. 2017-12-07 17:51:55 +01:00
Lain Iwakura b727ecc5e7 Add function to deactivate users. 2017-12-07 17:47:23 +01:00
Lain Iwakura 0ec5aeb8a7 Don't log in deactivated users. 2017-12-07 17:41:34 +01:00
Lain Iwakura 66c3813ea6 Add basic queue prioritization. 2017-12-05 18:21:30 +01:00
Lain Iwakura e7c2472abd Fix tests. 2017-12-05 12:18:04 +01:00
Roger Braun d08a34e88b OStatus: Add user bio as summary field
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
Lain Iwakura 5637d163e6 MastodonAPI: Add proper user count. 2017-11-30 14:59:44 +01:00
Lain Iwakura c680ae581d Return xml notice at /notice path. 2017-11-27 17:24:52 +01:00
eal 1625021a9c Merge branch 'fix/self-follow' into 'develop'
Dont include the user in their own follower count.

See merge request pleroma/pleroma!29
2017-11-21 23:09:59 +00:00
eal 3d29fc5462 Make /api/friends/ids test deterministic. 2017-11-20 19:16:43 +02:00
Roger Braun 747a68a075 Treat internal emoji like external. 2017-11-20 17:53:21 +01:00
eal 8d4e7b32c9 Ensure correct state in self-unfollow. 2017-11-20 09:26:31 +02:00
eal bd921ca5d7 Fix posts being streamed to non-local websocket channels. 2017-11-20 07:58:43 +02:00
eal edc3e5bc30 Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
2017-11-20 07:52:02 +02:00
eal 4db5954786 Don't let the user unfollow their own account. 2017-11-20 07:50:56 +02:00
Roger Braun 40ca379357 Fix flakey test. 2017-11-19 13:07:29 +01:00
lambda ed3403ad8b Merge branch 'formatting-fixes' into 'develop'
Formatting fixes

Closes #80

See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
eal f53cdabcdf Add #nsfw tag if sensitive content bit is set 2017-11-18 16:30:18 +02:00
eal fb118b2978 Don't insert newlines to generated HTML.
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
eal 66e78c3ec4 Escape HTML instead of discarding it. 2017-11-18 14:43:41 +02:00
Roger Braun a743940463 MastoAPI: Implement all streaming functions. 2017-11-16 16:49:51 +01:00
Roger Braun ced0d64d75 MastoAPI: Make attachment ids strings. 2017-11-15 18:58:39 +01:00
lambda 1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.

Closes #67

See merge request pleroma/pleroma!18
2017-11-14 16:47:54 +00:00
eal f9828e578c TwitterAPI: Add /users/show. 2017-11-14 17:34:48 +02:00
eal 3533bf7eac TwitterAPI: Add /friends/ids. 2017-11-14 16:04:58 +02:00
eal 06c3ee3bac Accept 1 as true. 2017-11-14 15:54:50 +02:00
eal c84723b679 MastoAPI: Add media timelines. 2017-11-14 15:41:16 +02:00
Roger Braun 083cd169d2 MastoAPI: Fix repeat api bug.
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
2017-11-13 09:48:56 +01:00
lambda 08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop'
MastoAPI: Add notification endpoints get, clear and dismiss.

Closes #42

See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
lambda efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop'
MastoAPI: Add update credentials endpoint.

Closes #61

See merge request pleroma/pleroma!15
2017-11-12 09:24:32 +00:00
eal fc7483cb3c MastoAPI: Add update credentials endpoint. 2017-11-12 00:27:09 +02:00
Roger Braun a1923d20e8 MastoAPI: Fix reblog emojis. 2017-11-11 11:18:05 +01:00
Roger Braun 1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-10 17:37:54 +01:00
Roger Braun 6e9c22c0af MastoAPI: Use string ids everywhere. 2017-11-10 17:18:19 +01:00
eal e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss. 2017-11-10 15:24:52 +02:00
Roger Braun 1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-09 16:49:32 +01:00
Roger Braun 266d9c008d MastoAPI: Fetch statuses in search. 2017-11-09 16:48:45 +01:00
lambda 2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.

See merge request pleroma/pleroma!12
2017-11-09 14:41:44 +00:00
eal e942e1e552 Correct mimetype on bad uploads. 2017-11-09 15:01:59 +02:00
Roger Braun f1d27a5fbb Add actor column to activities. 2017-11-09 10:41:19 +01:00
Roger Braun 41b8a76e96 Re-fetch user data on salmon decode error. 2017-11-09 08:32:54 +01:00
eal f7fc048aeb TwitterAPI user view: add follows_you. 2017-11-08 19:13:03 +02:00
eal 4656cb9b99 TwitterAPI user view: add blocks. 2017-11-08 13:02:00 +02:00
eal 6c0758e041 TwitterAPI: Add blocks. 2017-11-08 00:04:53 +02:00
lambda d761b1543a Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only.

Closes #54

See merge request pleroma/pleroma!7
2017-11-07 18:58:22 +00:00
Roger Braun 7da978f3f5 Linkify fixes. 2017-11-07 12:06:37 +01:00
eal f85566324e Allow profile fetching for authenticated users only. 2017-11-07 00:33:44 +02:00
Roger Braun 7252f6b054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-05 12:12:19 +01:00
Roger Braun 046bee34d3 Fix bug when no posts are in the db. 2017-11-05 12:11:59 +01:00
Roger Braun c6b9b777da MastoAPI: Add list of blocked users. 2017-11-03 08:51:17 +01:00
Roger Braun 5bf92e50be MastoAPI: Add blocking. 2017-11-03 08:38:05 +01:00
Roger Braun 33beb51da4 MastoAPI: Add blocking to AccountView. 2017-11-03 08:23:31 +01:00
Roger Braun 867ac1e4f5 Handle nil cases. 2017-11-02 22:47:48 +01:00
Roger Braun 8ef58a266b Don't return blocked users' activities in contexts. 2017-11-02 22:44:36 +01:00
Roger Braun a47727adde Don't return activities from blocked users. 2017-11-02 22:37:26 +01:00
Roger Braun 632da6c927 Don't create notifications if the user is blocked. 2017-11-02 22:08:22 +01:00
Roger Braun 6a5f087174 Add blocks to User. 2017-11-02 21:57:37 +01:00
Roger Braun 345ad870f7 Clean up user_test.exs. 2017-11-02 21:57:21 +01:00
Roger Braun 9be286a900 Handle empty terms / tags. 2017-11-01 09:33:29 +01:00
Roger Braun 6f05367325 Federate out content warnings. 2017-10-31 19:51:58 +01:00
Roger Braun e014cc6ed8 Allow using cws in mastodon api. 2017-10-31 19:44:36 +01:00
Roger Braun 0c871e5c6e Fix specs. 2017-10-31 17:57:26 +01:00
Roger Braun 44295dd49a MastoAPI: Include CW. 2017-10-31 17:49:47 +01:00
Roger Braun 04217f52c9 TwitterAPI: Display cws. 2017-10-31 17:43:37 +01:00
Roger Braun 4cbf17dac6 Save cws in the activitypub data. 2017-10-31 17:30:46 +01:00
Roger Braun 4dcbb64f19 Avoid potentially slow count queries for user note count.
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
Roger Braun 968a546d4a MastoAPI: Return id as string instead of integer. 2017-10-31 14:51:41 +01:00
Roger Braun 2f39bb6b43 Typo. 2017-10-31 14:46:01 +01:00
Roger Braun ce7f9f527c MastoAPI: Always return an url for statuses.
External url if available, id if not.
2017-10-31 14:40:12 +01:00
Roger Braun 502cb38cd6 Move user search to User module. 2017-10-30 19:23:16 +01:00
eal 71f66bd458 Fix follow test semantics. 2017-10-29 14:25:11 +02:00
eal c56d28f96c Fix return type of /api/v1/follows 2017-10-29 00:07:38 +03:00
eal 8e94936553 Add tests. 2017-10-28 17:09:32 +03:00
Roger Braun 64bc38e009 MastoAPI: Add emoji output. 2017-10-23 16:27:51 +02:00
Roger Braun b4f055b604 Don't reject already accepted subscriptions. 2017-10-05 12:53:16 +02:00
Roger Braun 6268b7e0eb HTTP Signatures: Work with all test vectors. 2017-09-18 18:10:21 +02:00
Roger Braun 9cefbaf016 Start of HTTP Signatures. 2017-09-18 11:39:57 +02:00
Roger Braun 6000f61727 MastoAPI: Add repeats to statusview. 2017-09-17 13:54:14 +02:00
Roger Braun 422d0f324f MastodonAPI: Add user favorites endpoint. 2017-09-17 13:09:49 +02:00
Roger Braun 6d5bd4dcc0 TwitterAPI: Use correct endpoint for tag timeline. 2017-09-17 13:03:46 +02:00
Roger Braun 255a681782 TwitterAPI: Add tag timeline. 2017-09-17 11:45:16 +02:00
Roger Braun 003cb17b16 Add missing fixtures. 2017-09-17 00:33:58 +02:00
Roger Braun 7c82b82197 Make emoji configurable in files. 2017-09-16 16:49:46 +02:00
Roger Braun 959e993c7d Apply incoming custom emoji. 2017-09-16 16:40:20 +02:00
Roger Braun 16b1fcd271 Handle incoming emoji. 2017-09-16 16:27:48 +02:00
Roger Braun 884006a9e9 Federate emoji out. 2017-09-16 16:14:23 +02:00
Roger Braun 79aeb219d8 Small emoji refactor. 2017-09-16 15:47:45 +02:00
Roger Braun 5d1f8dcd1c TwitterAPI: Add search. 2017-09-16 14:33:47 +02:00
Roger Braun 0872f5f394 Add undocumented default user default settings. 2017-09-16 11:52:33 +02:00
Roger Braun c36229c4aa Add remote user fetching to search. 2017-09-16 11:26:20 +02:00
Roger Braun 9f0a2a714b Add basic search. 2017-09-16 10:42:24 +02:00
Roger Braun d659fcc195 MastoAPI: Fix date in account view. 2017-09-15 17:50:47 +02:00
Roger Braun 50409326a8 Refactor posting and make character limit configurable. 2017-09-15 14:17:36 +02:00
Roger Braun 3ca853fb61 MastoAPI: Follower-related changes 2017-09-14 18:30:05 +02:00
Roger Braun fc85c9f086 Add tag timelines. 2017-09-14 13:22:09 +02:00
Roger Braun a8701282d4 MastoAPI: fake out 'application' property. 2017-09-14 09:14:08 +02:00
Roger Braun 6258c6b6b3 MastoAPI: Also return text_url in attachments. 2017-09-14 08:38:48 +02:00
Roger Braun 7f3ce5c1a0 Cleanup. 2017-09-14 08:11:51 +02:00
Roger Braun 641c24cdd4 Add media upload endpoint. 2017-09-14 08:08:32 +02:00
Roger Braun d168ef5a9e MastoAPI: Add accounts getting. 2017-09-13 17:36:02 +02:00
Roger Braun 94be93aad0 Allign datetime format with mastodon. 2017-09-13 16:26:02 +02:00
Roger Braun e6286152b9 Fix logic. 2017-09-13 16:05:39 +02:00
Roger Braun 49929321c7 Add relationships to masto api. 2017-09-13 15:55:10 +02:00
Roger Braun 1bc58230ee Remove milliseconds from mastodon api response. 2017-09-12 13:31:17 +02:00
Roger Braun b58b35bf56 Use hash of attachment url as id.
Pretty hacky, let's see if we can get away with this.
2017-09-12 11:28:12 +02:00
Roger Braun 44a650235b MastoAPI: Remove domain ending from account name. 2017-09-12 09:34:39 +02:00
Roger Braun 61adf676d5 Add basic mastodon notification support. 2017-09-11 18:53:19 +02:00
Roger Braun 7616b202ea Add user timelines to Masto Api. 2017-09-10 17:49:13 +02:00
Roger Braun fc10875895 Add attachments to mastoapi statuses. 2017-09-10 11:51:01 +02:00
Roger Braun e8975d06be Add header image to masto api. 2017-09-10 10:37:34 +02:00
Roger Braun d625d8db7d Add unfav to Mastodon API. 2017-09-09 18:30:02 +02:00
Roger Braun 454dc18570 Add favoriting to Mastodon API. 2017-09-09 18:09:37 +02:00
Roger Braun 66e4c710d4 Add reblogging to MastodonAPI. 2017-09-09 17:48:57 +02:00
Roger Braun 4dc517a0bb Add deletion to masto api. 2017-09-09 13:56:51 +02:00
Roger Braun be04f725e9 Add more Mastodon API methods. 2017-09-09 13:15:01 +02:00
Roger Braun 2b7efff71b Add Mastodon StatusView. 2017-09-09 12:10:29 +02:00
Roger Braun c6bdc5960c Test for Mastodon AccountView
Handles users and mentions.
2017-09-09 12:09:53 +02:00
Roger Braun 95cedd6000 Make auth tokens usable once and expire them. 2017-09-09 12:02:59 +02:00
Roger Braun d1c10ad2fb Fix specs. 2017-09-05 09:35:00 +02:00
Roger Braun 3438a120cc Don't delete new delete activity... 2017-09-04 20:47:43 +02:00
Roger Braun fcf3128a56 Add TwAPI representer for deletes. 2017-09-04 20:03:28 +02:00
Roger Braun 2348b272e0 Create deletes activities for incoming deletes. 2017-09-04 18:47:46 +02:00
Roger Braun 5db535c0b1 Add delete to ActivityPub. 2017-09-04 18:47:33 +02:00
Roger Braun 540dfb4617 Add delete activity representer. 2017-09-04 17:56:09 +02:00
Roger Braun 10e40206c6 Output mastodon-style conversation ids. 2017-09-04 11:04:04 +02:00
Roger Braun 1b1f861bad Handle mastodon conversation ids. 2017-09-04 11:03:51 +02:00
Roger Braun 4b03c43fd7 fix specs. 2017-08-29 17:22:22 +02:00
Roger Braun 5142a8efbb Add profile update. 2017-08-29 15:14:00 +02:00
Roger Braun 171ef33cbb More sensible attachment names. 2017-08-28 19:17:38 +02:00
Roger Braun fecbd099cd Ignore padding for salmon public keys. 2017-08-25 15:09:05 +02:00
Roger Braun 67bfa19b35 Set twitter-style possibly_sensitive boolena. 2017-08-24 16:27:37 +02:00
Roger Braun 5dc278b1a6 Add activity_type to twitter api output. 2017-08-24 16:18:26 +02:00
Roger Braun 08bd59e446 Extend webfinger capabilities. 2017-08-24 12:54:53 +02:00
Roger Braun 1a001588e8 Don't break on empty mentions. 2017-08-24 12:54:01 +02:00
Roger Braun 552cfdbe11 Fix deletion not deleting relevant actions. 2017-08-16 16:29:25 +02:00
Roger Braun 7d34cec58d escape attachment urls on creation. 2017-08-09 16:55:18 +02:00
Roger Braun a32784fe6d Cowboy and Elixir don't seem to agree on uri encoding... 2017-08-09 16:45:05 +02:00
Roger Braun 9c35456d77 URI encode filenames... 2017-08-09 15:21:34 +02:00
Roger Braun 763756f879 Also fetch atom links. 2017-08-04 16:57:38 +02:00
Roger Braun 25c733f402 Add href to in-reply-to.
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
Roger Braun f226f46a09 Add basic incoming deletions. 2017-08-01 17:05:07 +02:00
Roger Braun 558ab6e74e Display html links correctly for remote activies. 2017-08-01 14:05:18 +02:00
Roger Braun 00b722430f Revert "Close br tags."
This reverts commit 2eba8e74cc.
2017-07-31 13:27:38 +02:00
Roger Braun 19e8421947 Revert "Wrap in <p>."
This reverts commit c81d0b6f89.
2017-07-31 13:27:29 +02:00
Roger Braun 3063e3b440 Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59.
2017-07-31 13:27:19 +02:00
Roger Braun 0ca3ab7b59 Remove newlines completely so mastodon doesn't bug out. 2017-07-31 13:06:31 +02:00
Roger Braun c81d0b6f89 Wrap in <p>. 2017-07-31 12:16:44 +02:00
Roger Braun 2eba8e74cc Close br tags. 2017-07-31 10:46:29 +02:00
Roger Braun fc269fd319 Add html alternate link to atom. 2017-07-29 22:07:02 +02:00
Roger Braun 72ca58c540 Save follower count and note count in user. 2017-07-22 17:42:15 +02:00
Roger Braun a027b0027c Add friends endpoint. 2017-07-20 20:35:30 +02:00
Roger Braun 94a394e3a8 Add followers endpoint. 2017-07-20 20:29:15 +02:00
Roger Braun 44aef2183e Add follower / friend fetching to user. 2017-07-20 19:37:41 +02:00
Roger Braun 140f72725d Use follower address in user entry. 2017-07-19 19:06:49 +02:00
Roger Braun 396c32a6da Add follower_address to users, add on generation. 2017-07-19 18:49:25 +02:00
Roger Braun 7e9647b146 Fix undo activity. 2017-07-08 11:17:35 +02:00
Roger Braun e343c0c9c4 Add way to update most recent notification id. 2017-07-02 15:01:59 +02:00
Roger Braun 9cda5b897a Fix test. 2017-07-01 16:39:12 +02:00
Roger Braun 201804b836 Only return posts in TwAPI conversations. 2017-06-30 16:41:09 +02:00