Maxim Filippov
5869a43fe7
Fix tests
2019-11-26 01:06:54 +09:00
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Steven Fuchs
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
Ariadne Conill
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
Ariadne Conill
dbfdb1f6e3
add some missing tesla fixtures
2019-10-18 14:50:10 +00:00
Ariadne Conill
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
Steven Fuchs
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
Thibaut Girka
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22
Import object from self-Announce whenever possible
2019-10-05 13:56:40 +02:00
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
Ariadne Conill
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
2019-09-30 10:39:17 +00:00
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
Ivan Tashkinov
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
Haelwenn
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
lain
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
2019-08-25 16:12:13 +00:00
Haelwenn (lanodan) Monnier
20c3f613d8
HttpRequestMock: Remove useless error = error
2019-08-25 08:55:29 +02:00
Haelwenn (lanodan) Monnier
211e163770
Implement missing mocks for rel=me
2019-08-25 08:03:25 +02:00
Haelwenn (lanodan) Monnier
e22737ffb5
HttpRequestMock: Improve non-implemented error message
2019-08-25 07:33:46 +02:00
Haelwenn (lanodan) Monnier
18668447d2
HttpRequestMock: Log mock errors as warnings
2019-08-25 07:33:13 +02:00
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded oban from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
Maksim
a320358703
added test helpers to clear config after tests
2019-08-19 15:34:29 +00:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
Ariadne Conill
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
Ariadne Conill
dd0b71ea6d
tests: add tests for MRF.describe()
2019-08-13 22:19:15 +00:00
Ariadne Conill
7089400675
test: add mock MRF module for describe() testing
2019-08-13 21:29:15 +00:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
Ivan Tashkinov
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
Sergey Suprunenko
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
lain
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
rinpatch
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
Maksim
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
kaniini
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
kPherox
8d9f43e1d1
Add WebFinger test for AP-only account
2019-07-25 01:27:34 +09:00
Maksim
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
Mike Verdone
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
2019-07-24 14:46:08 +02:00
Mike Verdone
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
2019-07-24 13:14:52 +02:00
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
Maxim Filippov
14ab2fd0f4
remove pry
2019-07-23 12:30:37 +03:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
Maksim
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
Haelwenn (lanodan) Monnier
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
2019-07-14 13:55:41 +02:00
Haelwenn (lanodan) Monnier
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
2019-07-14 13:55:41 +02:00
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
Alexander Strizhakov
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
Ivan Tashkinov
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
Roman Chvanikov
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
Ivan Tashkinov
46cf81a544
[ #878 ] Formatting fix.
2019-07-08 20:05:02 +03:00
Ivan Tashkinov
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
Egor Kislitsyn
11143c542a
Remove httpoison from dependencies
2019-07-03 14:42:24 +07:00
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
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
Roger Braun
b91ccef237
Output conversation id.
2017-04-26 08:47:22 +02:00
Roger Braun
cef4a4d709
Fix utf8 problems with iolists.
2017-04-22 15:34:29 +02:00
dtluna
28b203d08f
Add Undo of Follow Activity insertion
2017-04-21 19:54:21 +03:00
Roger Braun
424e0e7779
Add Websub verification.
2017-04-21 03:59:11 +02:00
Roger Braun
d7e3b72c6a
Add avatar objects to user, fix specs.
2017-04-16 15:28:28 +02:00
Roger Braun
a926038cd0
Add unliking to activitypub.
2017-04-14 18:09:30 +02:00
Roger Braun
834c84b5dc
Update factory.
2017-04-13 17:05:35 +02:00
Roger Braun
4cac385411
Add factories for testing.
2017-04-13 15:49:24 +02:00
Roger Braun
e2e0cd75b7
Add friends timeline.
2017-03-22 17:25:59 +01:00
Roger Braun
37e443ce6c
Add friends status fetching.
2017-03-22 16:51:20 +01:00
Roger Braun
d4cf273f28
Add limiting to activity pub fetching.
2017-03-21 20:22:05 +01:00
Roger Braun
9a8850eb9e
Basic status creation and retrieval.
2017-03-21 17:53:20 +01:00
Roger Braun
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
