492 Commits (b1fc4fe0ca6abab97be69e0b1bf138e8b5c1c303)

Author	SHA1	Message	Date
lain	c845820911	Notifications: Create a chat notification.	4 years ago
lain	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	4 years ago
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	4 years ago
lain	ca598e9c27	AccountView: Return user ap_id.	4 years ago
Egor Kislitsyn	cf4ebba774	Cleanup SubscriptionController	5 years ago
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	5 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	5 years ago
Egor Kislitsyn	247e6fcb90	Merge branch 'develop' into openapi/account	5 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	03124c96cc	Add spec for AccountController.statuses	5 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	5 years ago
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	5 years ago
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	5 years ago
Ivan Tashkinov	ac672a9d6b	[#1559] Addressed code review requests.	5 years ago
Ivan Tashkinov	1a4875adfa	[#1559] Support for "follow_request" notifications (configurable). ... (Not currently supported by PleromaFE, thus disabled by default).	5 years ago
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	5 years ago
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	5 years ago
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	5 years ago
Haelwenn	e999c67cee	Merge branch 'feature/funkwhale-audio' into 'develop' ... Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287	5 years ago
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).	5 years ago
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (`ThreadMute.exists?/2`).	5 years ago
Ivan Tashkinov	6b793d3f83	Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).	5 years ago
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	5 years ago
Ivan Tashkinov	be5e2c4dbb	Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).	5 years ago
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	5 years ago
Ivan Tashkinov	3c78e5f327	Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Ivan Tashkinov	c2e415143b	WIP: preloading of user relations for timeline/statuses rendering (performance improvement).	5 years ago
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	5 years ago
rinpatch	981e015f1b	Mastodon API Account view: Remove an outdated hack ... The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.	5 years ago
Haelwenn (lanodan) Monnier	8176ca9e40	static_fe: Sanitize HTML in users	5 years ago
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	5 years ago
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	5 years ago
Mark Felder	05da5f5cca	Update Copyrights	5 years ago
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	2ef70b55f5	Fix `status.expires_at` type	5 years ago
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	5 years ago
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	5 years ago
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	5 years ago
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	5 years ago
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	5 years ago
lain	a802e07241	Emoji Reactions: Add `reacted` field to emoji reactions	5 years ago
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	5 years ago
Alexander Strizhakov	de4102b247	can be changed in runtime	5 years ago
lain	347f3ed2c6	Emoji reactions: Change api format once more	5 years ago
lain	615b72238e	Notifications: Add emoji reaction notifications	5 years ago
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	5 years ago
lain	4c5b5f14dc	StatusView: Add `emoji_reactions`	5 years ago
Thomas Citharel	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
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	5 years ago
Egor Kislitsyn	80ededc04f	Add `direct_conversation_id` to web push payload	5 years ago
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
rinpatch	94f1cfced8	format the code	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
Mark Felder	7d101bc9c5	Fix rendering conversations when there's a malformed status	5 years ago
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	ed29be24cb	Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.	5 years ago
Maksim Pechnikov	209319c8d2	update marker api	5 years ago
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	5 years ago
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
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
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
Thibaut Girka	43e3db0951	Fix returned visibility of announces in MastodonAPI	5 years ago
Egor Kislitsyn	36a34c36fe	Extract poll actions from `MastodonAPIController` to `PollController`	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
Egor Kislitsyn	8d31530119	Cleanup ScheduledActivityView	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
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
Maksim Pechnikov	494bb6bac6	updated 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
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
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
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
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
Egor Kislitsyn	30510ade0e	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	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	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	7483679a7b	StatusView: Return direct conversation id.	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
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
lain	1ed24bcc76	Status View: Poll ids are strings. ... All ids in mastodon are strings, in general.	5 years ago
Alexander Strizhakov	e7c39b7ac8	Feature/1072 muting notifications	5 years ago
Sergey Suprunenko	ff55e3c16f	Create mentions only for explicitly mentioned users	5 years ago
Maksim	008c55e4e9	add test for search_controller/ 100% coverage	5 years ago