flisk/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7190 commits 1 branch 76 tags 308 MiB
Commit graph

547 commits

Author SHA1 Message Date
Sergey Suprunenko
9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
rinpatch
f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity 2019-04-22 11:54:27 +03:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Roman Chvanikov
2662bea4e0 Add accounts and last_status to conversation read response 2019-04-21 20:26:13 +07:00
eugenijm
375fd21055 Set correct values in the MastoAPI reblog status view 2019-04-21 05:40:22 +03:00
eugenijm
fa48532387 Handle reblogs on the first follow request in MastoAPI 2019-04-20 04:39:49 +03:00
rinpatch
4ef237f26a Fix my incorrect search test fix 2019-04-18 14:37:57 +03:00
rinpatch
ff8d76c670 Refactor all tests that acessed the embeded object 2019-04-17 15:46:59 +03:00
rinpatch
ad681877df Make credo happy 2019-04-17 14:52:01 +03:00
rinpatch
e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests 2019-04-17 14:21:39 +03:00
rinpatch
b09ae02c04 Added some more normalization calls all in mastodon api controller 2019-04-17 13:04:58 +03:00
rinpatch
627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
kaniini
73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' 
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
 2019-04-16 18:44:07 +00:00
lain
76999c73a7 Conversation: Add accounts to output. 2019-04-15 22:28:42 +02:00
lain
0da985182f Conversation: Return full status object, id is a string. 2019-04-15 21:58:58 +02:00
lambda
56956de6fa Merge branch 'fix/status-reblogged' into 'develop' 
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
 2019-04-15 10:26:23 +00:00
lambda
f358295cbe Merge branch 'unfollow-oneself' into 'develop' 
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
 2019-04-15 10:24:37 +00:00
eugenijm
27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00
rinpatch
5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
eugenijm
507e7821e3 Handle follow/unfollow directed to themselves 2019-04-15 10:21:18 +03:00
eugenijm
679a8ef629 Assign reblogged in the Mastodon reblog status view 2019-04-14 11:35:15 +03:00
Alex S
c349573791 Merge develop to 788-separate-email-addresses 
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
 2019-04-13 12:24:38 +07:00
lambda
0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' 
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976
 2019-04-12 09:34:12 +00:00
Alexander Strizhakov
711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
Alexander Strizhakov
e03d24af96 in_reply_to_id - null 2019-04-12 02:21:32 +00:00
lain
c352a0aba6 Conversations: Make tests run. 2019-04-10 17:48:31 +02:00
Alex S
fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lain
b5cecebbc1 Conversations: Fix specs. 2019-04-10 09:32:17 +02:00
kaniini
97395e013e Merge branch 'notification-pleroma-settings' into 'develop' 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
 2019-04-10 02:10:31 +00:00
lain
a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations 2019-04-08 14:10:51 +02:00
lambda
23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
 2019-04-08 09:50:00 +00:00
eugenijm
2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
b3870df51f Handle scheduled_at on status creation. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S
7410aee886 Merge develop to 770-add-emoji-tags 
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
 2019-04-06 20:34:00 +07:00
Sergey Suprunenko
325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Sadposter
9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
lambda
a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop' 
Add fake status submit

See merge request pleroma/pleroma!995
 2019-04-02 14:17:43 +00:00
Alex S
fa8483cb80 Merging develop into feature/770-add-emoji-tags 
Conflict test/web/twitter_api/util_controller_test.exs
 2019-04-02 20:39:52 +07:00
lambda
b95cf3d490 Merge branch 'get_by_id' into 'develop' 
Replace `Repo.get_by` with existing functions

See merge request pleroma/pleroma!1010
 2019-04-02 12:43:28 +00:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
rinpatch
fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db 2019-04-02 14:31:18 +03:00
lambda
26d509cc86 Merge branch 'get_by_id' into 'develop' 
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible

See merge request pleroma/pleroma!1009
 2019-04-02 10:52:29 +00:00
cascode
95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Egor Kislitsyn
9a59c26619 replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id) 2019-04-02 17:47:52 +07:00
Egor Kislitsyn
11c2d6bdc4 change Repo.get(Activity, id) => Activity.get_by_id(id) in tests 2019-04-02 17:08:03 +07:00
Egor Kislitsyn
1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Ivan Tashkinov
aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations 2019-04-02 09:19:10 +03:00
Alex S
3601f03147 Adding tag to emoji ets table 
changes in apis
 2019-04-01 17:17:57 +07:00
