5521 commits

Author	SHA1	Message	Date
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:46:18 +09:00
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:43:11 +09:00
Maxim Filippov	40059c9b1e	Typo	2019-11-25 00:05:52 +09:00
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	2019-11-25 00:04:29 +09:00
rinpatch	9f29930440	fetcher: move local object checking into a reusable function	2019-11-23 22:55:41 +03:00
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	2019-11-23 14:06:19 +03:00
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	2019-11-22 15:39:19 +00:00
Maxim Filippov	b64c7b35d4	Swap map with each	2019-11-22 09:11:36 +09:00
lain	19b727bf8f	Merge branch 'fix/mix-task-logging' into 'develop' ... Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997	2019-11-21 15:04:19 +00:00
Ivan Tashkinov	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	2019-11-21 16:47:52 +03:00
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	2019-11-21 13:13:14 +00:00
lain	320690f7a5	Object: Use inspect to log missing preload.	2019-11-21 14:03:01 +01:00
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	2019-11-21 16:31:13 +07:00
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
sadposter	9d29a5063c	fe	2019-11-20 09:48:05 +00:00
Ivan Tashkinov	555edd01ab	[#1335] User AP ID relations fetching performance optimizations.	2019-11-20 12:19:07 +03:00
Ivan Tashkinov	565f261338	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-19 23:22:47 +03:00
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
Maksim Pechnikov	708fd234bd	fix order favorites activites	2019-11-19 20:19:41 +03:00
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
Egor Kislitsyn	36686f5245	Support authentication via x-admin-token HTTP header	2019-11-19 15:58:20 +07:00
Maksim Pechnikov	5cee51fac5	fix order by for fetch_favorites	2019-11-18 21:34:54 +03:00
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-18 20:43:19 +03:00
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	2019-11-18 20:38:56 +03:00
Maksim Pechnikov	0937895182	updated fetch_favorites	2019-11-18 16:56:47 +03:00
Maksim Pechnikov	9da4c88b49	fix test	2019-11-18 10:00:48 +03:00
Maksim Pechnikov	4beb3ce5c5	/api/v1/favourites: added sorting for activites by adds to favorites	2019-11-18 09:44:08 +03:00
Maxim Filippov	c506cc48ef	Admin API: Error when trying to update reports in the "old" format	2019-11-16 18:44:48 +09:00
kaniini	81cba405af	Merge branch 'nodeinfo-fields-limit' into 'develop' ... Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983	2019-11-15 20:29:38 +00:00
Maksim Pechnikov	b9041c2097	added recount unread notifications to markers	2019-11-15 22:46:58 +03:00
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-15 21:40:14 +03:00
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized users.mutes as relation to UserMute entity.	2019-11-15 21:38:54 +03:00
rinpatch	22554ac5ca	Merge branch 'bugfix/1395-email-activation' into 'develop' ... Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965	2019-11-15 14:11:48 +00:00
lain	f17e0f8e4f	OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug	2019-11-15 14:13:21 +01:00
kPherox	72d2557e11	Add fieldsLimit to metadata of nodeinfo	2019-11-15 18:52:31 +09:00
Ariadne Conill	eecd64cc07	object age policy: remove debug logging	2019-11-14 19:56:14 -06:00
Ariadne Conill	5705cf0e3e	MRF: add ObjectAgePolicy which deals with old posts being imported	2019-11-14 19:48:10 -06:00
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-14 23:45:29 +09:00
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	2019-11-14 23:44:07 +09:00
rinpatch	09b4f7269e	Merge branch 'fix/conversations-rendering' into 'develop' ... Fix rendering conversations when there's a malformed status Closes #1401 See merge request pleroma/pleroma!1973	2019-11-14 14:40:37 +00:00
rinpatch	94f1cfced8	format the code	2019-11-14 17:26:59 +03:00
feld	1afeaf82fa	Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' ... Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815	2019-11-14 13:35:41 +00:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	2019-11-14 08:47:10 +00:00
Phil Hagelberg	3c60adbc1f	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
Phil Hagelberg	0867cb083e	Support redirecting by object ID in static FE. ... This matches the behavior of pleroma-fe better. Fixes #1412.	2019-11-13 08:02:02 -08:00
lain	facc37aaa6	Merge branch 'static-remote-redirect' into 'develop' ... For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974	2019-11-13 10:16:00 +00:00
sadposter	2de30812ea	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-13 00:10:01 +00:00
Phil Hagelberg	62f3a93049	For remote notices, redirect to the original instead of 404. ... We shouldn't treat these like local statuses, but I don't think a 404 is the right choice either here, because within pleroma-fe, these are valid URLs. So with remote notices you have the awkward situation where clicking a link will behave differently depending on whether you open it in a new tab or not; the new tab will 404 if it hits static-fe. This new redirecting behavior should improve that situation.	2019-11-12 09:40:29 -08:00
Maksim Pechnikov	b5b62f42b2	update Marker.multi_set_unread_count	2019-11-12 15:59:34 +03:00
Egor Kislitsyn	768c1a5de1	Fix tests	2019-11-12 19:13:19 +07:00
Egor Kislitsyn	27cd1374e3	Add a notification for Move activities	2019-11-12 18:48:14 +07:00
Egor Kislitsyn	e6d7e27bd6	Add allow_following_move setting to User	2019-11-12 18:45:28 +07:00
lain	e835cd97f6	Containment: Add a catch-all clause to contain_origin.	2019-11-12 12:07:17 +01:00
Mark Felder	7d101bc9c5	Fix rendering conversations when there's a malformed status	2019-11-11 18:29:55 -06:00
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	2019-11-11 23:57:30 +03:00
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	2019-11-11 19:14:06 +00:00
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	2019-11-11 19:10:44 +00:00
href	b39b49cc14	report federating status in nodeinfo	2019-11-11 19:03:43 +01:00
Maksim Pechnikov	ddbfc995ac	clean sql query	2019-11-11 17:06:41 +03:00
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	2019-11-11 12:27:33 +00:00
lain	417f9a782f	Merge branch 'fix/1399' into 'develop' ... fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964	2019-11-11 12:13:45 +00:00
Steven Fuchs	94627baa5c	New rate limiter	2019-11-11 12:13:06 +00:00
lain	f6056e9c9c	UserEnabledPlug: Don't authenticate unconfirmed users.	2019-11-11 12:43:46 +01:00
lain	8521553ad9	User: Don't let deactivated users authenticate.	2019-11-11 12:37:38 +01:00
Ivan Tashkinov	5cf2c7422b	[#1335] Applied code review suggestions.	2019-11-11 14:16:57 +03:00
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
Maxim Filippov	31343e4321	Code style fixes	2019-11-11 19:06:09 +09:00
Alexander	6a4201e0b4	fix for migrate task	2019-11-10 22:54:37 +03:00
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	2019-11-10 16:30:21 +03:00
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-11-10 11:32:50 +00:00
lain	3a1aaadc18	Merge branch 'issue/1339' into 'develop' ... [#1339] add subject to atom feed See merge request pleroma/pleroma!1961	2019-11-10 11:20:20 +00:00
Maksim Pechnikov	9d0b989521	add subject to atom feed	2019-11-10 11:10:20 +03:00
Phil Hagelberg	3cc49cdb78	Formatter moved to new module.	2019-11-09 18:30:23 -08:00
Phil Hagelberg	ef7c3bdc7a	Add some further test cases. ... Including like ... private visibility, cos that's super important.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	4729027f91	Prevent non-local notices from rendering.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	886a07ba57	Move static_fe config to its own section instead of in :instance.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	b0080fa730	Render errors in HTML, not with JS.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	e27c61218d	Expand subject content automatically when config is set.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	bfd5d79826	Include metadata in static FE conversations and profiles.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	828259fb65	Catch 404s.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	df2f59be91	Pagination for user profiles.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	8969c5522d	Make many of the improvements suggested in review.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	e8bee35578	Static FE plug should only respond to text/html requests.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	dc3b87d153	Move static FE routing into its own plug. ... Previously it was piggybacking on FallbackRedirectController for users and OStatusController for notices; now it's all in one place.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	c6c706161e	Make sure notice link is remote if the post is remote.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	274cc18e8a	Visually separate header.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	2ac1ece652	Fix a bug where reblogs were displayed under the wrong user.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	5d7c44266b	Change date formatting.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	e4b9784c39	Show counts for replies, likes, and announces for selected notice. ... Using text instead of an icon, for now.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	93e9c0cedf	Format dates using CommonAPI utils.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	918e1353f6	Add header to profile/notice pages linking to pleroma-fe.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	33a26b61c3	Remove activity/user representer; move logic to controller.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	41fde63def	Get rid of @data in views and use separate fields.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	e944a2213d	Use gettext for sensitive media warning.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	2d1897e8a7	Apply all suggested changes from reviewers.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	cc1b07132f	Notices should show entire thread from context.	2019-11-09 18:07:08 -08:00
Phil Hagelberg	748d800acb	Show images, video, and audio attachments to notices.	2019-11-09 18:07:08 -08:00
Phil Hagelberg	1d8950798c	Fix activity_representer to work with User.get_or_fetch returning tuple.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	0cf04e1088	Fix OStatus controller to know about StaticFEController. ... But only when it's configured to be on.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	e79d8985ab	Don't show 404 in static-fe controller unless it's actually not found.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	c1fc139986	Add permalinks to the static-fe notice rendering.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	d1320160f4	Looks like source_data is on user directly now.	2019-11-09 18:06:51 -08:00
William Pitcock	ca5ef201ef	static fe: add remote follow button	2019-11-09 18:06:51 -08:00
William Pitcock	b33fbd58e3	static fe: add support for message subjects	2019-11-09 18:06:51 -08:00
William Pitcock	e2904b5777	static fe: reformat activity representer	2019-11-09 18:06:51 -08:00
William Pitcock	2b5bd5236d	static fe: add user profile rendering	2019-11-09 18:06:51 -08:00
William Pitcock	8f08da750a	static fe: use a generic activity representer to render activities	2019-11-09 18:06:51 -08:00
William Pitcock	ff8d0902f3	static fe: formatting	2019-11-09 18:06:51 -08:00
William Pitcock	a4d3a8ec03	static fe: proof of concept	2019-11-09 18:06:51 -08:00
sadposter	55cc96bcf9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-09 19:11:33 +00:00
Ariadne Conill	5b60d82592	object containment: handle all cases where ID is invalid (missing, nil, non-string)	2019-11-08 14:51:28 -06:00
Ariadne Conill	532fd38b12	nodeinfo: add multifetch feature (ref pleroma-fe!977).	2019-11-08 12:48:28 -06:00
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
Maxim Filippov	7258db023e	Support old flag format	2019-11-08 18:21:29 +09:00
eugenijm	7888803ffe	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
rinpatch	32afa07995	Fetcher: fix local check returning unwrapped object ... This resulted in error messages about failed refetches being logged.	2019-11-07 01:40:55 +03:00
rinpatch	802d249827	Merge branch 'fix/trailing-format-plug-oauth' into 'develop' ... Fix TrailingFormatPlug not being active for /api/oauth_tokens Closes #1385 See merge request pleroma/pleroma!1944	2019-11-06 14:47:34 +00:00
rinpatch	365657320c	Fix TrailingFormatPlug not being active for /api/oauth_tokens	2019-11-06 17:22:23 +03:00
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	2019-11-06 16:41:19 +03:00
feld	8b19464176	Merge branch 'feature/multiple-users-force-password-reset' into 'develop' ... Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928	2019-11-06 12:24:41 +00:00
Maxim Filippov	f171095960	Grouped reports with status data baked in	2019-11-06 21:25:46 +10:00
rinpatch	54746c6c26	Object Fetcher: set cache after reinjecting ... Probably fixes the issue hj had, where polls would have different counters between endpoints.	2019-11-06 14:00:03 +03:00
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	2019-11-05 23:52:47 +09:00
lain	1bd1f62af5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	2019-11-05 15:21:00 +01:00
lain	faced6236b	NoteValidator: Add very basic validator for Note objects.	2019-11-05 15:02:31 +01:00
lain	3d1b445cbf	Object Validators: Extract common validations.	2019-11-05 15:02:09 +01:00
Maksim Pechnikov	e52955c961	update following_relationship.ex	2019-11-05 10:50:03 +03:00
Maksim Pechnikov	62bc0657e7	excluded invisible users from search results	2019-11-05 08:55:41 +03:00
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	2019-11-05 11:36:47 +10:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
sadposter	9bc70ca0c1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-04 18:20:19 +00:00
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	2019-11-04 20:44:24 +03:00
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	2019-11-04 20:24:53 +03:00
rinpatch	fee1276963	Merge branch 'failing-search-fixes' into 'develop' ... User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935	2019-11-04 16:28:55 +00:00
lain	4e53520917	User Search: Remove superfluous setweight and random test. ... The test tested for a behavior that isn't actually enforced anymore.	2019-11-04 16:57:41 +01:00
eugenijm	ed29be24cb	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
Steven Fuchs	5271bbcf11	add missing tesla mocks	2019-11-04 15:18:32 +00:00
kaniini	06cc77e6fb	Merge branch 'faster-user-deactivation' into 'develop' ... User: Don't pull remote users follower count immediately after deactivating. Closes #1369 See merge request pleroma/pleroma!1933	2019-11-04 14:24:21 +00:00
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	2019-11-04 14:11:44 +00:00
lain	0c31258616	User: Don't pull remote users follower count immediately after deactivating. ... The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369	2019-11-04 14:36:54 +01:00
rinpatch	8dd7c099a7	Merge branch 'bugfix/streamer-follows' into 'develop' ... streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931	2019-11-03 17:09:57 +00:00
kaniini	74135e1318	Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924	2019-11-03 16:19:27 +00:00
kaniini	61bcd4595f	Merge branch 'feature/fast_sanitize' into 'develop' ... Switching to FastSanitize See merge request pleroma/pleroma!1916	2019-11-03 16:18:19 +00:00
Ariadne Conill	4bf942583f	streamer: use direct object for filter checks when there is no valid child object in an activity ... We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291	2019-11-03 09:05:12 -06:00
Maxim Filippov	1b83a0694a	Fix moderation log crash	2019-11-01 19:13:29 +03:00
Maxim Filippov	743b622b7b	Force password reset for multiple users	2019-11-01 18:45:47 +03:00
Maxim Filippov	d75934b0d0	Undo dialyzer fix	2019-11-01 15:14:43 +03:00
Maxim Filippov	ced9f92327	Fix count	2019-10-31 15:34:49 +03:00
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	2019-10-31 02:26:02 +03:00
Maxim Filippov	59a149c69a	Fix "the call ... will never return" warning	2019-10-31 02:25:15 +03:00
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	2019-10-30 17:51:15 -05:00
Maksim Pechnikov	209319c8d2	update marker api	2019-10-30 23:49:05 +03:00
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	2019-10-30 18:21:49 +07:00
kPherox	363e76d4da	Fix duplicate recipients	2019-10-30 15:40:25 +09:00
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	2019-10-30 09:20:13 +03:00
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	2019-10-29 22:23:19 +03:00
rinpatch	77cfb08b8c	Remove commented-out code	2019-10-29 20:58:54 +03:00
sadposter	bea4a82d1e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-29 13:12:38 +00:00
sadposter	55ce1daeaf	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-29 10:47:37 +00:00
kPherox	0c361eeb25	Add pending to handle incoming for Follow activity	2019-10-29 17:12:49 +09:00
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	2019-10-29 01:18:08 +03:00
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	2019-10-28 15:10:47 +07:00
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	2019-10-28 07:27:45 +00:00
Maxim Filippov	d56bc62275	Fix report parsing	2019-10-27 16:33:58 +03:00
Maxim Filippov	791bcfd90f	Merge branch 'develop' into feature/store-statuses-data-inside-flag	2019-10-27 16:11:25 +03:00
Maxim Filippov	8eff05d4c6	Strip status data from Flag (when federating or closing/resolving report)	2019-10-27 16:05:32 +03:00
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	2019-10-26 02:29:18 +03:00
rinpatch	653054d301	Merge branch 'remove-unsed-info-fields-fn' into 'develop' ... Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882	2019-10-25 14:51:02 +00:00
Egor Kislitsyn	b777083f3f	Add also_known_as field to Pleroma.User	2019-10-25 19:14:18 +07:00
sadposter	1d85dc62aa	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-25 12:08:37 +01:00
Egor Kislitsyn	dbee53c2df	Remove unused Pleroma.User.info_fields/0	2019-10-25 16:48:01 +07:00
stwf	2ab072f949	object fetcher error handling	2019-10-24 12:08:34 -04:00
Maksim Pechnikov	922e3d082c	add test	2019-10-24 12:17:50 +03:00
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	2019-10-24 09:23:59 +03:00
Maksim Pechnikov	d3fb9e02cc	add tests	2019-10-23 22:48:04 +03:00
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	2019-10-23 21:27:22 +02:00
Maksim Pechnikov	aa64b3108b	fix migrate	2019-10-23 22:02:59 +03:00
Ivan Tashkinov	c0246309a5	[#1304] Extra bullet-proofing.	2019-10-23 19:30:02 +03:00
Ivan Tashkinov	065e9fac12	[#1304] Adjusted User.Info references from Notification.	2019-10-23 17:31:02 +03:00
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	2019-10-23 17:22:42 +03:00
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	2019-10-23 17:15:48 +03:00
lain	1adafa0966	Credo fixes.	2019-10-23 12:18:05 +02:00
lain	97d5c79aa0	Add Pipeline module, test for federation.	2019-10-23 11:52:27 +02:00
Maksim Pechnikov	9a4afbd2a0	added update unread_count for notifications	2019-10-23 11:22:48 +03:00
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	2019-10-22 20:50:46 -05:00
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	2019-10-22 14:51:46 +03:00
sadposter	85b9992f86	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-22 09:12:39 +01:00
kaniini	6281e4795a	Merge branch 'feature/push-subject-for-dm' into 'develop' ... Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864	2019-10-21 23:50:01 +00:00
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	2019-10-21 16:44:17 +00:00
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	2019-10-21 19:27:38 +03:00
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged develop, handled User.Info.invisible.	2019-10-21 11:58:22 +03:00
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	2019-10-21 11:32:28 +03:00
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	2019-10-21 11:05:09 +03:00
Egor Kislitsyn	c6fba62666	Fix Relay	2019-10-21 14:47:07 +07:00
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	2019-10-21 14:19:15 +07:00
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.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	2019-10-20 22:29:56 +03:00
Ivan Tashkinov	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	2019-10-20 20:43:18 +03:00
Ivan Tashkinov	b4cbf0568b	[#1304] Analysis issue fix.	2019-10-20 13:58:27 +03:00
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	2019-10-20 13:42:42 +03:00
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	2019-10-19 23:21:37 +00:00
Ariadne Conill	ef659331b0	implement invisible support for remote users	2019-10-19 23:21:37 +00:00
Ariadne Conill	95871cb462	user: implement User.invisible?/1	2019-10-19 23:21:37 +00:00
Ariadne Conill	1469a084d4	relay: set invisible to true	2019-10-19 23:21:37 +00:00
Ariadne Conill	e7333db72a	user info: add invisible field	2019-10-19 23:21:37 +00:00
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	2019-10-19 20:11:58 +00:00
eugenijm	52ed2f8f2d	Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read	2019-10-19 15:24:06 +03:00
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	2019-10-19 12:15:14 +02:00
Mark Felder	dcb23a85b6	Merge branch 'develop' into feature/push-subject-for-dm	2019-10-18 17:56:15 -05:00
Mark Felder	152caef51d	Direct messages should provide a distinct push notification subject	2019-10-18 17:51:34 -05:00
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	2019-10-18 18:35:58 +02:00
Ariadne Conill	44e64af5e7	object: containment: simplify the pattern match for OStatus testsuite hack	2019-10-18 15:39:15 +00:00
Ariadne Conill	e99fdfc32d	object: containment: only allow OStatus references in test suite environment	2019-10-18 15:37:14 +00:00
Ariadne Conill	3c785b85a6	object: fetcher: fix up formatting	2019-10-18 14:50:10 +00:00
Ariadne Conill	bae96de273	activitypub: tag containment checks for better error tracing	2019-10-18 14:50:10 +00:00
Ariadne Conill	7295a05cee	object: containment: also allow OStatus object IDs through when comparing origins	2019-10-18 14:50:10 +00:00
Ariadne Conill	a177f22e02	object: fetcher: improve error reporting	2019-10-18 14:50:10 +00:00
Ariadne Conill	bf2107743f	object: containment: don't try to contain ostatus objects	2019-10-18 14:50:10 +00:00
Ariadne Conill	6f110fc04c	object fetcher: fix up error handling	2019-10-18 14:50:09 +00:00
Ariadne Conill	48059c03c9	fix up some tests	2019-10-18 14:50:09 +00:00
Ariadne Conill	d379b48769	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
Ariadne Conill	6a1f4c5145	federator: remove OStatus incoming document support	2019-10-18 14:50:09 +00:00
Ariadne Conill	835ad52378	remove Salmon module	2019-10-18 14:50:09 +00:00
Ariadne Conill	beb9861f9d	router: disconnect Salmon	2019-10-18 14:50:09 +00:00
Ariadne Conill	a7b92bba68	webfinger: stop pulling Salmon data out of WebFinger	2019-10-18 14:50:09 +00:00
Ariadne Conill	c00ae10af8	feed: don't advertise salmon endpoint	2019-10-18 14:50:09 +00:00
Ariadne Conill	adb639db56	publisher: move remote_users() from Salmon module	2019-10-18 14:50:09 +00:00
Ariadne Conill	4f82e42e4e	websub: remove entirely	2019-10-18 14:50:09 +00:00
Ariadne Conill	b16a460916	federator: remove websub stuff	2019-10-18 14:50:09 +00:00
Ariadne Conill	25b7ff56c3	application: don't start Federator.init/1 anymore	2019-10-18 14:50:09 +00:00
rinpatch	39e996528c	Fix a migration wiping user info of users that don't have any mutes ... And introduce safe_jsonb_set	2019-10-18 15:22:07 +03:00
sadposter	6b9c5e4696	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-18 13:12:58 +01:00
Haelwenn (lanodan) Monnier	3c6fd0bb99	upload.ex: Remove deprecated configuration	2019-10-18 12:34:09 +02:00
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	2019-10-18 10:24:29 +02:00
kaniini	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	2019-10-18 04:42:02 +00:00
kaniini	733b73b71c	Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex	2019-10-18 04:36:37 +00:00
lain	203d61b950	Transmogrifier: Make proper use of the LikeValidator.	2019-10-17 19:35:31 +02:00
lain	66452f518f	ObjectValidator: Rewrite LikeValidator with Ecto.	2019-10-17 18:36:52 +02:00
eugenijm	359dd1890e	Mastodon API: Mark the conversation as read for the author when they send a new direct message	2019-10-17 16:49:39 +03:00
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
lain	081e8206ab	Transmogrifier: Use new ingestion pipeline for Likes.	2019-10-16 17:03:21 +02:00
lain	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	2019-10-16 16:16:39 +02:00
lain	1bfdf57fc7	Merge branch 'user-search-experiments' into 'develop' ... User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850	2019-10-16 12:29:08 +00:00
feld	21f0757b0d	Merge branch 'feature/multiple-users-activation-permissions' into 'develop' ... Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825	2019-10-16 12:14:47 +00:00
lain	6977cddff9	Merge branch 'benchmark-finishing' into 'develop' ... Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848	2019-10-16 11:54:49 +00:00
rinpatch	0a5175ecbb	Order fts results by trigram	2019-10-16 13:49:33 +03:00
rinpatch	c10ce113d4	User search: Remove trigram and refactor the module ... - Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees	2019-10-16 12:52:47 +03:00
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	2019-10-15 17:33:29 +02:00
Maxim Filippov	90d516d42b	Store status data inside flag activity	2019-10-15 16:52:41 +02:00
Alexander	e7bb762ec2	don't stream in benchmark env	2019-10-15 15:16:17 +03:00
kPherox	5bd0717de2	Add Sec-WebSocket-Protocol to response header	2019-10-15 21:09:44 +09:00
Egor Kislitsyn	1d46944fbd	Do not add follower_address to following for non local users	2019-10-14 13:50:43 +07:00
eugenijm	a97b642289	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
lain	e3b4a3e96b	Merge branch 'incoming-id-fixes' into 'develop' ... Assorted transmogrifier fixes See merge request pleroma/pleroma!1831	2019-10-13 15:37:49 +00:00
rinpatch	9bdbf0811b	Make MediaProxy failure tracking less brutal ... The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.	2019-10-11 22:52:38 +03:00
Maxim Filippov	cc6875b582	Add GET /api/pleroma/admin/relay endpoint - lists all followed relays	2019-10-11 19:12:29 +03:00
Maxim Filippov	c0aca32dd0	Merge branch 'develop' into feature/multiple-users-activation-permissions	2019-10-11 15:59:35 +03:00
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	2019-10-11 15:58:45 +03:00
lain	422aa6befe	Ostatus DeleteHandler: Fix for new option format.	2019-10-11 12:53:09 +02:00
lain	37812740c4	Transmogrifier: Correctly save incoming ids for Accept/Reject.	2019-10-11 11:48:58 +02:00
lain	9b963064eb	Transmogrifier: Actually store who deleted a note.	2019-10-11 11:25:45 +02:00
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	2019-10-11 00:24:31 +03:00
Egor Kislitsyn	059005ff82	Replace user.following with Pleroma.FollowingRelationship	2019-10-11 02:35:32 +07:00
lain	29647dfd09	Transmogrifier: Save correct ids for incoming deletes.	2019-10-10 17:17:33 +02:00
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	2019-10-10 14:40:59 +02:00
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-10 12:38:51 +00:00
sadposter	58f9ce0deb	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-10 10:28:16 +01:00
Maxim Filippov	24eecc3cb4	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-10 03:33:55 +03:00
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	2019-10-09 17:03:54 +03:00
eugenijm	580a67f5ca	Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)	2019-10-09 07:27:09 +03:00
Maxim Filippov	aa7fd616c7	Line is too long!	2019-10-07 16:03:23 +03:00
Maxim Filippov	35068baf65	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-07 15:41:41 +03:00
Maxim Filippov	7aceaa517b	Admin API: Reports, grouped by status	2019-10-07 15:39:07 +03:00
lain	6c278cfe09	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-07 12:31:51 +00:00
Ariadne Conill	9a2f71f4d5	mastodon api: fix exclude_replies (closes #1287)	2019-10-07 12:29:33 +00:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
lain	d580eedfe9	Linting.	2019-10-07 12:40:33 +02:00
lain	73b6512907	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-07 12:30:59 +02:00
kaniini	93bdc55306	Merge branch 'mrf/simple_policy/check_actor' into 'develop' ... mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806	2019-10-07 10:19:24 +00:00
Ivan Tashkinov	28fb98d69e	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-07 11:06:30 +03:00
lain	91e90aa807	Merge branch 'misskey-compat' into 'reactions' ... Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783	2019-10-07 07:25:27 +00:00
Haelwenn	b4f3c16885	Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' ... [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643	2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	2019-10-07 03:49:57 +02:00
kaniini	2411d09215	Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' ... Move local keys out of `user.info` See merge request pleroma/pleroma!1799	2019-10-06 14:32:56 +00:00
feld	1d8e956c32	Use the user.id instead of nickname in report URLs ... Ensures links to profiles of remote users work.	2019-10-06 14:13:04 +00:00
Ivan Tashkinov	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	2019-10-06 17:12:17 +03:00
rinpatch	fefbd31c6e	Move local keys out of user.info	2019-10-06 16:56:36 +03:00
Ivan Tashkinov	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	2019-10-06 11:43:49 +03:00
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-06 08:11:47 +00:00
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-06 09:30:49 +03:00
Haelwenn	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	2019-10-06 04:41:06 +00:00
kaniini	7a318d74e6	Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761	2019-10-05 19:28:53 +00:00
kaniini	45b7f03f89	Merge branch 'accept-embedded-announce-object' into 'develop' ... Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770	2019-10-05 19:28:29 +00:00
kaniini	17ff4b43cb	Merge branch 'unread-conversation-count' into 'develop' ... Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796	2019-10-05 19:28:07 +00:00
sadposter	f1c77f9682	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-05 18:22:05 +01:00
eugenijm	8249924485	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 15:10:57 +02:00
lain	276a520163	CommonAPI: Create profile updates as public. ... This saves us lots of sending out because we can use sharedInbox.	2019-10-05 14:53:50 +02:00
lain	4b8524f392	ActivityPub / Transmogrifier: Correctly store incoming Update id.	2019-10-05 14:49:45 +02:00
Thibaut Girka	791d93ff0e	Make credo happy	2019-10-05 13:56:40 +02:00
Thibaut Girka	977e711e22	Import object from self-Announce whenever possible	2019-10-05 13:56:40 +02:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	2019-10-05 10:00:05 +00:00
lain	6a85f7d1ea	Transmogrifier: Extend misskey like compatibility.	2019-10-05 10:45:42 +02:00
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 10:42:29 +02:00
Maksim Pechnikov	83631752af	removed legacy api: "/objects/:uuid/likes"	2019-10-04 22:35:26 +03:00
kaniini	e0c0ea9f13	Merge branch 'bugfix/widen-streamer-blocks' into 'develop' ... widen streaming API block effects See merge request pleroma/pleroma!1784	2019-10-04 17:39:06 +00:00
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	2019-10-04 17:33:18 +00:00
Maxim Filippov	8dcc2f9f5e	Admin API: Allow changing the state of multiple reports at once	2019-10-04 19:00:58 +03:00
Ariadne Conill	d1d058bf85	streamer: worker: actually use should_send? consistently	2019-10-04 15:42:25 +00:00
Ariadne Conill	5a0c018d2a	streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist	2019-10-04 15:41:55 +00:00
Ariadne Conill	2417b633ed	streamer: add missing copyright headers	2019-10-04 15:21:45 +00:00
lain	43a211bcb1	Transmogrifier: Handle misskey likes with reactions like EmojiReactions.	2019-10-04 17:01:04 +02:00
lain	568a995d64	ActivityPub: Change addressing of Undo.	2019-10-04 16:32:42 +02:00
lain	27110793a7	Merge branch 'featrue/job-monitor' into 'develop' ... Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721	2019-10-04 12:52:11 +00:00
lain	27e914955e	Merge branch 'fix/nickname-fail' into 'develop' ... Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777	2019-10-04 11:54:05 +00:00
rinpatch	8217292085	Fix get_cached_by_nickname_or_id not allowing to get local users by ... nickname Closes #1293	2019-10-04 14:44:09 +03:00
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	2019-10-04 11:28:20 +00:00
sadposter	59e6b48553	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-04 11:48:39 +01:00
Egor Kislitsyn	d3ac4e8083	Fix OAuthController	2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier	5dc14c89ce	notification_view.ex: Make sure account isn’t empty ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1203	2019-10-04 07:11:53 +02:00
eugenijm	06d9df79c5	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
lain	c9043c6c80	Transmogrifier: Handle incoming Undos for EmojiReactions.	2019-10-03 18:37:23 +02:00
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	2019-10-02 20:42:40 +03:00
lain	4cb603e1df	PleromaAPI: Add unreacting.	2019-10-02 18:19:16 +02:00
lain	391c736292	PleromaAPI: Fix emoji_reactions_by	2019-10-02 18:13:10 +02:00
Egor Kislitsyn	e0c68eeb02	Move :favourites and :bookmarks actions to StatusController	2019-10-02 21:31:19 +07:00
Egor Kislitsyn	7f2bc57725	Move follows, mutes and blocks actions to AccountController	2019-10-02 21:22:21 +07:00
lain	9cfe9a57c5	CommonAPI: Add unreactions.	2019-10-02 15:38:57 +02:00
Egor Kislitsyn	d3c404af12	Add MastoFEController	2019-10-02 20:36:08 +07:00
lain	dfe5c958eb	ActivityPub: Add undo for emoji reactions.	2019-10-02 15:08:20 +02:00
Egor Kislitsyn	1c6e1055c8	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-02 13:27:55 +02:00
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	2019-10-02 10:46:14 +00:00
kaniini	debd0a3066	Merge branch 'accept-embedded-announce-object' into 'develop' ... Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769	2019-10-02 10:45:55 +00:00
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	2019-10-02 12:15:06 +02:00
Thibaut Girka	3d61efa7c9	Rename misleading get_announce_visibility to public_announce?	2019-10-02 10:48:34 +02:00
Egor Kislitsyn	26693292f4	Remove :enqueued counter	2019-10-02 14:50:25 +07:00
Egor Kislitsyn	c8b01f6667	Extract instance actions from MastodonAPIController to InstanceController	2019-10-02 14:13:52 +07:00
kaniini	89ab673d00	Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' ... Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765	2019-10-02 07:04:33 +00:00
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	2019-10-02 07:02:56 +00:00
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	2019-10-02 07:02:24 +00:00
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	2019-10-01 22:16:29 +00:00
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	2019-10-01 22:39:25 +02:00
Sergey Suprunenko	c541b83bef	Track failed proxy urls and don't request them again	2019-10-01 20:00:27 +00:00
Thibaut Girka	43e3db0951	Fix returned visibility of announces in MastodonAPI	2019-10-01 20:38:29 +02:00
Thibaut Girka	4c1f158f5d	Allow users to announce privately, including own private notes	2019-10-01 20:00:59 +02:00
Maxim Filippov	b2273c695e	Discard identifier, if empty	2019-10-01 19:43:22 +03:00
Thibaut Girka	fe538973dd	Ensure self-announces do not widen the audience of the original post	2019-10-01 18:38:57 +02:00
KokaKiwi	1f0be71ea4	Make activity announceable by its author.	2019-10-01 17:47:43 +02:00
Maxim Filippov	0f9c2c8b87	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
Egor Kislitsyn	af690d1033	Extract auth actions from MastodonAPIController to AuthController	2019-10-01 15:54:45 +07:00
Egor Kislitsyn	2dad6dd020	Extract apps actions from MastodonAPIController to AppController	2019-10-01 15:21:46 +07:00
Egor Kislitsyn	39695c4436	Extract suggestions actions from MastodonAPIController to SuggestionController	2019-10-01 15:07:49 +07:00
Egor Kislitsyn	585bc57edb	Extract media actions from MastodonAPIController to MediaController	2019-10-01 14:36:35 +07:00
Egor Kislitsyn	36a34c36fe	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	2019-10-01 01:40:33 +09:00
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	2019-09-30 18:13:05 +02:00
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-09-30 17:41:20 +03:00
lain	19bc0b8c79	.	2019-09-30 16:38:19 +02:00
lain	08256e9299	ActivityPub: Federate reactions.	2019-09-30 15:51:09 +02:00
lain	6068d2254e	PleromaAPIController: Fixes and refactoring.	2019-09-30 15:13:25 +02:00
lain	04a2910f33	Pleroma.Constants: Fix typo.	2019-09-30 15:13:05 +02:00
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from MastodonAPIController to MascotController	2019-09-30 19:32:43 +07:00
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	2019-09-30 19:10:56 +07:00
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	e7aef27c00	Fix merge	2019-09-30 19:10:54 +07:00
lain	a7f22c6e93	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:58:14 +02:00
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:57:54 +02:00
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	2019-09-30 11:21:49 +00:00
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	2019-09-30 11:17:30 +00:00
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	2019-09-30 10:49:40 +00:00
Egor Kislitsyn	b7f27a4f58	Extract report actions from MastodonAPIController to ReportController ... Update MastodonAPI.ReportView	2019-09-30 17:44:10 +07:00
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	2019-09-30 10:39:48 +00:00
Ariadne Conill	e653edd182	split scrobble functions into their own controller	2019-09-30 10:39:48 +00:00
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	2019-09-30 10:39:48 +00:00
Ariadne Conill	8b34b221cb	common api: add some missing IR bits for listen activities' children	2019-09-30 10:39:48 +00:00
Ariadne Conill	84712c35f9	activitypub: object view: include child object for Listen activities	2019-09-30 10:39:48 +00:00
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	2019-09-30 10:39:48 +00:00
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	2019-09-30 10:39:17 +00:00
Ariadne Conill	2c82d8603b	common api: implement scrobbling	2019-09-30 10:39:17 +00:00
Ariadne Conill	172c74a77b	activitypub: transmogrifier: implement support for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	1f9de2a8cd	activitypub: implement IR-level considerations for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	b7877e9b1c	mastodon api: implement rendering of listen activities	2019-09-30 10:39:17 +00:00
Egor Kislitsyn	d4d88b3361	Extract conversation actions from MastodonAPIController to ConversationController	2019-09-30 16:52:07 +07:00
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	2019-09-29 18:43:27 +03:00
kaniini	6d74a7528c	Merge branch 'feature/follow-requests-count' into 'develop' ... Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726	2019-09-29 11:44:31 +00:00
Maksim Pechnikov	1053319cd6	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	2019-09-28 01:53:41 +02:00
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	2019-09-28 01:58:06 +03:00
minibikini	f9380289eb	Add remote_ip plug	2019-09-27 21:59:23 +00:00
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	2019-09-27 07:54:54 +00:00
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	2019-09-27 07:54:08 +00:00
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	2019-09-27 07:53:22 +00:00
Egor Kislitsyn	408750b94e	Extract domain blocks actions from MastodonAPIController to DomainBlockController	2019-09-27 14:28:05 +07:00
Egor Kislitsyn	99c5a35890	Extract follow requests actions from MastodonAPIController to FollowRequestController	2019-09-27 14:25:17 +07:00
Egor Kislitsyn	8d31530119	Cleanup ScheduledActivityView	2019-09-27 13:36:28 +07:00
Egor Kislitsyn	0a5b106ddd	Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController	2019-09-27 13:36:28 +07:00
Egor Kislitsyn	621377f378	Extract filter actions from MastodonAPIController to FilterController	2019-09-27 13:06:25 +07:00
Egor Kislitsyn	6c7c35dbe1	Fix SubscriptionNotificationView	2019-09-27 11:55:47 +07:00
kaniini	91e2bcf218	Merge branch 'refactor/status-controller' into 'develop' ... Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719	2019-09-27 04:37:48 +00:00
Ariadne Conill	14294243a2	mastodon api: implement follow_requests_count	2019-09-27 04:22:40 +00:00
Egor Kislitsyn	5ea5c58a85	Move view logic from StatusController.context to StatusView and add a test	2019-09-27 10:52:47 +07:00
kaniini	eb9aa7aa10	Merge branch 'refactor/subscription' into 'develop' ... Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664	2019-09-27 03:51:24 +00:00
Egor Kislitsyn	98d1347a4e	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00
kaniini	219771288c	Merge branch 'refactor/common_api' into 'develop' ... Refactor `CommonAPI.post/2` See merge request pleroma/pleroma!1713	2019-09-27 03:46:02 +00:00
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	2019-09-27 03:42:30 +00:00
sadposter	1e11b97c1b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-26 23:22:24 +01:00
Maksim Pechnikov	73ae38ca04	add deprecated tag	2019-09-26 21:08:04 +03:00
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 20:56:59 +03:00
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	2019-09-26 19:01:54 +03:00
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 16:16:30 +03:00
Egor Kislitsyn	75290cbfbd	Add Pleroma.JobQueueMonitor	2019-09-26 18:49:57 +07:00
Roman Chvanikov	b4b147000c	Merge develop	2019-09-26 10:38:54 +03:00
Egor Kislitsyn	3572cf29b7	Extract timeline actions from MastodonAPIController into TimelineController	2019-09-26 10:53:42 +07:00
Egor Kislitsyn	c57ad0a402	Cleanup CommonAPI	2019-09-26 10:33:13 +07:00
Egor Kislitsyn	de3e90e536	Add ActivityDraft.with_valid/2	2019-09-26 10:29:34 +07:00
Egor Kislitsyn	eed774d058	Add CommonAPI.ActivityDraft	2019-09-26 10:29:34 +07:00
kaniini	6abe12dced	Merge branch 'refactor/notification-controller' into 'develop' ... Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646	2019-09-26 03:13:22 +00:00
kaniini	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	2019-09-26 03:12:03 +00:00
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	2019-09-26 03:00:38 +00:00
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	2019-09-26 02:57:41 +00:00
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	2019-09-26 02:51:54 +00:00
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	2019-09-26 02:49:45 +00:00
kaniini	1b9cd4c866	Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' ... Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716	2019-09-26 00:03:47 +00:00
rinpatch	f92d7d52c2	Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex	2019-09-25 13:38:45 +00:00
rinpatch	f2880d7d29	Credo considered harmful	2019-09-25 16:36:46 +03:00
rinpatch	c7d8ccd0c4	Remove useless with clause	2019-09-25 16:26:47 +03:00
rinpatch	1ddd403339	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-25 13:20:48 +00:00
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	2019-09-25 15:59:04 +03:00
sadposter	f82d9e1359	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-25 13:33:10 +01:00
Ekaterina Vaartis	1fd9c60f87	Fix emoji tags for shareable packs to be "pack:{name}"	2019-09-25 12:34:03 +02:00
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	2019-09-25 12:32:19 +02:00
vaartis	a6e85215e1	Credo fix (remove parens on function definition)	2019-09-25 12:32:19 +02:00
vaartis	f21dbbc021	Move emoji_dir_path & cache_seconds_per_file	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	cdbe7cd37a	When listing emoji packs, be sure to create the directory	2019-09-25 12:32:19 +02:00
Egor Kislitsyn	b5dfe83433	Replace Pleroma.FlakeId with flake_id hex package	2019-09-25 17:14:31 +07:00
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	2019-09-25 12:24:12 +03:00
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	2019-09-24 19:03:06 +02:00
Egor Kislitsyn	035f22f784	Fix Credo warnings	2019-09-24 19:50:09 +07:00
Egor Kislitsyn	1bea67cb5e	Cleanup Pleroma.User	2019-09-24 19:50:09 +07:00
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	2019-09-24 19:50:07 +07:00
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-24 13:00:48 +03:00
Egor Kislitsyn	a66a7a328f	Extract notification actions from MastodonAPIController into NotificationController	2019-09-24 15:16:44 +07:00
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	2019-09-24 15:03:20 +07:00
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-24 08:06:04 +03:00
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	2019-09-23 22:42:34 +00:00
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	2019-09-23 22:41:31 +00:00
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	2019-09-23 22:35:09 +00:00
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	2019-09-23 22:34:52 +00:00
Steven Fuchs	e1d2d69c87	Clean up views	2019-09-23 22:33:59 +00:00
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	2019-09-24 00:37:27 +03:00
Rachel Fae Fox	63af6951fa	add tunable for stream uploads, as needed for jortage to work.	2019-09-23 20:38:53 +00:00
Maksim Pechnikov	494bb6bac6	updated tests	2019-09-23 22:37:30 +03:00
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-23 21:41:57 +03:00
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-23 21:32:50 +03:00
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	2019-09-23 18:20:08 +00:00
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	2019-09-23 19:47:35 +02:00
Maxim Filippov	d72d4757a8	Format	2019-09-22 23:13:48 +03:00
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-22 16:58:39 +03:00
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	2019-09-22 16:36:59 +03:00
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	2019-09-22 16:08:07 +03:00
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)	2019-09-20 18:27:00 +03:00
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	2019-09-19 16:53:59 +00:00
D Anzorge	0e6085da10	Fix pagination in AP outbox.json	2019-09-19 16:09:07 +02:00
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	2019-09-19 10:59:09 +03:00
Egor Kislitsyn	95c948110c	Add rel="ugc" to hashtags and mentions	2019-09-19 14:56:10 +07:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
eugenijm	fe5e0b7846	Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)	2019-09-19 08:59:25 +03:00
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-19 07:35:34 +03:00
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' ... [#733] added test for Ostatus See merge request pleroma/pleroma!1657	2019-09-18 22:28:10 +00:00
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' ... Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 ... Done via the following command: git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	2019-09-18 23:21:11 +02:00
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	a1325d5fd9	Change path from nodeinfo to metadata->features	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	d51e5e447e	Move emoji reloading to admin api	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7680aec17d	Move emoji api to pleroma api dir	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	36f2275dc9	A feature for shareable emoji packs, use it in download_from & tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	74fb6d8647	Move EmojiAPIController from EmojiAPI to PleromaAPI	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	6cd651a38b	Make the emoji controller api more RESTy	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	3971bf9c5f	Change :sha to :checksum	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7c784128fd	Change emoji api responses to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f24731788e	Move emoji pack list from /list to /	2019-09-19 00:16:33 +03:00
vaartis	cb125ffaf7	Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8f509e6d1e	Use with w/ pack_info_res	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8790365fef	Remove unused variable	2019-09-19 00:16:33 +03:00
vaartis	b8a214b0ab	Split list_packs	2019-09-19 00:16:33 +03:00
vaartis	f251225cae	Apply suggestions to emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
vaartis	c049c32270	Fixed a typo in create_archive_and_cache	2019-09-19 00:16:33 +03:00
vaartis	163082de6f	Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f6d4acc871	Fix credo warnings	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	87057101b0	Add documentation for the emoji api endpoints	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9eb2ee4df0	Allow importing old (emoji.txt / plain) packs from the filesystem	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	13cd93a0d3	Use && insted of "and" for checking shared-files for packs ... share-files can be nil and "and" does not like that	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f5131540dc	Add a way to create emoji packs via an endpoint	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8dbdd5c280	Allow uploading new emojis to packs from URLs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	16edfef12e	Handle empty shortcode/filename/new_shortcode/new_filename	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9afe7258dd	Implememt emoji pack file updating + write tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	261d92f9c2	Update the pack fallback-src sha generation condition ... The old one would not regenerate sha when fallback src changed	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	bcc0bfd0c5	Add an endpoint for emoji pack metadata updating	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b78973d27f	fallback can't have pack.json, reflect that in code ... having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2a94eca096	Change YAML to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b0ecd412f5	Clean out old emojis on reload	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2d4b8f3d20	Add an endpoint for deleting emoji packs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	3a8669b487	Fix responses for emoji pack controlller	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7a0c755d0a	Send ok for emoji reloading as text, not as json	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	ee620ecbf1	Add caching for emoji pack sharing	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7fb7dd9e0e	Only find SHA256 for packs that are shared	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	54b8e683bc	Swap TOML for YAML to get YAML generation for packs from fallbacks ... If fallback url doesn't have a pack.yml file, one from the source will be used	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b791a08656	Implement API actions on packs ... That incldues listing them and downloading them from other instances or from the remote url	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	6a42641b8d	Add pack.toml loading	2019-09-19 00:16:33 +03:00
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	2019-09-18 21:13:15 +00:00
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	2019-09-18 21:11:37 +00:00
Haelwenn	e32d099a3a	Merge branch 'feature/poll-refresh' into 'develop' ... Poll refetching See merge request pleroma/pleroma!1694	2019-09-18 20:58:53 +00:00
rinpatch	5028b7b578	Fix credo issues	2019-09-18 22:09:03 +03:00
rinpatch	c096dd86e5	Do not refetch local objects	2019-09-18 20:01:26 +03:00
rinpatch	eb87a86b5b	Preserve internal fields when reinjecting	2019-09-18 19:53:51 +03:00
rinpatch	d32894ae51	Move object internal fields to a constant	2019-09-18 19:24:20 +03:00
rinpatch	e3f902b3a1	Set updated_at even if the object stayed the same	2019-09-18 19:07:25 +03:00
rinpatch	a9c700ff15	Fix wrong argument order when calling NaiveDateTime.diff	2019-09-18 18:52:33 +03:00
rinpatch	7ef575d11e	Initial poll refresh support ... Implement refreshing the object with an interval and call the function when getting the poll.	2019-09-18 18:13:21 +03:00
Maxim Filippov	384b7dd40d	Fix response	2019-09-18 18:06:49 +03:00
Maxim Filippov	f89728ad95	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-18 16:44:11 +03:00
Ivan Tashkinov	e4f3d7f69d	Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex	2019-09-18 10:31:10 +00:00
Ivan Tashkinov	551f2fa59e	[#1234] Added changelog entry, removed admin OAuth scopes.	2019-09-18 12:31:33 +03:00
Ivan Tashkinov	c98e761d28	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions	2019-09-18 12:06:38 +03:00
Alex S	a18f1e7cd7	namings	2019-09-18 10:49:14 +03:00
Alex S	2263c8b6b9	little fixes	2019-09-18 10:49:14 +03:00
Alex S	4faf2b1555	post for creating invite tokens in admin api	2019-09-18 10:49:14 +03:00
Haelwenn (lanodan) Monnier	e501c822c9	markdown.ex: put two-spaces before the description-newline	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	4785596a2c	markdown.ex: end suggestions list with a newline ... Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	d2097fd0f5	markdown.ex: \n\n on >1 suggestions, 2-spaces on one	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	d6182a3c8f	markdown.ex: Make suggestion(s) plural only if on >1	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	c0c5628200	description.exs: remove empty strings on descriptions	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	106afaed58	markdown.ex: do not fail if there is no children	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	e0d8c8897e	docs/markdown.ex: do no print empty suggestions	2019-09-17 23:05:26 +02:00
Ivan Tashkinov	b4d775161c	[#1234] Undone reordering-related changes in router.ex.	2019-09-17 23:24:55 +03:00
Maxim Filippov	f9dd121ad3	Admin API: Return link alongside with token on password reset	2019-09-17 23:09:08 +03:00
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	2019-09-17 22:53:26 +03:00
Haelwenn (lanodan) Monnier	7f211a48e0	docs/markdown.ex: child header as "- key (type): description"	2019-09-17 21:47:32 +02:00
Maksim Pechnikov	0447c42715	Merge branch 'develop' into issue/733	2019-09-17 22:20:39 +03:00
Ivan Tashkinov	76068873db	[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.	2019-09-17 22:19:39 +03:00
rinpatch	ef2e2c5e12	Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628	2019-09-17 19:09:56 +00:00
Maksim Pechnikov	7dd51652f9	Merge branch 'develop' into issue/733	2019-09-17 21:20:08 +03:00
Steven Fuchs	6193157f19	Fix notification warnings	2019-09-17 18:12:27 +00:00
Haelwenn	2301de3d75	Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' ... Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677	2019-09-17 17:16:39 +00:00
rinpatch	95a4a19417	Merge branch 'support/tests' into 'develop' ... add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627	2019-09-17 14:47:26 +00:00
Steven Fuchs	80c5c3495b	remove remaining errors from tests	2019-09-17 14:44:52 +00:00
Roman Chvanikov	9fa2586abd	Refactor SubscriptionNotificationView	2019-09-17 17:44:10 +03:00
sadposter	c3de75b2a1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-17 14:58:02 +01:00
Roman Chvanikov	e9f69a3eb7	Move pleroma_api controllers into controllers sub-folders	2019-09-17 16:52:23 +03:00
Roman Chvanikov	7d1773bc6b	Rename SubscriptionNotificationController list and get actions to index and show	2019-09-17 16:48:24 +03:00
Roman Chvanikov	a76168e743	Cleanup PleromaAPIController	2019-09-17 16:44:54 +03:00
Roman Chvanikov	a81f80233d	Apply suggestion to lib/pleroma/web/router.ex	2019-09-17 13:43:10 +00:00
Roman Chvanikov	f9be517c7f	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:40 +00:00
Roman Chvanikov	c0f776faec	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:36 +00:00
Roman Chvanikov	2688b876ab	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:28 +00:00
Ivan Tashkinov	e7afb67c5c	[#1260] Rate-limiting for create authentication and related requests.	2019-09-17 16:16:11 +03:00
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)	2019-09-17 14:45:47 +03:00
rinpatch	a21584556f	Update oban to 0.8.1 ... This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam	2019-09-17 13:04:43 +03:00
Roman Chvanikov	6042e21b25	Move subscription notifications to a separate controller	2019-09-16 21:59:49 +03:00
Roman Chvanikov	56b60798c2	Code style fixes	2019-09-16 20:50:14 +03:00
Roman Chvanikov	76c3e290fc	Merge develop	2019-09-16 20:30:42 +03:00
Maxim Filippov	df15ed13d1	Merge branch 'develop' into feature/moderation-log-filters	2019-09-16 19:44:06 +03:00
Egor Kislitsyn	085d014f08	Fix Transmogrifier.upgrade_user_from_ap_id/1	2019-09-16 19:26:00 +07:00
Maxim Filippov	219dca1b00	Merge branch 'develop' into feature/return-total-for-reports	2019-09-16 14:40:17 +03:00
sadposter	4714b739a7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-16 12:14:48 +01:00
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	2019-09-16 17:55:04 +07:00
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	2019-09-16 09:09:21 +00:00
Steven Fuchs	aab264db82	Streamer refactoring	2019-09-16 07:44:03 +00:00
kaniini	17142a3720	Merge branch 'feature/delivery-tracking' into 'develop' ... Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661	2019-09-16 07:39:58 +00:00
kaniini	d1a84ceec8	Merge branch 'feature/optimize_rich_media_parser' into 'develop' ... added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672	2019-09-16 07:37:54 +00:00
Maksim Pechnikov	d75bc728e7	Merge branch 'develop' into issue/733	2019-09-16 07:34:22 +03:00
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	2019-09-15 18:52:27 +03:00
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
Maksim Pechnikov	b4cf74c106	added prepare html for RichMedia.Parser	2019-09-15 14:53:58 +03:00
Maksim Pechnikov	8751809e1e	Merge branch 'develop' into support/tests	2019-09-15 14:22:15 +03:00
Ivan Tashkinov	610236d6be	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md	2019-09-15 10:12:24 +03:00
rinpatch	9c64a25713	Merge branch 'config-changes' into 'develop' ... two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666	2019-09-14 17:26:35 +00:00
sadposter	c137545a84	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-14 17:40:40 +01:00
rinpatch	62bbba80f3	Merge branch 'fix/truncate-remote-user-fields' into 'develop' ... Truncate remote user fields See merge request pleroma/pleroma!1619	2019-09-14 16:39:42 +00:00
Roman Chvanikov	d7457c9165	Merge branch 'develop' into refactor/subscription	2019-09-14 18:29:51 +03:00
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	2019-09-14 16:11:44 +03:00
sadposter	ab55e41626	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-14 00:20:56 +01:00
rinpatch	5c5ebd3861	Mastodon API: Respect post privacy in favourited/reblogged endpoints	2019-09-14 01:50:15 +03:00
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	2019-09-13 17:06:38 +00:00
rinpatch	ba70a8cae6	Merge branch 'develop' into feature/delivery-tracking	2019-09-13 19:42:53 +03:00
rinpatch	ac4a748fad	Disallow NULLs in deliveries	2019-09-13 19:28:35 +03:00
lain	6fe2f554c3	Emoji: Generate emoji detecting functions at compile time. ... Suggested by jvalim	2019-09-13 18:27:32 +02:00
Alex S	69faec031d	markdown generation to the new file	2019-09-13 19:02:42 +03:00
Roman Chvanikov	0bd2b85edb	Separate Subscription Notifications from regular Notifications	2019-09-13 18:25:27 +03:00
rinpatch	8900cb68ae	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-13 15:25:15 +00:00
rinpatch	05f8a066a1	Apply suggestion to lib/pleroma/delivery.ex	2019-09-13 15:23:26 +00:00
rinpatch	2784962dba	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-13 15:23:03 +00:00
lain	53a3ad6043	Merge branch 'cleanup-activity' into 'develop' ... Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623	2019-09-13 14:48:00 +00:00
lain	3ff5532220	Linting.	2019-09-13 16:41:30 +02:00
lain	a7f31bf06c	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-13 16:31:27 +02:00
lain	e5b3ad3d04	ActivityPub: Use is_unicode_emoji? function.	2019-09-13 16:06:34 +02:00
Haelwenn	0d9609894f	Merge branch 'feature/change-email' into 'develop' ... Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580	2019-09-13 12:46:16 +00:00
rinpatch	f884987ace	Merge branch 'admin-config-description' into 'develop' ... Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611	2019-09-13 12:36:24 +00:00
rinpatch	3896a51b8a	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-13 10:09:56 +00:00
rinpatch	5170170483	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-13 10:09:46 +00:00
rinpatch	fb96facc32	Remove unused functions and fix credo issues	2019-09-13 12:29:42 +03:00
rinpatch	ce23529d91	Use delivery info when federating deletes	2019-09-13 11:38:17 +03:00
Egor Kislitsyn	25d8216804	Add email change endpoint	2019-09-13 13:09:35 +07:00
Egor Kislitsyn	39dc9b470c	Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils	2019-09-13 12:44:59 +07:00
Maksim Pechnikov	d8a178274b	fix Activity.get_by_id	2019-09-13 07:12:34 +03:00
Maksim Pechnikov	2b40e57a72	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-13 06:55:05 +03:00
lain	a697f0d791	Emoji: Add function to detect if a character is an emoji	2019-09-13 02:11:02 +02:00
Haelwenn	51609217c2	Merge branch 'fix/error-log-double-quotes' into 'develop' ... Fix double quotes in error logs See merge request pleroma/pleroma!1656	2019-09-12 20:21:56 +00:00
rinpatch	b0e6058021	Parse http signature for request to objects/activities	2019-09-12 23:03:52 +03:00
Maksim Pechnikov	936951826e	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-12 22:15:43 +03:00
rinpatch	dabc4a00f5	Put the cache with the right key when using a tracking function	2019-09-12 22:10:15 +03:00
rinpatch	769fb778d4	Track object/create activity fetches	2019-09-12 21:37:36 +03:00
lain	8d4b661ecb	Transmogrifier: Strip internal emoji reaction fields.	2019-09-12 18:59:13 +02:00
lain	05e9776517	PleromaAPIController: Add endpoint to fetch emoji reactions.	2019-09-12 18:48:25 +02:00
Maksim Pechnikov	4f548cb2b7	added test for Ostatus	2019-09-12 10:25:43 +03:00
Mark Felder	74e4c72c4a	Fix double quotes in error logs ... Example: pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil	2019-09-11 16:16:09 -05:00
Maksim Pechnikov	007e0c1ce1	added tests	2019-09-11 23:19:06 +03:00
rinpatch	56828abf6d	Use Jason for rendering responses ... Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))	2019-09-11 23:06:31 +03:00
Haelwenn	46ae62d159	Merge branch 'patch-5' into 'develop' ... Mastodon API: URI encode hashtag name in generated URLs See merge request pleroma/pleroma!1642	2019-09-11 17:47:19 +00:00
lain	fb7332aec7	Merge branch 'fix/oom-parallel-rendering' into 'develop' ... Revert "Parallelize template rendering" See merge request pleroma/pleroma!1654	2019-09-11 11:21:03 +00:00
Alex S	be32d90a0c	little refactor	2019-09-11 09:25:33 +03:00
Alex S	5ff12e7df1	some changes	2019-09-11 09:25:33 +03:00
Alex S	35757b6d0e	don't add behaviour to suggestions	2019-09-11 09:25:33 +03:00
Alex S	0624e06a9c	little fix	2019-09-11 09:25:33 +03:00
Alex S	6721301086	some changes	2019-09-11 09:25:33 +03:00
Alex S	a1f2dfb10a	expanding regex sigils to use modifiers	2019-09-11 09:25:33 +03:00
Alex S	67e4300931	description formatters	2019-09-11 09:25:33 +03:00
Maksim Pechnikov	fcf604fa43	added tests	2019-09-11 07:23:33 +03:00
sadposter	94076a23e4	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-10 21:11:03 +01:00
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.	2019-09-10 22:01:45 +03:00
Maksim Pechnikov	a31af93e1d	added tests /activity_pub/transmogrifier.ex	2019-09-10 16:43:10 +03:00
Egor Kislitsyn	b40b10b53d	Add an endpoint to get multiple statuses by IDs	2019-09-10 13:39:45 +07:00
Maxim Filippov	d1abf7a358	Merge branch 'develop' into feature/moderation-log-filters	2019-09-10 01:23:20 +03:00
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	2019-09-09 18:53:08 +00:00
feld	edbaf78176	Merge branch 'fix/read-inbox' into 'develop' ... Fix `ActivityPubController.read_inbox/2` Closes #1248 See merge request pleroma/pleroma!1649	2019-09-09 18:21:29 +00:00
Egor Kislitsyn	e0f84d0043	Fix ActivityPubController.read_inbox/2	2019-09-10 01:11:57 +07:00
Ivan Tashkinov	b63faf9819	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	2019-09-08 15:00:03 +03:00
Ivan Tashkinov	c3f00447af	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-09-08 08:41:10 +03:00
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.	2019-09-07 19:50:45 +00:00
Maksim Pechnikov	8c6cdff3cc	Merge branch 'develop' into issue/1218	2019-09-07 22:17:32 +03:00
Maksim Pechnikov	39f99dc6cd	Merge branch 'develop' into support/tests	2019-09-07 22:13:43 +03:00
Ariadne Conill	40a61532ca	activity: when restricting deactivated users, precalculate the user list ... the PostgreSQL query planner is easily confused due to the complexity of certain queries we make. while we plan to simplify these queries through unification of activities and objects, we are not yet there. it has been discovered that using a precalculated list of deactivated users encourages the query planner to prefer simpler indices instead of the activity_visibility index. accordingly, drop the subquery and precalc the user list instead.	2019-09-06 23:14:29 +00:00
Ariadne Conill	5effb2cbca	activitypub: help ecto build a better query for thread mute filtering ... using an indexed value in thread_mute table helps ecto build a better query.	2019-09-06 23:11:26 +00:00
Maksim Pechnikov	ab2f21e470	tests for mastodon_api_controller.ex	2019-09-06 21:50:00 +03:00
Alex S	b3f6f6a409	generating remote users	2019-09-06 20:14:02 +03:00
Maksim Pechnikov	eb74c3d5c7	Merge branch 'develop' into issue/1218	2019-09-06 14:01:07 +03:00
Ivan Tashkinov	ca1ba1e272	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs	2019-09-06 13:26:05 +03:00
Egor Kislitsyn	40b3289c26	Refactor add_link_headers/7 -> add_link_headers/3	2019-09-06 17:08:47 +07:00
rinpatch	896ffabe37	Merge branch 'so-long-twitterapi' into 'develop' ... Removing TwitterAPI See merge request pleroma/pleroma!1605	2019-09-06 08:43:38 +00:00
rinpatch	3523bdcf26	Call TrailingFormatPlug for /api/pleroma/emoji ... Apparently Pleroma-FE still calls it with trailing '.json'	2019-09-05 22:21:20 +03:00
Maxim Filippov	736165c082	Reverse reports list	2019-09-05 16:54:34 +03:00
Alex S	79dde58044	one more temp commit	2019-09-05 16:02:20 +03:00
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	2019-09-05 12:48:27 +00:00
rinpatch	26fe6f70c9	Move checking for restrict_local to User.get_cached_by_id_or_nickname	2019-09-05 15:39:10 +03:00
sadposter	c2a1bac5de	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-05 12:08:45 +01:00
rinpatch	b312ca3d52	Mastodon API Poll view: Fix handling of polls without an end date	2019-09-05 12:03:39 +03:00
Ivan Tashkinov	79cf629e1a	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-09-05 11:30:41 +03:00
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	2019-09-05 05:47:06 +00:00
rinpatch	558969a0fd	Do not crash if one notification failed to render	2019-09-05 08:32:49 +03:00
Maksim Pechnikov	ae506ca997	fix formatting	2019-09-04 21:40:53 +03:00
Maksim	e2011a667c	Apply suggestion to lib/pleroma/web/activity_pub/utils.ex	2019-09-04 18:35:01 +00:00
Maksim	8306078de1	Apply suggestion to lib/pleroma/web/activity_pub/utils.ex	2019-09-04 17:31:14 +00:00
lain	99ea990a16	PleromaAPIController: Add emoji reactions.	2019-09-04 12:20:35 -05:00
Maxim Filippov	af746fa4a8	Return total for reports	2019-09-04 20:08:13 +03:00
Maxim Filippov	3542ca6702	Merge branch 'develop' into feature/moderation-log-filters	2019-09-04 19:40:07 +03:00
Sadposter	cb99cfcc65	don't try to truncate non-strings	2019-09-04 15:57:42 +01:00
Sadposter	2975da284b	truncate remote user bio/display name	2019-09-04 15:45:40 +01:00
Maksim Pechnikov	a890451187	fetch_announcements -> take_announcements	2019-09-04 17:42:27 +03:00
Maksim Pechnikov	8cbad5500c	add tests for activity_pub/utils.ex	2019-09-04 15:25:12 +03:00
rinpatch	3face45467	Mastodon API: Add pleroma.thread_muted to Status entity ... Needed for pleroma-fe!941	2019-09-04 14:17:23 +03:00
rinpatch	7c3838090f	Apply suggestion to lib/pleroma/notification.ex	2019-09-04 10:14:15 +00:00
rinpatch	c2b6c1b089	Extend /api/pleroma/notifications/read to mark multiple notifications ... as read and make it respond with Mastoapi entities	2019-09-04 12:38:27 +03:00
lain	9bc12b88b3	ActivityPub: Save emoji reactions in object.	2019-09-03 16:50:04 -05:00
rinpatch	cc1d1ee406	Mastdon API: Add ability to get a remote account by nickname to ... `/api/v1/accounts/:id`	2019-09-03 19:26:10 +03:00
Ivan Tashkinov	eb17cc17a1	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # CHANGELOG.md	2019-09-03 17:12:15 +03:00
Maxim Filippov	b15cfd80ef	Return "total" optionally	2019-09-03 13:58:27 +03:00
Maxim Filippov	a4c5f71e93	Return total from pagination + tests	2019-09-02 22:48:52 +03:00
Ivan Tashkinov	b49085c156	[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.	2019-09-02 14:57:40 +03:00
Sadposter	d0f07e55d2	use atom key for fields	2019-09-02 12:31:23 +01:00
Sadposter	05c935c396	mix format	2019-09-02 12:15:40 +01:00
Sadposter	35ef470d00	truncate fields for remote users instead	2019-09-02 12:15:21 +01:00
Maxim Filippov	9c96b17e16	Add pagination to logs	2019-09-01 21:23:30 +03:00
Ivan Tashkinov	dd017c65a4	[#1149] Refactored Oban workers API (introduced enqueue/3).	2019-08-31 21:58:42 +03:00
Ivan Tashkinov	a90ea8ba15	[#1149] Addressed code review comments (code style, jobs pruning etc.).	2019-08-31 19:08:56 +03:00
Ivan Tashkinov	e890ea7e82	[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # config/config.exs	2019-08-31 14:25:43 +03:00
rinpatch	70eed0594c	credo fixes	2019-08-31 13:08:43 +03:00
rinpatch	bd3ed3a622	Add back /api/qvitter/statuses/notifications/read.json	2019-08-31 11:43:06 +03:00
rinpatch	64410497d2	Remove TwitterAPI representers	2019-08-31 10:41:15 +03:00
rinpatch	985122cc03	Remove Activity, User and Notification views from TwitterAPI	2019-08-31 10:31:15 +03:00
rinpatch	90c2dae9a4	Remove most of Pleroma.Web.TwitterAPI.TwitterAPI	2019-08-31 10:20:34 +03:00
Maksim Pechnikov	6ef0103ca0	added Emoji struct	2019-08-31 10:14:53 +03:00
Maxim Filippov	4d6e22bb9b	Style	2019-08-31 01:09:48 +03:00
Maxim Filippov	f182f0f6bd	Add ability to search moderation logs	2019-08-31 00:57:15 +03:00
Maksim Pechnikov	d8098d142a	added Emoji.Formatter	2019-08-30 22:04:17 +03:00
Maksim	5c90b70733	Apply suggestion to lib/pleroma/emoji/loader.ex	2019-08-30 07:30:54 +03:00
Maksim Pechnikov	d7808b5db4	added code\path fields without html tags in ets	2019-08-30 07:30:54 +03:00
Maksim Pechnikov	cef2e980b1	division emoji.ex on loader.ex and emoji.ex	2019-08-30 07:30:54 +03:00
feld	7853b3f17d	Fix AntiFollowbotPolicy when trying to follow a relay	2019-08-30 00:38:03 +00:00
sadposter	227e6260ca	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-29 10:52:27 +01:00
Haelwenn	d9d7765383	Merge branch 'fix-osada-follow' into 'develop' ... Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604	2019-08-28 07:10:35 +00:00
lain	b770ed1d99	CommonAPI: Support emoji reactions.	2019-08-27 17:56:28 -05:00
lain	f017260cdc	Merge remote-tracking branch 'origin/develop' into reactions	2019-08-27 16:38:51 -05:00
lain	66519f2100	Merge branch 'list-controller' into 'develop' ... Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600	2019-08-27 21:15:54 +00:00
Maxim Filippov	5e4fde1d3d	Filter logs by date	2019-08-27 20:48:16 +03:00
Maksim	ffcd742aa0	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-08-27 17:37:19 +00:00
lain	c30cc039e4	Transmogrifier: Use Containment.get_actor to get actors.	2019-08-27 12:22:30 -05:00
Maksim Pechnikov	00abe099cd	added tests for ActivityPub.like\unlike	2019-08-27 16:21:03 +03:00
Ivan Tashkinov	cd78e63a25	[#1149] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.	2019-08-27 14:34:37 +03:00
rinpatch	eb1739c596	Remove most of TwitterAPIController	2019-08-27 12:29:19 +03:00
sadposter	cc28184854	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-27 08:58:51 +01:00
sadposter	62487e3976	fix gab rewrite	2019-08-27 08:58:47 +01:00
lain	a0b21c8928	Transmogrifier: Handle incoming emoji reactions.	2019-08-26 16:47:31 -05:00
lain	6e1ec4c5da	ActivityPub: Basic EmojiReactions.	2019-08-26 16:29:51 -05:00
lain	3da65292b3	Transmogrifier: Fix follow handling when the actor is an object.	2019-08-26 14:34:52 -05:00
Egor Kislitsyn	4194abbc8f	Move mastodon_api/*_controller.ex to mastodon_api/controllers/	2019-08-26 19:37:57 +07:00
Egor Kislitsyn	30510ade0e	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	2019-08-26 19:37:54 +07:00
Egor Kislitsyn	4d82bc8b0b	Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController	2019-08-26 19:16:40 +07:00
Egor Kislitsyn	3b1b631c2a	Add validation in Pleroma.List.create/2	2019-08-26 18:59:57 +07:00
kPherox	8ca4f145a5	Extract if block into private function	2019-08-26 17:09:32 +09:00
kaniini	6dc24422dc	Merge branch 'issue/1177' into 'develop' ... [#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589	2019-08-25 19:43:27 +00:00
Maxim Filippov	37dd3867bb	Log admin/moderator actions	2019-08-25 19:39:37 +00:00
kaniini	503139b343	Merge branch 'fix-all-custom-fields-deleted' into 'develop' ... Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596	2019-08-25 19:35:28 +00:00
kPherox	b15e226593	Change to delete empty name field	2019-08-25 07:34:15 +09:00
kPherox	705b5adfc4	Fix type of fields_attributes ... Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`	2019-08-25 07:34:14 +09:00
kPherox	45e21a9df4	Rename fields to fields_attributes	2019-08-25 07:34:11 +09:00
kPherox	3549cd9754	Change to use attachment only when fields do not exist	2019-08-25 01:28:38 +09:00
lain	90986667ce	Merge branch 'admin-create-users' into 'develop' ... user creation admin api will create multiple users See merge request pleroma/pleroma!1170	2019-08-24 16:04:19 +00:00
lain	efb8818e9e	Activity Expiration: Switch to 'expires_in' system.	2019-08-24 17:22:48 +02:00
lain	1692fa8945	ActivityExpirationWorker: Fix merge issues.	2019-08-24 17:22:26 +02:00
Maksim Pechnikov	654d291b6d	update tests	2019-08-24 17:41:53 +03:00
Maksim Pechnikov	6062017493	put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")	2019-08-24 17:17:17 +03:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
Ivan Tashkinov	581123f8bb	[#1149] Introduced quantum job scheduler. Documentation & config changes.	2019-08-23 18:28:23 +03:00
Ivan Tashkinov	c056736daa	[#1149] Publisher worker fix (atomized params keys).	2019-08-23 16:11:39 +03:00
Ivan Tashkinov	c29686309e	[#1149] Upgraded oban from 0.6.0 to 0.7.1.	2019-08-23 09:23:10 +03:00
Maksim Pechnikov	8dc6a6b210	fix /inbox for Relay	2019-08-22 22:48:07 +03:00
Maksim Pechnikov	399ca9133b	fix test	2019-08-22 21:54:37 +03:00
Maksim Pechnikov	f95b67c933	Merge branch 'develop' into issue/1177	2019-08-22 21:13:03 +03:00
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 21:01:28 +03:00
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	2019-08-22 20:59:58 +03:00
Egor Kislitsyn	a79ebac592	Improve AP routes rate limit	2019-08-22 16:03:43 +07:00
Maksim Pechnikov	64bfb41c55	fixed unfollow for relay actor	2019-08-22 06:57:55 +03:00
Sachin Joshi	37229af15f	remove old user create and delete routes for admin	2019-08-22 00:15:00 +05:45
lain	f740d786a3	Merge branch 'rate-limit-ap-routes' into 'develop' ... [#1174] Rate limit AP routes See merge request pleroma/pleroma!1586	2019-08-21 16:45:20 +00:00
lain	74f7f308f8	Merge branch 'fix/admin-api-user-deletion' into 'develop' ... Fix deactivated user deletion See merge request pleroma/pleroma!1546	2019-08-20 19:34:47 +00:00
Egor Kislitsyn	8d899d6197	Add :ap_routes rate limit	2019-08-20 22:10:36 +07:00
lain	8340fe8fcc	Merge branch 'digest-template' into 'develop' ... Improve digest email template See merge request pleroma/pleroma!1565	2019-08-20 12:55:51 +00:00
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	2019-08-20 12:44:14 +00:00
Maxim Filippov	5171aa5b4d	Refactor check_actor_is_active	2019-08-19 20:36:25 +03:00
lain	d2c9befc64	Merge branch 'develop' into 'fix/reverse-proxy-body-too-large' ... # Conflicts: # CHANGELOG.md	2019-08-19 17:00:59 +00:00
Sergey Suprunenko	75a5dd41ee	Add more tests for Database tasks and DigestEmailWorker	2019-08-19 16:10:00 +00:00
lain	49ae3191df	Merge branch 'hotfix/user_unfollow' into 'develop' ... [#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579	2019-08-19 14:36:10 +00:00
kaniini	475fcb3e6c	Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' ... Clear follow requests when blocking a user See merge request pleroma/pleroma!1583	2019-08-18 21:59:22 +00:00
kaniini	18c8c8d176	Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' ... Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575	2019-08-18 21:57:55 +00:00
Sadposter	94e336d9d5	clear follow requests when blocking a user	2019-08-18 20:30:57 +01:00
Mark Felder	ef82f868d9	Formatting	2019-08-16 10:00:18 -05:00
Maksim Pechnikov	3315a2a1c3	fixed User.unfollow with synchronization external user	2019-08-16 15:58:42 +03:00
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' ... Extended Pleroma Conversations See merge request pleroma/pleroma!1535	2019-08-16 12:55:33 +00:00
Egor Kislitsyn	158231cd20	Add configurable colors and logo for the digest template	2019-08-16 18:32:25 +07:00
sadposter	1da00eb1b0	add describe to gab rewrite	2019-08-16 10:58:32 +01:00
sadposter	3fc4b078f2	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-16 10:54:53 +01:00
Mark Felder	6a3b1a526e	max_body_size -> max_body_length, as it should be	2019-08-15 15:34:41 -05:00
rinpatch	fba3c16d20	Fix OAuth cleanup worker unconditionally starting ... !1576 removed enabled/disabled check from the worker, in favor of just not starting it in application.ex if disabled. However a line unconditionally starting the worker was removed	2019-08-15 20:36:20 +03:00
kaniini	1c8f58a30e	Merge branch 'features/formatting-sub_sup' into 'develop' ... html.ex: Allow sub and sup elements by default Closes #1191 See merge request pleroma/pleroma!1572	2019-08-15 17:34:16 +00:00
rinpatch	1ad71592ad	Parallelize template rendering	2019-08-15 18:05:50 +03:00
rinpatch	a4a3e3becd	Hide muted theads from home/public timelines unless with_muted is set	2019-08-15 17:37:30 +03:00
lain	9fb71ce7f4	Merge branch 'cache-follow-state' into 'develop' ... Cache follow state Closes #1180 See merge request pleroma/pleroma!1573	2019-08-15 14:06:27 +00:00
Maxim Filippov	ec969eec51	Merge branch 'develop' into 'fix/admin-api-user-deletion' ... # Conflicts: # CHANGELOG.md	2019-08-14 22:45:32 +00:00
Maxim Filippov	2b94ae3b39	Do not check if actor is active when deleting a user	2019-08-15 01:35:29 +03:00
rinpatch	e8a8d50138	Collect stats immediately after init	2019-08-15 01:01:13 +03:00
rinpatch	bd5ad0af78	Cache follow state	2019-08-15 00:47:30 +03:00
Haelwenn (lanodan) Monnier	a6a814420d	html.ex: Allow sub and sup elements by default ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191	2019-08-14 22:49:13 +02:00
rinpatch	31d576de0c	Merge branch 'misc-otp-issues' into 'develop' ... Misc OTP issues See merge request pleroma/pleroma!1567	2019-08-14 19:22:15 +00:00
rinpatch	dc902ad3df	Merge branch 'fix/http-signatures-post' into 'develop' ... activitypub: publisher: add (request-target) to http signature when POSTing See merge request pleroma/pleroma!1569	2019-08-14 19:16:52 +00:00
kaniini	1754f8ce6d	Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex	2019-08-14 19:05:44 +00:00
Ariadne Conill	5bb418a90d	activitypub: publisher: add (request-target) to http signature when POSTing	2019-08-14 19:01:51 +00:00
Ariadne Conill	626e094589	MRF: fix up unserializable option lists in describe implementations	2019-08-14 18:54:17 +00:00
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-14 21:44:50 +03:00
Ivan Tashkinov	a180c1360e	[#1149] Oban mailer job. Adjusted tests.	2019-08-14 21:42:21 +03:00
stwf	c43152f6c1	fix formatting	2019-08-14 14:01:11 -04:00
stwf	d81f63845a	Implement Pleroma.Stats as GenServer	2019-08-14 11:59:33 -04:00
stwf	574856ef01	streamline Streamer pings	2019-08-14 11:58:32 -04:00
stwf	15ef521009	Isolate OAuth.Token.CleanWorker	2019-08-14 11:57:50 -04:00
stwf	51bdf0cab6	use default child_specs	2019-08-14 11:55:17 -04:00
lain	d3af9e19ed	Conversations: Load relations in one query.	2019-08-14 17:01:11 +02:00
Egor Kislitsyn	c9970feee2	Fix compatibility with Elixir 1.8	2019-08-14 21:03:25 +07:00
lain	f73212b2a3	Conversation: Render new participation on update.	2019-08-14 15:56:15 +02:00
lain	df81abb68c	Conversations: Use correct oauth paths for extended api.	2019-08-14 15:55:43 +02:00