8341 commits

Author	SHA1	Message	Date
Alexander Strizhakov	c3110c46f3	expanding filtration for home timeline ... added local & remote statuses filtration for home timeline	2021-02-01 14:11:11 +03:00
Ivan Tashkinov	cf4765af40	[#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.	2021-01-31 23:06:38 +03:00
Ivan Tashkinov	10207f840c	[#3213] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.	2021-01-31 22:36:46 +03:00
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	2021-01-31 20:38:58 +03:00
Ivan Tashkinov	6fd4163ab6	[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.	2021-01-31 20:37:33 +03:00
Ivan Tashkinov	9948ff3356	[#3213] Added HashtagsCleanupWorker periodic job.	2021-01-31 18:24:19 +03:00
Alexander Strizhakov	b794dae98a	like this	2021-01-29 15:55:00 +03:00
Alexander Strizhakov	c369d2b930	support for with_relationships parameter ... in /api/v1/mutes and /api/v1/accounts/:id endpoints	2021-01-29 08:41:21 +03:00
Ivan Tashkinov	380d0cce6b	[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.	2021-01-29 00:17:33 +03:00
Mark Felder	5fcab23aa3	Improve error message for ConfigDB	2021-01-28 14:59:23 -06:00
Mark Felder	13d79c281f	Make attachment cleanup jobs a noop if the setting is disabled.	2021-01-28 14:42:20 -06:00
Egor Kislitsyn	a51d903e0c	Make sure active_user_count/1 counts only local users	2021-01-28 22:23:10 +04:00
Ivan Tashkinov	60b4654038	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). ... Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.	2021-01-28 19:49:43 +03:00
Alexander Strizhakov	6c987c7670	fix and delete purge activities duplicates	2021-01-28 16:57:41 +03:00
Alexander Strizhakov	39335d4251	fix for unique oban worker option	2021-01-28 16:57:03 +03:00
Alexander Strizhakov	35cad9793d	cache headers for emoji and images	2021-01-27 18:49:08 +03:00
Egor Kislitsyn	793fc77b16	Add active user count	2021-01-27 18:20:06 +04:00
Alexander Strizhakov	d4158e8bf0	added total ... to the instance adminAPI endpoint	2021-01-27 07:45:06 +03:00
Alexander Strizhakov	6806c03e85	added total ... to the user statuses adminAPI endpoint	2021-01-27 07:45:02 +03:00
feld	d7af0294e6	Merge branch 'service-worker-allowed-header' into 'develop' ... Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247	2021-01-26 18:14:01 +00:00
lain	229acae6c3	Merge branch 'develop' into '2435-list-multiple-users' ... # Conflicts: # CHANGELOG.md	2021-01-26 14:24:32 +00:00
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	2021-01-26 08:27:45 +03:00
Haelwenn	250e202098	Merge branch 'fix/missing-own_votes' into 'develop' ... Include own_votes in the poll data See merge request pleroma/pleroma!3274	2021-01-26 00:55:05 +00:00
Mark Felder	2cb5c16723	Credo	2021-01-25 18:25:53 -06:00
Mark Felder	0b19534475	Merge branch 'develop' into docs/apache-config	2021-01-25 17:00:26 -06:00
Ivan Tashkinov	e7864a32d7	[#3213] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.	2021-01-25 22:31:23 +03:00
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-25 21:24:07 +03:00
Ivan Tashkinov	ea4785213a	[#3213] Switched to using embedded hashtags in Object.hashtags/1 ... (to avoid extra joins / preload in timeline queries).	2021-01-25 20:12:09 +03:00
Alexander Strizhakov	3f3d64acbf	little refactor and tests ... for voted & own_votes fields in polls	2021-01-25 19:46:36 +03:00
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-25 09:45:06 -06:00
Ivan Tashkinov	f264d930cc	[#3213] Speedup of HashtagsTableMigrator (query optimization). State handling fix.	2021-01-24 23:27:02 +03:00
sadposter	3aa25b008d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-01-23 22:38:07 +00:00
Mark Felder	6bfd497f4a	Include own_votes in the poll data	2021-01-22 09:47:59 -06:00
Ivan Tashkinov	218c519606	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs	2021-01-22 10:05:28 +03:00
Mark Felder	80ccdb56f6	Make tag urls absolute	2021-01-21 16:49:19 -06:00
Mark Felder	e5b32aab92	rename function	2021-01-21 14:41:28 -06:00
Mark Felder	003402df40	Add ability to invalidate cache entries for Apache	2021-01-21 14:20:13 -06:00
eugenijm	7fcaa188a0	Allow to define custom HTTP headers per each frontend	2021-01-21 21:55:23 +03:00
eugenijm	133644dfa2	Ability to set the Service-Worker-Allowed header	2021-01-21 21:55:11 +03:00
Ivan Tashkinov	ca7f240643	[#3213] Ignoring of blank elements from objects.data->tag.	2021-01-21 20:50:06 +03:00
Ivan Tashkinov	c041e9c630	[#3213] HashtagsTableMigrator: failures handling fix, retry function. ... Changed default hashtags filtering strategy to non-aggregate approach.	2021-01-21 20:23:08 +03:00
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	2021-01-21 20:20:35 +03:00
Alexander Strizhakov	6d48144a9d	use proper naming ... for MediaProxyWarmingPolicy in ConcurrentLimiter	2021-01-21 09:50:18 +03:00
Alexander Strizhakov	b4ff63d020	configurable limits for ConcurrentLimiter ... Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy	2021-01-21 09:47:21 +03:00
feld	2926713fe5	Merge branch 'deprecate-public_endpoint' into 'develop' ... Deprecate Uploaders.S3, :public_endpoint See merge request pleroma/pleroma!3251	2021-01-20 22:48:48 +00:00
Mark Felder	704eef3c2d	Special handling for unconfirmed users based on instance config no longer needed.	2021-01-20 11:14:15 -06:00
Mark Felder	e759579f97	Active users must be confirmed	2021-01-19 16:39:55 -06:00
Ivan Tashkinov	b830605577	[#3213] Performance-related stat in HashtagsTableMigrator. Reworked count/_ to indicate approximate total count for current iteration.	2021-01-19 22:03:25 +03:00
Ivan Tashkinov	f0f0f2af00	[#3213] timeout option for HashtagsTableMigrator.count/_.	2021-01-19 21:17:06 +03:00
Ivan Tashkinov	7f07909a7b	[#3213] Added HashtagsTableMigrator.count/1.	2021-01-19 21:13:32 +03:00
feld	958a7f6ed0	Merge branch 'fix/reblog-api' into 'develop' ... Fix Reblog API Closes #2423 See merge request pleroma/pleroma!3261	2021-01-18 21:19:14 +00:00
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	2021-01-18 12:05:05 -06:00
Egor Kislitsyn	1b79dce7bc	Fix Reblog API ... Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	2021-01-18 20:15:57 +04:00
Lain Soykaf	bdfd72630f	ListController: Fix being unable to add / remove users.	2021-01-18 16:28:36 +01:00
Ivan Tashkinov	9d28a7ebfb	[#3213] Missing copyright header for HashtagsTableMigrator.State.	2021-01-17 21:58:15 +03:00
Ivan Tashkinov	85f7ef4d13	[#3213] Feature lock adjustment for HashtagsTableMigrator.	2021-01-17 10:57:06 +03:00
Ivan Tashkinov	3f88e33a71	[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.	2021-01-16 23:05:31 +03:00
Ivan Tashkinov	48b399cedb	[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).	2021-01-16 20:22:14 +03:00
Mark Felder	2c0fe2ea9e	Remove toggle_confirmation; require explicit state change ... Also cosmetic changes to make the code clearer	2021-01-15 13:11:51 -06:00
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	6c50ac1d3f	Readability	2021-01-15 11:37:17 -06:00
Mark Felder	ebd7d1365b	Make setting user activation status explicit	2021-01-15 11:37:17 -06:00
Mark Felder	cd1e5d76ab	Remove User.restrict_deactivated/1 ... Everything else is in User.Query, no need for this odd kludge.	2021-01-15 11:24:46 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
Mark Felder	63923df0a5	Further simplify changeset logic	2021-01-15 10:42:02 -06:00
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	2021-01-15 10:42:02 -06:00
Haelwenn	cf367fdbd5	Merge branch 'optimize-command_available' into 'develop' ... Optimize Pleroma.Utils.command_available?/1 See merge request pleroma/pleroma!3254	2021-01-15 04:44:58 +00:00
Mark Felder	d0e0396528	Hack to fix tests not passing. Unclear why the filters are being set to nil. ... Both of these changes are needed or it doesn't work.	2021-01-14 17:49:37 -06:00
Mark Felder	8d6e9b25a4	Just validate command is in PATH; forking a shell is wasteful	2021-01-14 17:19:02 -06:00
Ivan Tashkinov	f5f267fa76	[#3213] Refactoring of HashtagsTableMigrator.	2021-01-14 22:41:27 +03:00
Lain Soykaf	39f3683a06	Pbkdf2: Use it everywhere.	2021-01-14 15:06:16 +01:00
Lain Soykaf	87a31c5c9b	Password -> Password.Pbkdf2	2021-01-14 14:49:39 +01:00
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-13 22:11:16 +03:00
Ivan Tashkinov	3e4d84729a	[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.	2021-01-13 22:07:38 +03:00
Mark Felder	f0ab60189e	truncated_namespace should default to nil	2021-01-13 11:54:00 -06:00
lain	9106048c61	Password: Replace Pbkdf2 with Password.	2021-01-13 15:11:11 +01:00
lain	c7cd9bd591	Password: Add password module ... Replaces Pbkdf2.	2021-01-13 15:09:01 +01:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Mark Felder	c35e6fb516	Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader	2021-01-12 16:34:24 -06:00
Mark Felder	12528edc34	Fix another ad-hoc construction of the upload base_url	2021-01-12 16:32:52 -06:00
Mark Felder	8b28dce82a	Deprecate Pleroma.Uploaders.S3, :public_endpoint	2021-01-12 16:31:35 -06:00
feld	5453038ce9	Merge branch 'fix/backup-url-on-s3' into 'develop' ... Standardize base url for uploads See merge request pleroma/pleroma!3246	2021-01-12 20:54:30 +00:00
lain	7a1cb752dd	Pagination: Don't be dos'd by random parameters.	2021-01-12 12:59:50 +01:00
Mark Felder	ef59d99833	Simplify. We will always have a result from Upload.base_url/0, so just add it to the list	2021-01-11 14:19:14 -06:00
Mark Felder	1040881047	Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains	2021-01-11 14:01:31 -06:00
lain	e1a547d7d3	ChatMessages: Fix pagination headers. ... They used to contain the path parameter `id` as query param, which would break the link.	2021-01-11 15:30:40 +01:00
Mark Felder	9887cdf9be	Formatting	2021-01-10 09:03:42 -06:00
feld	fa63f1b55b	Apply 4 suggestion(s) to 2 file(s)	2021-01-10 01:34:54 +00:00
Mark Felder	e8bf060e6e	Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0 ... Now we should have a correct base URL for S3 hosted objects throughout the codebase.	2021-01-08 17:32:42 -06:00
Mark Felder	86dcfb4eb9	More places we should be using Upload.base_url	2021-01-08 17:32:42 -06:00
Mark Felder	530fb5b29e	Avoid duplicate Config calls	2021-01-08 17:32:42 -06:00
Mark Felder	3c936061d5	Apply Upload.base_url for S3	2021-01-08 17:32:42 -06:00
Mark Felder	ad79983614	Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase	2021-01-08 17:32:42 -06:00
lain	80167e62dd	Merge branch 'fix/missing_emoji_steal_dir' into 'develop' ... Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218	2021-01-08 13:10:49 +00:00
Alex Gleason	3342f6a7ef	Backups: render ID in API	2021-01-07 13:06:22 -06:00
lain	ac1298fce8	Merge branch 'cleanup/unused-proxy-opts' into 'develop' ... Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236	2021-01-07 16:25:39 +00:00
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	2021-01-07 11:09:18 +00:00
lain	4d56aca904	Merge branch 'adminapi-user-email' into 'develop' ... AdminAPI: return user email See merge request pleroma/pleroma!3240	2021-01-07 10:08:02 +00:00
Ivan Tashkinov	0d521022fe	[#3213] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).	2021-01-07 12:20:29 +03:00
Alex Gleason	cc09079aea	Exclude blockers from notifications when blockers_visible: false	2021-01-06 15:39:14 -06:00
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-01-06 15:22:35 -06:00
Alex Gleason	20af025c65	AdminAPI: return user email	2021-01-06 11:30:32 -06:00
Roger Braun	48cd336a72	allow external emoji	2021-01-06 10:13:01 -06:00
Mark Felder	d69c78ceb9	Remove configurability of upload proxy opts, simplify	2021-01-05 15:06:00 -06:00
Mark Felder	64116f63d9	URI.encode custom emojis	2021-01-05 12:29:51 -06:00
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' ... Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	2021-01-05 12:40:45 +00:00
lain	e802b48d55	User: Use ObjectID type to validate also-known-as field	2021-01-05 13:10:14 +01:00
lain	f0e6cff583	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	2021-01-05 12:42:30 +01:00
lain	bea69853a2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff	2021-01-05 12:19:39 +01:00
lain	d44850d7a5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor	2021-01-05 10:48:32 +01:00
lain	8e5904daa5	SideEffects.DeleteTest: asyncify. ... Replace Mock with Mox, mock out Logger.	2021-01-04 18:40:59 +01:00
Mark Felder	83f27282ba	Do not try to guess which pagination we need by the existence of an :offset param. ... Require explicit request to get offset pagination.	2021-01-04 10:13:17 -06:00
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	2021-01-04 13:38:31 +01:00
Alex Gleason	0ec7e9b8e9	AdminAPI: return id for moderation log entries	2021-01-01 11:59:48 -06:00
feld	afe9c152ab	Merge branch 'fix/reports-ordering' into 'develop' ... Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225	2020-12-31 19:24:49 +00:00
Alex Gleason	4200a06340	Aliases: refactor validate_also_known_as/1	2020-12-31 12:53:28 -06:00
Alex Gleason	0d6b9ce8ca	Apply 2 suggestion(s) to 1 file(s)	2020-12-31 18:51:57 +00:00
feld	2aa60e7592	Apply 1 suggestion(s) to 1 file(s)	2020-12-31 09:58:43 -06:00
Ivan Tashkinov	303055456f	Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.	2020-12-31 12:45:23 +03:00
Ivan Tashkinov	367f0c31c3	[#3213] Added query options support for Repo.chunk_stream/4. ... Used infinite timeout in transfer_hashtags select query.	2020-12-31 09:36:26 +03:00
Alex Gleason	11d40e92b7	Render AKAs in Actor endpoints	2020-12-30 18:53:27 -06:00
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	2020-12-30 17:10:02 -06:00
Mark Felder	2597b028f7	Make pagination type conditional	2020-12-30 16:37:04 -06:00
Mark Felder	085d4e6cfc	Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset	2020-12-30 16:10:10 -06:00
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	2020-12-30 15:18:54 -06:00
Mark Felder	744b34709d	Do not reverse order of reports. We want newest ones sorted to the top.	2020-12-30 14:22:48 -06:00
Ivan Tashkinov	8d1a0c1afd	[#3213] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.	2020-12-30 15:22:49 +03:00
Ivan Tashkinov	e0b5edb6d5	[#3213] Fixed Object.object_data_hashtags/1 to process only AS2 elements of data.tag (basing on #2984).	2020-12-30 14:42:35 +03:00
sadposter	6cd0586ef9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-12-29 13:16:14 +00:00
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	2020-12-28 12:02:16 +00:00
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' ... Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	2020-12-28 10:14:58 +00:00
Haelwenn (lanodan) Monnier	18b536c176	Pleroma.Object/1: take %Object{} as argument instead	2020-12-28 11:05:24 +01:00
Ivan Tashkinov	14fae94c0e	[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.	2020-12-28 00:08:09 +03:00
Alexander Strizhakov	2e859794ee	non condition dir creation	2020-12-27 21:58:15 +03:00
Alexander Strizhakov	dad76703aa	not needed	2020-12-27 21:53:30 +03:00
Alexander Strizhakov	7bfb041658	insreasing test coverage for StealEmojiPolicy	2020-12-27 21:53:30 +03:00
Alexander Strizhakov	aafd7b44ce	check dir existence in policy	2020-12-27 21:53:30 +03:00
Mark Felder	e02889edb2	Add MRFs to the list of things that may need a soft reboot	2020-12-27 21:53:29 +03:00
Mark Felder	72aeb2e73b	Mark private	2020-12-27 21:53:29 +03:00
Mark Felder	77e39e6aae	Create dir for EmojiStealPolicy automatically	2020-12-27 21:53:29 +03:00
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2020-12-26 22:23:05 +03:00
Ivan Tashkinov	cbb19d0e18	[#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.	2020-12-26 22:20:55 +03:00
lain	e4f1d8f48c	Merge branch 'cachex-test' into 'develop' ... Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209	2020-12-26 10:26:35 +00:00
Ivan Tashkinov	e369b1306b	Added Hashtag entity and objects-hashtags association with auto-sync with data.tag on Object update.	2020-12-22 22:04:33 +03:00
Haelwenn (lanodan) Monnier	87b13c5430	Create Object.hashtags/1 wrapper	2020-12-22 05:15:34 +01:00
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	2020-12-22 05:15:34 +01:00
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	2020-12-21 22:54:26 +03:00
lain	ab633e51ab	Linting	2020-12-21 16:48:35 +01:00
lain	5db1e6c8d3	Pipeline test: Switch from Mock to Mox. ... Speeds up the test and makes it possible to run async.	2020-12-21 16:35:12 +01:00
lain	c9d73af74d	Cachex: Unify arity of callback function	2020-12-21 12:03:58 +01:00
lain	ee81a94ab2	Caching: Add caching behavior, add null implementation.	2020-12-21 11:42:53 +01:00
Kaizhe Huang	fb02241580	Fix trailing whitespaces in lib/pleroma/web/web_finger.ex	2020-12-21 00:54:15 +11:00
lain	95a9bdfc37	Tests: Use NullCache for async tests. ... Caching can't work in async tests, so for them it is mocked to a null cache that is always empty. Synchronous tests are stubbed with the real Cachex, which is emptied after every test.	2020-12-18 19:53:19 +01:00
lain	713612c377	Cachex: Make caching provider switchable at runtime. ... Defaults to Cachex.	2020-12-18 17:44:46 +01:00
FiveYellowMice	83cd7f2b5f	WebFinger: add subscribe_address in return data of JSON responses	2020-12-18 13:48:38 +00:00
Alex Gleason	80891e83d8	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-12-17 09:05:36 -06:00
lain	8b8c317c0f	Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' ... Fix mastoapi ws posts dropping Closes #2336 See merge request pleroma/pleroma!3198	2020-12-16 11:35:45 +00:00
lain	6bb4f4e172	Merge branch 'support/2255_posix_errors' into 'develop' ... [#2255] added error messages for posix error code See merge request pleroma/pleroma!3138	2020-12-15 15:16:03 +00:00
Mark Felder	6dac2ac71a	Minor refactoring of the logic for hiding followers/following counts. ... Field is not nullable anymore, and this is more readable.	2020-12-14 13:27:42 -06:00
Alexander Strizhakov	cebe3c7def	Fix for dropping posts/notifs in WS when mix task is executed ... - start oban in mix tasks with empty queues, plugins and crontab - fix for update_users_following_followers_counts - fix for removed logo.png - typo in resend confirmation emails mix task docs - fix for uploads mix task (start Majic.Pool) - fix for creating user mix task (start :fast_html app)	2020-12-14 11:02:32 -06:00
Mark Felder	6520599b7d	Update Earmark to 1.4.13, use the new compact_output mode	2020-12-11 17:23:03 -06:00
Alex Gleason	642729b49f	Fix AudioVideoValidator markdown	2020-12-11 17:22:54 -06:00
Alex Gleason	f8c93246d6	Refactor Earmark code, fix tests	2020-12-11 17:22:42 -06:00
Alex Gleason	ba71bbf610	Improve Formatter.minify/2	2020-12-11 17:22:24 -06:00
Alex Gleason	e9e17e5df3	Upgrade Earmark to v1.4.10	2020-12-11 17:22:17 -06:00
Ivan Tashkinov	7fff9c1bee	Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).	2020-12-09 21:14:39 +03:00
Ivan Tashkinov	7da0349d73	Changed default OAuth token expiration time to 30 days.	2020-12-09 19:59:46 +03:00
lain	477c6c8e55	Merge branch 'auth-improvements' into 'develop' ... Cookie auth rework / Auth subsystem refactoring and tweaks Closes pleroma/secteam/pleroma#3 See merge request pleroma/pleroma!3112	2020-12-09 15:55:45 +00:00
lain	1436a2fa2d	Merge branch 'stream-follow-updates' into 'develop' ... Stream follow updates Closes #2299 See merge request pleroma/pleroma!3183	2020-12-09 15:52:31 +00:00
lain	e73d878b38	Merge branch 'feat/warn-large-pool-size' into 'develop' ... Add a startup error for modified Repo pool_size See merge request pleroma/pleroma!3190	2020-12-08 16:36:51 +00:00
lain	50d16a9e27	ApplicationRequirements: Add test, more text for pool size.	2020-12-08 17:30:10 +01:00
lain	5b9b7b4888	Apply 1 suggestion(s) to 1 file(s)	2020-12-08 16:16:43 +00:00
Mark Felder	fb3fd692c6	Add a startup error for modified Repo pool_size	2020-12-07 16:44:55 -06:00
Haelwenn (lanodan) Monnier	1403798820	instance.reachable?: Limit to binary input	2020-12-07 21:20:44 +01:00
Haelwenn (lanodan) Monnier	e1a2e8b17c	instance: Do not fetch unreachable instances ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346	2020-12-07 20:11:47 +01:00
Ivan Tashkinov	c8e7ace812	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md	2020-12-07 21:45:04 +03:00
lain	ed76323776	Merge branch 'feature/configdb-mix-tasks' into 'develop' ... Add mix tasks to give additional ConfigDB recovery and debugging options See merge request pleroma/pleroma!3174	2020-12-07 18:06:06 +00:00
Ivan Tashkinov	e00c667145	[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. ... Minor fixes.	2020-12-06 18:02:30 +03:00
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-12-06 13:59:35 +03:00
Ivan Tashkinov	e9859b68fc	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	2020-12-06 13:59:10 +03:00
feld	6adad96c79	Merge branch 'issue/2256' into 'develop' ... [#2256] added subject actor to moderation log See merge request pleroma/pleroma!3164	2020-12-04 17:49:05 +00:00
rinpatch	1d04bd0894	Merge branch 'supported-emojos' into 'develop' ... Update Emoji support to unicode 13.1, support all RGI emoji. See merge request pleroma/pleroma!3186	2020-12-03 18:29:42 +00:00
Alexander Strizhakov	a02eb88396	config_db search methods	2020-12-03 19:34:23 +03:00
lain	fa0d0b602f	Emoji: Also accept regional indicators	2020-12-03 16:17:39 +01:00
lain	8fb259e739	Emoji: Only accept RGI emoji. ... "recommended for general interchange"	2020-12-02 16:46:19 +01:00
Egor Kislitsyn	c9afb350e7	Document follow relationship updates and cleanup	2020-12-02 19:16:36 +04:00
lain	b6f5e9ac9c	Emoji: Remove unused emoji-data.txt	2020-12-02 16:15:31 +01:00
lain	1adee08321	Emoji: Update to Unicode 13.1, switch base file, allow multichar.	2020-12-02 16:15:03 +01:00
lain	04af0bbe44	User: Remove left-over (wrong) fix.	2020-12-02 13:39:29 +01:00
lain	222312900e	User: Don't allow local users in remote changesets	2020-12-02 12:18:43 +01:00
Egor Kislitsyn	35ba48494f	Stream follow updates	2020-12-02 00:18:58 +04:00
Ivan Tashkinov	d50a3345ae	[#3112] Allowed revoking same-user token from any apps. Added tests.	2020-11-30 21:55:48 +03:00
Ivan Tashkinov	50e47a215f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-28 21:51:27 +03:00
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	2020-11-28 21:51:06 +03:00
Alexander Strizhakov	6aadb1cb40	digest algorithm is taken from header	2020-11-27 08:10:52 +03:00
Maksim Pechnikov	fb72f2034a	fix spec	2020-11-25 22:44:27 +03:00
Ivan Tashkinov	62993db499	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-25 21:48:18 +03:00
Ivan Tashkinov	12a5981cc3	Session token setting on token exchange. Auth-related refactoring.	2020-11-25 21:47:23 +03:00
Alexander Strizhakov	5eef4988bf	fix for elixir 1.11 ... load runtime configs in releases with config provider	2020-11-25 14:10:24 +03:00
lain	67b15cc033	Search: Save detected pg version in a persistent term.	2020-11-23 15:29:55 +01:00
lain	f9a4cf2097	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	2020-11-23 15:18:19 +01:00
Ivan Tashkinov	489b12cde4	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-21 19:47:46 +03:00
Ivan Tashkinov	ccc2cf0e87	Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.	2020-11-21 19:47:25 +03:00
Alex Gleason	30ed7b502f	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-11-21 10:23:53 -06:00
feld	ecd1ef8cb5	Merge branch 'fix/2302-report-duplicates' into 'develop' ... Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146	2020-11-20 18:40:15 +00:00
lain	e4289792d2	Linting.	2020-11-20 16:38:05 +01:00
lain	9a1e5f5d48	Search: Change search method based on detected pg version	2020-11-20 16:26:43 +01:00
lain	a407e33c78	Application: Save postgres version in the environment	2020-11-20 16:26:22 +01:00
Alexander Strizhakov	0a5b22bc3b	start limiters in mix tasks	2020-11-20 11:37:01 +03:00
feld	79a509ee61	Merge branch '2301-users-search-discoverability-fix' into 'develop' ... [#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162	2020-11-19 20:33:52 +00:00
feld	cd1b4155d5	Merge branch 'oban-jobs-to-simple-tasks' into 'develop' ... Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129	2020-11-19 20:32:32 +00:00
Maksim Pechnikov	66f411fba0	added subject actor to moderation log	2020-11-19 22:13:45 +03:00
Ivan Tashkinov	b27d8f7437	Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ... # Conflicts: # CHANGELOG.md	2020-11-19 19:35:44 +03:00
lain	5e04f4156c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	2020-11-19 17:32:57 +01:00
Ivan Tashkinov	e164c37139	[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.	2020-11-19 19:30:02 +03:00
Haelwenn	c8d11c3064	Merge branch '2317-old-reset-tokens' into 'develop' ... Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160	2020-11-19 16:22:14 +00:00
lain	8b90d62506	Search: Only skip ordering the rum index.	2020-11-19 16:29:31 +01:00
lain	a60242464e	Search: Add option to search with the websearch function	2020-11-19 16:12:01 +01:00
Ivan Tashkinov	fcad3e716a	[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.	2020-11-19 18:08:22 +03:00
Alexander Strizhakov	46dab37351	little fix	2020-11-19 15:29:26 +03:00
lain	5e2ba57327	Activity search: Fix order of results ... Greatly speeds up the search for RUM.	2020-11-19 13:20:58 +01:00
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	2020-11-19 12:27:06 +01:00
Alexander Strizhakov	8a8c154b4e	test fixes	2020-11-19 09:58:32 +03:00
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	2020-11-19 09:53:14 +03:00
Alexander Strizhakov	e2bf6b1f7e	fix for forwarded reports	2020-11-19 09:53:13 +03:00
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	2020-11-18 20:22:40 +00:00
lain	aae669d05e	Merge branch 'fix/webpush-and-emojireact' into 'develop' ... Push notifications: add pleroma:emoji_reaction, improve tests Closes #2185 See merge request pleroma/pleroma!3141	2020-11-18 18:33:48 +00:00
lain	6b32e1de23	Merge branch 'frontend-admin-api' into 'develop' ... Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108	2020-11-18 17:51:57 +00:00
Maksim Pechnikov	9c5d1cb9ed	fix tests	2020-11-18 09:58:51 +03:00
Maksim	25eb222bed	Apply 1 suggestion(s) to 1 file(s)	2020-11-18 05:19:01 +00:00
Mark Felder	ccddedb504	Credo	2020-11-17 20:33:30 +00:00
Mark Felder	499faa82f6	Synchronize reaction notification text with PleromaFE's style	2020-11-17 20:22:24 +00:00
Mark Felder	5d0bc5e028	Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription	2020-11-17 20:21:48 +00:00
Mark Felder	67a6abd071	Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions	2020-11-17 20:20:00 +00:00
Mark Felder	83ec2f1384	Allow subscribing for pleroma:emoji_reaction push notifications	2020-11-17 20:20:00 +00:00
Mark Felder	3ce11b830e	Add capability for emoji reaction push notifications	2020-11-17 20:20:00 +00:00
lain	bb9650f3c2	FrontendController: Return error on installation error.	2020-11-17 16:43:07 +01:00
feld	d33b9e7b33	Merge branch 'remove/fedsockets' into 'develop' ... Remove FedSockets See merge request pleroma/pleroma!3155	2020-11-17 14:58:33 +00:00
Egor Kislitsyn	f69fe36ebf	Merge branch 'develop' into frontend-admin-api	2020-11-17 18:34:04 +04:00
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	2020-11-17 18:29:52 +04:00
rinpatch	2c55f7d7cb	Remove FedSockets ... Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.	2020-11-17 17:28:30 +03:00
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	2020-11-17 15:01:38 +01:00
lain	81293e5aad	ActivityPubController: Don't return local only objects	2020-11-17 13:11:39 +01:00
Mark Felder	b1466661eb	Use absolute URLs to thumbnail and background in /api/v1/instance	2020-11-16 21:29:15 +00:00
Maksim Pechnikov	e4b202d905	added test	2020-11-16 22:23:28 +03:00
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	2020-11-16 22:50:14 +04:00
Maksim Pechnikov	e1d25bad0c	fix tests	2020-11-16 21:45:37 +03:00
sadposter	7947236575	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-11-15 19:40:23 +00:00
Alex Gleason	9546c1444c	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-11-14 19:48:47 -06:00
Maksim Pechnikov	36ec604521	added test	2020-11-14 08:30:22 +03:00
lain	0d149502fe	Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' ... fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912	2020-11-13 13:35:47 +00:00
Ilja	70e4b86250	Make notifs view work for reports ... * These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)	2020-11-13 13:35:46 +00:00
Maksim Pechnikov	1830b6aae5	added error messages for posix error code	2020-11-13 15:21:59 +03:00
rinpatch	6ca709816f	Fix object spoofing vulnerability in attachments ... Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948	2020-11-12 15:25:33 +03:00
Haelwenn	99bc175f02	Merge branch 'title-injection-change' into 'develop' ... Title injection change See merge request pleroma/pleroma!3132	2020-11-12 08:50:26 +00:00
Mark Felder	2156de2fee	Ingest blurhash field during transmogrification	2020-11-11 13:39:02 -06:00
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	2020-11-11 12:51:13 -06:00
Mark Felder	6fd72e9e85	Ingest blurhash for attachments if they were federated	2020-11-11 12:27:51 -06:00
Egor Kislitsyn	d26a449396	Change endpoint path	2020-11-11 20:39:57 +04:00
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	2020-11-11 20:12:35 +04:00
lain	631def2df2	RedirectController: Don't replace title, but inject into the meta	2020-11-11 17:10:59 +01:00
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	2020-11-11 19:53:40 +04:00
Alexander Strizhakov	8da9f919f8	little changes for MRF config descriptions ... - log level reduction, if policy doesn't implement config_description method - docs in dev.md	2020-11-11 18:49:15 +03:00
Egor Kislitsyn	af3f00292c	Fix formatting	2020-11-11 19:12:46 +04:00
Egor Kislitsyn	0118ccb53c	Add local visibility	2020-11-11 18:54:01 +04:00
feld	3cd7ea693f	Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' ... Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128	2020-11-11 13:48:03 +00:00
Alexander Strizhakov	8d218ebaf5	Moving some background jobs into simple tasks ... - fetching activity data - attachment prefetching - using limiter to prevent overload	2020-11-11 13:39:49 +03:00
Alexander Strizhakov	f97f24b067	making credo happy and test fix	2020-11-11 10:48:03 +03:00
Alexander Strizhakov	efc27f6464	fix for adminFE ... - revert UserAllowPolicy description - MRF descriptions order	2020-11-11 10:10:57 +03:00
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	2020-11-10 19:20:14 +03:00
lain	88f6b61a5e	Merge branch '2260-wrong-report-link' into 'develop' ... Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121	2020-11-10 11:04:19 +00:00
lain	d77fd6b3d0	Merge branch 'fix/html-title-load' into 'develop' ... Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125	2020-11-10 10:05:15 +00:00
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	2020-11-10 10:46:57 +03:00
Sean King	e4a21084f0	Fix title on load of Pleroma HTML	2020-11-08 16:16:20 -07:00
lain	294628d981	Merge branch 'feature/expire-mutes' into 'develop' ... Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971	2020-11-05 12:44:16 +00:00
lain	6d850c46dc	AdminEmail: Use AP id as user url.	2020-11-04 17:12:47 +01:00
lain	7bbc328d66	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix	2020-11-04 16:52:30 +01:00
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	2020-11-04 16:51:42 +01:00
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-11-04 16:18:11 +01:00
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	2020-11-04 15:00:52 +00:00
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	2020-11-04 14:54:53 +00:00
Ivan Tashkinov	73e66fd31f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-04 17:48:10 +03:00
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	2020-11-04 14:44:45 +00:00
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	2020-11-04 15:38:10 +01:00
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	2020-11-04 15:05:01 +01:00
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	2020-11-04 13:48:15 +00:00
Egor Kislitsyn	ca95cbe0b4	Add with_muted param to ChatController.index/2	2020-11-04 16:40:12 +04:00
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	2020-11-04 13:23:18 +01:00
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	2020-11-04 11:47:41 +01:00
lain	92d252f364	Poll Schema: Update and fix.	2020-11-04 10:20:09 +01:00
lain	1cfc3278c0	Poll View: Always return voters_count.	2020-11-04 10:14:00 +01:00
lain	c37118e6f2	Conversations: A few refactors	2020-11-03 13:56:12 +01:00
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	2020-11-03 13:45:09 +01:00
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	2020-11-02 13:06:59 -06:00
Egor Kislitsyn	be52819a11	Hide chats from muted users	2020-11-02 17:51:54 +04:00
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	2020-11-02 12:08:20 +00:00
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	2020-11-02 10:43:45 +00:00
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	2020-11-02 05:56:17 +01:00
feld	9fbe9ef774	Merge branch 'tesla-get-to-pleroma' into 'develop' ... Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113	2020-11-01 19:31:17 +00:00
sadposter	ddf36b096e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-11-01 12:22:28 +00:00
Ekaterina Vaartis	8f00d90f91	Use Pleroma.HTTP instead of Tesla ... Closes #2275 As discovered in the issue, captcha used Tesla.get instead of Pleroma.HTTP. I've also grep'ed the repo and changed the other place where this was used.	2020-11-01 12:05:39 +03:00
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	2020-10-31 17:03:40 +00:00
Ivan Tashkinov	04f6b48ac1	Auth subsystem refactoring and tweaks. ... Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.	2020-10-31 13:38:35 +03:00
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	2020-10-31 05:50:59 +03:00
Egor Kislitsyn	d1698267a2	Fix credo warning	2020-10-31 00:26:11 +04:00
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
Alibek Omarov	d63ec02f31	ConversationView: fix formatting	2020-10-30 13:59:53 +01:00
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	2020-10-30 13:59:53 +01:00
Alibek Omarov	241bd061fc	ConversationView: add current user to conversations, according to Mastodon behaviour	2020-10-30 12:58:51 +01:00
minibikini	1cc8e94506	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	2020-10-30 11:18:55 +00:00
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	2020-10-29 23:39:15 +00:00
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	2020-10-29 21:06:15 +00:00
Egor Kislitsyn	d83c2bd330	Add support for install via file and build_url params	2020-10-29 16:37:50 +04:00
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	2020-10-29 15:35:42 +04:00
Egor Kislitsyn	8542d2efee	Merge remote-tracking branch 'origin/develop' into feature/local-only-scope	2020-10-29 14:51:23 +04:00
Ivan Tashkinov	9f5f7dc9f9	Fixed User.is_discoverable attribute rendering in Admin API User view.	2020-10-28 22:29:52 +03:00
Ivan Tashkinov	da4a1e57b1	@doc fix.	2020-10-28 19:09:38 +03:00
Ivan Tashkinov	ba50dc05a8	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md	2020-10-28 19:03:40 +03:00
Mark Felder	d2b140a525	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261	2020-10-28 08:48:26 -05:00
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-28 15:33:36 +04:00
feld	1204aaa2e3	Merge branch 'feature/autofollowing' into 'develop' ... autofollowing_nicknames See merge request pleroma/pleroma!3087	2020-10-27 22:55:31 +00:00
Haelwenn	d8d4bd15d0	Merge branch '2236-no-name' into 'develop' ... Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101	2020-10-27 22:44:31 +00:00
feld	03a318af9a	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 22:13:50 +00:00
Maksim Pechnikov	d28f72a55a	FrontStatic plug: excluded invalid url	2020-10-27 22:59:27 +03:00
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	2020-10-27 18:59:19 +00:00
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	2020-10-27 12:54:33 -05:00
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	2020-10-27 12:51:31 -05:00
feld	5aff479951	Merge branch '1668-prometheus-access-restrictions' into 'develop' ... [#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093	2020-10-27 17:47:56 +00:00
feld	e062329a17	Merge branch 'develop' into 'feature/autofollowing' ... # Conflicts: # CHANGELOG.md	2020-10-27 17:42:24 +00:00
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	2020-10-27 19:20:21 +04:00
lain	04b7505c75	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-10-26 17:50:34 +01:00
lain	de6d49c8ce	ActivityPub: Add back debug call + explanation.	2020-10-26 16:33:26 +01:00
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	2020-10-26 16:30:48 +01:00
Haelwenn	073ad7e6d9	Merge branch 'docs/ap_c2s' into 'develop' ... AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056	2020-10-26 02:09:20 +00:00
rinpatch	df61071422	Merge branch '2242-nsfw-case' into 'develop' ... Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094	2020-10-23 19:39:42 +00:00
lain	60e379ce0b	User: Correctly handle whitespace names.	2020-10-23 13:53:01 +02:00
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	2020-10-22 20:33:52 +00:00
Ivan Tashkinov	8a68673eed	[#3059] Formatting fix.	2020-10-22 14:07:33 +03:00
Ivan Tashkinov	8a55de1d78	[#3059] Fixed Phoenix 1.5 telemetry processing.	2020-10-22 13:54:15 +03:00
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	2020-10-22 12:22:08 +02:00
Maksim Pechnikov	ef627b9391	fix module name	2020-10-22 12:04:23 +03:00
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by actor_types	2020-10-22 11:53:28 +03:00
Maksim Pechnikov	60663150b5	admin user search: added filter by actor_type	2020-10-22 11:53:28 +03:00
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	2020-10-22 11:50:49 +03:00
Haelwenn	2ca98f2d94	Apply 1 suggestion(s) to 1 file(s)	2020-10-21 19:40:37 +00:00
Egor Kislitsyn	034ac43f3a	Fix credo warnings	2020-10-20 17:47:04 +04:00
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-20 17:27:29 +04:00
Egor Kislitsyn	ad605e3e16	Rename Pleroma.Backup to Pleroma.User.Backup	2020-10-20 17:16:58 +04:00
lain	e97b254c6b	Transmogrifier: Refactor and unify incoming tag handling	2020-10-19 15:46:24 +02:00
lain	39fd4d7639	Transmogrifier: Downcase incoming Hashtags ... Also, set sensitive to true if we have an nsfw hashtag present.	2020-10-19 15:40:50 +02:00
Egor Kislitsyn	98f32cf820	Fix tests	2020-10-19 17:19:45 +04:00
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	2020-10-19 15:40:03 +04:00
Egor Kislitsyn	18a91d85e5	Merge branch 'develop' into feature/local-only-scope	2020-10-19 15:31:56 +04:00
Haelwenn	0495a07dc7	Merge branch '2239-mute-fixes' into 'develop' ... ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084	2020-10-19 04:26:35 +00:00
Ivan Tashkinov	524fb0e4c2	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. ... Added tests and documentation.	2020-10-18 21:22:21 +03:00
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	2020-10-17 17:53:47 +03:00
Ivan Tashkinov	d54233760f	[#3053] Post-merge fix.	2020-10-17 13:33:57 +03:00
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	2020-10-17 13:12:39 +03:00
Mark Felder	1b8fd7e65a	Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts	2020-10-16 17:36:02 +00:00
Haelwenn (lanodan) Monnier	aafdc975bd	federation_status: Add ApiSpec	2020-10-16 01:14:15 +02:00
Haelwenn (lanodan) Monnier	3b5a7a6b14	federation_status: New endpoint showing unreachable instances	2020-10-16 01:14:04 +02:00
Mark Felder	fb056ce05b	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-15 16:39:01 -05:00
Haelwenn	724e4b7f00	Apply 1 suggestion(s) to 1 file(s)	2020-10-15 21:03:48 +00:00
Egor Kislitsyn	2a475622ee	Add Pleroma.Constants.as_local_public/0	2020-10-15 19:07:00 +04:00
Egor Kislitsyn	4f79bbbc31	Add local-only statuses	2020-10-15 18:37:44 +04:00
Egor Kislitsyn	3985c1b450	Fix warnings	2020-10-15 16:54:59 +04:00
lain	7a2f100061	ActivityPub: Show own replies to muted users. ... Aligns mute with block behavior.	2020-10-15 12:28:25 +02:00
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	2020-10-14 15:27:15 -05:00
feld	77bca41595	Apply 3 suggestion(s) to 3 file(s)	2020-10-14 19:33:54 +00:00
Alex Gleason	83770b7b39	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-14 12:33:24 -05:00
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	2020-10-14 17:31:45 +00:00
Mark Felder	ed61002815	Undo API breaking changes	2020-10-14 11:03:17 -05:00
Mark Felder	b001237b79	Finish undoing API breakage	2020-10-14 10:44:18 -05:00
Mark Felder	3242cfef20	Undo API breaking changes	2020-10-14 09:54:07 -05:00
Alex Gleason	dc38dc8472	Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235	2020-10-13 22:01:27 -05:00
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	2020-10-13 19:26:04 -05:00
Alex Gleason	7d8f610720	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-13 19:25:18 -05:00
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	2020-10-13 19:22:32 -05:00
Alex Gleason	c3112fd13a	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-10-13 19:20:00 -05:00
Egor Kislitsyn	6734abcbd4	Add pagination for Mutes	2020-10-13 21:58:18 +04:00
Egor Kislitsyn	33f4f39b1c	Add pagination for Blocks	2020-10-13 21:39:41 +04:00
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
Mark Felder	64553ebae2	Merge branch 'develop' into chore/elixir-1.11	2020-10-13 09:54:53 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Mark Felder	4ead0d564f	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
Mark Felder	8bacdc3680	Change user.discoverable field to user.is_discoverable	2020-10-13 09:45:08 -05:00
Mark Felder	9968b7efed	Change user.locked field to user.is_locked	2020-10-13 09:31:13 -05:00
Alexander Strizhakov	4c4ea9a348	changes after rebase	2020-10-13 17:10:34 +03:00
Alexander Strizhakov	3cb9c88837	migration and warning for RemoteIp plug rename	2020-10-13 16:44:04 +03:00
Alexander Strizhakov	5f2071c458	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	7f5dbb0201	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	b081080dd9	fixes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	c4c5caedd8	changes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	1d0e130cb3	fixes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	0f8ab46a0e	fix after rebase	2020-10-13 16:44:00 +03:00
Alexander Strizhakov	207211a2b3	update files consistency after rebase	2020-10-13 16:44:00 +03:00
Alexander Strizhakov	9f4fe5485b	alias alphabetically order	2020-10-13 16:43:59 +03:00
Alexander Strizhakov	3ef4e9d170	AdminSecretAuthenticationPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	c497558d43	AuthenticationPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	c1777e7479	BasicAuthDecoderPlug module name	2020-10-13 16:43:58 +03:00
Alexander Strizhakov	970932689f	DigestPlug rename	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	66e0b0065b	Cache plug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	c6baa811d6	EnsureAuthenticatedPlug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	011525a3d1	EnsurePublicOrAuthenticatedPlug module name	2020-10-13 16:43:57 +03:00
Alexander Strizhakov	8e301a4c37	EnsureUserKeyPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	d6cb1a3b46	ExpectAuthenticatedCheckPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	99e4ed21b1	ExpectPublicOrAuthenticatedCheckPlug module name	2020-10-13 16:43:56 +03:00
Alexander Strizhakov	8c993c5f63	FederatingPlug module name	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	abc3c7689b	HTTPSecurityPlug module name and filename	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	5cd7030076	IdempotencyPlug module name	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	8dfaa54ffc	InstanceStatic module name	2020-10-13 16:43:55 +03:00
Alexander Strizhakov	e2332d92ce	LegacyAuthenticationPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	96d320bdfe	OAuthPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	a6d8cef33e	OAuthScopesPlug module name	2020-10-13 16:43:54 +03:00
Alexander Strizhakov	15772fda57	PlugHelper module name	2020-10-13 16:43:53 +03:00
Alexander Strizhakov	4b1863ca4e	RateLimiter module name	2020-10-13 16:43:53 +03:00
Alexander Strizhakov	3be8ab5103	RemoteIp module name	2020-10-13 16:43:50 +03:00
Alexander Strizhakov	4b4c0eef36	SessionAuthenticationPlug module name	2020-10-13 16:42:53 +03:00
Alexander Strizhakov	8249b75761	SetFormatPlug module name	2020-10-13 16:42:53 +03:00
Alexander Strizhakov	c97c7d982f	SetLocalePlug module name	2020-10-13 16:42:52 +03:00
Alexander Strizhakov	f7614d4718	SetUserSessionIdPlug module name	2020-10-13 16:42:52 +03:00
Alexander Strizhakov	d36c9e210a	StaticFEPlug module name	2020-10-13 16:42:52 +03:00
Alexander Strizhakov	a07688deb1	TrailingFormatPlug module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	a5987155f7	UploadedMedia module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	ebd6dd7c53	UserEnabledPlug module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	61c609884c	UserFetcherPlug module name	2020-10-13 16:42:51 +03:00
Alexander Strizhakov	1d16cd0c3d	UserIsAdminPlug module name	2020-10-13 16:42:50 +03:00
Alexander Strizhakov	2125286e90	fix for fallback controller	2020-10-13 16:42:50 +03:00
Alexander Strizhakov	e267991a44	renaming LimiterSupervisor	2020-10-13 16:42:48 +03:00
Alexander Strizhakov	6a87f94ee2	renaming ratelimiter supervisor	2020-10-13 16:38:48 +03:00
Alexander Strizhakov	2501793f81	moving plugs into web dir	2020-10-13 16:38:19 +03:00
Alexander Strizhakov	0374df1d12	other files consistency	2020-10-13 16:38:19 +03:00
Alexander Strizhakov	fc7151a9c4	more files renamings	2020-10-13 16:38:19 +03:00
Alexander Strizhakov	e8e4034c48	metadata providers consistency	2020-10-13 16:38:18 +03:00
Alexander Strizhakov	b5b4395e4a	oauth consistency	2020-10-13 16:38:18 +03:00
Alexander Strizhakov	103f3dcb9e	rich media parser ttl files consistency	2020-10-13 16:38:15 +03:00
Alex Gleason	83ae45b000	Preload /api/pleroma/frontend_configurations, fixes #1932	2020-10-12 18:49:37 -05:00
Alex Gleason	66e00ace7c	Refactor User.post_register_action/1 emails	2020-10-12 17:21:08 -05:00
Alex Gleason	cb29769a22	Make User.confirm/1 and User.approve/1 idempotent	2020-10-12 16:42:59 -05:00
Alex Gleason	6ebec50df6	Refactor User.confirm/1, add more tests	2020-10-12 16:32:34 -05:00
Mark Felder	8539e386c3	Add missing Copyright headers	2020-10-12 12:00:50 -05:00
Alex Gleason	bb8c0614ef	Move admin approval email logic into User.post_register_action/1	2020-10-11 21:46:10 -05:00
Alex Gleason	521e965884	Registration tests	2020-10-11 21:38:01 -05:00
Alex Gleason	28005563f0	Send approval pending email during registration	2020-10-11 20:50:09 -05:00
Alex Gleason	c69b205409	Registration: user state is separate from instance state	2020-10-11 19:25:34 -05:00
Alex Gleason	b2fed59209	Handle User.post_register_action/1 in steps	2020-10-11 18:52:35 -05:00
Ivan Tashkinov	2498e569f1	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-11 22:34:48 +03:00
Ivan Tashkinov	89c595b772	[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.	2020-10-11 22:34:28 +03:00
Ivan Tashkinov	e1eb54d389	[#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).	2020-10-11 13:37:19 +03:00
Alex Gleason	7c2d0e378c	Blocks: make blockers_visible config work	2020-10-10 03:41:35 -05:00
Alex Gleason	d2364276a1	Blocks: always see your own posts	2020-10-10 01:58:48 -05:00
Mark Felder	3ca98878d2	Deep link to the user account in AdminFE in account confirmation emails	2020-10-09 17:08:05 -05:00
Mark Felder	04b514c567	Merge branch 'develop' into feature/gen-magic	2020-10-09 11:26:10 -05:00
Alex Gleason	9c672ecbb5	Remote Timeline: add Streaming support	2020-10-08 20:07:03 -05:00
Alex Gleason	3f9263fb16	Merge remote-tracking branch 'upstream/develop' into restrict-origin	2020-10-08 17:24:09 -05:00
Alex Gleason	5ec7d88b77	Aliases: fix URL regex	2020-10-08 16:33:47 -05:00
Alex Gleason	77b1ea68a7	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-08 15:44:48 -05:00
Haelwenn	74be4de3f6	Merge branch 'fix/2209-remoteip' into 'develop' ... #2209 RemoteIP CIDR helper, config and doc improvements See merge request pleroma/pleroma!3057	2020-10-08 17:29:00 +00:00
Mark Felder	ed6511a086	Lint	2020-10-07 15:28:29 -05:00
feld	d0eca5b125	Apply 2 suggestion(s) to 2 file(s)	2020-10-07 19:16:53 +00:00
Mark Felder	8156940a49	Compatibility with phoenix_pubsub 2.0.0	2020-10-07 13:28:39 -05:00
Mark Felder	70880d54f8	@env is not used	2020-10-07 12:55:16 -05:00
Mark Felder	42e78a08b2	Fix rendering of reports	2020-10-07 12:30:55 -05:00
feld	6d1666a080	Apply 1 suggestion(s) to 1 file(s)	2020-10-07 16:44:52 +00:00
Mark Felder	218a3e61e1	Fix incompatible types warning (Elixir 1.11)	2020-10-07 10:04:25 -05:00
Mark Felder	d3106c69c8	Fix incompatible type (Elixir 1.11)	2020-10-07 10:02:20 -05:00
Mark Felder	636c00037d	Fix duplicate @doc entries	2020-10-07 09:58:45 -05:00
Egor Kislitsyn	bc3db72403	Use ModerationLog instead of Logger	2020-10-07 18:35:29 +04:00
Egor Kislitsyn	8545d533dd	Use to_string/1 instead of :binary.list_to_bin/1	2020-10-07 18:35:29 +04:00
Egor Kislitsyn	08972dd135	Use Path.join/2	2020-10-07 18:35:29 +04:00
Egor Kislitsyn	9af9f02f4b	Use Gettext for error messages	2020-10-07 18:35:28 +04:00
Egor Kislitsyn	d7a5291b4f	Use Jason.encode/1 for likes and bookmarks	2020-10-07 18:35:28 +04:00
Egor Kislitsyn	8baee855d9	Fix emails	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	e4792ce76a	Do not limit admins	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	17562bf414	Move API endpoints to /api/v1/pleroma/backups	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	a9efd441e2	Use Pleroma.Repo.chunk_stream/2 instead of Pleroma.RepoStreamer.chunk_stream/2	2020-10-07 18:35:27 +04:00
Egor Kislitsyn	e50314d9d3	Fix export	2020-10-07 18:35:26 +04:00
Egor Kislitsyn	7c22c9afb4	Allow admins request user backups	2020-10-07 18:34:31 +04:00
Egor Kislitsyn	7fdd81d000	Add "Your backup is ready" email	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	e52dd62e14	Add configurable temporary directory	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	27bc121ec0	Require email	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	cd13613db3	Fix query	2020-10-07 18:34:30 +04:00
Egor Kislitsyn	86ce4afd93	Improve backup urls	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	2c73bfe122	Add API endpoints for Backups	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	739cb1463b	Add backups deletion	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	3ad7492f9d	Add config for Pleroma.Backup	2020-10-07 18:34:29 +04:00
Egor Kislitsyn	a0ad9bd734	Add BackupWorker	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	4f3a633745	Add backups table	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	75e07ba206	Fix tests	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	be42ab70dc	Add backup upload	2020-10-07 18:34:28 +04:00
Egor Kislitsyn	c01a818048	Add tests	2020-10-07 18:34:27 +04:00
Egor Kislitsyn	9d564ffc29	Zip exported files	2020-10-07 18:34:27 +04:00
Egor Kislitsyn	257e059e61	Add account export	2020-10-07 18:34:27 +04:00
Mark Felder	7a2ed2fc90	Credo	2020-10-06 17:26:31 -05:00
Mark Felder	d43d05005a	Move hardcoded default configuration into config.exs	2020-10-06 17:02:46 -05:00
Mark Felder	cddca85c84	Merge branch 'develop' into revert/rich-media-censorship	2020-10-06 14:25:20 -05:00
rinpatch	2698bbc9f6	Merge branch 'filtering-following' into 'develop' ... ActivityPub: Return Announces when filtering by `following`. See merge request pleroma/pleroma!3022	2020-10-06 18:11:34 +00:00
Ivan Tashkinov	6c2264af24	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-05 23:50:08 +03:00
Ivan Tashkinov	094edde7c4	[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.	2020-10-05 23:48:00 +03:00
Haelwenn (lanodan) Monnier	f497eb034d	activity_pub_controller.ex: Remove unused @doc block ... [ci skip]	2020-10-05 21:11:00 +02:00
Mark Felder	346cc3ac24	Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination	2020-10-05 12:40:53 -05:00
Mark Felder	35ee759e74	Add helper function to convert single IPs into CIDR format if they were not provided that way	2020-10-05 11:49:56 -05:00
rinpatch	9e96c9ae48	Merge branch 'fix/empty-params-openapi' into 'develop' ... OpenAPI CastAndValidate: filter out empty params Closes #2198 See merge request pleroma/pleroma!3047	2020-10-03 12:35:49 +00:00
Ivan Tashkinov	f6024252ae	[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.	2020-10-02 22:18:02 +03:00
sadposter	a9938611f7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-10-02 15:09:47 +01:00
Ivan Tashkinov	0d575735bf	No auth check in UserController.feed_redirect/2, even on non-federating instances.	2020-10-01 21:41:22 +03:00
Ivan Tashkinov	7efadc3cbd	No auth check in OStatusController, even on non-federating instances.	2020-10-01 21:34:45 +03:00
Alexander Strizhakov	cbdaabad34	web push http_client fix	2020-10-01 13:32:11 +03:00
rinpatch	2566467782	Merge branch '2201-i-hate-this' into 'develop' ... User search: Once again, change uri handling. Closes #2201 See merge request pleroma/pleroma!3048	2020-09-30 13:37:46 +00:00
lain	90fee49c52	User search: Once again, change uri handling. ... They can indeed be non-unique.	2020-09-30 14:14:41 +02:00
rinpatch	006b62fd12	OpenAPI CastAndValidate: filter out empty params ... Closes #2198	2020-09-29 21:52:16 +03:00
Mark Felder	b3a9ba09ec	More robust expires_at timestamp processing	2020-09-29 12:27:47 -05:00
lain	2a11068a11	Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop' ... `ffmpeg` / `ImageMagick` handling as optional dependencies See merge request pleroma/pleroma!3031	2020-09-29 14:48:30 +00:00
Ivan Tashkinov	7d5c3883ac	[#3031] Refactoring: moved system commands checks to ApplicationRequirements.	2020-09-29 16:28:06 +03:00
Mark Felder	ba7f9459b4	Revert Rich Media censorship for sensitive statuses ... The #NSFW hashtag test was broken anyway.	2020-09-28 18:22:59 -05:00
Maksim Pechnikov	de993b856b	added force option to the unfollow operation	2020-09-28 09:16:42 +03:00
Ivan Tashkinov	4e4f771082	Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update. ... Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).	2020-09-26 19:32:16 +03:00
Mark Felder	dcdf75fbac	Merge branch 'develop' into fix/deprecation-warning-welcome-message	2020-09-25 11:45:51 -05:00
feld	1672d8b37c	Merge branch 'feature/bulk-confirmation' into 'develop' ... Bulk account confirmation actions Closes #2085 See merge request pleroma/pleroma!2975	2020-09-25 16:15:01 +00:00
Mark Felder	2bf2c68dee	Merge branch 'develop' into fix/deprecation-warning-welcome-message	2020-09-25 10:48:01 -05:00
rinpatch	5cd71208d9	Merge branch 'search-even-more' into 'develop' ... More user search improvements See merge request pleroma/pleroma!3032	2020-09-25 12:56:21 +00:00
rinpatch	f67c967c4a	Merge branch 'features/incoming-create-exists' into 'develop' ... transmogrifier: Drop incoming create early if it already exists See merge request pleroma/pleroma!3026	2020-09-25 12:44:33 +00:00
lain	05b5241314	Linter fixes	2020-09-25 09:12:48 +02:00
lain	a8c17ea25a	User Search: Also find user by uri	2020-09-25 08:46:14 +02:00
lain	d0078bc404	User Search: Boost resolved results and exact ap_id matches.	2020-09-24 15:54:55 +02:00
Alexander Strizhakov	5d7ec00bed	fixes after rebase	2020-09-24 09:42:30 +03:00
Alexander Strizhakov	8c6ec4c111	pack routes change	2020-09-24 09:16:14 +03:00
Alexander Strizhakov	dbbc801667	pagination for remote emoji packs	2020-09-24 09:12:39 +03:00
Alexander Strizhakov	9b6d89ff8c	support for special chars in pack name	2020-09-24 09:12:37 +03:00
Mark Felder	f3a1f9c3bb	Merge branch 'develop' into feature/bulk-confirmation	2020-09-23 11:56:22 -05:00
lain	e02101e15c	Merge branch 'issue/2115' into 'develop' ... [#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981	2020-09-23 12:09:38 +00:00
lain	4dadb7c433	Merge branch 'user-query/filter-out-internal' into 'develop' ... Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024	2020-09-23 11:51:04 +00:00
lain	436d1a3c41	Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md	2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier	5e86a2809e	transmogrifier: Drop incoming create early if it already exists	2020-09-23 13:40:45 +02:00
Roman Chvanikov	8f5589cf66	Merge develop	2020-09-23 13:56:50 +03:00
lain	a6c14041c4	Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md	2020-09-23 09:16:00 +00:00
Maksim Pechnikov	72d2b34d3b	Merge branch 'develop' into issue/1975	2020-09-22 21:42:10 +03:00
Alex Gleason	3104367931	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
Mark Felder	e2dcf039d2	Fix gun_pool_options deprecation warning message	2020-09-22 11:15:40 -05:00
Mark Felder	2fc3b46ee7	Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.	2020-09-22 11:13:36 -05:00
lain	c95859e45b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	2020-09-22 17:13:46 +02:00
Egor Kislitsyn	0e0ece251a	Filter out internal users by default	2020-09-22 16:56:11 +04:00
lain	ee3052a2d8	ActivityPub: Return Announces when filtering by following.	2020-09-22 14:20:19 +02:00
Mark Felder	e5927e92a6	Fix deprecation warning for welcome message	2020-09-21 17:08:49 -05:00
feld	a5c34e3123	Merge branch 'fix/fedsocket-useragent' into 'develop' ... Minor Fedsocket improvements See merge request pleroma/pleroma!3012	2020-09-21 21:06:32 +00:00
Alex Gleason	23d5d7cf59	Fix #2172 HTTP error on password reset	2020-09-21 14:09:26 -05:00
Alex Gleason	8b6ac45f3c	Allow emails to be sent again, #2101 #2172 ... https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707	2020-09-21 13:28:02 -05:00
lain	59680f27ff	Merge branch 'bugfix/federator-actor-error' into 'develop' ... federator: normalize only actor, catch actor error See merge request pleroma/pleroma!2986	2020-09-21 17:24:14 +00:00
lain	9108e27c2f	Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' ... [#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013	2020-09-21 17:15:54 +00:00
lain	b36b6259d8	Merge branch 'issue/2099' into 'develop' ... [#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965	2020-09-21 16:25:17 +00:00
Mark Felder	8afdbcdb1c	Force HTTP for fedsockets	2020-09-21 10:13:41 -05:00
lain	f2f0a0260f	ActivityPub: Don't block-filter your own posts ... We are filtering out replies to people you block, but that should not include your own posts.	2020-09-21 16:08:38 +02:00
Roman Chvanikov	28d0986f83	Refactor mutes removing in CommonAPI and User	2020-09-20 20:58:17 +03:00
Roman Chvanikov	4987ee6256	Merge branch 'develop' into feature/expire-mutes	2020-09-20 19:27:27 +03:00
Ivan Tashkinov	60b025b782	[#2074] OAuth scope checking in Streaming API.	2020-09-19 19:16:55 +03:00
rinpatch	4b12e071ac	OpenAPI: make it possible to generate a spec without starting the app ... Needed for api docs generation on pleroma.social that will come later	2020-09-19 16:26:15 +03:00
rinpatch	51116b5392	OpenAPI: fix various errors pointed out by editor.swagger.io	2020-09-19 16:26:15 +03:00
Mark Felder	26859c549c	Add user agent to fedsocket requests	2020-09-19 07:26:46 -05:00
Maksim Pechnikov	ed3bc53fa1	Merge branch 'develop' into issue/2099	2020-09-18 22:13:05 +03:00
feld	6c052bd5b6	Merge branch 'media-preview-proxy-nostream' into 'develop' ... Media preview proxy See merge request pleroma/pleroma!3001	2020-09-18 18:38:20 +00:00
rinpatch	26c571df33	FedSockets: fix log spam on cached rejects	2020-09-18 16:09:37 +03:00
Steven Fuchs	f2ef9735c5	Federate data through persistent websocket connections	2020-09-18 11:58:22 +00:00
Maksim Pechnikov	2ec0dcf001	Merge branch 'develop' into issue/2099	2020-09-18 07:08:37 +03:00
Ivan Tashkinov	a428800405	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream ... # Conflicts: # CHANGELOG.md	2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier	7bf269fe83	Fix MRF reject for ChatMessage	2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier	abf25e5d52	Create MRF.filter_pipeline to inject :object_data when present	2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier	3a0f99ed35	KeywordPolicy: Still match when fields are absent	2020-09-17 22:07:54 +03:00
Haelwenn	beefc022dd	Merge branch 'omit-nondiscoverable-from-search' into 'develop' ... User search should respect discoverable flag See merge request pleroma/pleroma!2997	2020-09-17 17:59:38 +00:00
feld	608824b97e	Merge branch 'instance-docs' into 'develop' ... AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931	2020-09-17 16:54:53 +00:00
rinpatch	6bbd65fb09	Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' ... [#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979	2020-09-17 19:51:54 +03:00
rinpatch	608017b7df	Merge branch 'fix/streaming-termination-errors' into 'develop' ... Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982	2020-09-17 19:50:51 +03:00
Haelwenn	0465bdbd49	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' ... Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992	2020-09-17 19:50:23 +03:00
lain	bb70b231d0	Merge branch 'reply-visibility-user-guard' into 'develop' ... Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999	2020-09-17 19:49:08 +03:00
rinpatch	22d49993d9	Merge branch 'bugfix/mrf-ingestion' into 'develop' ... Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15	2020-09-17 19:48:33 +03:00
stwf	41939e3175	User search respect discoverable flag	2020-09-17 12:15:50 -04:00
rinpatch	eff7f9892d	Merge branch 'hotfix/rich-media-compile-error' into 'develop' ... RichMedia: fix a compilation error due to nonexistent variable See merge request pleroma/pleroma!2996	2020-09-17 19:06:10 +03:00
rinpatch	dee4639dbb	Merge branch 'feat/rich-media-head' into 'develop' ... RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995	2020-09-17 19:04:50 +03:00
Mark Felder	f7e40f7ef1	Deny ConfigDB migration when deprecated settings found	2020-09-17 09:32:50 -05:00
lain	2a7c9ac147	Merge branch 'nondiscoverable-user-metadata' into 'develop' ... search indexing metadata should respect discoverable flag See merge request pleroma/pleroma!2998	2020-09-17 14:20:03 +00:00
Ivan Tashkinov	d9fb5bc08a	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-17 17:14:20 +03:00
Ivan Tashkinov	7cdbd91d83	[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	2020-09-17 17:13:40 +03:00
lain	7c60789ba5	Merge branch 'develop' into 'nondiscoverable-user-metadata' ... # Conflicts: # CHANGELOG.md	2020-09-17 14:09:01 +00:00
rinpatch	db80b9d630	RichMedia: Fix log spam on failures and resetting TTL on cached errors	2020-09-17 16:56:39 +03:00
eugenijm	c711a2b157	Return the file content for GET /api/pleroma/admin/instance_document/:document_name	2020-09-17 16:55:53 +03:00
eugenijm	582ad5d4e1	AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API	2020-09-17 16:48:07 +03:00
Roman Chvanikov	44e8b6037a	Merge branch 'develop' into feature/expire-mutes	2020-09-17 14:54:00 +03:00
lain	7a73850928	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation	2020-09-17 13:26:04 +02:00
Maksim Pechnikov	5a8ea0a5b0	small refactoring	2020-09-17 09:13:43 +03:00
Maksim Pechnikov	b867f9d7ae	Merge branch 'develop' into issue/2099	2020-09-17 08:41:35 +03:00
Ivan Tashkinov	a781f41f96	[#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring.	2020-09-16 22:30:42 +03:00
rinpatch	3a9baa9d0d	Merge branch '2144-empty-users' into 'develop' ... User: Remote users don't need to be confirmed or approved Closes #2144 See merge request pleroma/pleroma!3003	2020-09-16 15:47:07 +00:00
lain	7a88b726bf	User: Remote users don't need to be confirmed or approved	2020-09-16 17:29:16 +02:00
rinpatch	a4f80e1e74	Merge branch 'feat/connection-worker-monitor-flush' into 'develop' ... ConnectionPool Worker: use monitor flush instead of checking ref See merge request pleroma/pleroma!3002	2020-09-16 15:10:20 +00:00
rinpatch	adb1b0282d	ConnectionPool Worker: use monitor flush instead of checking ref ... `:flush` removes the DOWN message if one had arrived, so this check should no longer be necessary.	2020-09-16 17:29:07 +03:00
rinpatch	eca8d26784	Merge branch 'chores/mrf-loglevel' into 'develop' ... Fetcher: Correctly return MRF reject reason See merge request pleroma/pleroma!2990	2020-09-16 13:37:04 +00:00
rinpatch	adbd0032fa	Merge branch 'features/validators-video' into 'develop' ... Pipeline Ingestion: Video and Article See merge request pleroma/pleroma!2908	2020-09-16 13:36:27 +00:00
lain	6b088ed76a	Merge branch 'issue/2089' into 'develop' ... [#2089] fix notifications See merge request pleroma/pleroma!3000	2020-09-16 12:22:48 +00:00
Maksim Pechnikov	599f8bb152	RepoStreamer.chunk_stream -> Repo.chunk_stream	2020-09-16 09:47:18 +03:00
Ivan Tashkinov	2f155fb89f	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-15 20:29:39 +03:00
sadposter	95a1e5bf5a	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-09-15 17:21:18 +01:00
eugenijm	3ab59a6f3c	Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user	2020-09-15 13:00:56 +03:00
Haelwenn	5c4ff5c73c	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' ... Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992	2020-09-15 08:25:10 +00:00
Mark Felder	709723182d	Ensure SimplePolicy's tags in string representation don't trip up the object validator	2020-09-14 17:06:42 -05:00
stwf	38b2db297b	search indexing metadata respects discoverable flag	2020-09-14 13:18:11 -04:00
rinpatch	bb407edce4	RichMedia: fix a compilation error due to nonexistent variable ... No idea why this passed Gitlab CI	2020-09-14 15:46:00 +03:00
rinpatch	f70335002d	RichMedia: Do a HEAD request to check content type/length ... This shouldn't be too expensive, since the connections are pooled, but it should save us some bandwidth since we won't fetch non-html files and files that are too large for us to process (especially since you can't cancel a request without closing the connection with HTTP1).	2020-09-14 14:45:58 +03:00
rinpatch	f66a15c4a5	RichMedia parser: do not set a cache TTL for unchanging errors	2020-09-14 14:44:25 +03:00
Maksim Pechnikov	3e53ab4e98	added notification constraints	2020-09-14 14:08:12 +03:00
Maksim	489a107cf4	Apply 1 suggestion(s) to 1 file(s)	2020-09-13 11:54:15 +00:00
Roman Chvanikov	c5830ac037	Merge develop	2020-09-13 12:24:57 +03:00
Roman Chvanikov	527afb813a	Remove unused require	2020-09-13 12:23:45 +03:00
Ivan Tashkinov	cd234a5321	[#2497] Media preview proxy: preview bypass for small images ... (basing on Content-Length and Content-Type).	2020-09-12 11:20:41 +03:00
Ivan Tashkinov	32831f371f	[#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.	2020-09-12 10:33:42 +03:00
Mark Felder	c0b36621f1	Ensure we only apply NSFW Simple policy on parsable objects	2020-09-11 23:22:14 -05:00
Alex Gleason	9733c9d065	Merge remote-tracking branch 'upstream/develop' into chat-moderation	2020-09-11 14:13:38 -05:00
Alex Gleason	e229536e5c	Chat Moderation: use explicit sender and recipient fields	2020-09-11 14:11:00 -05:00
Alex Gleason	02d70228b5	AdminAPI: fix delete chat message	2020-09-11 14:10:35 -05:00
Alex Gleason	9dd0b23da4	AdminAPI: show chat	2020-09-11 14:10:28 -05:00
Alex Gleason	f13b52a703	AdminAPI: list messages in a chat	2020-09-11 14:10:19 -05:00
Alex Gleason	c41430b23e	Refactor with Chat.for_user_query/1	2020-09-11 14:10:13 -05:00
Alex Gleason	fb0de07343	AdminAPI: list chats for a user	2020-09-11 14:10:05 -05:00
Alex Gleason	b40a627ab0	AdminAPI: delete a chat message	2020-09-11 14:09:58 -05:00
Alex Gleason	f88dc1937e	MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1	2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier	f1f44069ae	Fetcher: Correctly return MRF reject reason	2020-09-11 20:00:41 +02:00
Ivan Tashkinov	0bda85857e	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex	2020-09-11 17:19:58 +03:00
rinpatch	89a7efab69	ConnectionPool: Log possible HTTP1 blocks	2020-09-11 15:37:39 +03:00
Haelwenn	36c9197ac3	Apply 1 suggestion(s) to 1 file(s)	2020-09-11 10:46:16 +00:00
Haelwenn (lanodan) Monnier	dbc013f24c	instance: Handle not getting a favicon	2020-09-11 11:37:46 +02:00
Haelwenn (lanodan) Monnier	f18178cb09	AttachmentValidator: directly embed url schema and pass it fix_media_type	2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier	1b3d5956b1	Pipeline Ingestion: Article	2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier	2132b24a9d	object_validators: likes & announcements as [ObjectID]	2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier	846b59ccb0	Pipeline Ingestion: Video	2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier	b73e9ef686	transmogrifier: Call strip_internal_fields on pipeline ingestion	2020-09-11 01:39:38 +02:00
Haelwenn (lanodan) Monnier	da876d09e8	federator: normalize only actor, catch actor error	2020-09-11 00:56:21 +02:00
Mark Felder	55562ca936	Merge branch 'develop' into feature/gen-magic	2020-09-10 16:05:22 -05:00
Ivan Tashkinov	4d18a50f3c	[#2497] Formatting fix.	2020-09-10 21:54:26 +03:00
Alexander Strizhakov	15aece7238	remove validate_expires_at from enqueue method	2020-09-10 21:52:31 +03:00
Alexander Strizhakov	2c2094d4b2	configurable lifetime for ephemeral activities	2020-09-10 21:51:59 +03:00
Alexander Strizhakov	f24828a3e8	oban warning	2020-09-10 21:51:30 +03:00
Alexander Strizhakov	eb5ff715f7	pin/unpin for activities with expires_at option	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	b3485a6dbf	little clean up	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	357d971a10	expiration for new pipeline	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	93e1c8df9d	reject activity creation ... if passed expires_at option and expiring activities are not configured	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	4981b5a1a3	copyright header	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	629a8de9cb	deprecation warning ... changed namespace for activity expiration configuration	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	de4c935071	don't expire pinned posts	2020-09-10 21:50:41 +03:00
Alexander Strizhakov	9bf1065a06	schedule activity expiration in Oban	2020-09-10 21:50:40 +03:00
rinpatch	0254696e30	Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop' ... Feature/1790 removing expired tokens through Oban scheduled jobs See merge request pleroma/pleroma!2957	2020-09-10 18:45:04 +00:00
rinpatch	541a3eede2	Merge branch 'chores/remove-ostatus-fixtures' into 'develop' ... Remove OStatus in testsuite See merge request pleroma/pleroma!2968	2020-09-10 18:41:00 +00:00
rinpatch	53cf7fef6e	Merge branch 'fix/streaming-termination-errors' into 'develop' ... Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982	2020-09-10 18:40:54 +00:00
rinpatch	45c299e5b5	Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' ... [#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979	2020-09-10 18:38:48 +00:00
Ivan Tashkinov	dc4e06e199	[#2497] Removed support for thumbnail_max_* params for media preview proxy ... (per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771)	2020-09-10 21:28:07 +03:00
rinpatch	01fa68fe45	Websocket handler: fix never matching code on failed auth ... `:cowboy_req.reply` does not return tuples since 2.0, see https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/	2020-09-10 21:26:52 +03:00
rinpatch	e16e8f9816	Websocket handler: do not raise if handler is terminated before switching protocols ... Closes #2131	2020-09-10 21:14:23 +03:00
rinpatch	cb06e98da2	websocket handler: Do not log client ping frames as errors	2020-09-10 21:14:23 +03:00
Alexander Strizhakov	e8bfb50fa3	pass options without adapter key	2020-09-10 20:09:44 +03:00
Alexander Strizhakov	8af1fd3223	oban warning	2020-09-10 16:01:20 +03:00
Alexander Strizhakov	7dd986a563	expire mfa tokens through Oban	2020-09-10 16:01:19 +03:00
Alexander Strizhakov	3ce658b930	schedule expired oauth tokens deletion with Oban	2020-09-10 16:01:19 +03:00
Maksim Pechnikov	9853c90abb	added paginate links to headers for /chats/:id/messages	2020-09-10 12:39:29 +03:00
Ivan Tashkinov	148bc24435	[#2497] Removed Hackney-specific code ... (no longer needed due to adapter options unification).	2020-09-10 11:54:10 +03:00
Ivan Tashkinov	cad69669fc	[#2130] Fixed OAuth OOB authentication for users with enabled MFA.	2020-09-09 22:44:38 +03:00
Ivan Tashkinov	b4860c57a6	[#2497] Formatting fix.	2020-09-09 19:43:36 +03:00
Ivan Tashkinov	68a74d6659	[#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_.	2020-09-09 19:30:42 +03:00
Mark Felder	4ee99dafcc	Merge branch 'develop' into media-preview-proxy	2020-09-09 11:11:36 -05:00
sadposter	d0ffefc270	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-09-09 09:35:48 +01:00
Alexander Strizhakov	de2499e54b	don't run update in tests	2020-09-09 10:48:18 +03:00
Mark Felder	d23d0c27c2	Handle possibility of user account in a bulk operation not having an email address	2020-09-08 16:48:54 -05:00
Mark Felder	75b6fef25d	Add mix task for bulk [un]confirming the local instance users	2020-09-08 16:39:41 -05:00
Mark Felder	23ca5f75af	Make it possible to bulk send confirmation emails to all unconfirmed users	2020-09-08 16:39:08 -05:00
rinpatch	0d2814ec8e	Metadata: Move restriction check from Feed provider to activated_providers	2020-09-08 20:21:34 +03:00
Mark Felder	2011142ed9	Use :restrict_unauthenticated testing for more granular control	2020-09-08 20:21:34 +03:00
Mark Felder	a85ed6defb	Do not serve RSS/Atom feeds when instance is private	2020-09-08 20:21:34 +03:00
Mark Felder	14d07081fd	Feed provider only generates a redirect, so always activate it. ... Making this configurable is misleading.	2020-09-08 20:21:34 +03:00
Mark Felder	ff07014b26	Disable providers of user and status metadata when instance is private	2020-09-08 20:21:34 +03:00
Mark Felder	630444ee08	Do not make RelMe metadata provider optional. ... There's really no sound reason to turn this off anyway.	2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier	947ee55ae2	user: harden get_friends_query(), get_followers_query() and their wrappers	2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier	16c451f8f1	search: Apply following filter only when user is usable	2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier	10ef532c63	AP C2S: Restrict character limit on Note	2020-09-08 20:21:34 +03:00
Egor Kislitsyn	a781ac6ca5	Fix atom leak in AdminAPIController	2020-09-08 20:21:34 +03:00
rinpatch	27c3973b78	Merge branch 'temp-hackney-fix' into 'develop' ... temp hackney fix See merge request pleroma/pleroma!2951	2020-09-08 19:45:44 +03:00
rinpatch	7490b76bbf	Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' ... Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924	2020-09-08 19:45:44 +03:00
Haelwenn (lanodan) Monnier	921f926e96	Remove OStatus in testsuite	2020-09-08 18:43:57 +02:00
Haelwenn (lanodan) Monnier	ee0e05f930	Drop unused "inReplyToAtomUri" in objects	2020-09-08 18:43:57 +02:00
Alexander Strizhakov	87d2805791	combo fixes	2020-09-08 17:40:23 +02:00
Mark Felder	21efda2edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted	2020-09-08 09:31:26 -05:00
Roman Chvanikov	91b9985e1c	Pass expires_in param from status controller	2020-09-08 15:26:06 +03:00
rinpatch	0a05670b44	Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' ... Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924	2020-09-08 12:21:33 +00:00
Roman Chvanikov	880a92ccc7	Merge branch 'develop' into feature/expire-mutes	2020-09-08 15:16:43 +03:00
Roman Chvanikov	e3f845b243	Add expiring mutes for activities	2020-09-08 15:13:50 +03:00
rinpatch	4b76d7ce67	Merge branch 'fix/admin-controller-atom-leak' into 'develop' ... Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6	2020-09-08 14:00:00 +03:00
lain	9b85592b8b	Merge branch 'fix/rich-media-fake-statuses' into 'develop' ... Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956	2020-09-08 13:56:42 +03:00
rinpatch	964bc8e2e8	Merge branch 'bugfix/favicon-too-long' into 'develop' ... instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949	2020-09-08 13:55:52 +03:00
feld	43b07c31cb	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	2020-09-08 13:53:47 +03:00
rinpatch	dccbed856d	Merge branch 'http-fixes' into 'develop' ... Improvements and fixes for http requests See merge request pleroma/pleroma!2904	2020-09-08 13:53:16 +03:00
Roman Chvanikov	c56e3d4f3b	Add expires_in param for account mutes	2020-09-08 13:26:44 +03:00
rinpatch	ea4b6c64d6	Merge branch 'feat/rich-media-improvements' into 'develop' ... Rich media improvements See merge request pleroma/pleroma!2944	2020-09-08 13:00:49 +03:00
rinpatch	8c3241df44	Merge branch 'fix/2047-rich-media-parser' into 'develop' ... RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941	2020-09-08 13:00:15 +03:00
rinpatch	13e606941c	Merge branch 'fix/2087-metadata' into 'develop' ... Fix/2087 metadata See merge request pleroma/secteam/pleroma!11	2020-09-08 12:55:30 +03:00
rinpatch	74d46a1b09	Merge branch 'secfix/search-crash' into 'develop' ... Fix crash done via search See merge request pleroma/secteam/pleroma!12	2020-09-08 12:53:11 +03:00
rinpatch	84acfab156	Merge branch 'fix-searching-following' into 'develop' ... search: fix 'following' query parameter See merge request pleroma/pleroma!2943	2020-09-08 12:53:02 +03:00
rinpatch	718c7cc847	Merge branch 'fix/apc2s-limits' into 'develop' ... AP C2S: Restrict character limit on Note Closes #2 See merge request pleroma/secteam/pleroma!9	2020-09-08 12:51:38 +03:00
Mark Felder	4ea07f74e9	Revert/simplify. ... We only need to check the content-type. There's no chance a webp file will get mismatched as another image type.	2020-09-08 12:29:38 +03:00
Mark Felder	216c84a8f4	Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.	2020-09-08 12:29:38 +03:00
Mark Felder	2165a24974	Improve upload filter return values so we can identify when filters make no changes to the input	2020-09-08 12:29:38 +03:00
Mark Felder	fa347b9c2f	Fix uploading webp image files when Exiftool Upload Filter is enabled	2020-09-08 12:29:38 +03:00
Alibek Omarov	95688c90ad	ForceBotUnlistedPolicy: simplify code	2020-09-08 01:15:15 +02:00
Alibek Omarov	8b695c3eeb	ForceBotUnlistedPolicy: format	2020-09-07 22:53:45 +02:00
Alibek Omarov	699224a900	ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version	2020-09-07 22:15:42 +02:00
Alexander Strizhakov	18d21aed00	deprecation warnings	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	696bf09433	passing adapter options directly without adapter key	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	a83916fdac	adapter options unification ... not needed options deletion	2020-09-07 19:59:17 +03:00
Alexander Strizhakov	ee67c98e55	removing Stats worker from Oban cron jobs	2020-09-07 19:16:14 +03:00
rinpatch	6c6de8e5df	Merge branch 'temp-hackney-fix' into 'develop' ... temp hackney fix See merge request pleroma/pleroma!2951	2020-09-07 12:47:43 +00:00
rinpatch	d5c286b802	Merge branch 'bugfix/favicon-too-long' into 'develop' ... instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949	2020-09-07 11:12:30 +00:00
lain	fdab01ab56	Merge branch 'fix/rich-media-fake-statuses' into 'develop' ... Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956	2020-09-07 10:19:19 +00:00
sadposter	1c44d476e7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-09-07 09:57:00 +01:00
Haelwenn (lanodan) Monnier	08aef7dd4e	instance: Log catch favicon errors as warnings	2020-09-07 08:40:52 +02:00
Maksim Pechnikov	917d325972	added api spec	2020-09-07 07:17:30 +03:00
Maksim Pechnikov	5ae56aafb2	added import mutes	2020-09-06 21:42:51 +03:00
Mark Felder	563718cab9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy	2020-09-06 08:15:34 -05:00
rinpatch	170599c390	RichMedia: do not log webpages missing metadata as errors ... Also fixes the return value of Parser.parse on errors, previously was just `:ok` due to the logger call in the end	2020-09-05 22:05:35 +03:00
rinpatch	129a2f48df	ConnectionPool middleware: handle connection opening errors	2020-09-05 21:36:17 +03:00
rinpatch	9d6aca5bee	ConnectionPool: fix the previous hotfix ... I rushed the hotfix and forgot how `pop_in` actually works, I want to die. We need some integration tests for the HTTP client	2020-09-05 21:27:06 +03:00
rinpatch	5298de3be6	ConnectionPool middleware: fix a crash due to unimplemented behaviour ... Structs don't implement Access behaviour, so this crashed. Tests didn't catch it and I didn't test that part of the codepath. Very sorry	2020-09-05 21:17:03 +03:00
rinpatch	e198ba492e	Rich Media: Do not cache URLs for preview statuses ... Closes #1987	2020-09-05 20:53:46 +03:00
Ivan Tashkinov	88a6ee4a59	[#2497] Func defs grouping fix.	2020-09-05 20:23:18 +03:00
Ivan Tashkinov	f170d47130	[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. ... Removed :preview pool in favor of existing :media one. Misc. refactoring.	2020-09-05 20:19:09 +03:00
Ivan Tashkinov	c3b02341bf	[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.	2020-09-05 16:16:35 +03:00
Haelwenn (lanodan) Monnier	0d91f65284	Prevent AccountView and instance.get_or_update_favicon fails	2020-09-05 05:43:50 +02:00
rinpatch	10da13c713	ConnectionPool middleware: Fix connection leak on ReverseProxy redirects ... Requires a patched Tesla due to upstream not saving opts between redirects, patch submitted at https://github.com/teamon/tesla/pull/414	2020-09-04 22:10:40 +03:00
Alexander Strizhakov	473458b0fb	fix for ReverseProxy	2020-09-04 14:45:30 +03:00
Alexander Strizhakov	8bd2b6eb13	temp hackney fix	2020-09-04 14:24:15 +03:00
rinpatch	d34fe2840d	HTTP: radically simplify pool checkin/checkout ... Use a custom tesla middleware instead of adapter helper function + custom redirect middleware. This will also fix "Client died before releasing the connection" messages when the request pool is overloaded. Since the checkout is now done after passing ConcurrentLimiter. This is technically less efficient, since the connection needs to be checked in/out every time the middleware is left or entered respectively. But I don't think the nanoseconds we might lose on redirects to the same host are worth the complexity.	2020-09-03 23:44:13 +03:00
Mark Felder	f25b0e87f3	URL passed to helper is already MediaProxy ... Set :preview pool on the request	2020-09-03 15:28:57 -05:00
Mark Felder	d1e1057e22	Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy	2020-09-03 14:48:43 -05:00
Mark Felder	6141eb94ab	Fetch preview requests through the MediaProxy. Separate connection options are not needed. ... Use a separate pool for preview requests	2020-09-03 14:42:11 -05:00
Ivan Tashkinov	60c925380d	[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).	2020-09-03 20:13:29 +03:00
Mark Felder	85446cc30c	Merge branch 'develop' into media-preview-proxy	2020-09-03 10:34:06 -05:00
lain	9433311923	Merge branch 'bugfix/incoming-poll-emoji' into 'develop' ... Fix emoji in Question, force generated context/context_id insertion Closes #1870 See merge request pleroma/pleroma!2915	2020-09-03 11:50:30 +00:00
feld	d1a6f67b1d	Merge branch 'fix/2095-deactivated-account-reset' into 'develop' ... Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935	2020-09-02 17:11:24 +00:00
lain	0ab03e8564	Merge branch 'fix/1991-tzdata-update' into 'develop' ... user agent if Endpoint is not started yet Closes #1991 See merge request pleroma/pleroma!2945	2020-09-02 17:09:55 +00:00
lain	119e11f455	Merge branch 'bugfix/mastoapi-lists' into 'develop' ... Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940	2020-09-02 17:03:45 +00:00
lain	581f382e71	ListController: DRY up stuff.	2020-09-02 18:32:00 +02:00
Mark Felder	cbf7f0e029	Disallow password resets for deactivated accounts. ... Ensure all responses to password reset events are identical.	2020-09-02 09:09:13 -05:00
rinpatch	d48fc90978	StatusView: Start fetching rich media cards as soon as possible	2020-09-02 16:45:54 +03:00
Alexander Strizhakov	a11f23c130	user agent if Endpoint is not started yet	2020-09-02 15:45:47 +03:00