rinpatch
1bb4d5d65b Implement fake status submit 2019-03-29 21:59:04 +03:00
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id 2019-03-28 17:23:21 +01:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm
a4ab60ac54 Add vapid_key to the POST /api/v1/apps response 2019-03-26 23:27:37 +03:00
eugenijm
691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
Ivan Tashkinov
47b49ab1a1 Test for MastoAPI /api/v1/instance response structure (formatting fix). 2019-03-26 18:18:36 +03:00
Ivan Tashkinov
caf0e9cf33 Test for MastoAPI /api/v1/instance response structure. 2019-03-26 18:13:24 +03:00
William Pitcock
3cc2554fa3 mastodon api: add conversation_id extension (ref #674) 2019-03-21 23:25:41 +00:00
eugenijm
1588688a11 Added support for exclude_types, limit, and min_id in Mastodon 
notifications.

Unify Mastodon-compatible pagination logic.
 2019-03-18 11:27:27 +03:00
Haelwenn (lanodan) Monnier
42d034505a
Add test for conversation API beforehand 2019-03-17 16:51:26 +01:00
Fong-Wan Chau
4ed2618f6c Allow 'rel' attribute on <a> link with specific values (for hashtag recognition). 2019-03-17 11:03:19 -04:00
Karen Konou
13c298d354 Fix tests to assume reblogs shown by default 2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop' 
Extend MastoAPI to provide attachment mimetypes

See merge request pleroma/pleroma!938
 2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b Extend MastoAPI to provide attachment mimetypes 2019-03-15 11:58:12 +03:00
eugenijm
100413bf2c Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests 2019-03-15 01:35:48 +03:00
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils 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
kaniini
c231ed610a Merge branch 'masto-api-followers-following' into 'develop' 
MastoAPI followers/following endpoints

See merge request pleroma/pleroma!924
 2019-03-12 16:27:47 +00:00
eugenijm
984b5f8adf MastoAPI followers/following endpoints 2019-03-12 16:01:24 +03:00
lain
3474066f6d MastoAPI Accounts: Add fetching by nickname. 
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
 2019-03-11 15:18:32 +01:00
lain
4811eefa6e MastoAPI StatusView: Add locality indicator. 2019-03-11 13:48:27 +01:00
eugenijm
2827dfea50 Allow an admin to delete a user status 2019-03-08 20:21:56 +03:00
eugenijm
7342b5a45f Preserve parameters in link headers (Mastodon API) 2019-03-07 09:12:16 +03:00
Maksim
bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
eugenijm
86e4b48a5e Fix DM visibility for blocking users 2019-03-04 06:24:27 +03:00
eugenijm
d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore. 
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
 2019-03-03 18:42:27 +03:00
kaniini
cf426a719d Merge branch 'with-mutes' into 'develop' 
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
 2019-02-28 10:22:19 +00:00
lain
c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
William Pitcock
1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
lain
62296f5a25 Fix private post card handling. 2019-02-22 12:02:51 +01:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain
59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
Ivan Tashkinov
6fe7acd58e [#468] Merged upstream/develop. 2019-02-20 16:48:59 +03:00
Ivan Tashkinov
04ee877a20 [#468] Added OAuth scopes-specific tests. 2019-02-19 22:28:21 +03:00
Ekaterina Vaartis
ad2cf4fd86 Add test for mastodon muting endpoints 2019-02-19 21:49:55 +03:00
kaniini
c23bd05737 Merge branch 'features/flavour-switching' into 'develop' 
[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807
 2019-02-18 04:01:51 +00:00
Haelwenn (lanodan) Monnier
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching 2019-02-16 19:52:46 +01:00
eugenijm
ecdf0657ba Add logic for keeping follow_request_count up-to-date on the follow, 
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
 2019-02-15 12:20:20 +03:00
kaniini
19756d68f2 Merge branch 'fix/credo-issues-test' into 'develop' 
Fix credo issues in ./test

See merge request pleroma/pleroma!808
 2019-02-14 03:55:26 +00:00
Karen Konou
ac72b578da Merge branch 'develop' into feature/thread-muting 2019-02-11 12:10:49 +01:00
Karen Konou
c01ef574c1 Refactor as per Rin's suggestions, add endpoint tests 2019-02-11 12:04:02 +01:00
Haelwenn (lanodan) Monnier
74579115a7
test: Change lenght(…) == 0 to Enum.empty?(…) 2019-02-11 03:44:16 +01:00
Haelwenn (lanodan) Monnier
8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
Mark Felder
74518d0b60 hide_followings was renamed to hide_followers in the FE, but never synced up in the BE 
This was a dirty regex replace which worked on my server
 2019-02-06 22:34:44 +00:00
William Pitcock
26670b09a7 tests: add a rich media card that contains all relevant fields 2019-02-06 18:27:55 +00:00
William Pitcock
6eb8c1eb92 test: add some regression tests for the rich media card rendering 2019-02-06 18:12:26 +00:00
Maxim Filippov
16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
lain
e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
kaniini
486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'" 
This reverts merge request !733
 2019-02-01 20:22:58 +00:00
kaniini
0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop' 
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
 2019-02-01 17:05:29 +00:00
Haelwenn
00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' 
Features/glitch soc frontend

See merge request pleroma/pleroma!192
 2019-01-31 10:16:11 +00:00
Maxim Filippov
50d6183893 Split hide_network into hide_followers & hide_followings 2019-01-28 21:40:08 +03:00
William Pitcock
339c26e12b test: add status posting with OGP link preview test 2019-01-28 06:19:00 +00:00
William Pitcock
364cf5369b test: update mastodon status view tests 2019-01-28 05:53:17 +00:00
William Pitcock
132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
kaniini
5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop' 
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
 2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
 2019-01-27 10:33:22 +01:00
William Pitcock
1f7843b9b8 mastodon api: use OGP uri instead of page_url for deducing domain name, fix test 2019-01-26 15:24:16 +00:00
Haelwenn (lanodan) Monnier
3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline 2019-01-26 04:46:01 +01:00
kaniini
4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
lain
2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency 2019-01-23 13:05:58 +01:00
Ivan Tashkinov
34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test. 2019-01-22 17:12:53 +03:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 2019-01-21 08:00:41 +01:00
Maxim Filippov
0a97badddd Format 2019-01-19 04:26:52 +03:00
Maxim Filippov
651a1d64b5 Add current user to mentioned 2019-01-19 04:25:15 +03:00
Maxim Filippov
e116e55cab Add actor to recipients 2019-01-18 22:40:52 +03:00
Ivan Tashkinov
954dc4a4ad [#502] Fixed user_count in /api/v1/instance to include only active local users. 2019-01-17 19:16:02 +03:00
lain
943324b661 MastoAPI: Don't break on missing users. 2019-01-16 15:13:09 +01:00
lambda
608cc65d43 Merge branch 'feature/improve-microformats' into 'develop' 
improve microformats support

See merge request pleroma/pleroma!672
 2019-01-16 09:06:47 +00:00
Ivan Tashkinov
90433b988e [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses. 2019-01-16 11:07:46 +03:00
William Pitcock
85a5be6220 tests: fixup 2019-01-16 04:09:01 +00:00
Sadposter
98d9ae0718 Add test for mastodon API /favourites endpoint 2019-01-13 15:17:47 +00:00
Egor Kislitsyn
6cbe63726d improve tests 2019-01-09 19:54:37 +07:00
Egor Kislitsyn
7b6c5f0a9d improve test readability 2019-01-08 16:01:35 +07:00
Egor Kislitsyn
e679da4c34 add pinned property to StatusView 2019-01-08 15:27:02 +07:00
Egor Kislitsyn
63dbd87568 rename post to status 2019-01-08 15:25:50 +07:00
Egor Kislitsyn
f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-07 20:55:32 +07:00
Egor Kislitsyn
380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
lain
7dcafb4894 MastoAPI: Add test. 2019-01-07 13:13:37 +01:00
kaniini
bee6acd51d Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' 
Create tombstone instead of object deletion

See merge request pleroma/pleroma!593
 2018-12-27 19:37:55 +00:00
Vyr Cossont
e4562105e7 Implement exclude_reblogs and include_rts 2018-12-26 21:38:00 -08:00
Maxim Filippov
aeb89bece6 Remove unused test 2018-12-25 03:38:02 +03:00
Maxim Filippov
f75f707f6c Revert Activity tombstones, add ObjectTombstone struct 2018-12-25 03:00:06 +03:00
Maxim Filippov
18a4cbb244 Capitalize "tombstone" 2018-12-24 20:09:18 +03:00
Maxim Filippov
0f412cf6e6 Create tombstone instead of object deletion 2018-12-24 02:25:36 +03:00
William Pitcock
3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
William Pitcock
9f48485f64 tests: mastodon api: add test verifying that peertube videos are correctly rendered 2018-12-23 13:44:01 +00:00
Ivan Tashkinov
aed0f90287 [#114] Added pleroma.confirmation_pending to user views, adjusted view tests. 2018-12-18 17:22:45 +03:00
href
b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
eal
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
eal
4c783e35c0 Mastodon API: Fix PUT /api/web/settings 2018-12-16 13:15:34 +02:00
Maksim Pechnikov
ea72ac549b fix case when tags is invalid 2018-12-14 23:16:12 +03:00
Maksim Pechnikov
d3ec09bb38 fix tags 2018-12-14 22:09:04 +03:00
Maksim Pechnikov
89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
Maksim Pechnikov
9442588ae9 fix hashtags in api response 2018-12-09 11:24:46 +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
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
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
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
7ec64ac33f update test 2018-12-04 14:04:06 +03:00
William Pitcock
f7e15d3257 tests: fix a lot of the 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
Maxim Filippov
4b70e5eae9 Parse bio for MastodonAPI 2018-12-03 18:59:50 +03:00
lain
2a639de9b3 MastodonApi: Implement hide_network. 2018-12-02 17:48:00 +01:00
lain
347df6421d Fix masto api user updating. 2018-12-01 10:40:01 +01:00
lain
d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain
badbe2656c More fixes. 2018-11-27 18:12:03 +01:00
Haelwenn (lanodan) Monnier
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket 2018-11-24 08:51:35 +01: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
William Pitcock
c196754b4d mastodon api: account view: fix tests 2018-11-20 18:54:48 +00:00
lain
2cf40237ff MastodonAPI: Add pagination to private messages. 2018-11-13 19:46:34 +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
Lee Starnes
585b29337c Ensure filters have a filter_id 2018-11-01 09:17:02 +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
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
Martin Kühl
ff38ffd9f8 Fix the tests 2018-09-05 22:20:59 +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
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
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
William Pitcock
9cac7c957c test: add testcase proving lists system does not leak non-public posts 2018-08-29 08:50:23 +00: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
ensra
2b5db840ee attempt to add html validation to mastodon api test case 2018-08-21 15:41:32 +01: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
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
359093d73b
Fake 2.4.0 API 2018-06-23 16:12:57 +02:00
William Pitcock
590e8d5555 tests: fix a completely bogus mastodon api test 2018-06-19 08:53:54 +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
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
eal
4856962434 MastoAPI: add domain blocking. 2018-06-03 22:21:23 +03:00
lain
4856ba596f Better error handling for MastodonApiController. 2018-06-03 19:28:11 +02: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
0a6c897c94 Formatting. 2018-05-26 15:11:50 +02: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
eal
3dbd9809d4 MastoAPI: add lists. 2018-05-24 15:34:39 +03:00
csaurus
4fd9df100f Merge branch 'develop' into feature/mstdn-direct-api 2018-05-21 20:19:37 -04:00
lain
434601a5c3 Return private / direct posts on user timelines, too. 2018-05-20 16:15:18 +02: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
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
c464355d1a Idempotency: Use special cache, keep for 6 hours. 2018-05-05 11:15:57 +02: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
e981280fa7 Formatting fixes 2018-04-25 01:43:45 -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
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
4afbef39f4 Format the code. 2018-03-30 15:01:53 +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
lain
32ae918843 Clear caches on test. 2018-03-22 12:44:32 +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
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
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
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
f1f79c0dca Fix timelines in subway tooter. 2017-12-19 16:15:07 +01:00
Lain Iwakura
47887ac848 MastoAPI: Fix always-sensitive bugs. 2017-12-18 16:56:03 +01:00
eal
9223038319 Fix some more tests. 2017-12-11 21:01:36 +02:00
eal
79b3397c17 Fix tests. 2017-12-11 18:41:03 +02:00
Lain Iwakura
5637d163e6 MastodonAPI: Add proper user count. 2017-11-30 14:59:44 +01:00
eal
f53cdabcdf Add #nsfw tag if sensitive content bit is set 2017-11-18 16:30:18 +02:00
Roger Braun
ced0d64d75 MastoAPI: Make attachment ids strings. 2017-11-15 18:58:39 +01: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
266d9c008d MastoAPI: Fetch statuses in search. 2017-11-09 16:48:45 +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
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
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
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
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
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
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
rinpatch
4a6855d9ee Provide plaintext representations of content/cw in MastoAPI 2017-01-01 03:10:08 +03:00