eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
5 years ago
lain
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
5 years ago
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
5 years ago
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
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
5 years ago
Egor Kislitsyn
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
Egor Kislitsyn
d3c404af12
Add MastoFEController
5 years ago
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
5 years ago
Egor Kislitsyn
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
5 years ago
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka
4c1f158f5d
Allow users to announce privately, including own private notes
5 years ago
Egor Kislitsyn
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn
e7aef27c00
Fix merge
5 years ago
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
5 years ago
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
5 years ago
Egor Kislitsyn
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
kaniini
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
5 years ago
kaniini
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
5 years ago
kaniini
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
5 years ago
Egor Kislitsyn
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn
8d31530119
Cleanup ScheduledActivityView
5 years ago
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
5 years ago
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
Egor Kislitsyn
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
Maksim Pechnikov
73ae38ca04
add deprecated tag
5 years ago
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn
035f22f784
Fix Credo warnings
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Egor Kislitsyn
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
5 years ago
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
5 years ago
Steven Fuchs
e1d2d69c87
Clean up views
5 years ago
Maksim Pechnikov
494bb6bac6
updated tests
5 years ago
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
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
5 years ago
eugenijm
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
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
5 years ago
Ivan Tashkinov
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
Ivan Tashkinov
efbc2edba1
[ #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
# lib/pleroma/web/router.ex
5 years ago
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
5 years ago
Haelwenn
46ae62d159
Merge branch 'patch-5' into 'develop'
...
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
5 years ago
lain
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
5 years ago
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
5 years ago
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
shadowfacts
e5c6bf3673
Mastodon API: URI encode hashtag name in generated URLs
...
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
5 years ago
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
Maksim Pechnikov
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
Haelwenn
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
5 years ago
rinpatch
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
rinpatch
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
5 years ago
rinpatch
558969a0fd
Do not crash if one notification failed to render
5 years ago
rinpatch
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
Maksim Pechnikov
6ef0103ca0
added Emoji struct
5 years ago
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
5 years ago
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
5 years ago
Egor Kislitsyn
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
kPherox
8ca4f145a5
Extract if block into private function
5 years ago
kPherox
b15e226593
Change to delete empty name field
5 years ago
kPherox
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
5 years ago
kPherox
45e21a9df4
Rename fields to fields_attributes
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
rinpatch
1ad71592ad
Parallelize template rendering
5 years ago
rinpatch
bd5ad0af78
Cache follow state
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
rinpatch
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
5 years ago
Haelwenn
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
5 years ago
Maksim
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
5 years ago
rinpatch
c1b6952d2a
Mastodon API: Preloading and normalization optimizations
...
- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?)
5 years ago
lain
511ccea5aa
ConversationView: Align parameter names with other views.
5 years ago
lain
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
5 years ago
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
5 years ago
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
5 years ago
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
5 years ago
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Thibaut Girka
9c0da1009a
Return profile URL in MastodonAPI's `url` field
5 years ago
Thibaut Girka
089d53a961
Simplify logic to mention.js `url` field
...
`User.profile_url` already fallbacks to ap_id
5 years ago
Thibaut Girka
a10c840aba
Return profile URL when available instead of actor URI for MastodonAPI mention URL
...
Fixes #1165
5 years ago
lain
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
5 years ago
lain
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
5 years ago
lain
7483679a7b
StatusView: Return direct conversation id.
5 years ago
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
5 years ago
Eugenij
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
.
5 years ago
Mike Verdone
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
5 years ago
Mike Verdone
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
5 years ago
Sadposter
a5d6287ba8
Hide blocked users from interactions
5 years ago
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
Eugenij
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
5 years ago
Eugenij
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
5 years ago
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
5 years ago
Mark Felder
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
5 years ago