Commit graph

263 commits

Author SHA1 Message Date
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Alex S 0f59265a50 salmon fix
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
Roman Chvanikov b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks 2019-06-04 05:46:19 +00:00
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings 2019-05-30 21:03:31 +00:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants 2019-05-25 04:43:11 +00:00
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects 2019-05-18 13:37:38 +03:00
Alexander Strizhakov 7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
rinpatch 62e42b03ab Handle incoming Question objects 2019-05-15 20:10:16 +03:00
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
Roman Chvanikov bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
lain 64c1c3a407 Participations: Add marking as read and unread. 2019-04-10 15:12:01 +02:00
lain d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm 7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S be54e40890 twitter api registration
fix for twitter api tests
2019-04-06 17:18:59 +07:00
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Ivan Tashkinov f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. 2019-04-04 22:41:03 +03:00
lambda 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status

See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
Ivan Tashkinov 15ce710460 Added "GET /oauth/authorize" tests. 2019-04-02 13:43:33 +03:00
Sachin Joshi 6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Sachin Joshi 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Egor 9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier fb82f6fc7c
[Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Maksim bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
Ivan Tashkinov b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov c0ecbf6669 [#468] Merged upstream/develop. 2019-02-19 19:10:55 +03:00
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop'
Job Queue

See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
kaniini 7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
Ivan Tashkinov bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov dcf24a3233 [#468] Refactored OAuth scopes' defaults & missing selection handling. 2019-02-17 13:49:14 +03:00
Ivan Tashkinov 063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages. 2019-02-14 00:29:29 +03:00
Maxim Filippov 61a4bc5095 Add OAuth tokens endpoint 2019-02-13 12:59:56 +03:00
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
lain e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
William Pitcock 106475f265 test: http mocks: formatting 2019-01-31 16:30:56 +00:00
William Pitcock 4e76f9fde1 test: add malformed OGP data fixture 2019-01-31 16:12:35 +00:00
Egor Kislitsyn d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07:00
Egor Kislitsyn 55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
Haelwenn (lanodan) Monnier d9f3af477d Move definitions of RichMedia fixtures to test/support/http_request_mock.ex 2019-01-26 14:18:23 +00:00
Ivan Tashkinov d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
sxsdv1 1eb7318831 Prepare all types objects before serialising
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
sxsdv1 2d7da5f437 Don't crash on AP request for tombstone
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
rinpatch b73a1a33de Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
William Pitcock 3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
lambda 52ac7dce5c Merge branch 'captcha' into 'develop'
Captcha

See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
Ekaterina Vaartis ef6829382a Clean captchas up periodically, not schedule it after theyre created 2018-12-16 23:53:44 +03:00
Ekaterina Vaartis 73576ab64e Fix captcha tests 2018-12-16 23:01:44 +03:00
Ekaterina Vaartis e8537208bd Add a captcha mock for tests 2018-12-15 22:38:39 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01: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 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
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
lain c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain 47d883d3ab Fix User deactivation. 2018-11-18 18:06:02 +01: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 b483ae0a72 tests: add a second spoofing variant 2018-11-17 18:25:32 +00:00
William Pitcock 010fcb73d7 test: httpoison mock: add second spoofing activity test 2018-11-17 18:11:17 +00:00
William Pitcock 1d9fcbf2ba add missing prismo testcase data 2018-11-10 11:11:01 +00:00
William Pitcock 958c5e02e8 tests: add a testcase for matching osada users in the formatter 2018-10-17 19:27:05 +00:00
William Pitcock d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs 2018-09-27 20:00:48 +02:00
William Pitcock 303af9ba4c tests: add regression tests 2018-09-01 23:33:10 +00:00
Haelwenn (lanodan) Monnier 74c74decf5
Basic peertube support. 2018-08-21 18:24:09 +02: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
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
hakabahitoyo 9c1b6f11c5 improve test 2018-07-21 02:57:56 +09:00
Haelwenn (lanodan) Monnier 24b5a75d09
Add test for Plume Articles 2018-07-12 23:08:28 +02: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
lain 4b3ec53514 Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api 2018-05-26 16:00:59 +02:00
lain 1cd6194dee More efficient queries. 2018-05-24 12:44:26 +02:00
csaurus 4fd9df100f Merge branch 'develop' into feature/mstdn-direct-api 2018-05-21 20:19:37 -04:00
William Pitcock 75cfd9d34d webfinger: fix finding the XRD uri for statusnet instances 2018-05-21 12:41:31 +00: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
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 f32e19f668 webfinger: add tests 2018-05-19 01:28:27 -05:00
csaurus d0ad13c12e Add direct_note[_activity]_factory and a couple tests 2018-05-14 21:54:25 -04:00
Mark Felder ab4aa5720a Fix a bunch of unused variable warnings 2018-05-04 20:59:01 +00:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain e3a81fe58f Fetch the same data from json webfinger as from xml webfinger. 2018-03-24 14:45:54 +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
lain ec83175100 Use connection pools. 2018-03-19 17:42:09 +01:00
lain 368e085144 Don't validate on missing public key. 2018-03-11 14:47:37 +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 aa79d64e0d Correctly stitch mastodon -> ostatus replies. 2018-02-23 15:00:41 +01:00
lain 95f7e7e2d5 Add some more tests. 2018-02-20 18:42:41 +01:00
lain fc9d361d17 Add mock. 2018-02-18 10:21:19 +01:00
lain 5a371892a0 Fix specs. 2018-02-17 10:26:44 +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
Roger Braun c1d26751e6 Mocks: Add mastodon user json example. 2018-02-11 17:19:06 +01: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
Roger Braun f1d27a5fbb Add actor column to activities. 2017-11-09 10:41:19 +01:00
Roger Braun 44295dd49a MastoAPI: Include CW. 2017-10-31 17:49:47 +01:00
Roger Braun 64bc38e009 MastoAPI: Add emoji output. 2017-10-23 16:27:51 +02:00
Roger Braun 7c82b82197 Make emoji configurable in files. 2017-09-16 16:49:46 +02:00
Roger Braun 884006a9e9 Federate emoji out. 2017-09-16 16:14:23 +02:00
Roger Braun 08bd59e446 Extend webfinger capabilities. 2017-08-24 12:54:53 +02:00
Roger Braun 763756f879 Also fetch atom links. 2017-08-04 16:57:38 +02:00
Roger Braun 72ca58c540 Save follower count and note count in user. 2017-07-22 17:42:15 +02:00
Roger Braun 396c32a6da Add follower_address to users, add on generation. 2017-07-19 18:49:25 +02:00
Roger Braun fa82822932 Revert "Add invisible tags to TwAPI output."
This reverts commit a92a9dce94.
2017-06-18 18:59:13 +02:00
Roger Braun 869e5ccfe1 Fix factory. 2017-05-24 13:53:20 +02:00
Roger Braun 8e02fa100f Add categories to ostatus output. 2017-05-18 18:18:27 +02:00
Roger Braun a92a9dce94 Add invisible tags to TwAPI output. 2017-05-18 16:24:41 +02:00
Roger Braun 70024632ba AP refactoring. 2017-05-16 18:19:04 +02:00
Roger Braun dd12cf7296 Fix cws. 2017-05-11 17:59:11 +02:00
Roger Braun 05f2cd0d93 Handle incoming follows.
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
Roger Braun b403ea4d2b Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity 2017-05-07 19:28:23 +02:00
Roger Braun fa2610c795 Handle incoming favorites, fetch potentially missing messages. 2017-05-05 16:07:44 +02:00
Roger Braun d982f04a65 Mock HTTPoison in testing. 2017-05-05 14:16:54 +02:00
Roger Braun 56bacc90d1 Fix specs, add local marker to actitivies. 2017-05-02 10:43:35 +02:00
dtluna a9b2ad1759 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity 2017-04-28 16:06:57 +03:00
Roger Braun 90da25505f Add discovery and subscription requests to websub. 2017-04-27 09:46:45 +02:00