2593 commits

Author	SHA1	Message	Date
Maksim Pechnikov	4ad15ad2a9	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
Maksim Pechnikov	0cb8e710fb	add test	2019-06-25 18:06:08 +03:00
Maksim	a0c4ebb4d7	[#184] small refactoring reset password	2019-06-24 19:01:56 +00:00
Sergey Suprunenko	2c63c67512	Rework user deletion	2019-06-24 18:59:12 +00:00
Eugenij	f2c03425b0	Broadcast conversation update when DM is deleted	2019-06-24 07:14:04 +00:00
kaniini	27b9605de0	Merge branch 'rich_media_titles_two' into 'develop' ... Rich media titles two See merge request pleroma/pleroma!1325	2019-06-23 05:43:11 +00:00
Alex S	b37ede5df3	log capturing	2019-06-23 08:16:28 +03:00
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +03:00
Sachin Joshi	a0c65bbd6c	Merge branch 'develop' into 'remove-avatar-header' ... # Conflicts: # CHANGELOG.md	2019-06-23 03:25:50 +00:00
Alex S	410add1c30	support for tuples with more than 2 values	2019-06-22 17:30:53 +03:00
lain	0e415921cd	Rich Media Parser: Do not return just a title if nothing else is there.	2019-06-22 16:22:59 +02:00
lain	58c4d5312b	Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" ... This reverts commit b6af80f769.	2019-06-22 15:12:57 +02:00
Alex S	f0fccb7578	fix for int and modules	2019-06-22 09:01:30 +03:00
kaniini	55742d978d	Merge branch 'feature/mrf-anti-link-spam' into 'develop' ... implement anti link spam MRF See merge request pleroma/pleroma!1307	2019-06-21 22:56:54 +00:00
kaniini	e3534f5b3c	Merge branch 'oauth_secure_redirect' into 'develop' ... OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302	2019-06-21 22:31:12 +00:00
kaniini	720412bf24	Merge branch 'revert-6f5a0cc1' into 'develop' ... Revert "Merge branch 'fix/ogp-title' into 'develop'" See merge request pleroma/pleroma!1317	2019-06-21 22:28:46 +00:00
feld	b6af80f769	Revert "Merge branch 'fix/ogp-title' into 'develop'" ... This reverts merge request !1277	2019-06-21 11:36:32 +00:00
Egor Kislitsyn	fc6e661672	Fix rate limiter tests	2019-06-21 16:47:16 +07:00
Alexander Strizhakov	32320c1ee9	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
William Pitcock	21dacd4b15	unbreak polls	2019-06-19 16:33:49 +00:00
William Pitcock	736d8ad6be	implement anti link spam MRF	2019-06-19 15:58:32 +00:00
Alexander Strizhakov	e4fa6b99ac	aliases for mix tasks ... ecto.migrate ecto.rollback	2019-06-19 10:33:33 +00:00
lain	5c6c4ce634	Merge branch 'fix/rich-media-hashtags-again' into 'develop' ... Rich Media: Skip Microformats hashtags See merge request pleroma/pleroma!1304	2019-06-19 08:48:41 +00:00
rinpatch	035368d363	Rich Media: Skip Microformats hashtags ... When fixing this problem I incorrectly assumed a.hashtag is the proper way for detecting hashtags, but it is just something Pleroma and Mastodon add. Per microformats it should be detected by the presense of rel=tag. This MR adds a check for rel=tag, but I still left a.hashtag just in case	2019-06-19 00:46:30 +03:00
Ivan Tashkinov	9f45f93949	Added more redirect_uri checks to prevent redirect to not explicitly listed URI.	2019-06-18 17:00:49 +03:00
rinpatch	c7acca2abb	Mastodon API: Sanitize display names ... Closes #1000	2019-06-18 14:12:11 +03:00
rinpatch	49a49d3763	Merge branch 'removing-test-errors' into 'develop' ... Removing test errors See merge request pleroma/pleroma!1296	2019-06-17 14:16:23 +00:00
Haelwenn	c34327b22e	Merge branch 'fix/sanitize-report-content' into 'develop' ... Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293	2019-06-16 18:05:00 +00:00
Alex S	2e2edcb461	capturing errors	2019-06-16 20:10:12 +08:00
Alex S	0f59265a50	salmon fix ... removed some ownership sandbox error	2019-06-16 20:10:12 +08:00
Maksim	a04bf131e0	[#570] add user:notification stream	2019-06-16 10:33:25 +00:00
rinpatch	bf6aa6f1a8	Fix report content stopping to be nullable	2019-06-16 13:06:12 +03:00
rinpatch	44de34d170	Credo fixes	2019-06-16 01:35:45 +03:00
rinpatch	e943905bd7	Add tests for report view	2019-06-16 01:30:14 +03:00
kaniini	52b1b0e45d	Merge branch '963_oob_oauth_redirect_fix' into 'develop' ... [#963] No redirect on OOB OAuth authorize request with existing authorization See merge request pleroma/pleroma!1276	2019-06-15 13:45:50 +00:00
lain	a440cf856d	Mastodon API: Return the token needed for the chat.	2019-06-15 10:59:35 +02:00
rinpatch	62ffc00a5d	Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' ... AccountView: Add user background. See merge request pleroma/pleroma!1280	2019-06-14 16:49:28 +00:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
lain	7f48b90bfb	Merge branch 'fix/hashtag-rich-media' into 'develop' ... Fix hashtags being picked up by rich media parser Closes #989 See merge request pleroma/pleroma!1288	2019-06-14 11:52:04 +00:00
Maksim	ee4ed87fb4	[#948] /api/v1/account_search added optional parameters (limit, offset, following)	2019-06-14 11:39:57 +00:00
rinpatch	d0ebc0edf3	Fix hashtags being picked up by rich media parser ... Closes #989	2019-06-14 14:34:42 +03:00
lain	eac298083f	MastodonAPI: Add a way to update the background image.	2019-06-14 11:19:22 +02:00
lain	5965efb216	AccountView: Add user background.	2019-06-13 19:08:05 +02:00
lain	6f5a0cc14e	Merge branch 'fix/ogp-title' into 'develop' ... Rich Media Parser: Attempt to use <title> from HTML as a fallback Closes #979 See merge request pleroma/pleroma!1277	2019-06-13 13:26:39 +00:00
Egor Kislitsyn	30e54fd7e2	Handle HTTP 404 response	2019-06-13 17:13:35 +07:00
Egor Kislitsyn	afae3ada22	Handle HTTP "410 Gone" response	2019-06-13 16:34:03 +07:00
Egor Kislitsyn	a12f8e13c8	Improve <title> fallback; Add a test	2019-06-13 15:02:46 +07:00
Ivan Tashkinov	4b2c29016c	[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.	2019-06-12 21:30:06 +03:00
Egor Kislitsyn	6f29865d43	Add option to restrict all users to local content	2019-06-11 21:25:53 +07:00
lain	63ab3c30eb	Merge branch 'feature/rate-limiter' into 'develop' ... Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266	2019-06-11 11:32:01 +00:00
Egor Kislitsyn	ad04d12de6	Replace MastodonAPIController.account_register/2 rate limiter	2019-06-11 16:06:03 +07:00
Egor Kislitsyn	2e5affce61	Add RateLimiter	2019-06-11 14:27:41 +07:00
kaniini	f2d72b1fe4	Merge branch 'preload-changes' into 'develop' ... Conversations: Fetch users in one query. See merge request pleroma/pleroma!1258	2019-06-11 02:37:08 +00:00
Sergey Suprunenko	365268d522	Add more tests for using media_proxy and whitelists	2019-06-10 11:34:11 +00:00
rinpatch	dffc9f060a	replace missing mock with a 404	2019-06-07 20:48:25 +03:00
rinpatch	d020f68e87	Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched	2019-06-07 20:40:38 +03:00
lain	970f71e222	Conversations: Fetch users in one query.	2019-06-07 17:51:47 +02:00
Roman Chvanikov	01fe5abad1	Resolve conflicts	2019-06-07 01:20:50 +03:00
lain	cb2bcee842	User Search: Boost friends more strongly.	2019-06-06 16:18:27 +02:00
lain	7e9f7ea0c2	MastodonAPI: Add test for user search.	2019-06-06 16:16:22 +02:00
Egor	f82382de22	[#943] Make the unauthenticated users limitation optional	2019-06-06 12:17:49 +00:00
kaniini	3f6da9c45a	Merge branch 'bugfix/377-stuck-follow-request' into 'develop' ... Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250	2019-06-05 15:52:40 +00:00
kaniini	a511d2f900	Merge branch 'improve-search' into 'develop' ... [#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220	2019-06-05 15:51:32 +00:00
lain	ad19bfc7fe	Utils: Split update_follow_state and update_follow_state_for_all.	2019-06-05 16:43:35 +02:00
lain	827a51e777	CommonAPI: Add test for accept_follow_request.	2019-06-05 15:45:16 +02:00
lain	076c9ae40e	User: Remove superfluous maybe_follow.	2019-06-05 14:24:31 +02:00
lain	3115b64cfe	Transmogrifier: Add tests for incoming follows to locked accounts.	2019-06-05 14:10:46 +02:00
Egor Kislitsyn	cfa5572d28	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 17:53:15 +07:00
lain	024dfdc39c	Typo + Linting.	2019-06-05 12:45:28 +02:00
lain	8b9a0dd4a7	User: Don't error out when following a user that's already followed. ... This leads to a few situations where it is impossible to follow a user.	2019-06-05 12:06:45 +02:00
Egor Kislitsyn	5b04f07a1e	Limit search for unauthenticated users to local users only	2019-06-05 16:51:04 +07:00
Egor Kislitsyn	17a6f81f7b	Fix tests with enabled RUM	2019-06-05 16:37:43 +07:00
Egor Kislitsyn	93397fce3d	Contain search for unauthenticated users	2019-06-05 16:37:43 +07:00
kaniini	e4babb1c9f	Merge branch 'explicit-addressing' into 'develop' ... Explicit addressing See merge request pleroma/pleroma!1239	2019-06-05 08:28:20 +00:00
Egor Kislitsyn	6ba9055b51	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-05 12:54:30 +07:00
Roman Chvanikov	b1b1a270e8	Fix conflict	2019-06-05 02:45:21 +03:00
Haelwenn	ab4915edcb	Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop' ... Participations: Filter out participations without activities. Closes #956 and #953 See merge request pleroma/pleroma!1246	2019-06-04 15:34:55 +00:00
Maksim Pechnikov	d3d1704e84	Merge branch 'develop' into issue/941	2019-06-04 15:06:58 +03:00
lain	a3a7178b60	Participations: Filter out participations without activities.	2019-06-04 13:58:36 +02:00
rinpatch	bbff7554de	Add tests for get_existing_votes	2019-06-04 13:47:53 +03:00
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-06-04 16:28:23 +07:00
lain	4cab98b7bf	Merge remote-tracking branch 'origin/develop' into explicit-addressing	2019-06-04 11:23:46 +02:00
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	2019-06-04 05:49:54 +00:00
Sergey Suprunenko	84cc131b59	Add missing HTTP Request mocks	2019-06-04 05:46:19 +00:00
kaniini	9d2563a3de	Merge branch 'generic-fe-settings' into 'develop' ... Generic settings store for frontend user settings See merge request pleroma/pleroma!1221	2019-06-04 05:43:43 +00:00
Roman Chvanikov	f6036ce3b9	Fix tests	2019-06-04 03:38:53 +03:00
Roman Chvanikov	bd325132ca	Fix tests	2019-06-04 03:07:49 +03:00
Roman Chvanikov	3e17610587	Add task to test emails	2019-06-04 02:48:21 +03:00
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
Maksim Pechnikov	64ada7f960	fix tests	2019-06-03 22:51:14 +03:00
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	2019-06-03 21:02:57 +03:00
lain	804b6a4d8f	CommonAPI.Utils: Add tests.	2019-06-03 19:08:38 +02:00
lain	80d4d83aac	CommonAPI: Add explicit addressing.	2019-06-03 18:17:08 +02:00
lain	2b664b048e	User: Add function to get AP ids from nicknames.	2019-06-03 18:16:11 +02:00
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 13:16:17 +03:00
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	2019-06-03 09:48:37 +00:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	2019-06-02 23:33:15 +03:00
rinpatch	c47da0e65d	Add tests for poll view	2019-06-02 23:25:33 +03:00
William Pitcock	38a275b31f	test: add tests for subchain policy	2019-06-02 10:08:51 +00:00
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	2019-06-02 08:25:37 +00:00
Sachin Joshi	e394fc2eef	fix the flaky test for users creation by admin	2019-06-02 09:49:59 +05:45
rinpatch	cfa588e357	Fix Credo issues	2019-06-01 21:42:29 +03:00
rinpatch	65db5e9f52	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	2019-06-01 16:17:46 +03:00
Sachin Joshi	ad5263c647	Merge remote-tracking branch 'upstream/develop' into admin-create-users	2019-06-01 11:42:37 +05:45
Sachin Joshi	5534d4c676	make bulk user creation from admin works as a transaction	2019-06-01 11:17:53 +05:45
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	2019-06-01 03:39:13 +00:00
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	2019-06-01 03:26:45 +00:00
kaniini	d46cc7896e	Merge branch 'bugfix/remove-vanilla-flavour' into 'develop' ... Bugfix: remove vanilla flavour See merge request pleroma/pleroma!1228	2019-06-01 03:26:05 +00:00
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	2019-06-01 03:24:08 +00:00
Sachin Joshi	d4304a3945	add the missing mock file	2019-06-01 08:37:10 +05:45
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	2019-06-01 01:44:10 +02:00
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	2019-05-31 13:26:48 +00:00
lain	7861974ab2	MastodonAPI: Add extension to set and get pleroma_settings_store.	2019-05-31 14:50:18 +02:00
lain	aaad85c4d9	AccountView: settings -> settings_store	2019-05-31 14:49:46 +02:00
lain	eb2963bc43	User: Add settings store to Info, AccountView ... This is to provide a generic frontend settings storage mechanism for all kinds of frontends.	2019-05-31 14:27:15 +02:00
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM	2019-05-31 15:25:17 +03:00
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	2019-05-31 14:17:05 +03:00
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	2019-05-31 11:27:14 +02:00
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	2019-05-30 21:03:31 +00:00
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	2019-05-30 13:16:08 +00:00
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
Maksim	db94294dfb	[#936] fix tests	2019-05-29 14:04:58 +00:00
Sachin Joshi	1452a96ad6	ability to set and reset avatar, profile banner and backgroud in Mastodon API	2019-05-27 15:31:01 +05:45
lambda	5bb843ceec	Merge branch 'refactor/die-httpoison-die' into 'develop' ... remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203	2019-05-26 13:33:11 +00:00
William Pitcock	79503ce90f	mrf: simple policy: fix matching imported activitypub and ostatus statuses	2019-05-26 02:01:24 +00:00
William Pitcock	45e4642a58	tests: chase remote/local removal	2019-05-26 00:20:54 +00:00
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	2019-05-25 05:31:13 +00:00
William Pitcock	0f7eeb0943	tests: add tests for non-follows/non-followers settings	2019-05-25 05:25:40 +00:00
William Pitcock	1542cccbbc	tests: chase notification setting changes	2019-05-25 05:22:13 +00:00
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00
William Pitcock	80d55d428f	tests: websub: check only that signature validation succeeds or fails	2019-05-25 04:34:16 +00:00
Aaron Tinio	9415932af5	Keep nodeinfo available when not federating	2019-05-25 08:15:12 +08:00
Sergey Suprunenko	bbea5691da	Mention all people in the beginning of DM	2019-05-24 20:34:23 +00:00
feld	f916e4cdd9	Move the Cache Control header test to its own file ... We can consolidate our cache control header tests here	2019-05-24 20:33:55 +00:00
Egor Kislitsyn	a7affbdd6d	Fix tests	2019-05-24 21:41:11 +07:00
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-24 21:05:57 +07:00
Sachin Joshi	0c53d91f3b	fix merge conflict	2019-05-23 09:45:12 +02:00
William Pitcock	8086c7aed6	tests: add tests for banner and avatar removal	2019-05-22 18:53:12 +00:00
rinpatch	19c90d47c4	Normalize poll votes to Answer objects	2019-05-22 21:17:57 +03:00
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	2019-05-22 15:44:50 +00:00
lambda	714d8d4ef9	Merge branch 'feature/object-pruning' into 'develop' ... Object pruning See merge request pleroma/pleroma!1181	2019-05-22 11:04:30 +00:00
lambda	ff363f70b5	Merge branch 'refactor/keys' into 'develop' ... move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186	2019-05-22 06:28:16 +00:00
rinpatch	cdac5efd10	Merge branch 'bugfix/account_view_source.note' into 'develop' ... MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189	2019-05-22 05:39:01 +00:00
Haelwenn (lanodan) Monnier	0e2c215a00	MastoAPI AccountView: fill source.note with plaintext version of note ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/926	2019-05-22 07:22:19 +02:00
Sachin Joshi	17bfd000d7	Ability to reset avatar, profile banner and backgroud	2019-05-22 06:47:18 +02:00
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	2019-05-22 04:06:54 +00:00
kaniini	ab6e15622b	Merge branch 'fix/api-fallback' into 'develop' ... Do not fallback to index.html for /api/* routes Closes #920 See merge request pleroma/pleroma!1182	2019-05-22 04:05:41 +00:00
Sergey Suprunenko	9134848170	Do not truncate DM when it contains newlines and safe_dm_mentions is set to true	2019-05-22 04:04:20 +00:00
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
Aaron Tinio	f76268135c	Fix failing test	2019-05-22 07:16:11 +08:00
Aaron Tinio	3ab9255eda	Respond with a 404 Not implemented JSON error message ... when requested API is not implemented	2019-05-22 07:15:52 +08:00
Aaron Tinio	a13d449b24	Add tests for fallback routes	2019-05-22 05:39:29 +08:00
William Pitcock	73df9d690d	object: fetcher: add support for reinjecting pruned objects	2019-05-21 21:38:56 +00:00
rinpatch	63b0b7190c	MastoAPI: Add GET /api/v1/polls/:id	2019-05-21 20:40:35 +03:00
rinpatch	0407ffe75f	Change validation error status codes to be more appropriate	2019-05-21 17:12:38 +03:00
rinpatch	aafe30d94e	Handle poll votes	2019-05-21 14:12:10 +03:00
rinpatch	3f96b3e4b8	Enforce poll limits and add error handling for MastodonAPI's post endpoint	2019-05-21 10:54:20 +03:00
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	2019-05-21 09:13:10 +03:00
kaniini	d4847b17ca	Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' ... Add virtual :thread_muted? field Closes #901 See merge request pleroma/pleroma!1178	2019-05-20 23:30:19 +00:00
Aaron Tinio	eb02edcad9	Add virtual :thread_muted? field ... that may be set when fetching activities	2019-05-21 00:35:46 +08:00
Sadposter	dc916ba15f	Format mascot tests	2019-05-20 12:58:17 +01:00
Sadposter	e81f0fc6d4	Add mascot get/set tests	2019-05-20 12:58:06 +01:00
Aaron Tinio	2375e9a95b	Add report filtering to MRF.SimplePolicy	2019-05-20 06:02:50 +08:00
rinpatch	5ece901af3	Resolve merge conflicts and remove IO.inspects	2019-05-18 13:37:38 +03:00
rinpatch	fd920c8973	Mastodon API: Add support for posting polls	2019-05-18 13:29:28 +03:00
William Pitcock	dc08159538	also suppress link previews from posts marked #nsfw	2019-05-17 22:13:24 +00:00
William Pitcock	0da1233e8e	rich media: suppress link previews if post is marked as sensitive	2019-05-17 18:49:43 +00:00
lain	f959bf7aa6	MongooseIM: Add basic integration endpoints.	2019-05-17 18:21:11 +02:00
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-17 19:57:14 +07:00
Egor Kislitsyn	f2936e0a07	Add ap_id to List	2019-05-17 19:56:37 +07:00
lain	249b31ffe5	Fix specs.	2019-05-17 11:49:13 +02:00
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	2019-05-17 07:25:20 +00:00
Sachin Joshi	5c028b8f92	user creation admin api will create multiple users	2019-05-17 12:21:58 +05:45
Aaron Tinio	443cd68a4c	Add tests for MRF.SimplePolicy	2019-05-17 09:02:34 +08:00
kaniini	bf84d50c76	Merge branch 'feature/890-add-report-uri' into 'develop' ... Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164	2019-05-16 20:11:12 +00:00
Sergey Suprunenko	2c303afc8b	Remove duplicated entries in users' following lists	2019-05-16 20:04:08 +00:00
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	2019-05-16 19:09:18 +00:00
feld	e190b3022b	Merge branch 'fix/domain-unblocked-reblogs' into 'develop' ... Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157	2019-05-16 18:57:14 +00:00
Mark Felder	ebb0482116	Merge branch 'develop' into conversations-import	2019-05-16 13:11:17 -05:00
lambda	fde30aee43	Merge branch 'feature/sql-thread-sat' into 'develop' ... SQL thread visibility solver See merge request pleroma/pleroma!971	2019-05-16 13:44:22 +00:00
Alexander Strizhakov	73ae58fdfa	Feature/896 toggling confirmation	2019-05-16 13:23:41 +00:00
Egor Kislitsyn	fc7246d715	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-16 17:54:24 +07:00
Alex S	4711d8151c	try this	2019-05-16 17:35:07 +07:00
Alex S	aa11fa4864	add report uri and report to	2019-05-16 12:49:40 +07:00
Aaron Tinio	2b6119dfbf	Restrict reblogs of activities from blocked domains	2019-05-16 05:53:51 +08:00
Aaron Tinio	64495b96e9	Add test for blocked domains	2019-05-16 05:53:51 +08:00
rinpatch	62e42b03ab	Handle incoming Question objects	2019-05-15 20:10:16 +03:00
William Pitcock	f09c3afdf5	chase test failures	2019-05-15 16:23:01 +00:00
William Pitcock	c7644313e7	test: update obsolete test	2019-05-15 15:54:10 +00:00
lain	f168a1cbdc	Merge remote-tracking branch 'origin/develop' into conversations-import	2019-05-15 17:47:29 +02:00
kaniini	62516be9c4	Merge branch 'fix/public-option-not-working' into 'develop' ... Fix public option not working Closes #873 See merge request pleroma/pleroma!1143	2019-05-15 15:42:21 +00:00
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	2019-05-15 15:37:31 +00:00
William Pitcock	4429c1b7da	tests: fixup	2019-05-15 15:29:42 +00:00
lain	cbb3451023	CommonAPI: Refactor visibility, forbid public to private replies.	2019-05-15 16:30:08 +02:00
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	2019-05-15 15:29:59 +05:45
Egor Kislitsyn	a7a8f3bc2c	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-15 14:31:24 +07:00
Aaron Tinio	70c81b95d0	Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug	2019-05-15 05:09:32 +08:00
Aaron Tinio	7b8dc99ef1	Implement Pleroma.Plugs.EnsurePublicOrAuthenticated	2019-05-15 05:09:29 +08:00
William Pitcock	071f78733a	switch to pleroma/http_signatures library	2019-05-14 20:03:13 +00:00
kaniini	dfd031c26a	Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop' ... Fix Pleroma.Config.get!/1 raising an error when value is false See merge request pleroma/pleroma!1148	2019-05-14 14:58:45 +00:00
Maksim	52297920e7	Refactoring oauth response.	2019-05-14 14:49:45 +00:00
Egor Kislitsyn	d474995efa	Add Tests	2019-05-14 20:12:47 +07:00
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-14 18:15:56 +07:00
Aaron Tinio	a18b2c0b12	Fix Pleroma.Config.get!/1 raising an error when value is false	2019-05-14 06:40:59 +08:00
lambda	b14a314ce7	Merge branch 'feature/federator-behaviours' into 'develop' ... federator modularization (outgoing) See merge request pleroma/pleroma!1140	2019-05-13 18:58:04 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	2019-05-14 00:13:15 +05:45
rinpatch	15cda998f3	Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type	2019-05-13 10:32:04 +03:00
William Pitcock	582bd9d170	tests: fix AP test failures	2019-05-12 14:40:57 +00:00
William Pitcock	d823eb921b	tests: fix salmon tests	2019-05-12 14:35:38 +00:00
William Pitcock	2b847d4add	tests: chase federator publish_single_foo removals	2019-05-12 05:04:24 +00:00
kaniini	131f883207	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129	2019-05-11 16:52:26 +00:00
Sachin Joshi	f01f995816	make url uniform in admin api	2019-05-11 14:46:00 +05:45
Roman Chvanikov	f1f7a11222	Merge develop	2019-05-11 14:45:54 +07:00
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	2019-05-09 19:58:34 -04:00
rinpatch	e4523c3010	Fix get_in_reply_to in OStatus' activity representer depending on embedded objects	2019-05-09 22:27:00 +03:00
lain	a33bec7d58	Conversations: Import order, import as read.	2019-05-09 16:39:28 +02:00
lain	a4598b5e8b	Visibility: Make it more resilient.	2019-05-08 18:08:50 +02:00
lain	fcf2f38d20	Conversations: Add a function to 'import' old DMs.	2019-05-08 17:37:00 +02:00
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
rinpatch	4c5125dedc	Remove bookmarks assoc and add a fake bookmark assoc instead	2019-05-07 19:33:22 +00:00
rinpatch	3a7c14645e	- Actually use preloaded bookmarks in views ... - Preload bookmarks in bookmark timeline - Rework bookmark preload tests	2019-05-07 19:33:22 +00:00
rinpatch	f841eb7cdb	Preload bookmarks wherever the object is preloaded	2019-05-07 19:33:22 +00:00
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	2019-05-07 14:43:21 +00:00
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-07 16:51:11 +07:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	2019-05-06 17:17:03 +00:00
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00
lain	eb0fb73ddb	BBS: Credo fixes.	2019-05-04 15:47:50 +02:00
lain	c58fd4c038	BBS: Fix tests.	2019-05-04 15:36:48 +02:00
lain	4c76f49e60	BBS: small fixes.	2019-05-04 15:06:18 +02:00
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	2019-05-04 15:00:45 +02:00
Haelwenn (lanodan) Monnier	b5ad1715b2	MastoAPI: profile update with emoji_map	2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier	d70af32127	Pleroma.User: remove emojify on parse_bio	2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier	85b5c60694	Pleroma.Formatter: width/height to class=emoji	2019-05-03 16:25:58 +02:00
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	2019-05-03 13:39:14 +02:00
lambda	497d34b825	Merge branch 'iss-849' into 'develop' ... Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103	2019-05-02 14:17:17 +00:00
AkiraFukushima	a53a6c9d64	Add oauth plug tests for url and body parameters	2019-05-02 22:25:21 +09:00
Roman Chvanikov	8af55728e4	Fix tests	2019-05-01 19:03:55 +02:00
lain	45f790becc	Merge remote-tracking branch 'origin/develop' into conversations_three	2019-05-01 18:40:41 +02:00
Maksim	c854bff8f5	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
lambda	0bcdaf378e	Merge branch 'bugfix/web-notification-special-char' into 'develop' ... fix the web push notification with special char for status created See merge request pleroma/pleroma!1092	2019-05-01 10:45:32 +00:00
Alex S	f11e7037c2	test fixes	2019-05-01 16:09:53 +07:00
Sachin Joshi	cd6da3606b	Merge branch 'develop' into bugfix/web-notification-special-char	2019-05-01 00:21:30 +05:45
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	2019-04-29 18:15:30 +02:00
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	2019-04-29 06:45:18 +00:00
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	2019-04-28 23:05:14 +00:00
rinpatch	61ca2f7a4e	Fix rights in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	2019-04-28 19:42:43 +03:00
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	2019-04-27 23:55:54 +03:00
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	2019-04-27 23:06:46 +03:00
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	2019-04-27 07:44:24 +00:00
William Pitcock	ef52aa0e66	tests: fix up for changed bbcode library output and verify html is properly escaped	2019-04-26 22:45:45 +00:00
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	2019-04-26 11:59:47 +00:00
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	2019-04-26 02:41:35 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00
Alex S	85953c0836	fixes for tests	2019-04-25 13:46:40 +07:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
Alex S	73d01857e3	bookmarks in separate table	2019-04-25 13:38:24 +07:00
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	2019-04-25 00:48:45 +00:00
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	2019-04-24 20:01:42 +03:00
Sachin Joshi	963d5774af	fix the status notification with special char	2019-04-24 07:06:17 +05:45
kaniini	030a7876b4	Merge branch 'security/fix-html-class-scrubbing' into 'develop' ... html: lock down allowed class attributes to only those related to microformats See merge request pleroma/pleroma!1090	2019-04-23 23:07:56 +00:00
William Pitcock	f5535e5743	html: lock down allowed class attributes to only those related to microformats	2019-04-23 23:03:45 +00:00
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00
rinpatch	f60d072bbb	Add pleroma.in_reply_to_account_acct to MastoAPI status entity	2019-04-22 11:54:27 +03:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	2019-04-22 02:07:19 +00:00
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	2019-04-21 20:26:13 +07:00
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	2019-04-21 10:51:32 +03:00
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	2019-04-21 05:40:22 +03:00
Roman Chvanikov	724311e151	Fix Credo warnings	2019-04-20 19:57:43 +07:00
Roman Chvanikov	60f213bb1a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-20 19:43:06 +07:00
Ekaterina Vaartis	aef3a3ca46	Fix tests that used finmoji	2019-04-20 11:34:00 +03:00
Ekaterina Vaartis	52ed287e87	Fix incorrect multiple emoji tag handling introduced in initial impl	2019-04-20 11:17:17 +03:00
eugenijm	fa48532387	Handle reblogs on the first follow request in MastoAPI	2019-04-20 04:39:49 +03:00
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	2019-04-19 16:55:33 +00:00
Roman Chvanikov	73407f4eea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-19 23:27:13 +07:00
Roman Chvanikov	bc7862106d	Fix tests	2019-04-19 23:26:41 +07:00
Roman Chvanikov	8add119444	Add User.list_inactive_users_query/1	2019-04-19 22:19:00 +07:00
Roman Chvanikov	aeafa0b2ef	Add Notification.for_user_since/2	2019-04-19 22:16:17 +07:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	2019-04-19 07:49:26 +00:00
rinpatch	4ef237f26a	Fix my incorrect search test fix	2019-04-18 14:37:57 +03:00
rinpatch	83589ca6a5	Merge branch 'develop' into feature/database-compaction	2019-04-18 12:56:38 +03:00
rinpatch	6069d0fd36	Fix object search depending on embeded object	2019-04-18 09:28:20 +03:00
rinpatch	2abc09570f	Use the preloaded object in tag queries	2019-04-18 01:37:04 +03:00
William Pitcock	36f78c6dcd	activitypub: fix filtering of boosts from blocked users	2019-04-17 22:27:59 +00:00
William Pitcock	2140e164d7	activitypub: properly filter out transitive activities concerning blocked users	2019-04-17 20:05:09 +00:00
rinpatch	35ac672b8d	Remove containment tests from transmogrifier and fix thread visibility solver	2019-04-17 17:59:15 +03:00
rinpatch	d1eb578a57	Refactor tests that used ActivityPub.fetch_object_from_id	2019-04-17 17:03:35 +03:00
rinpatch	8e4d950f31	Remove updating reply count for embeded objects	2019-04-17 15:54:09 +03:00
rinpatch	ff8d76c670	Refactor all tests that acessed the embeded object	2019-04-17 15:46:59 +03:00
rinpatch	54b82f236b	Fix note count test	2019-04-17 15:03:17 +03:00
rinpatch	ad681877df	Make credo happy	2019-04-17 14:52:01 +03:00
rinpatch	e7c3c36766	Update functions in object fetcher for tesla and set up a proper mock for tests	2019-04-17 14:21:39 +03:00
rinpatch	b09ae02c04	Added some more normalization calls all in mastodon api controller	2019-04-17 13:04:58 +03:00
Roman Chvanikov	2f0203a4a1	Resolve conflicts	2019-04-17 16:59:05 +07:00
Roman Chvanikov	87013f8438	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-17 16:58:08 +07:00
rinpatch	dda4e0e2a8	Fix warnings in object tests	2019-04-17 12:27:29 +03:00
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	2019-04-16 18:44:07 +00:00
Haelwenn	cde7711b12	Merge branch 'bugfix/relax-spam-protection' into 'develop' ... activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069	2019-04-16 18:38:11 +00:00
Normandy	d4a749cfb2	Handle new-style mastodon follow lists ... Fixes https://git.pleroma.social/pleroma/pleroma/issues/814	2019-04-16 18:35:38 +00:00
William Pitcock	750b369d04	activitypub: allow indirect messages from users being followed at a personal inbox	2019-04-16 18:31:12 +00:00
lain	76999c73a7	Conversation: Add accounts to output.	2019-04-15 22:28:42 +02:00
lain	0da985182f	Conversation: Return full status object, id is a string.	2019-04-15 21:58:58 +02:00
lain	c1ebb38d3a	Conversation: Also create participations for remote users. ... Needed to get the participating user list.	2019-04-15 21:45:25 +02:00
lambda	56956de6fa	Merge branch 'fix/status-reblogged' into 'develop' ... Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057	2019-04-15 10:26:23 +00:00
lambda	f358295cbe	Merge branch 'unfollow-oneself' into 'develop' ... Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061	2019-04-15 10:24:37 +00:00
eugenijm	27d78dc526	Use User.get_cached_by*	2019-04-15 12:37:49 +03:00
rinpatch	fd2e31af86	oops	2019-04-15 11:59:01 +03:00
rinpatch	5d73dca064	Remove inReplyToStatusId	2019-04-15 11:50:36 +03:00
eugenijm	507e7821e3	Handle follow/unfollow directed to themselves	2019-04-15 10:21:18 +03:00
Roman Chvanikov	dc21181f65	Update updated_at field on notification read	2019-04-14 22:29:05 +07:00
eugenijm	679a8ef629	Assign reblogged in the Mastodon reblog status view	2019-04-14 11:35:15 +03:00
Roman Chvanikov	0cd4b6024d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-14 14:05:21 +07:00
Roman Chvanikov	371a4aed2c	Add User.Info.email_notifications	2019-04-13 17:40:42 +07:00
Alex S	c5d0fffeaf	naming fix	2019-04-13 14:55:42 +07:00
Alex S	c349573791	Merge develop to 788-separate-email-addresses ... Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs	2019-04-13 12:24:38 +07:00
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' ... Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	2019-04-12 10:41:09 +00:00
Egor Kislitsyn	d0304b4f92	more tests	2019-04-12 16:51:28 +07:00
Egor Kislitsyn	dd097a406b	add tests	2019-04-12 16:38:32 +07:00
lambda	0a09692c7d	Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' ... Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976	2019-04-12 09:34:12 +00:00
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	2019-04-12 02:28:46 +00:00
Alexander Strizhakov	e03d24af96	in_reply_to_id - null	2019-04-12 02:21:32 +00:00
lain	6f880b1627	Conversation: Fix tests.	2019-04-11 13:31:20 +02:00
lain	36ec8d9694	ActivityPub: Fix specs.	2019-04-11 13:20:46 +02:00
Ivan Tashkinov	c3f12cf3c3	[#923] OAuth consumer params handling refactoring. ... Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.	2019-04-10 21:40:38 +03:00
lain	c352a0aba6	Conversations: Make tests run.	2019-04-10 17:48:31 +02:00
lain	cf353514fe	Participations: Add last activity.	2019-04-10 17:28:02 +02:00
lain	20d9b90760	Participation: Get for a user.	2019-04-10 17:05:33 +02:00
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	2019-04-10 16:33:45 +02:00
lain	64c1c3a407	Participations: Add marking as read and unread.	2019-04-10 15:12:01 +02:00
lain	d1da6b155a	Conversation: Add Conversations and Participations.	2019-04-10 15:01:42 +02:00
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	2019-04-10 18:06:54 +07:00
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	2019-04-10 10:10:08 +00:00
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
lain	b5cecebbc1	Conversations: Fix specs.	2019-04-10 09:32:17 +02:00
lambda	c8440b5e0c	Merge branch 'fix/emoji-api-nonsense' into 'develop' ... Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038	2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	2019-04-10 06:33:20 +02:00
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	2019-04-10 02:10:31 +00:00
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
rinpatch	144648de92	Merge branch 'mastoapi/plaintext-statuses' into 'develop' ... Provide plaintext representations of content/cw in MastoAPI Closes #787 See merge request pleroma/pleroma!1035	2019-04-09 17:25:31 +00:00
lambda	0a02ed7a2f	Merge branch 'bugfix/follower_count' into 'develop' ... update the follower count when a follower is blocked See merge request pleroma/pleroma!1033	2019-04-09 07:30:38 +00:00
Sachin Joshi	07afb9b537	update the follower count when a follower is blocked	2019-04-09 09:15:45 +05:45
Alex S	fee50636d0	removing not needed invite update	2019-04-08 20:08:16 +07:00
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	2019-04-08 14:10:51 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
Sadposter	13ff312c48	Sever subscription in case of block	2019-04-08 12:46:12 +01:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
Alexander Strizhakov	36c0a10fdf	adding language tag	2019-04-08 11:03:10 +00:00
Alex S	f0ca0696c8	test for valid_invite?	2019-04-08 17:06:04 +07:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Ivan Tashkinov	44829d9181	AdminApiControllerTest unused variables fix.	2019-04-08 12:32:55 +03:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
lambda	b177e1e7f3	Merge branch 'scheduled-activities' into 'develop' ... Scheduled activities See merge request pleroma/pleroma!989	2019-04-08 09:08:18 +00:00
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Sadposter	76fdfd1c7f	Add check on activity visibility in sub notification	2019-04-07 15:11:29 +01:00
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	2019-04-07 19:48:52 +07:00
feld	fb2040d061	Merge branch 'fix/deactivated-user-error' into 'develop' ... Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031	2019-04-06 22:19:30 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
eugenijm	b3870df51f	Handle scheduled_at on status creation.	2019-04-06 23:55:58 +03:00
eugenijm	7bf622ce73	Add scheduled activities	2019-04-06 23:55:58 +03:00
eugenijm	7aa53d52bd	Return 403 on oauth token exchange for a deactivated user	2019-04-06 23:27:55 +03:00
feld	876965a7e7	Merge branch 'fix/failed-legacy-test' into 'develop' ... Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS See merge request pleroma/pleroma!1030	2019-04-06 16:03:35 +00:00
Alex S	ce8d457132	little channges	2019-04-06 22:38:35 +07:00
Alex S	76d8928cf1	fix for field name	2019-04-06 20:49:43 +07:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07:00
Alex S	47b07cec49	token -> invite renaming	2019-04-06 20:24:22 +07:00
Alex S	be54e40890	twitter api registration ... fix for twitter api tests	2019-04-06 17:18:59 +07:00
Alex S	0484f3a8b1	generating tokens with mix	2019-04-06 16:58:22 +07:00
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	2019-04-05 23:36:42 +00:00
Sergey Suprunenko	e9c075d05c	Mock :crypt.crypt/2 because otherwise the test fails on Mac OS	2019-04-05 22:48:11 +02:00
Mark Felder	fac76bfa35	We actually want the user id not nickname in the test...	2019-04-05 12:11:19 -05:00
Mark Felder	c746087f57	Also remove Repo functions in the tests	2019-04-05 11:59:56 -05:00
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	2019-04-05 11:27:07 -05:00
Sadposter	a270e7a191	Mix format everything	2019-04-05 17:07:58 +01:00
Sadposter	f6e131eeb9	Don't use twitterAPI for subscription tests	2019-04-05 17:02:09 +01:00
Sadposter	9ca91cbb87	Change relationship direction of subscriptions	2019-04-05 17:02:07 +01:00
Sadposter	73afd13c21	Add subscription key to one test I forgot about	2019-04-05 15:37:36 +01:00
Sadposter	06cd547fc6	Format subscriptions related stuff	2019-04-05 15:30:34 +01:00
Sadposter	d56866c824	Add subscribed status to user view ... Added in pleroma extensions, but can be moved whenever	2019-04-05 15:30:31 +01:00
Sadposter	75c4ceb4a2	Add tests for subscriptions	2019-04-05 15:30:29 +01:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	3e7f2bfc2f	[#923] OAuthController#callback adjustments (with tests).	2019-04-05 09:19:17 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Ivan Tashkinov	f7cd9131d4	[#923] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +03:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Haelwenn	0cb94cfa94	Merge branch 'fix-slow-relationships' into 'develop' ... ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011	2019-04-02 18:43:48 +00:00
lambda	256b492a58	Merge branch 'bugfix/wrong-date-format' into 'develop' ... Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004	2019-04-02 14:18:23 +00:00
lambda	a79ce94dd4	Merge branch 'feature/fake-statuses' into 'develop' ... Add fake status submit See merge request pleroma/pleroma!995	2019-04-02 14:17:43 +00:00
lain	39bcf93007	Merge remote-tracking branch 'origin/develop' into fix-slow-relationships	2019-04-02 16:10:38 +02:00
lain	fd07745d1b	ActivityPub Utils: Greatly speed up the follow / block activity fetching.	2019-04-02 16:08:55 +02:00
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs	2019-04-02 20:39:52 +07:00
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' ... [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	2019-04-02 12:47:40 +00:00
lambda	ce9284b36f	Merge branch 'remove-user-activities' into 'develop' ... [#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008	2019-04-02 12:45:29 +00:00
lambda	b95cf3d490	Merge branch 'get_by_id' into 'develop' ... Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010	2019-04-02 12:43:28 +00:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	2019-04-02 14:31:18 +03:00
Egor Kislitsyn	20c619f85f	replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests	2019-04-02 17:58:32 +07:00
lambda	091baf9316	Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' ... MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999	2019-04-02 10:57:38 +00:00
lambda	26d509cc86	Merge branch 'get_by_id' into 'develop' ... Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009	2019-04-02 10:52:29 +00:00
cascode	95c92c49c9	Fix account lookup for nicknames beginning with numbers	2019-04-02 10:51:33 +00:00
Egor Kislitsyn	9a59c26619	replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)	2019-04-02 17:47:52 +07:00
Ivan Tashkinov	15ce710460	Added "GET /oauth/authorize" tests.	2019-04-02 13:43:33 +03:00
Egor Kislitsyn	11c2d6bdc4	change Repo.get(Activity, id) => Activity.get_by_id(id) in tests	2019-04-02 17:08:03 +07:00
Egor Kislitsyn	1b3d921921	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
Sergey Suprunenko	3db9235150	Ignore dates in wrong formats	2019-04-02 11:32:36 +02:00
Egor Kislitsyn	a14742f495	add user delete_activities mix task	2019-04-02 16:30:11 +07:00
Alex S	484162c187	test fix	2019-04-02 16:26:40 +07:00
Alex S	9b2188da7c	refactoring of emoji tags config to use groups	2019-04-02 15:44:56 +07:00
Ivan Tashkinov	aac48d0cc6	Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations	2019-04-02 09:19:10 +03:00
Sachin Joshi	6386c1c9c1	fetch url for OStatus to know if it is a/c or status	2019-04-02 10:26:09 +05:45
Sergey Suprunenko	b6f9f7b8aa	Handle dates in the Unix timestamp format (Fixes #763)	2019-04-01 22:45:24 +02:00
Sachin Joshi	1d01e8e656	[OStatus] adds status to pleroma instance if the url given is a status	2019-04-01 22:26:58 +05:45
Alex S	17d3d05a71	code style ... little fix	2019-04-01 17:54:30 +07:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
lain	e3bf6655ba	Add replying.	2019-03-31 21:24:29 +02:00
lain	10fdc080a0	BBS: Tests and formatting.	2019-03-31 20:35:10 +02:00
rinpatch	1bb4d5d65b	Implement fake status submit	2019-03-29 21:59:04 +03:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier	6b407872b4	mastodon_api_controller.ex: Use min_id in link header instead of since_id	2019-03-28 17:23:21 +01:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	55d086b520	Notification controls ... Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances	2019-03-28 07:52:07 +03:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
lambda	926bf114b7	Merge branch 'feature/more-user-filters' into 'develop' ... Add more user filters + move search to its own module See merge request pleroma/pleroma!982	2019-03-27 11:33:13 +00:00
rinpatch	776bb5137f	Fix muting reblogs tests	2019-03-27 13:43:43 +03:00
Maxim Filippov	3cf7539bca	Add more user filters + move search to its own module	2019-03-27 03:51:59 +05:00
eugenijm	a4ab60ac54	Add vapid_key to the POST /api/v1/apps response	2019-03-26 23:27:37 +03:00
eugenijm	691d1208b5	Add GET /api/v1/apps/verify_credentials	2019-03-26 21:53:28 +03:00
lambda	ff3b09f6b3	Merge branch 'fix/ap-icon' into 'develop' ... Do not federate instance avatar Closes #759 See merge request pleroma/pleroma!977	2019-03-26 16:12:50 +00:00
lambda	c6ab5ebe7c	Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' ... Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979	2019-03-26 16:01:52 +00:00
lain	10a7a4a868	AP UserView: Refactor banner / avatar display code, add test.	2019-03-26 16:59:28 +01:00
Ivan Tashkinov	47b49ab1a1	Test for MastoAPI /api/v1/instance response structure (formatting fix).	2019-03-26 18:18:36 +03:00
lambda	9e3899bf36	Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' ... Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978	2019-03-26 15:13:55 +00:00
Ivan Tashkinov	caf0e9cf33	Test for MastoAPI /api/v1/instance response structure.	2019-03-26 18:13:24 +03:00
lambda	21ff78cd40	Merge branch 'replies-count' into 'develop' ... Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974	2019-03-26 14:49:09 +00:00
rinpatch	aacdcac1be	Credo is upset about me not remembering the alphabet	2019-03-26 17:35:45 +03:00
rinpatch	087662d4fb	Fix formatting	2019-03-26 17:18:18 +03:00
rinpatch	406d19331f	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
eugenijm	568e348588	Increment replies_count on replies (MastoAPI)	2019-03-26 15:27:04 +03:00
Ivan Tashkinov	263ca3dea2	Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.	2019-03-26 15:09:06 +03:00
William Pitcock	26b0c802c3	fix up missing announcements with preloads	2019-03-25 07:38:09 +00:00
rinpatch	a32bcab04b	Merge branch 'fix/eldap-warnings' into 'develop' ... Ignore compilation warnings for undefined module :eldap See merge request pleroma/pleroma!956	2019-03-24 11:17:40 +00:00
William Pitcock	4a3dd86a55	tests: fix up activity collision test	2019-03-23 03:17:51 +00:00
William Pitcock	aaec91b9a1	relay test: don't do preloading (since follow objects are activities, it's a mess)	2019-03-23 01:23:02 +00:00
William Pitcock	73efe95368	activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)	2019-03-23 01:09:12 +00:00
lambda	fee360e581	Merge branch 'safe-mentions' into 'develop' ... NodeInfo: Return safe_dm_mentions feature flag. See merge request pleroma/pleroma!964	2019-03-22 11:03:56 +00:00
lain	e2afce34b6	NodeInfo: Return safe_dm_mentions feature flag.	2019-03-22 11:57:20 +01:00
rinpatch	3229c7a1d6	Ensure fts is prefered over trigram and use union_all instead of union in user search query	2019-03-22 08:39:49 +03:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
William Pitcock	a223e65f35	tests: fixup	2019-03-21 23:56:57 +00:00
William Pitcock	3cc2554fa3	mastodon api: add conversation_id extension (ref #674)	2019-03-21 23:25:41 +00:00
William Pitcock	fea3696799	common api: move context functions from twitterapi	2019-03-21 23:24:04 +00:00
lain	bf27190f7f	UtilController: Return state of safe dm mentions.	2019-03-21 16:20:58 +01:00
link0ff	f858df819b	Skip tests in LDAPAuthorizationTest if :eldap module is unavailable	2019-03-21 12:31:16 +02:00
kaniini	b68fb3dc17	Merge branch 'imageoptim' into 'develop' ... used imageOptim to reduce size of image files See merge request pleroma/pleroma!944	2019-03-21 00:59:24 +00:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Maxim Filippov	ed8a2935f5	Use ILIKE to search users	2019-03-20 01:37:40 +03:00
William Pitcock	455bb526f6	test: add test for list sanitization	2019-03-19 17:53:40 +00:00
William Pitcock	fd0aa58ee0	tests: add test for as:Public issues	2019-03-19 17:49:29 +00:00
optikfluffel	00c5d7248f	fix UploadTest to use new image_tmp.jpg	2019-03-19 10:10:48 +01:00
optikfluffel	a907522690	used imageOptim to reduce size of image files	2019-03-19 10:10:48 +01:00
kaniini	43bd7f47db	Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop' ... Order users by nickname See merge request pleroma/pleroma!945	2019-03-18 23:08:31 +00:00
eugenijm	1588688a11	Added support for exclude_types, limit, and min_id in Mastodon ... notifications. Unify Mastodon-compatible pagination logic.	2019-03-18 11:27:27 +03:00
Haelwenn (lanodan) Monnier	42d034505a	Add test for conversation API beforehand	2019-03-17 16:51:26 +01:00
Fong-Wan Chau	4ed2618f6c	Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).	2019-03-17 11:03:19 -04:00
Maxim Filippov	76a13bc5a2	Fix test	2019-03-17 13:29:28 +03:00
Maxim Filippov	93291c3d7a	Order users by nickname	2019-03-17 13:23:31 +03:00
kaniini	6d6f48d079	Merge branch 'feature/federated-flags' into 'develop' ... Federated reports See merge request pleroma/pleroma!935	2019-03-16 19:27:56 +00:00
lambda	28df397454	Merge branch 'feature/oauth-me' into 'develop' ... oauth: add me property to token responses See merge request pleroma/pleroma!942	2019-03-16 08:44:02 +00:00
kaniini	c69dc2acf1	Merge branch 'feature/reblog-muting' into 'develop' ... Implement mastodon's reblog hiding feature See merge request pleroma/pleroma!916	2019-03-16 04:31:31 +00:00
William Pitcock	40134598a8	test: fix defective ldap setup/teardown	2019-03-16 04:05:19 +00:00
William Pitcock	e0edc706cf	oauth: add me property to token responses	2019-03-16 01:12:50 +00:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
kaniini	8b352af4dd	Merge branch 'feature/openldap-support' into 'develop' ... OpenLDAP support Closes #203 See merge request pleroma/pleroma!859	2019-03-15 19:57:09 +00:00
link0ff	a070dd4a83	Add tests for LDAP authorization	2019-03-15 16:28:46 +02:00
Karen Konou	ebfc10c834	Fix streamer test	2019-03-15 14:20:08 +01:00
Karen Konou	da53c079db	Refactor to store user ap_id, add tests	2019-03-15 14:20:08 +01:00
Karen Konou	13c298d354	Fix tests to assume reblogs shown by default	2019-03-15 14:18:21 +01:00
Haelwenn	41fc67aa49	Merge branch 'mastoapi/mime_type' into 'develop' ... Extend MastoAPI to provide attachment mimetypes See merge request pleroma/pleroma!938	2019-03-15 09:48:50 +00:00
rinpatch	d7a34b604b	Extend MastoAPI to provide attachment mimetypes	2019-03-15 11:58:12 +03:00
kaniini	0f42ea87d6	Merge branch 'notifications-is-seen' into 'develop' ... MastoAPI notifications is_seen See merge request pleroma/pleroma!934	2019-03-15 02:59:17 +00:00
eugenijm	100413bf2c	Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests	2019-03-15 01:35:48 +03:00
rinpatch	cbdd11c381	Merge develop to bump elixir version in the CI so I don't get failing formatting	2019-03-14 22:33:20 +03:00
rinpatch	355f285a86	Fix uploaded media plug test	2019-03-14 22:26:54 +03:00
William Pitcock	414d4b8088	test: add a test for accepting inbound Flag activities	2019-03-14 19:04:33 +00:00
rinpatch	e2fe796c63	Add some tests	2019-03-14 22:02:48 +03:00
Maxim Filippov	257d8e78e5	Add tags	2019-03-14 01:52:24 +03:00
Maxim Filippov	4872914d32	Add test when local is false	2019-03-13 17:56:15 +03:00
Maxim Filippov	d5edff6ce6	Fix test	2019-03-13 16:14:31 +03:00
Maxim Filippov	490d9cf7b1	Add "local" to users admin API	2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier	23960309a0	[Credo] Change quoted string with 3+ quotes to sigils	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	c42d34b2ec	[Credo] fix Credo.Check.Readability.MaxLineLength	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	fb82f6fc7c	[Credo] Remove parentesis on argument-less functions	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	a3a9cec483	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier	6c8743d0c0	[Credo] Fix the warnings	2019-03-13 04:17:30 +01:00
Maxim Filippov	25eb6cf1cb	Add "roles" to users admin API	2019-03-12 22:15:28 +03:00
kaniini	c231ed610a	Merge branch 'masto-api-followers-following' into 'develop' ... MastoAPI followers/following endpoints See merge request pleroma/pleroma!924	2019-03-12 16:27:47 +00:00
eugenijm	984b5f8adf	MastoAPI followers/following endpoints	2019-03-12 16:01:24 +03:00
rinpatch	faf238c1b0	Fix upload tests	2019-03-12 15:33:15 +03:00
lain	3474066f6d	MastoAPI Accounts: Add fetching by nickname. ... This is to make it easier for the frontends to handle domain.com/users/nickname urls.	2019-03-11 15:18:32 +01:00
lambda	2c8deecdd2	Merge branch 'add-local-field-to-status' into 'develop' ... MastoAPI StatusView: Add locality indicator. See merge request pleroma/pleroma!920	2019-03-11 13:26:12 +00:00
lain	4811eefa6e	MastoAPI StatusView: Add locality indicator.	2019-03-11 13:48:27 +01:00
eugenijm	6038c8a753	Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec	2019-03-11 09:02:03 +03:00
kaniini	735f40047a	Merge branch 'delete-status' into 'develop' ... Allow an admin to delete a user status #721 (MastoAPI) See merge request pleroma/pleroma!914	2019-03-08 22:47:41 +00:00
kaniini	130fc9eae6	Merge branch 'fetch-posts-on-first-federation' into 'develop' ... Fetch user's outbox posts on first federation with that user Closes #131 See merge request pleroma/pleroma!907	2019-03-08 22:33:31 +00:00
eugenijm	2827dfea50	Allow an admin to delete a user status	2019-03-08 20:21:56 +03:00
Ekaterina Vaartis	b775fded10	Add tests for fetch_ordered_collection	2019-03-08 16:28:40 +03:00
William Pitcock	3c5926fe91	tests: add regression test	2019-03-07 12:20:04 +00:00
rinpatch	992145e64c	Merge branch 'bugfix/delete-activity-audience' into 'develop' ... expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891	2019-03-07 11:31:08 +00:00
eugenijm	7342b5a45f	Preserve parameters in link headers (Mastodon API)	2019-03-07 09:12:16 +03:00
kaniini	0fe715f3ba	Merge branch 'chore/merge-search-into-list-users' into 'develop' ... Merge search endpoint into /users See merge request pleroma/pleroma!898	2019-03-06 22:27:42 +00:00
kaniini	07f8c79a69	Merge branch 'bugfix/rel-me_list' into 'develop' ... Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901	2019-03-06 13:20:51 +00:00
Maksim	bc7570c282	[#647] tests for web push	2019-03-06 13:20:12 +00:00
Haelwenn	96901b6554	Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop' ... Properly escape reserved URI charachters in upload urls Closes #700 See merge request pleroma/pleroma!905	2019-03-06 01:45:17 +00:00
Karen Konou	28d5b40d0a	Add handling of objects not in database	2019-03-05 23:15:22 +01:00
rinpatch	40ff8f5964	Add tests for reserved char escaping in upload	2019-03-05 19:28:58 +03:00
rinpatch	bcd8ef65e0	Merge branch 'add-admin-to-node-info' into 'develop' ... Include admins in nodeinfo Closes #689 See merge request pleroma/pleroma!899	2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier	788a354ce0	Web.RelMe: Fix having other values in rel attr ... One example of this is Github which puts a rel="nofollow me" on the profile link.	2019-03-05 02:13:22 +01:00
eugenijm	d1de0a30cc	Include admins in nodeinfo	2019-03-05 03:17:24 +03:00
Maxim Filippov	e34710b988	Format & update docs	2019-03-04 21:33:53 +03:00
William Pitcock	9f3cb38012	helpers: use AutoLinker to validate URIs as well as the other tests	2019-03-04 18:31:49 +00:00
William Pitcock	d7a278a733	tests: add tests for rich media helper functions	2019-03-04 18:31:49 +00:00
kaniini	d45dbdce5a	Merge branch 'feature/add-status-text-to-notifications' into 'develop' ... Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897	2019-03-04 18:29:13 +00:00
Maxim Filippov	f620199836	Merge search endpoint into /users	2019-03-04 21:26:32 +03:00
Maxim Filippov	cc7b35e097	Add status text to notifications (mentions and reposts)	2019-03-04 20:47:34 +03:00
kaniini	ca5d894e68	Merge branch 'fix/like-adressing' into 'develop' ... Stop adresssing like activities to actor's follower collection on non-public posts See merge request pleroma/pleroma!896	2019-03-04 15:59:57 +00:00
rinpatch	33c614bce0	Stop adresssing like activities to actor's follower collection on non-public posts	2019-03-04 18:09:58 +03:00
Karen Konou	aab86698a5	Expand "to" of delete activities	2019-03-04 11:18:45 +01:00
eugenijm	86e4b48a5e	Fix DM visibility for blocking users	2019-03-04 06:24:27 +03:00
kaniini	ace4231628	Merge branch 'features/bio_rel_me' into 'develop' ... Add rel=me to the User bio Closes #423 See merge request pleroma/pleroma!813	2019-03-03 16:00:49 +00:00
kaniini	6c6a2dbfdd	Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop' ... Add pagination and search to users See merge request pleroma/pleroma!873	2019-03-03 15:59:15 +00:00
kaniini	b531e366df	Merge branch 'get-follow-requests-sql' into 'develop' ... Use sql query in User.get_follow_requests/1 for filtering logic See merge request pleroma/pleroma!883	2019-03-03 15:51:32 +00:00
kaniini	c93479c6f5	Merge branch 'count-only-public-statuses' into 'develop' ... Increment user note count only on public activities #703 See merge request pleroma/pleroma!884	2019-03-03 15:49:19 +00:00
eugenijm	d5418e9ff7	Remove follow_request_count as it's not needed for FE anymore. ... MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses `GET /api/pleroma/friend_requests` which they query on the initial page load.	2019-03-03 18:42:27 +03:00
lambda	9b63fda9c7	Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' ... [#675] Do not show DMs in mentions timeline See merge request pleroma/pleroma!877	2019-03-03 11:13:59 +00:00
eugenijm	c46950d3b1	Increment user note count only on public activities	2019-03-03 14:08:43 +03:00
eugenijm	1a1f4520cd	Use sql query in User.get_follow_requests/1 for filtering logic	2019-03-02 22:18:56 +03:00
Maxim Filippov	bf30df99cb	We do not guarantee the order of elements when we search	2019-03-02 17:32:40 +03:00
Maxim Filippov	2ec8cf5665	Add pagination to search	2019-03-02 17:21:30 +03:00
rinpatch	f38c316e6e	Merge branch 'bugfix/oauth-scopes-join' into 'develop' ... Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881	2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier	7b9868f343	Pleroma.UserTest: Add tests for rel=me	2019-03-02 06:59:09 +01:00
Haelwenn (lanodan) Monnier	8e6f7fdb86	RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil	2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier	25e588496a	Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe	2019-03-02 06:31:33 +01:00
Haelwenn (lanodan) Monnier	bb9e40968a	Web.OAuth.OAuthControllerTest: Add test against token formatting	2019-03-02 04:10:57 +01:00
Maxim Filippov	a25c1313ae	Format	2019-03-01 21:07:05 +03:00
Maxim Filippov	aaa9fed1ca	Fix user_test	2019-03-01 20:58:47 +03:00
Maxim Filippov	f384a9a256	Format	2019-03-01 20:23:19 +03:00
Maxim Filippov	f1a4c3163b	Show current user in users list as well	2019-03-01 20:23:03 +03:00
Maxim Filippov	5b08b470f6	Add "local" params to users search	2019-03-01 20:13:02 +03:00
rinpatch	9c6abec4d8	use commonapi.post instead of activitybulder	2019-03-01 15:48:04 +03:00
rinpatch	1341ee650e	[#675] Do not show DMs in mentions timeline	2019-03-01 09:37:29 +03:00
Maxim Filippov	46f29b9da1	Add search users endpoint	2019-02-28 19:04:47 +03:00
Maxim Filippov	70e82a3465	Add test for the second page	2019-02-28 17:54:02 +03:00
kaniini	cf426a719d	Merge branch 'with-mutes' into 'develop' ... Add `with_muted` param. Closes #683 See merge request pleroma/pleroma!872	2019-02-28 10:22:19 +00:00
kaniini	089e2588a3	Merge branch 'speedup-follow-requests' into 'develop' ... Speedup follow requests Closes #677 See merge request pleroma/pleroma!871	2019-02-28 10:10:03 +00:00
kaniini	3c849d0438	Merge branch 'deactivated-in-user-view' into 'develop' ... Add activation status to the regular user view See merge request pleroma/pleroma!874	2019-02-28 10:08:31 +00:00
eugenijm	6b11011039	Added deactivated to the user view	2019-02-28 09:08:34 +03:00
Maxim Filippov	2883f75a3a	Add pagination to users admin API	2019-02-28 01:11:56 +03:00
lain	bbbdbec4fd	Remove parts of the old activity view. ... Not used anymore.	2019-02-27 17:24:51 +01:00
lain	9ade1242c2	Add user muted status info to twitterapi.	2019-02-27 16:52:03 +01:00
lain	c1ae495878	Add user muted status info to MastodonAPI.	2019-02-27 16:46:47 +01:00
lain	c4235f96bd	Add with_muted param.	2019-02-27 16:37:42 +01:00
lain	8d8cb08f94	Add follow request test.	2019-02-27 14:51:07 +01:00
William Pitcock	1536640962	mastodon api: embed relationship card under account card for Pleroma FE convenience	2019-02-27 13:01:10 +00:00
Egor Kislitsyn	5d961d536c	fix formatter	2019-02-27 15:40:30 +07:00
Maxim Filippov	ed7fd6b47e	Add missing docs and tests	2019-02-27 03:08:03 +03:00
Egor	c3ac9424d2	AutoLinker	2019-02-26 23:32:26 +00:00
lain	9e0686efa6	Move visibility into own module.	2019-02-22 13:29:52 +01:00
lain	62296f5a25	Fix private post card handling.	2019-02-22 12:02:51 +01:00
KZ	7c722c08f5	Fix: Fixing an outbox related bug when local user activity is empty	2019-02-22 04:37:48 +00:00
William Pitcock	e95dbecf3e	tests: fix formatting	2019-02-20 20:49:10 +00:00
William Pitcock	aa45674be6	tests: add test for fetching AP objects with application/json.	2019-02-20 20:45:09 +00:00
William Pitcock	3ee77e95b2	tests: fix tests	2019-02-20 17:23:05 +00:00
Egor	bff9eb5ef7	Reports	2019-02-20 16:51:25 +00:00
lain	59c27f29c8	Add some nicer urls in status view.	2019-02-20 17:36:16 +01:00
Ivan Tashkinov	b574d97c2e	[#468] Added support for push OAuth scope (Mastodon 2.4+).	2019-02-20 17:27:41 +03:00
Ivan Tashkinov	6fe7acd58e	[#468] Merged upstream/develop.	2019-02-20 16:48:59 +03:00
lambda	11b3c10c54	Merge branch 'muting' into 'develop' ... Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319	2019-02-20 13:19:37 +00:00
lain	4196d9af11	Add test for User.mutes and so on.	2019-02-20 14:14:52 +01:00
lain	9ae79bb71a	Add test for muting functionality.	2019-02-20 13:47:44 +01:00
Ivan Tashkinov	337367d764	[#468] More OAuth scopes-specific tests.	2019-02-20 12:27:28 +03:00
Ivan Tashkinov	04ee877a20	[#468] Added OAuth scopes-specific tests.	2019-02-19 22:28:21 +03:00
Ekaterina Vaartis	ad2cf4fd86	Add test for mastodon muting endpoints	2019-02-19 21:49:55 +03:00
eugenijm	25b9e7a8c3	Added admin API for changing user activation status	2019-02-19 19:37:02 +03:00
Ivan Tashkinov	c0ecbf6669	[#468] Merged upstream/develop.	2019-02-19 19:10:55 +03:00
kaniini	833161b5d2	Merge branch 'feature/jobs' into 'develop' ... Job Queue See merge request pleroma/pleroma!732	2019-02-18 19:43:06 +00:00
kaniini	7456338ed3	Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' ... Add OAuth tokens endpoint See merge request pleroma/pleroma!805	2019-02-18 04:02:41 +00:00
kaniini	c23bd05737	Merge branch 'features/flavour-switching' into 'develop' ... [MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807	2019-02-18 04:01:51 +00:00
kaniini	cd019a5927	Merge branch 'follow-request-count' into 'develop' ... Follow request count See merge request pleroma/pleroma!817	2019-02-18 04:01:26 +00:00
kaniini	3f38a05571	Merge branch 'csv-export' into 'develop' ... Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833	2019-02-18 03:59:46 +00:00
Maxim Filippov	fd17a0cc9b	Fix test	2019-02-18 00:10:48 +03:00
lambda	79e503b3f5	Merge branch 'docker-speedup' into 'develop' ... Docker speedup See merge request pleroma/pleroma!837	2019-02-17 17:38:25 +00:00
lambda	ae84af4ad0	Merge branch 'fix/hellthread-policy-recipient-check' into 'develop' ... Fix recipient count in hellthread policy See merge request pleroma/pleroma!836	2019-02-17 16:57:57 +00:00
lain	71c8c60ded	More speedup, test fixes.	2019-02-17 17:47:24 +01:00
rinpatch	d0a94f98e0	more tests for HellthreadPolicy	2019-02-17 14:33:44 +03:00
Ivan Tashkinov	bc4f77b10b	[#468] Merged upstream/develop, resolved conflicts.	2019-02-17 14:07:04 +03:00
Ivan Tashkinov	dcf24a3233	[#468] Refactored OAuth scopes' defaults & missing selection handling.	2019-02-17 13:49:14 +03:00
Haelwenn (lanodan) Monnier	72a4272d84	Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching	2019-02-16 19:52:46 +01:00
lain	f469a8610f	Check that the welcome message is sent from the correct user.	2019-02-16 17:24:31 +01:00
lain	38e15930cb	Add option to return all friends in twitter api. ... Mainly useful for user export.	2019-02-16 17:01:15 +01:00
lain	d812a347ca	Add optional welcome message.	2019-02-16 16:42:34 +01:00
rinpatch	921571c19b	Merge branch 'hellthread-filter-fix' into 'develop' ... Hellthread filter fix Closes #634 See merge request pleroma/pleroma!831	2019-02-15 13:18:35 +00:00
Karen Konou	dca6bee2f7	Rename test, add check for follower collection when delisting	2019-02-15 13:43:14 +01:00
rinpatch	b63a5e309d	Merge branch 'bugfix/actor-containment' into 'develop' ... activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829	2019-02-15 12:27:03 +00:00
Karen Konou	d943c90249	Add tests, change default config values, fix a bug	2019-02-15 12:47:50 +01:00
eugenijm	ecdf0657ba	Add logic for keeping follow_request_count up-to-date on the follow, ... `approve_friend_request`, and `deny_friend_request` actions. Add follow_request_count to the user view.	2019-02-15 12:20:20 +03:00
William Pitcock	32b1649434	test: user: add a test for whether user search returns a user or not	2019-02-14 20:05:08 +00:00
lambda	ea2698beb7	Merge branch 'bugfix/activitypub-reserialization' into 'develop' ... activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826	2019-02-14 19:54:16 +00:00
Egor Kislitsyn	907306174b	fix S3 links encoding in Mediaproxy	2019-02-14 15:55:21 +07:00
kaniini	19756d68f2	Merge branch 'fix/credo-issues-test' into 'develop' ... Fix credo issues in ./test See merge request pleroma/pleroma!808	2019-02-14 03:55:26 +00:00
William Pitcock	e031cc6473	tests: update tests for totalItems leak fix	2019-02-14 03:22:54 +00:00
William Pitcock	64620d8980	activitypub: user view: do not expose oAuth endpoints for instance users	2019-02-14 02:41:21 +00:00
William Pitcock	889ad95a2a	tests: add some reserialization tests based on IR differences	2019-02-14 00:59:18 +00:00
Ivan Tashkinov	063baca5e4	[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.	2019-02-14 00:29:29 +03:00
William Pitcock	d54c483964	tests: add tests for endpoints	2019-02-13 19:48:24 +00:00
lain	88a4de24f9	User.follow_all: Respect blocks in both directions.	2019-02-13 13:52:27 +01:00
Maxim Filippov	62a45bdc11	Add revoke token	2019-02-13 12:59:56 +03:00
Maxim Filippov	61a4bc5095	Add OAuth tokens endpoint	2019-02-13 12:59:56 +03:00
rinpatch	379d04692c	Filter summary in keywordpolicy	2019-02-11 21:35:40 +03:00
Karen Konou	ac72b578da	Merge branch 'develop' into feature/thread-muting	2019-02-11 12:10:49 +01:00
Karen Konou	c01ef574c1	Refactor as per Rin's suggestions, add endpoint tests	2019-02-11 12:04:02 +01:00
lambda	d53e36bf1e	Revert "Merge branch 'object-creation' into 'develop'" ... This reverts merge request !802	2019-02-11 08:07:39 +00:00
Egor Kislitsyn	305d219413	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex	2019-02-11 13:54:21 +07:00
Haelwenn (lanodan) Monnier	74579115a7	test: Change lenght(…) == 0 to Enum.empty?(…)	2019-02-11 03:44:16 +01:00
Haelwenn (lanodan) Monnier	8bb7e19b38	test: de-group alias/es	2019-02-11 03:44:15 +01:00
rinpatch	e0de0fcf22	Merge branch 'object-creation' into 'develop' ... Do object insertion through Cachex See merge request pleroma/pleroma!802	2019-02-10 07:39:27 +00:00
kaniini	d5fe05c37e	Merge branch 'follow-enhancements' into 'develop' ... Respect blocks in mass follow. See merge request pleroma/pleroma!797	2019-02-09 21:03:42 +00:00
lain	f8388be9c6	Do object insertion through Cachex ... So we don't flood our postgres logs with errors. Should also make things slightly faster.	2019-02-09 22:01:08 +01:00
Karen Konou	6a150de3bd	Add unique index and unique constraint check, uniqueness test fails	2019-02-09 20:52:11 +01:00
Karen Konou	478a05b4c9	Merged "check mute" test into the other two	2019-02-09 18:34:00 +01:00
Karen Konou	a0d732ec55	it works!!	2019-02-09 17:47:57 +01:00
Karen Konou	4430a0ad12	added another test	2019-02-09 14:34:42 +01:00
Karen Konou	09189c3a7c	Made a test!	2019-02-09 14:23:51 +01:00
lain	bbd0049fae	Respect blocks in mass follow.	2019-02-09 13:24:23 +01:00
rinpatch	b05a341187	oof	2019-02-09 08:12:30 +03:00
rinpatch	9a23f8f3ea	Add tests and fix a typo in docs	2019-02-08 20:23:26 +03:00
Mark Felder	74518d0b60	hide_followings was renamed to hide_followers in the FE, but never synced up in the BE ... This was a dirty regex replace which worked on my server	2019-02-06 22:34:44 +00:00
Haelwenn	1220a17146	Merge branch 'bugfix/rich-media-card' into 'develop' ... rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785	2019-02-06 18:39:13 +00:00
William Pitcock	26670b09a7	tests: add a rich media card that contains all relevant fields	2019-02-06 18:27:55 +00:00
William Pitcock	6eb8c1eb92	test: add some regression tests for the rich media card rendering	2019-02-06 18:12:26 +00:00
Egor Kislitsyn	5b1d7c3c56	fix tests	2019-02-06 12:17:41 +07:00
Egor Kislitsyn	6f05f448f8	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-06 11:33:00 +07:00
eugenijm	035eaeb9b8	Allow to configure visibility for admin and moderator badges	2019-02-06 06:18:05 +03:00
eugenijm	398c81f9c8	Add is_admin and is_moderator boolean fields to the user view	2019-02-06 02:10:06 +03:00
William Pitcock	73e6a1f1dd	test: twitterapi: fix another possible test failure case	2019-02-05 20:08:16 +00:00
kaniini	eb2b1960e0	Merge branch 'feature/split-hide-network-v2' into 'develop' ... Split hide_network into hide_followers & hide_followings (fixed) See merge request pleroma/pleroma!765	2019-02-05 18:56:59 +00:00
William Pitcock	c4d317ccb6	test: twitterapi: fix the test breakage for real	2019-02-05 18:49:02 +00:00
Egor Kislitsyn	3a3a3996b7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex	2019-02-04 20:50:28 +07:00
Maxim Filippov	16ce129e38	Split hide_network into hide_followers & hide_followings (fixed)	2019-02-03 21:55:04 +03:00
lambda	69a38644bc	Merge branch '589-fix-cache' into 'develop' ... Resolve "Update object cache on favs/boosts" Closes #589 See merge request pleroma/pleroma!764	2019-02-03 18:19:40 +00:00
lain	e61f0be951	Unbreak all the tests.	2019-02-03 18:54:39 +01:00
lain	505a084058	Still do caching in tests.	2019-02-03 18:28:14 +01:00
Ivan Tashkinov	3913b0196e	[#582] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified. ... Added tests.	2019-02-03 13:28:13 +03:00
Ivan Tashkinov	b40b4bc4e5	[#582] Optimized federation retirement by reducing the number of SQL calls ... (calling `Instances.set_reachable/1` only if instance had `unreachable_since`, calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).	2019-02-03 12:41:27 +03:00
kaniini	486749064f	Revert "Merge branch 'feature/split-hide-network' into 'develop'" ... This reverts merge request !733	2019-02-01 20:22:58 +00:00
href	7e384a2425	Merge branch 'develop' into 'develop' ... Use nodeinfo 2.1 See merge request pleroma/pleroma!753	2019-02-01 19:18:46 +00:00
Luna	e8c7be38fc	add tests for nodeinfo 2.0 compat and 2.1's new field	2019-02-01 14:33:14 -03:00
kaniini	0a82a7e6d6	Merge branch 'feature/split-hide-network' into 'develop' ... Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733	2019-02-01 17:05:29 +00:00
href	b3b0855456	Merge branch '534_federation_targets_reachability' into 'develop' ... [#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703	2019-02-01 09:14:35 +00:00
Luna	c05928dbda	use nodeinfo 2.1, add repository field ... that is the only change from nodeinfo 2.0 to 2.1 also this makes the nodeinfo tests use 2.1.json instead of 2.0.json	2019-02-01 03:55:10 -03:00
href	308b35ebe2	User.follow_all: ensure its stays unique	2019-01-31 18:17:44 +01:00
William Pitcock	106475f265	test: http mocks: formatting	2019-01-31 16:30:56 +00:00
William Pitcock	3f5b784596	test: rich media: parser: add malformed data regression test	2019-01-31 16:19:53 +00:00
William Pitcock	4e76f9fde1	test: add malformed OGP data fixture	2019-01-31 16:12:35 +00:00
lambda	a43a1c6d4e	Revert "Merge branch 'spc-fix-3' into 'develop'" ... This reverts merge request !682	2019-01-31 12:16:23 +00:00
kaniini	4d3655c479	Merge branch 'spc-fix-3' into 'develop' ... Spc fix 3 See merge request pleroma/pleroma!682	2019-01-31 11:29:29 +00:00
Haelwenn	00d4333373	Merge branch 'features/glitch-soc-frontend' into 'develop' ... Features/glitch soc frontend See merge request pleroma/pleroma!192	2019-01-31 10:16:11 +00:00
Egor Kislitsyn	d3677d2b4d	Merge remote-tracking branch 'MAIN/develop' into feature/jobs	2019-01-31 15:07:49 +07:00
lain	c53b96a024	Fix specs.	2019-01-30 19:45:31 +01:00
lain	47ec690c54	Use race-condition free mass follow.	2019-01-30 19:33:25 +01:00
kaniini	d03a116654	Merge branch 'hj-happiness-improvement' into 'develop' ... New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700	2019-01-29 13:54:10 +00:00
Ivan Tashkinov	92753b0cd9	[#534] Made federation push sender be determined basing on content instead of referer header. Updated tests.	2019-01-29 13:12:28 +03:00
Haelwenn	ebb3496386	Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' ... Rich Media support, part 2. See merge request pleroma/pleroma!719	2019-01-29 05:11:08 +00:00
William Pitcock	61d6715714	rich media: oembed: return data in the same format as the other parsers	2019-01-28 21:13:25 +00:00
Maxim Filippov	3e968f9ef2	Format	2019-01-28 21:40:08 +03:00
Maxim Filippov	50d6183893	Split hide_network into hide_followers & hide_followings	2019-01-28 21:40:08 +03:00
Egor Kislitsyn	55affbca7f	add a job queue	2019-01-28 22:17:17 +07:00
Ivan Tashkinov	d3f9e6f6fe	[#534] Merged upstream/develop.	2019-01-28 15:39:14 +03:00
Ivan Tashkinov	1d2f41642c	[#534] Various tweaks. Tests for Instances and Instance.	2019-01-28 15:25:06 +03:00
lain	8e8a1e1ba8	Return new-style config if old-style config is set to false. ... This is in preparation for 1.0. We'll be able to switch the config to the new mechanism on PleromaFE then as well.	2019-01-28 13:07:12 +01:00
lain	1825118fd4	Correctly handle invalid credentials on auth login. ... Closes #407	2019-01-28 11:41:47 +01:00
William Pitcock	339c26e12b	test: add status posting with OGP link preview test	2019-01-28 06:19:00 +00:00
William Pitcock	6096846f5f	API: kill /api/rich_media/parse endpoint	2019-01-28 05:53:17 +00:00
William Pitcock	020b3b29d9	test: update twitterapi tests	2019-01-28 05:53:17 +00:00
William Pitcock	364cf5369b	test: update mastodon status view tests	2019-01-28 05:53:17 +00:00
William Pitcock	132d815f1f	mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data	2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier	cda1470e02	[MastoAPI][GlitchAPI] Add bookmarks	2019-01-28 04:47:32 +01:00
lain	2e277dd4ad	Fix objects.	2019-01-27 21:03:15 +01:00
kaniini	5eb81d2c72	Merge branch 'features/mastoapi-multi-hashtag' into 'develop' ... MastodonAPI multi-hashtag See merge request pleroma/pleroma!652	2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier	a65c188593	Web.MastodonAPI.AccountView: Add is_moderator and is_admin ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/557	2019-01-27 10:33:22 +01:00
kaniini	155a884300	Merge branch 'flake-from-int' into 'develop' ... Flake: support integers in from_string/1 See merge request pleroma/pleroma!715	2019-01-26 16:17:50 +00:00
href	d6015338c8	Flake: support integers in from_string/1 ... Some previously issued stateless tokens have integer ids in them.	2019-01-26 16:58:23 +01:00
William Pitcock	1f7843b9b8	mastodon api: use OGP uri instead of page_url for deducing domain name, fix test	2019-01-26 15:24:16 +00:00
Haelwenn (lanodan) Monnier	3f64379b13	Web.MastodonAPI.MastodonAPIController: Add Rich-Media support	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	d9f3af477d	Move definitions of RichMedia fixtures to test/support/http_request_mock.ex	2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier	22f2687f17	Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters	2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier	5a84def6a6	Fix the logic in multi-hashtag TLs	2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier	4ad0ad14ed	Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	d8f446f438	Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline	2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier	499a4591a4	Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null	2019-01-26 04:23:52 +01:00
Ivan Tashkinov	d99650270b	[#534] Federation reachability filtering tests.	2019-01-25 20:38:54 +03:00
lain	aa8ddfdbe2	SPC fixes: Fix activities.	2019-01-25 18:14:48 +01:00
rinpatch	a45a903480	Fix OGP provider tests	2019-01-25 10:51:06 +03:00
rinpatch	3a5b3c5a3a	Merge remote-tracking branch 'pl/develop' into oembed_provider	2019-01-25 10:40:51 +03:00
kaniini	4c99b6d35a	Merge branch 'fix/tusky-dm' into 'develop' ... Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683	2019-01-25 05:19:32 +00:00
kaniini	c9b418e547	Merge branch 'develop' into 'oembed_provider' ... # Conflicts: # lib/pleroma/activity.ex	2019-01-25 05:00:47 +00:00
kaniini	4df71cd88b	Merge branch 'classic-flakeids' into 'develop' ... Flake Ids for Users and Activities Closes #450 See merge request pleroma/pleroma!645	2019-01-25 04:59:06 +00:00
Maxim Filippov	9274cabe01	Use correct logic to determine "attentions" list	2019-01-24 23:30:43 +03:00
William Pitcock	13d72826df	test: add anti-followbot policy tests	2019-01-24 09:50:40 +00:00
Maxim Filippov	4333fea1dc	Send "hide_network" in user_view	2019-01-23 19:47:51 +03:00
lain	2de208817c	Merge branch 'develop' into rename/pleroma_activity_consistency	2019-01-23 13:05:58 +01:00
lain	e221c681dc	New frontend configuration mechanism.	2019-01-23 12:40:57 +01:00
href	422e60ad76	2019	2019-01-23 11:26:35 +01:00
href	9d63b27dcd	Test FlakeID old id compat & Ecto type	2019-01-23 11:26:34 +01:00
href	28d77e373c	Flake Ids for Users and Activities	2019-01-23 11:26:27 +01:00
Ivan Tashkinov	34d59e4008	[#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test.	2019-01-22 17:12:53 +03:00
lain	762fafe738	Fix buggy test.	2019-01-21 17:54:11 +01:00
lambda	8cd853ce0c	Merge branch '530_federator_user_info_overwrite_fix' into 'develop' ... [#530] Prevents user `info` from being overwritten because of race conditions Closes #530 See merge request pleroma/pleroma!691	2019-01-21 13:03:32 +00:00
lambda	69454c8345	Merge branch 'feature/dm-sanity' into 'develop' ... DM sanitization See merge request pleroma/pleroma!458	2019-01-21 12:35:10 +00:00
Ivan Tashkinov	789a9843da	[#530] Fixed test.	2019-01-21 14:30:01 +03:00
Haelwenn (lanodan) Monnier	98c8184c1f	Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1	2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier	f8ab1b7427	Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1	2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier	b82c6dc536	Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1	2019-01-21 07:49:59 +01:00
kaniini	5803672ae5	Merge branch '116-send-delete-event' into 'develop' ... Send delete event over Mastodon streaming api Closes #116 See merge request pleroma/pleroma!688	2019-01-20 23:06:21 +00:00
lain	cf1f35a93a	Send delete event over Mastodon streaming api ... Closes #116	2019-01-20 13:00:46 +01:00
lambda	501fba33d6	Merge branch 'add-custom-emoji-test' into 'develop' ... Add a test to ensure #39 is fixed. See merge request pleroma/pleroma!687	2019-01-20 10:58:19 +00:00
lain	be0fb5dec4	Add a test to ensure #39 is fixed.	2019-01-20 11:48:53 +01:00
lambda	f3045a179e	Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop' ... I1t/pleroma 477 user search improvements See merge request pleroma/pleroma!685	2019-01-20 10:24:05 +00:00