lain
76999c73a7
Conversation: Add accounts to output.
6 years ago
lain
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
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
6 years ago
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
eugenijm
27d78dc526
Use User.get_cached_by*
6 years ago
rinpatch
5d73dca064
Remove inReplyToStatusId
6 years ago
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
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
6 years ago
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
6 years ago
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
6 years ago
lain
c352a0aba6
Conversations: Make tests run.
6 years ago
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lain
b5cecebbc1
Conversations: Fix specs.
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
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
6 years ago
cascode
95c92c49c9
Fix account lookup for nicknames beginning with numbers
6 years ago
Egor Kislitsyn
9a59c26619
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
6 years ago
Egor Kislitsyn
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
6 years ago
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Ivan Tashkinov
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
rinpatch
1bb4d5d65b
Implement fake status submit
6 years ago
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
Ivan Tashkinov
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
6 years ago
Ivan Tashkinov
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
Haelwenn (lanodan) Monnier
42d034505a
Add test for conversation API beforehand
6 years ago
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
Karen Konou
13c298d354
Fix tests to assume reblogs shown by default
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm
2827dfea50
Allow an admin to delete a user status
6 years ago
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
eugenijm
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
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.
6 years ago
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
lain
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
lain
62296f5a25
Fix private post card handling.
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
lain
59c27f29c8
Add some nicer urls in status view.
6 years ago
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
04ee877a20
[ #468 ] Added OAuth scopes-specific tests.
6 years ago
Ekaterina Vaartis
ad2cf4fd86
Add test for mastodon muting endpoints
6 years ago
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
Haelwenn (lanodan) Monnier
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
6 years ago
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.
6 years ago
kaniini
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
6 years ago
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
Haelwenn (lanodan) Monnier
74579115a7
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
6 years ago
Haelwenn (lanodan) Monnier
8bb7e19b38
test: de-group alias/es
6 years ago
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
6 years ago
William Pitcock
26670b09a7
tests: add a rich media card that contains all relevant fields
6 years ago
William Pitcock
6eb8c1eb92
test: add some regression tests for the rich media card rendering
6 years ago
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
lain
e61f0be951
Unbreak all the tests.
6 years ago
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
William Pitcock
339c26e12b
test: add status posting with OGP link preview test
6 years ago
William Pitcock
364cf5369b
test: update mastodon status view tests
6 years ago
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
William Pitcock
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
Haelwenn (lanodan) Monnier
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
Haelwenn (lanodan) Monnier
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
6 years ago
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
Haelwenn (lanodan) Monnier
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
6 years ago
kaniini
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
Ivan Tashkinov
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Maxim Filippov
0a97badddd
Format
6 years ago
Maxim Filippov
651a1d64b5
Add current user to mentioned
6 years ago
Maxim Filippov
e116e55cab
Add actor to recipients
6 years ago
Ivan Tashkinov
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
6 years ago
lain
943324b661
MastoAPI: Don't break on missing users.
6 years ago
lambda
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
Ivan Tashkinov
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
William Pitcock
85a5be6220
tests: fixup
6 years ago
Sadposter
98d9ae0718
Add test for mastodon API /favourites endpoint
6 years ago
Egor Kislitsyn
6cbe63726d
improve tests
6 years ago
Egor Kislitsyn
7b6c5f0a9d
improve test readability
6 years ago
Egor Kislitsyn
e679da4c34
add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn
63dbd87568
rename `post` to `status`
6 years ago
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
380e9fba21
add pinned posts
6 years ago
lain
7dcafb4894
MastoAPI: Add test.
6 years ago
kaniini
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov
aeb89bece6
Remove unused test
6 years ago
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
6 years ago
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
William Pitcock
3c08d229db
tests: add legal boilerplate
6 years ago
William Pitcock
9f48485f64
tests: mastodon api: add test verifying that peertube videos are correctly rendered
6 years ago
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
abbf347dc7
[ #394 ] View tests fix.
6 years ago
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
6 years ago
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
Vald
028904c333
lint
6 years ago
Vald
911a877576
resolved api and controller test failures
6 years ago
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.
6 years ago
Maksim Pechnikov
7ec64ac33f
update test
6 years ago
William Pitcock
f7e15d3257
tests: fix a lot of the remaining test failures
6 years ago
William Pitcock
6f5f589f73
test: fix mastodon api test failure
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
badbe2656c
More fixes.
6 years ago
Haelwenn (lanodan) Monnier
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
William Pitcock
5b3480d896
tests: fix up some more broken mastodon api testcases
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
lain
2fedd93931
Fix formatting.
6 years ago
lain
81af7fd02d
Test for null-content activities.
6 years ago
lain
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
6 years ago
lain
45ebc8dd9a
Check for empty string in_reply_to ids.
6 years ago
Lee Starnes
585b29337c
Ensure filters have a filter_id
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
shadowfacts
85b8590109
Update status_view_test.exs
6 years ago
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.
6 years ago
Martin Kühl
ff38ffd9f8
Fix the tests
6 years ago
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
6 years ago
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
6 years ago
Martin Kühl
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
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.
6 years ago
William Pitcock
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
6 years ago
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters
6 years ago
Haelwenn (lanodan) Monnier
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
ensra
2b5db840ee
attempt to add html validation to mastodon api test case
6 years ago
eal
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
William Pitcock
18cac1e36b
test: mastodon attachments: update for added description field
6 years ago
William Pitcock
489453c246
tests: verify media description api support is working
6 years ago
Haelwenn (lanodan) Monnier
359093d73b
Fake 2.4.0 API
6 years ago
William Pitcock
590e8d5555
tests: fix a completely bogus mastodon api test
6 years ago
Haelwenn (lanodan) Monnier
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
William Pitcock
a0c5b42e29
tests: assert the state prior to mutating it as well as afterward
6 years ago
William Pitcock
c99b9b9d92
testsuite: add mastodon api tests
6 years ago
lambda
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
6 years ago
eal
4856962434
MastoAPI: add domain blocking.
6 years ago
lain
4856ba596f
Better error handling for MastodonApiController.
6 years ago
lain
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
lain
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
lain
0a6c897c94
Formatting.
6 years ago
lambda
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
eal
3dbd9809d4
MastoAPI: add lists.
6 years ago
csaurus
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
6 years ago
lain
434601a5c3
Return private / direct posts on user timelines, too.
6 years ago
lain
1d4bbec6b3
Fix User search.
...
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185 .
6 years ago
csaurus
d0ad13c12e
Add direct_note[_activity]_factory and a couple tests
6 years ago