7c235b8874
Add more Mix task tests in relay_test.exs and uploads_test.exs.
...
Rename test/tasks/user.exs to test/tasks/user_test.exs.
2018-12-16 18:08:31 +02:00
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
2018-12-16 13:15:34 +02:00
2e72d49e37
Rename captcha_test.ex to exs
2018-12-16 07:35:45 +00:00
36f1af232a
Add tests for Mix tasks
2018-12-16 02:14:23 +02:00
c859cd1d61
Fix style
2018-12-15 23:39:23 +03:00
5f96c2d216
Add a test for kocaptcha
2018-12-15 23:38:19 +03:00
e8537208bd
Add a captcha mock for tests
2018-12-15 22:38:39 +03:00
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
2018-12-15 17:56:12 +01:00
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
2018-12-15 16:17:44 +01:00
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
ea72ac549b
fix case when tags is invalid
2018-12-14 23:16:12 +03:00
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
9ff61ed793
Fix tests
...
Notice test has been failing due to missing placeholder in index.html
I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
2018-12-14 20:23:51 +01:00
d3ec09bb38
fix tags
2018-12-14 22:09:04 +03:00
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
07e93f9940
[ #114 ] Improved tests.
2018-12-14 13:52:04 +03:00
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
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
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
61ad2ce422
TwitterAPI: Include favorited post in json
2018-12-14 08:24:18 +02:00
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
c5c3ad90d0
Fix tests. Remove oembed template
2018-12-14 03:00:50 +01:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
2018-12-12 17:04:52 +03:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
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
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
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
abbf347dc7
[ #394 ] View tests fix.
2018-12-06 20:38:52 +03:00
22830c8fc9
[ #394 ] Formatting fix.
2018-12-06 20:13:07 +03:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
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
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
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
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
3c8ffe7ed3
resolved activity view test
2018-12-06 01:54:04 +05:30
028904c333
lint
2018-12-06 01:46:53 +05:30
911a877576
resolved api and controller test failures
2018-12-06 01:46:30 +05:30
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
743a09132b
linting
2018-12-06 01:28:52 +05:30
812b20d49f
resolved formatter_test failures
2018-12-06 01:27:08 +05:30
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
c524c50509
fix/273
2018-12-05 17:32:06 +03:00
ba345e4c29
[ #210 ] Formatting fix.
2018-12-05 13:43:00 +03:00
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
53797d19c5
[ #210 ] Test update (replaced bang- with non-bang method).
2018-12-05 11:56:31 +03:00
0f061bea0c
tests: add regression test for bug #408
2018-12-05 03:41:32 +00:00
a9e3e387c9
add test
2018-12-04 20:37:13 +03:00
44ab3dbe2c
[ #210 ] Refactoring.
2018-12-04 19:45:09 +03:00
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
50e72f6c48
remove httpoison_mock
2018-12-04 18:09:22 +03:00
dd8aee332c
formatting the code
2018-12-04 17:48:55 +03:00
5c6d47614d
all tests passed
2018-12-04 17:44:15 +03:00
a9e4a97586
update test
2018-12-04 14:04:06 +03:00
7ec64ac33f
update test
2018-12-04 14:04:06 +03:00
80bfdb4e7d
update test
2018-12-04 14:04:06 +03:00
6cfdc11e32
update test
2018-12-04 14:04:06 +03:00
c508d41c34
add http requests mock
2018-12-04 14:04:06 +03:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
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
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
8148943368
Format files
2018-12-02 22:08:53 +03:00
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
91065e1968
Fix background updating / handling.
2018-12-02 11:20:38 +01:00
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
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
253da275bd
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
65e7307d68
Upload: bring back base_url
2018-11-30 18:02:50 +01:00
1d537bc74f
remove eal
...
i like you eal don't take it personally<3
2018-11-30 18:02:49 +01:00
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
48b95a9b95
Assorted fixes.
2018-11-30 17:08:02 +01:00
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
6ac5d48575
More fixes
2018-11-29 00:25:43 +01:00
87098d1676
Streamer: Don't send unwanted DMs to list streams
2018-11-27 20:50:19 +01:00
e002858071
Fix ostatus test.
2018-11-27 18:37:46 +01:00
3c61df6b9e
Webfinger fixes.
2018-11-27 18:31:44 +01:00
5bd3b3a215
More and more fixes.
2018-11-27 18:21:05 +01:00
badbe2656c
More fixes.
2018-11-27 18:12:03 +01:00
f983c1d0c6
Fix CommonApi tests.
2018-11-27 17:31:14 +01:00
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
2018-11-24 08:51:35 +01:00
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
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-11-20 20:16:16 +01:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
5b3480d896
tests: fix up some more broken mastodon api testcases
2018-11-20 19:08:41 +00:00
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
c196754b4d
mastodon api: account view: fix tests
2018-11-20 18:54:48 +00:00
2887f4ff1d
Fix formatter tests.
2018-11-20 19:07:01 +01:00
7f4c3a1e99
mediaproxy: fix empty url & add some tests
2018-11-20 17:50:03 +01:00
689b46efc8
RetryQueue: tiny refractor, add tests
2018-11-19 18:08:41 +02:00
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
40d9d2098c
Fix user updating from AP.
2018-11-18 22:15:03 +01:00
fc3bcf335e
Fix following locked users.
2018-11-18 18:53:50 +01:00
d5af41b577
Fix note count update.
2018-11-18 18:52:21 +01:00
6f90ceb2ed
Fix follower count test.
2018-11-18 18:49:17 +01:00
8e3d8bde04
Fix user deactivation test.
2018-11-18 18:40:58 +01:00
5c8f07f0a8
Fix note counting.
2018-11-18 18:17:56 +01:00
47d883d3ab
Fix User deactivation.
2018-11-18 18:06:02 +01:00
f6be980f4f
activitypub: object view: avoid leaking private details
2018-11-17 22:30:53 +00:00
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
e10f839e9b
tests: federator: fix formatting
2018-11-17 21:41:08 +00:00
dfcfb184b1
activitypub: transmogrifier: make deletes secure
2018-11-17 21:22:57 +00:00
52681f7fd0
Web.AdminAPI.AdminAPIControllerTest: New Test
2018-11-17 22:12:14 +01:00
76bd80d462
test/plugs/user_is_admin_plug_test: New test
2018-11-17 22:12:13 +01:00
b1a6e8d80d
test: add sanity tests for federator handling of AP docs
2018-11-17 21:01:19 +00:00
55640c4804
tests: add a test to verify the general fake direction protection works in all cases
2018-11-17 20:31:20 +00:00
dc1d8e13b4
tests: add a testcase for user collision
2018-11-17 20:20:45 +00:00
1a940cb46e
tests: add tests for contain_origin_from_id()
2018-11-17 20:16:03 +00:00
b483ae0a72
tests: add a second spoofing variant
2018-11-17 18:25:32 +00:00
9c8adfb6ef
test: fix more test defects
2018-11-17 18:16:55 +00:00
d9cb081f07
tests: add additional spoofing tests
2018-11-17 18:12:11 +00:00
2ab8e28728
transmogrifier tests: fix defective spoofing test
2018-11-17 18:11:46 +00:00
010fcb73d7
test: httpoison mock: add second spoofing activity test
2018-11-17 18:11:17 +00:00
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
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
e8d8c84f79
Add better test for user search functionlity.
2018-11-16 18:31:32 +01:00
62944b47fb
Reset http security settings to fix plug test
2018-11-17 00:45:21 +09:00
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
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
db78c72868
Twitter API: Add tests for nil names.
2018-11-12 17:02:01 +00:00
ee5932a504
http security: allow referrer-policy to be configured
2018-11-12 15:14:46 +00:00
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
2018-11-12 15:08:02 +00:00
54fdce9107
tests: add tests for CSPPlug
2018-11-11 07:26:31 +00:00
69b8c0e299
tests: add test for internal data stripping
2018-11-10 12:24:25 +00:00
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
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
1d9fcbf2ba
add missing prismo testcase data
2018-11-10 11:11:01 +00:00
c9df011215
tests: add tests for new OStatus.is_representable? function
2018-11-10 10:39:42 +00:00
dfc26d0fdd
tests: add testing for new notification behavior
2018-11-09 09:37:12 +00:00
719a8a1f82
tests: flip testing to/cc for mentions
2018-11-08 19:17:15 +00:00
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
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
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
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
d675b8a16f
tests: add tests for twitterapi endpoint
2018-11-06 23:25:16 +00:00
50bf174651
tests: add tests for Notification.set_read_up_to()
2018-11-06 23:02:55 +00:00
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
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
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
36ca3c1b3e
format
2018-11-06 15:17:29 +01:00
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
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
2fedd93931
Fix formatting.
2018-11-03 16:40:57 +01:00
81af7fd02d
Test for null-content activities.
2018-11-03 16:28:29 +01:00
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
2018-11-03 11:41:40 +01:00
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
c5f26f3ce2
Test that prismo url-map transforms into a string
2018-11-01 11:30:50 +01:00
585b29337c
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
9b77030d3c
Add basic configuration management module.
2018-11-01 09:01:03 +00:00
2b3a40d038
object: split object_cache from user_cache
2018-11-01 08:41:46 +00:00
2c092ed355
test: fixup test breakage caused by User.delete() harmonization
2018-11-01 08:23:49 +00:00
21dafa7cd0
tests: add tests for User + cache interactions
2018-11-01 08:11:02 +00:00
f55fc68f76
tests: add tests for object deletion
2018-11-01 07:37:07 +00:00
b92e38d2d4
Add user reactivation task.
2018-10-29 23:13:15 +00:00
2ac13061af
testsuite: formatting
2018-10-26 06:37:00 +00:00
0d0c1dcf44
tests: add testsuite for broken thread filter
2018-10-26 06:35:06 +00:00
b1d1f9bc27
tests: add test for user inbox
2018-10-25 05:24:17 +00:00
6cfba7db8d
tests: twitterapi: add additional fields
2018-10-25 04:06:42 +00:00
9563f3766d
tests: update for new in_reply_to_screen_name field
2018-10-25 03:03:44 +00:00
5e9a0e2460
Fix some typos in the list test.
2018-10-20 13:03:45 +03:00
a249cbf187
Add a test for List.get_lists_account_belongs
2018-10-19 21:24:15 +09:00
958c5e02e8
tests: add a testcase for matching osada users in the formatter
2018-10-17 19:27:05 +00:00
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
ebc32045f0
test: add regression test for #316
2018-10-11 10:35:32 +00:00
497814cbbb
test: update test for new html scrub policy
2018-10-05 21:11:22 +00:00
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
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
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
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
2018-09-28 11:17:33 +02:00
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
2018-09-28 10:44:45 +02:00
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
2018-09-27 20:00:48 +02:00
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
2018-09-27 20:00:47 +02:00
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
2018-09-27 20:00:47 +02:00
85b59d07b6
test: add smoketests for the scrubbing policies
2018-09-22 03:45:37 +00:00
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
2018-09-22 03:24:40 +00:00
bd03644ca8
test: add tests for new User.html_filter_policy()
2018-09-22 03:02:05 +00:00
200ab27e7a
test: add test proving that users are refreshed when stale
2018-09-20 23:50:56 +00:00
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
2018-09-20 16:24:29 +02:00
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
2018-09-20 16:10:46 +02:00
85b8590109
Update status_view_test.exs
2018-09-10 23:40:29 +00:00
a4fe14de02
tests: break the cycle using pleroma.factory
2018-09-09 12:56:25 +00:00
fc92bb28b4
tests: try breaking the cycle a different way
2018-09-09 12:43:58 +00:00
33a5294fad
test: user enabled plug tests: fix circular reference
2018-09-09 12:23:48 +00:00
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
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
d22af29bb4
Fix warning.
2018-09-05 22:42:50 +02:00
44b094908c
Update legacy passwords automatically.
2018-09-05 22:30:14 +02:00
ff38ffd9f8
Fix the tests
2018-09-05 22:20:59 +02:00
e601165426
Add UserEnabledPlug.
2018-09-05 21:53:53 +02:00
5ce1ebb179
Add SetUserSessionIdPlug.
2018-09-05 21:42:42 +02:00
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
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
2018-09-05 19:06:28 +02:00
32465b9939
Simplify AuthenticationPlug
2018-09-05 18:53:38 +02:00
9a96c93be7
Add SessionAuthenticationPlug.
2018-09-05 18:37:02 +02:00
a3f54fca4d
Add LegacyAuthenticationPlug
2018-09-05 18:17:33 +02:00
3cf17dc402
Add EnsureAuthenticatedPlug
2018-09-05 17:59:19 +02:00
faf5347748
Add UserFetcherPlug.
2018-09-05 17:44:38 +02:00
42bd985e66
Add BasicAuthDecoderPlug
2018-09-05 17:30:05 +02:00
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
2018-09-05 00:21:44 -04:00
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
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
2018-09-03 14:48:36 +00:00
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
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
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
834515fb51
formatter: don't add XSS emoji
2018-09-02 00:04:09 +00:00
303af9ba4c
tests: add regression tests
2018-09-01 23:33:10 +00:00
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
2018-09-01 23:10:48 +02:00
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
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
2018-08-31 14:29:23 -03:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
e7871ed05e
tests: add tests for evil HTML filtering
2018-08-31 03:34:56 +00:00
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
2018-08-29 08:50:23 +00:00
0f1c629d65
better solution, added test.
2018-08-27 17:07:26 +03:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
2018-08-27 15:09:04 +02:00
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
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
86dca39640
tests: fix formatting
2018-08-26 23:19:45 +00:00
504a25f812
tests: add notification smoketests (ref #265 )
2018-08-26 22:42:02 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
aab2bdddf4
twitter api: provide object descriptions as attachment description field
2018-08-25 00:12:58 +00:00
a8bd120ea6
tests: formatting
2018-08-24 18:33:36 +00:00
14d1187702
test: add testcase for formatter issue #163
2018-08-24 18:22:46 +00:00
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
2018-08-23 01:25:27 +00:00
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
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
74c74decf5
Basic peertube support.
2018-08-21 18:24:09 +02:00
2b5db840ee
attempt to add html validation to mastodon api test case
2018-08-21 15:41:32 +01:00
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
f533daffdb
sync bio sanitization code in tests
2018-08-21 15:24:06 +01:00
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
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
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
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
8058443674
testsuite: add puckipedia test fixture
2018-08-16 15:10:57 +00:00
b8560e5ed5
testsuite: formatting
2018-08-14 17:15:33 +00:00
7fbcd4caaf
test: add kroeg fixtures
2018-08-14 17:09:17 +00:00
92caa2632b
Use Image type for emoji icons.
2018-08-13 16:21:18 +03:00
f9d13558c8
CommonAPI: add emoji to user source data on update
2018-08-13 15:27:20 +03:00
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
2018-08-08 08:38:25 +03:00
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
aea23468c6
test: nickname is no longer a required field
2018-08-06 08:46:06 +00:00
32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link
2018-07-30 22:01:48 +02:00
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
9c1b6f11c5
improve test
2018-07-21 02:57:56 +09:00
908cefd84a
debug
2018-07-21 02:19:20 +09:00
9c2afb2e71
improve test
2018-07-21 01:44:35 +09:00
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
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
18cac1e36b
test: mastodon attachments: update for added description field
2018-07-17 03:40:48 +00:00
489453c246
tests: verify media description api support is working
2018-07-17 03:40:47 +00:00
24b5a75d09
Add test for Plume Articles
2018-07-12 23:08:28 +02:00
f1a29fc43c
test: ostatus controller: add AS2 fetching tests
2018-07-12 20:32:56 +00:00
4fb64c1d86
testsuite: twitter api: add summary where necessary
2018-07-12 16:12:25 +00:00
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
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
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
2018-07-12 03:30:22 +00:00
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
2018-06-27 13:38:07 +00:00
32211c4ada
tests: add default_scope where appropriate
2018-06-27 13:17:07 +00:00
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
6160a1b3c0
mix format
2018-06-24 15:24:41 -07:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
082920044a
Normalize file extension for uploaded files
2018-06-21 14:04:12 -04:00
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
590e8d5555
tests: fix a completely bogus mastodon api test
2018-06-19 08:53:54 +00:00
3707a7fa42
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
2018-06-19 00:59:28 +00:00
link0ff