e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
de4102b247
can be changed in runtime
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
8589632d09
fixed delete ScheduledActivity
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
6e88a7e591
exclude blocked user posts from search results
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
e21afdb7c7
Merge branch 'develop' into issue/1411
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
652cc6ba4b
updated ScheduledActivity
5 years ago
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
88f7cf51d4
Merge branch 'develop' into issue/1411
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
f595cfe623
Remove User.user_info/2
5 years ago
1fc28a4b44
Add a view for the move notification
5 years ago
80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
0937895182
updated fetch_favorites
5 years ago
9da4c88b49
fix test
5 years ago
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
b9041c2097
added recount unread notifications to markers
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
94f1cfced8
format the code
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
94627baa5c
New rate limiter
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
9d0b989521
add subject to atom feed
5 years ago
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
209319c8d2
update marker api
5 years ago
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
d4270397dc
Marker: added unread_count field
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
5 years ago
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
5 years ago
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
b93856874d
[ #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
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
5 years ago
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
5 years ago
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
5 years ago
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
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
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
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
5 years ago
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
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
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
d3c404af12
Add MastoFEController
5 years ago
1c6e1055c8
Add CustomEmojiController
5 years ago
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
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
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
43e3db0951
Fix returned visibility of announces in MastodonAPI
5 years ago
4c1f158f5d
Allow users to announce privately, including own private notes
5 years ago
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
e7aef27c00
Fix merge
5 years ago
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
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
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
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
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
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
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
8d31530119
Cleanup ScheduledActivityView
5 years ago
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
14294243a2
mastodon api: implement follow_requests_count
5 years ago
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
73ae38ca04
add deprecated tag
5 years ago
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
035f22f784
Fix Credo warnings
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
79b25be4e1
Do not return tuple when unneeded
5 years ago
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
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
e1d2d69c87
Clean up views
5 years ago
494bb6bac6
updated tests
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
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
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
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
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
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
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
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
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
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
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
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
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
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
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
5 years ago
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
5 years ago
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
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
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
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
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
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
558969a0fd
Do not crash if one notification failed to render
5 years ago
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
6ef0103ca0
added Emoji struct
5 years ago
d8098d142a
added Emoji.Formatter
5 years ago
d7808b5db4
added code\path fields without html tags in ets
5 years ago
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
8ca4f145a5
Extract if block into private function
5 years ago
b15e226593
Change to delete empty name field
5 years ago
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
5 years ago
45e21a9df4
Rename fields to fields_attributes
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
1ad71592ad
Parallelize template rendering
5 years ago
bd5ad0af78
Cache follow state
5 years ago
Maksim Pechnikov