933 commits

Author	SHA1	Message	Date
FloatingGhost	ac0c00cdee	Add media sources to connect-src if media proxy is enabled	2022-11-10 17:26:51 +00:00
FloatingGhost	bab1ab5b6c	strip \r and \r from content-disposition filenames	2022-11-10 11:54:12 +00:00
floatingghost	cc6a076202	Include requested_by in relationship (#260) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #260	2022-11-10 03:16:32 +00:00
FloatingGhost	479aacb1b6	Add fallback for reports that don't have attached activities	2022-11-08 11:01:47 +00:00
FloatingGhost	a0b8e3c842	Don't mess with the cache on metadata update	2022-11-08 10:39:01 +00:00
FloatingGhost	7bbaa8f8e0	automatically trim loading *. prefixes on domain blocks	2022-11-07 22:33:18 +00:00
floatingghost	31ad09010e	Fix regex usage in MRF (#254) ... fixes #235 fixes #228 Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #254	2022-11-06 23:50:32 +00:00
floatingghost	b7e8ce2350	Scrape instance nodeinfo (#251) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #251	2022-11-06 22:49:39 +00:00
Thomas Citharel	4d0a51221a	Fix typo in CSP Report-To header name ... The header name was Report-To, not Reply-To. In any case, that's now being changed to the Reporting-Endpoints HTTP Response Header. https://w3c.github.io/reporting/#header https://github.com/w3c/reporting/issues/177 CanIUse says the Report-To header is still supported by current Chrome and friends. https://caniuse.com/mdn-http_headers_report-to It doesn't have any data for the Reporting-Endpoints HTTP header, but this article says Chrome 96 supports it. https://web.dev/reporting-api/ (Even though that's come out one year ago, that's not compatible with Network Error Logging which's still using the Report-To version of the API) Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2022-11-04 15:02:13 +01:00
floatingghost	9038da01cc	Merge pull request 'Push.Impl: support edits' (#244) from norm/akkoma:push-support-edits into develop ... Reviewed-on: #244	2022-11-01 15:14:08 +00:00
floatingghost	d5bbc3eeb2	Merge pull request 'fix flaky test filter_controller_test.exs:200' (#239) from ilja/akkoma:fix_flaky_filter_controller_test.exs_200 into develop ... Reviewed-on: #239	2022-11-01 14:42:43 +00:00
ilja	f1dfd76b98	Fix rate_limiter_test.exs test "it restricts based on config values" (#233) ... Fixes one of the 'erratic' tests It used a timer to sleep. But time also goes on when doing other things, so depending on hardware, the timings could be off. I slightly changed the tests so we still test what we functionally want. Instead of waiting until the cache expires I now have a function to expire the test and use that. That means we're not testing any more if the cache really expires after a certain amount of time, but that's the responsability of the dependency imo, so shouldn't be a problem. I also changed `Pleroma.Web.Endpoint, :http, :ip` in the tests to `127.0.0.1` Currently it was set to 8.8.8.8, but I see no reason for that and, while I assume that no calls are made to it, it may come over as weird or suspicious to people. Co-authored-by: Ilja <ilja@ilja.space> Reviewed-on: #233 Co-authored-by: ilja <akkoma.dev@ilja.space> Co-committed-by: ilja <akkoma.dev@ilja.space>	2022-11-01 14:25:54 +00:00
FloatingGhost	1bb8b76311	Fix tests in ldap registration	2022-11-01 14:21:35 +00:00
marcin mikołajczak	6486211064	Push.Impl: support edits ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2022-10-28 01:20:19 -04:00
Ilja	a59d310982	fix flaky test filter_controller_test.exs:200	2022-10-23 13:07:02 +02:00
floatingghost	f36d14818d	Unilateral remove from followers (#232) ... from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3647/ Co-authored-by: marcin mikołajczak <git@mkljczk.pl> Co-authored-by: Tusooa Zhu <tusooa@kazv.moe> Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #232	2022-10-19 10:01:14 +00:00
FloatingGhost	03662501c3	Check that the signature matches the creator	2022-10-14 11:48:32 +01:00
floatingghost	c6e63aaf6b	Backend settings sync (#226) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #226	2022-10-06 16:22:15 +00:00
Norm	561e1f2470	Make backups require its own scope (#218) ... Pulled from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3721. This makes backups require its own scope (`read:backups`) instead of the `read:accounts` scope. Co-authored-by: Tusooa Zhu <tusooa@kazv.moe> Reviewed-on: #218 Co-authored-by: Norm <normandy@biribiri.dev> Co-committed-by: Norm <normandy@biribiri.dev>	2022-09-19 17:31:35 +00:00
Hélène	8683252fc5	Metadata/Utils: use summary as description if set ... When generating OpenGraph and TwitterCard metadata for a post, the summary field will be used first if it is set to generate the post description.	2022-09-11 19:55:38 +01:00
Hélène	0b14f02ed2	User: generate private keys on user creation ... This fixes a race condition bug where keys could be regenerated post-federation, causing activities and HTTP signatures from an user to be dropped due to key differences.	2022-09-11 19:54:37 +01:00
Hélène	e88f36f72b	ObjectView: do not fetch an object for its ID ... Non-Create/Listen activities had their associated object field normalized and fetched, but only to use their `id` field, which is both slow and redundant. This also failed on Undo activities, which delete the associated object/activity in database. Undo activities will now render properly and database loads should improve ever so slightly.	2022-09-11 19:52:59 +01:00
Norm	a6d85003fe	Remote interaction with posts (#198) ... Grabbed from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3587 Co-authored-by: Tusooa Zhu <tusooa@kazv.moe> Reviewed-on: #198 Co-authored-by: Norm <normandy@biribiri.dev> Co-committed-by: Norm <normandy@biribiri.dev>	2022-09-08 10:19:22 +00:00
floatingghost	2641dcdd15	Post editing (#202) ... Rebased from #103 Co-authored-by: Tusooa Zhu <tusooa@kazv.moe> Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #202	2022-09-06 19:24:02 +00:00
FloatingGhost	6c80977b06	turn inlineQuotePolicy on by default	2022-09-05 17:22:33 +01:00
FloatingGhost	f6304cfd78	add extra tests for builder	2022-09-05 01:24:40 +01:00
floatingghost	1b826eea54	Allow reacting with remote emoji when they exist on the post (#200) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #200	2022-09-04 23:31:41 +00:00
floatingghost	8e4de118c1	Don't persist local undone follow (#194) ... same deal but backwards this time Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #194	2022-08-31 18:00:36 +00:00
floatingghost	decbca0c91	add seperate source and dest entries in language listing (#193) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #193	2022-08-30 16:59:33 +00:00
floatingghost	df39cab9c1	Automatic status translation (#187) ... Fixes #115 Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #187	2022-08-29 19:42:22 +00:00
Tusooa Zhu	95e4018c1a	Disconnect streaming sessions when token is revoked ... Use Websockex to replace websocket_client Test that server will disconnect websocket upon token revocation Lint Execute session disconnect in background Refactor streamer test allow multi-streams rebase websocket change	2022-08-27 19:07:48 +01:00
floatingghost	772c209914	GTS: cherry-picks and collection usage (#186) ... https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3725?commit_id=61254111e59f02118cad15de49d1e0704c07030e what is this, a yoink of a yoink? good times Co-authored-by: Hélène <pleroma-dev@helene.moe> Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #186	2022-08-27 18:05:48 +00:00
FloatingGhost	85137f591f	Add ability to obfuscate domains in MRF transparency	2022-08-27 11:57:57 +01:00
floatingghost	e4f2251e0f	Add support for setting language in instance metadata (#183) ... Reviewed-on: #183	2022-08-25 16:11:21 +00:00
floatingghost	618cf7ff7f	reuse valid oauth tokens (#182) ... Reviewed-on: #182	2022-08-25 14:37:51 +00:00
floatingghost	92ba2802fb	generate-keys-at-registration-time (#181) ... Reviewed-on: #181	2022-08-24 14:36:33 +00:00
FloatingGhost	8d7b63a766	Revert "Fix oauth2 (for real) (#179)" ... This reverts commit aa681d7e15.	2022-08-21 17:52:02 +01:00
floatingghost	aa681d7e15	Fix oauth2 (for real) (#179) ... Reviewed-on: #179	2022-08-21 16:24:37 +00:00
FloatingGhost	b0130bfa7b	Revert "oauth2 fixes (#177)" ... This reverts commit 429e2ac832.	2022-08-21 16:22:15 +01:00
floatingghost	d72f9e39d9	add visibility check on quote (#178) ... Reviewed-on: #178	2022-08-21 15:17:01 +00:00
floatingghost	429e2ac832	oauth2 fixes (#177) ... Reviewed-on: #177	2022-08-21 14:46:52 +00:00
floatingghost	e9f1897cfd	parser MFM server-side (#172) ... Reviewed-on: #172	2022-08-18 03:14:48 +00:00
floatingghost	aaf78e2b52	only put linked mfm in source (#171) ... Reviewed-on: #171	2022-08-17 09:35:11 +00:00
floatingghost	11ec9daa5b	API compatibility with fedibird, frontend config (#163) ... Reviewed-on: #163	2022-08-17 00:22:59 +00:00
FloatingGhost	967c325b0d	fix tests	2022-08-11 19:21:43 +01:00
floatingghost	1245141779	treat rejections in MRF as a reject in federator (#155) ... Reviewed-on: #155	2022-08-08 15:47:57 +00:00
Hélène	b3e4d81362	StatusView: implement pleroma.context field ... This field replaces the now deprecated conversation_id field, and now exposes the ActivityPub object `context` directly via the MastoAPI instead of relying on StatusNet-era data concepts.	2022-08-07 20:48:08 +01:00
Hélène	b9bb093600	StatusView: clear MSB on calculated conversation_id ... This field seems to be a left-over from the StatusNet era. If your application uses `pleroma.conversation_id`: this field is deprecated. It is currently stubbed instead by doing a CRC32 of the context, and clearing the MSB to avoid overflow exceptions with signed integers on the different clients using this field (Java/Kotlin code, mostly; see Husky and probably other mobile clients.) This should be removed in a future version of Pleroma. Pleroma-FE currently depends on this field, as well.	2022-08-07 20:47:59 +01:00
floatingghost	62e179f446	make conversation-id deterministic (#154) ... Reviewed-on: #154	2022-08-06 20:59:15 +00:00
floatingghost	ec162b496b	/notice signing checks on redirect (#150) ... Reviewed-on: #150	2022-08-05 19:31:32 +00:00
floatingghost	0ec3a11895	don't persist undo of follows (#149) ... Reviewed-on: #149	2022-08-05 13:28:56 +00:00
Hélène	c1e15ff6f8	Transmogrifier: fix reply context fixing ... Incoming Pleroma replies to a Misskey thread were rejected due to a broken context fix, which caused them to not be visible until a non-Pleroma user interacted with the replies. This fix properly sets the post-fix object context to its parent Create activity as well, if it was changed.	2022-08-04 12:57:48 +01:00
floatingghost	456c97fda9	Merge pull request 'remove unneeded function' (#143) from compile-fix into develop ... Reviewed-on: #143	2022-08-03 11:12:05 +00:00
FloatingGhost	359510eebc	remove unneeded function	2022-08-03 11:50:48 +01:00
Tusooa Zhu	f08241c8ab	Allow users to create backups without providing email address ... Ref: backup-without-email	2022-08-02 22:16:54 -04:00
floatingghost	c9600dbbbf	local-only-fixed (#138) ... Reviewed-on: #138	2022-08-02 14:46:46 +00:00
floatingghost	ca000f8301	Merge mrf_simple-reject with quarantine (#137) ... Reviewed-on: #137	2022-08-02 14:19:24 +00:00
Joel Beckmeyer	e26388a01c	Support reaching user@sub.domain.tld at user@domain.tld (#134) ... Reviewed-on: #134 Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us> Co-committed-by: Joel Beckmeyer <joel@beckmeyer.us>	2022-08-02 13:54:22 +00:00
floatingghost	c3eea8dc7d	expose bubble instances via nodeinfo (#136) ... Reviewed-on: #136	2022-08-02 09:11:22 +00:00
floatingghost	19a27ff006	allow small/center tags in misskeymarkdown (#132) ... Reviewed-on: #132	2022-08-01 12:46:52 +00:00
Yukkuri	38659e5610	Use uppercase HTTP HEAD method for media preview proxy request (#128) ... Reviewed-on: #128 Co-authored-by: Yukkuri <iamtakingiteasy@eientei.org> Co-committed-by: Yukkuri <iamtakingiteasy@eientei.org>	2022-07-30 21:58:14 +00:00
floatingghost	405406601f	Fix emoji qualification (#124) ... Reviewed-on: #124	2022-07-28 12:02:36 +00:00
floatingghost	645f0390bc	Prepare for ubuntu22 murdering openssl (#120) ... Reviewed-on: #120	2022-07-27 21:48:13 +00:00
floatingghost	a3501cab86	ensure quote fetching obeys max thread distance (#119) ... Reviewed-on: #119	2022-07-26 17:28:47 +00:00
FloatingGhost	0a55c37182	don't error out if the featured collection has a string ID	2022-07-26 15:08:35 +01:00
floatingghost	1f6deb0ef4	include local instance in bubble timeline (#117) ... Reviewed-on: #117	2022-07-26 12:22:49 +00:00
floatingghost	90c4785b89	remove public post quarantine exception (#114) ... Reviewed-on: #114	2022-07-26 11:09:13 +00:00
floatingghost	1419eee5df	Quote posting (#113) ... Reviewed-on: #113	2022-07-25 16:30:06 +00:00
floatingghost	4c47992686	bugfix/follow-state (#104) ... Reviewed-on: #104	2022-07-23 18:58:45 +00:00
floatingghost	cb6e7359af	add bubble timeline (#100) ... Reviewed-on: #100	2022-07-22 14:55:38 +00:00
floatingghost	0c542e58aa	Remove instrumentors (#98) ... Reviewed-on: #98	2022-07-21 11:32:17 +00:00
FloatingGhost	0f132b802d	purge chat and shout endpoints	2022-07-21 11:29:28 +01:00
floatingghost	07ea4d73e1	update mastofe paths (#95) ... Reviewed-on: #95	2022-07-20 20:13:50 +00:00
FloatingGhost	e35dced9c8	remove chat enabled feature	2022-07-20 15:46:41 +01:00
floatingghost	729f45ccd2	purge ldap authenticator (#92) ... Reviewed-on: #92	2022-07-20 12:49:13 +00:00
floatingghost	dc9f66749c	remove all endpoints marked as deprecated (#91) ... Reviewed-on: #91	2022-07-20 12:00:58 +00:00
FloatingGhost	cf0ad02ea9	Remove scrobbling support	2022-07-19 15:07:45 +01:00
floatingghost	54ed8760ff	Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) ... Reviewed-on: #85	2022-07-18 13:08:36 +00:00
floatingghost	5b4d77eaa7	maintenance: dependency upgrade (#81) ... Reviewed-on: #81	2022-07-18 00:56:35 +00:00
Tusooa Zhu	4c5bc3e9f7	Pass remote follow avatar into media proxy	2022-07-12 15:44:38 -04:00
floatingghost	8215434c65	also resolve @full@tags in mfm (#62) ... Reviewed-on: #62	2022-07-11 13:48:43 +00:00
floatingghost	ff6c8455fb	[#58] ensure all users are linked in MFM content (#61) ... Reviewed-on: #61	2022-07-11 11:48:29 +00:00
floatingghost	5ad256f170	[#58] pre-link MFM content (#59) ... Reviewed-on: #59	2022-07-10 17:06:25 +00:00
floatingghost	82fa766ed7	Remove precompiled javascript (#55) ... Reviewed-on: #55	2022-07-08 13:03:18 +00:00
floatingghost	bc6bfe383f	Add configurable theme color (#53) ... Reviewed-on: #53	2022-07-06 20:00:43 +00:00
sfr	058bf96798	implement Move activities (#45) ... Reviewed-on: #45 Co-authored-by: sfr <sol@solfisher.com> Co-committed-by: sfr <sol@solfisher.com>	2022-07-04 16:29:39 +00:00
FloatingGhost	0a3a552696	Add support for a first reference in pinned objects	2022-07-03 17:25:20 +01:00
FloatingGhost	4da9a12bf8	Add test for friendica featured collection	2022-07-03 16:59:12 +01:00
floatingghost	a40bf8be5e	Update eblurhash to a non-bugged version (#34) ... Reviewed-on: #34	2022-07-02 14:05:32 +00:00
floatingghost	3f7c64f30b	Fix broken attachments from owncast (#31) ... Reviewed-on: #31	2022-07-01 11:14:55 +00:00
FloatingGhost	1ecdb19de5	Refactor ES on top of search behaviour	2022-06-30 16:28:31 +01:00
Hélène	8f140deb8f	StealEmojiPolicy: fix String rejected_shortcodes ... * rejected_shortcodes is defined as a list of strings in the configuration description. As such, database-based configuration was led to handle those settings as strings, and not as the actually expected type, Regex. * This caused each message passing through this MRF, if a rejected shortcode was set and the emoji did not exist already on the instance, to fail federating, as an exception was raised, swiftly caught and mostly silenced. * This commit fixes the issue by introducing new behavior: strings are now handled as perfect matches for an emoji shortcode (meaning that if the emoji-to-be-pulled's shortcode is in the blacklist, it will be rejected), while still supporting Regex types as before.	2022-06-29 20:47:45 +01:00
Ilja	661d0ba481	Also use actor_type to determine if an account is a bot in antiFollowbotPolicy	2022-06-29 20:47:44 +01:00
Tusooa Zhu	33d821256e	Fix incorrect fallback when English is set to first language	2022-06-29 20:47:10 +01:00
Ilja	e3107fee98	Fix eratic test for POST /api/pleroma/admin/reports/:id/notes ... It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote. I made the test on the content more generic	2022-06-29 20:47:10 +01:00
Tusooa Zhu	2df25e6666	Support fallbacking to other languages	2022-06-29 20:47:10 +01:00
Tusooa Zhu	fcfb5a4967	Lint	2022-06-29 20:47:10 +01:00
Tusooa Zhu	07bd35227a	Support multiple locales from userLanguage cookie	2022-06-29 20:47:10 +01:00
Tusooa Zhu	fa95bc8725	Support multiple locales formally ... elixir gettext current does not fully support fallback to another language [0]. But it might in the future. We adapt it so that all languages in Accept-Language headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated list. [0]: https://github.com/elixir-gettext/gettext/issues/303	2022-06-29 20:47:10 +01:00
Tusooa Zhu	ff0bb3a3ac	Add test for fallbacking to a general language	2022-06-29 20:47:10 +01:00
Tusooa Zhu	ef73f61b07	Fallback to a variant if the language in general is not supported ... For an example, here, zh is not supported, but zh_Hans and zh_Hant are. If the user asks for zh, we should choose a variant for them instead of fallbacking to default. Some browsers (e.g. Firefox) does not allow users to customize their language codes. For example, there is no zh-Hans, but only zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for those users suffering from bad design decisions.	2022-06-29 20:47:10 +01:00
Tusooa Zhu	72bdb0640f	Allow user to register with custom language	2022-06-29 20:46:51 +01:00
Tusooa Zhu	775f997c40	Prefer userLanguage cookie over Accept-Language header in detecting locale ... https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60	2022-06-29 20:43:41 +01:00
Ilja	8b843be03e	Fix test get_user_apps/1 ... For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added. When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy. The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing. AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62	2022-06-29 20:43:41 +01:00
floatingghost	2342fface1	Add visibility check in context path (#26) ... Reviewed-on: #26	2022-06-29 09:33:57 +00:00
FloatingGhost	cac39ef817	Bugfix: standardise scheme for emoji reactions	2022-06-25 15:27:46 +01:00
FloatingGhost	cad4ba2ab3	mix format	2022-06-22 17:20:55 +01:00
FloatingGhost	3928cecf6b	ensure local statuses are not visible remotely	2022-06-22 17:06:40 +01:00
FloatingGhost	502382da45	cherry-pick security from upstream	2022-06-22 16:25:05 +01:00
sn0w	f2f8b81fc4	Use mediaproxy for emoji notifications if enabled	2022-06-17 14:27:22 +02:00
FloatingGhost	af1bd3af59	mix format	2022-06-14 17:43:45 +01:00
FloatingGhost	6e1d9c63da	allow %{source} dict in no_empty	2022-06-14 17:41:25 +01:00
FloatingGhost	abefbcec64	Merge branch 'mfm' into develop	2022-06-14 16:25:47 +01:00
FloatingGhost	829ae13572	ensure tests pass	2022-06-14 16:24:03 +01:00
sn0w	60bfaed368	Allow reacting with emojis containing a number	2022-06-14 11:47:09 +02:00
FloatingGhost	0f5bea2465	Add emoji_url to notifications to allow rendering ... Ref #5	2022-06-12 13:35:14 +01:00
FloatingGhost	2abf8c982e	fix secret key failure	2022-06-11 16:48:04 +01:00
FloatingGhost	24bf8c3977	mix format	2022-06-11 16:14:31 +01:00
FloatingGhost	32fbd2e4e3	fix all tests	2022-06-11 16:14:22 +01:00
FloatingGhost	c3ed86cd1e	fix emoji controller tests	2022-06-11 14:21:50 +01:00
FloatingGhost	142646426e	fix emoji tests	2022-06-11 14:08:54 +01:00
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
FloatingGhost	8cc6359a85	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 20:23:53 +00:00
FloatingGhost	25b4395830	just drop unknown tags	2022-01-07 20:14:04 +00:00
FloatingGhost	92d3742072	Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop	2022-01-07 17:21:44 +00:00
FloatingGhost	9ee27fb5ec	add bookwyrm entity tests	2022-01-07 17:17:18 +00:00
FloatingGhost	680c5d8d89	Add compatibility with bookwyrm's weird entities	2022-01-07 16:51:04 +00:00
Alex Gleason	2ae867842b	StreamerTest: tag erratic test	2021-12-31 10:29:50 -06:00
FloatingGhost	12a171844b	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-30 18:05:22 +00:00
marcin mikołajczak	746c9daa62	Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:27:27 +01:00
marcin mikołajczak	f734579965	MastoAPI: Add GET /api/v1/accounts/lookup ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-28 16:11:17 +01:00
Alex Gleason	5c80d4087d	PleromaAPI.AppView: add test	2021-12-27 18:52:34 -06:00
Alex Gleason	cb2a072e62	Apps: add test for get_user_apps/1	2021-12-27 18:29:03 -06:00
Alex Gleason	2e4a1c56c3	AppController: test creating with and without a user	2021-12-27 18:14:15 -06:00
Alex Gleason	f5c3d45120	Merge remote-tracking branch 'origin/develop' into apps-api-endpoint	2021-12-27 18:01:25 -06:00
Alex Gleason	479fc5fff8	EnsureStaffPrivilegedPlug: add tests	2021-12-27 10:39:59 -06:00
Alex Gleason	913141379c	Merge branch 'profile-directory' into 'develop' ... MastoAPI: Profile directory See merge request pleroma/pleroma!3573	2021-12-26 02:35:17 +00:00
marcin mikołajczak	de006443f0	MastoAPI: Profile directory	2021-12-26 02:35:17 +00:00
Alex Gleason	2c06eff519	Pleroma.Web.base_url() --> Endpoint.url()	2021-12-25 20:11:14 -06:00
Alex Gleason	db2bf55e9b	Merge remote-tracking branch 'origin/develop' into notice-routes	2021-12-25 19:57:53 -06:00
Alex Gleason	73609211a4	Merge branch 'account-notes' into 'develop' ... MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540	2021-12-25 01:41:12 +00:00
Alex Gleason	b96a58ff28	Merge branch 'account-subscriptions' into 'develop' ... MastoAPI: accept notify param in follow request See merge request pleroma/pleroma!3555	2021-12-25 01:34:27 +00:00
Alex Gleason	d9746ae4cb	Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' ... Handle Reject for already-accepted Follows properly Closes #2766 and #2802 See merge request pleroma/pleroma!3568	2021-12-23 16:00:16 +00:00
Alex Gleason	9c1cb87eff	Merge branch 'erratic-tests' into 'develop' ... Skip erratic tests See merge request pleroma/pleroma!3572	2021-12-22 04:14:31 +00:00
Alex Gleason	2ce7dae6de	Skip erratic tests	2021-12-21 22:04:15 -06:00
Alex Gleason	b0d2b53934	Merge branch 'manifest' into 'develop' ... Expose /manifest.json for PWA Closes #882 See merge request pleroma/pleroma!3544	2021-12-19 18:18:59 +00:00
Alex Gleason	1ff9ffed83	Merge branch 'live-dashboard' into 'develop' ... Add Phoenix LiveDashboard See merge request pleroma/pleroma!3566	2021-12-19 17:35:14 +00:00
Alex Gleason	e4f9cb1c1b	Merge remote-tracking branch 'origin/develop' into manifest	2021-12-19 11:33:10 -06:00
Alex Gleason	bd853199d9	Merge branch 'v2-suggestions' into 'develop' ... V2 suggestions See merge request pleroma/pleroma!3547	2021-12-19 17:31:17 +00:00
Tusooa Zhu	8376e83f61	Lint	2021-12-17 16:52:50 -05:00
Tusooa Zhu	951d1592c7	Add test to ensure removed follower cease to have relationship with ex-followee ... https://git.pleroma.social/pleroma/pleroma/-/issues/2802	2021-12-17 16:44:22 -05:00
Tusooa Zhu	bfd870380c	Add test to ensure the blocked cease to have follow relationship to the blocker ... https://git.pleroma.social/pleroma/pleroma/-/issues/2766	2021-12-17 14:44:28 -05:00
Tusooa Zhu	3d41ccc47b	Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 ... Mastodon uses the Reject activity also for the purpose of removing a follower, in addition to reject a follow request. We should also update the original Follow activity in this case.	2021-12-17 14:17:51 -05:00
FloatingGhost	0c0ea169d4	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-16 16:10:08 +00:00
Alex Gleason	e1b89fe3aa	Merge remote-tracking branch 'origin/develop' into live-dashboard	2021-12-15 19:05:36 -05:00
Alex Gleason	29d80b39f2	Add Phoenix LiveDashboard ... Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>	2021-12-15 19:05:27 -05:00
lain	6eb7d69e60	Merge branch 'delete-account-fix' into 'develop' ... TwitterAPI: allow deleting one's own account with request body Closes #2799 and #2746 See merge request pleroma/pleroma!3564	2021-12-15 21:26:45 +00:00
Alex Gleason	8672ad6b00	TwitterAPI: allow deleting one's own account with request body	2021-12-13 17:07:29 -05:00
FloatingGhost	de60b1f3c1	make search provider configurable	2021-12-12 17:35:35 +00:00
Alex Gleason	938c95d75d	VideoHandlingTest: remove nil values	2021-12-12 17:35:35 +00:00
Haelwenn	ecab82dea7	Apply alexgleason's suggestion(s) to 1 file(s)	2021-12-12 17:35:35 +00:00
Alex Gleason	2936adbbce	Fix VideoHandlingTest	2021-12-12 17:35:34 +00:00
Alex Gleason	da83839dc1	AttachmentValidator: ingest width and height	2021-12-12 17:35:02 +00:00
Alex Gleason	494149f173	Transmogrifier: test fix_attachments/1	2021-12-12 17:35:02 +00:00
FloatingGhost	0fab887eee	make linter happy	2021-12-12 17:35:02 +00:00
FloatingGhost	429407ba0a	Make deactivated user check into a subquery ... Fixes #2792	2021-12-12 17:35:02 +00:00
Alex Gleason	01cc099c8e	VideoHandlingTest: remove nil values	2021-12-07 21:55:54 -05:00
Haelwenn	992d9287d0	Apply alexgleason's suggestion(s) to 1 file(s)	2021-12-07 22:53:36 +00:00
Alex Gleason	2c96668a2c	Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions	2021-12-07 13:41:54 -05:00
Alex Gleason	335684182a	Fix VideoHandlingTest	2021-12-07 13:35:34 -05:00
Alex Gleason	3f03d71ea6	AttachmentValidator: ingest width and height	2021-12-07 12:59:03 -05:00
Alex Gleason	d9349bc52f	Transmogrifier: test fix_attachments/1	2021-12-07 01:10:47 -05:00
marcin mikołajczak	c96e52b88c	Add 'notifying' to relationship for compatibility with Mastodon ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:24:12 +01:00
marcin mikołajczak	3892bd353b	Add test for following with subscription ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-12-06 21:15:03 +01:00
FloatingGhost	db46913dcc	make linter happy	2021-12-06 11:50:51 +00:00
FloatingGhost	cd8bdbc761	Make deactivated user check into a subquery ... Fixes #2792	2021-12-06 11:44:17 +00:00
Alex Gleason	ba2ed3c255	Fix frontend_status_plug_test.exs	2021-12-03 07:56:26 -06:00
Alex Gleason	8286ceb465	Merge remote-tracking branch 'origin/develop' into password-reset	2021-12-03 00:11:38 -06:00
Alex Gleason	5da4f33bf1	Restore POST /auth/password	2021-12-03 00:10:57 -06:00
Alex Gleason	6519f59d91	v2 Suggestions: return is_suggested through the API	2021-11-26 23:10:01 -06:00
Alex Gleason	e5a7547fbe	v2 Suggestions: also filter out users you follow	2021-11-26 21:46:08 -06:00
Alex Gleason	437c1a5a52	v2 Suggestions: actually flter out dismissed suggestions	2021-11-26 21:09:37 -06:00
Alex Gleason	aee55b9a8b	v2 Suggestions: dismiss a suggestion	2021-11-26 20:19:29 -06:00
Alex Gleason	6c0484d571	AdminAPI: suggest a user through the API	2021-11-26 15:19:01 -06:00
Alex Gleason	b17360cd7c	v2 Suggestions: rudimentary API response	2021-11-26 14:34:10 -06:00
Alex Gleason	7e1caddc58	v2 Suggestions: return empty array	2021-11-25 14:57:36 -06:00
Alex Gleason	720198d569	Merge remote-tracking branch 'pleroma/develop' into manifest	2021-11-24 17:58:58 -06:00
Alex Gleason	cb9359335f	Expose /manifest.json for PWA	2021-11-24 17:50:55 -06:00
marcin mikołajczak	cb76faece9	Update test ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 17:51:00 +01:00
marcin mikołajczak	40414bf177	MastoAPI: Add user notes on accounts ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2021-11-21 16:56:26 +01:00
lain	4d341f51e1	Merge branch 'fix-tests' into 'develop' ... Test fixes See merge request pleroma/pleroma!3532	2021-11-15 14:31:27 +00:00
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	2021-11-15 14:27:59 +00:00
lain	6e3df11693	Merge branch 'instance-deletion' into 'develop' ... AdminAPI: endpoint to delete all content from a remote instance See merge request pleroma/pleroma!3483	2021-11-15 14:24:13 +00:00
lain	bd77243981	Merge branch 'userfeed-fe-fallback' into 'develop' ... UserController: fall back to frontend when user isn't found Closes #2730 See merge request pleroma/pleroma!3515	2021-11-15 10:48:56 +00:00
Lain Soykaf	871936b3ca	MediaProxyCacheControllerTest: Fix unstable tests. ... Cachex order isn't stable, so we can not depend on the order in tests. This adds some sorting to make the tests stable.	2021-11-14 11:45:38 +01:00
Lain Soykaf	2dea4a8c04	StealEmojiPolicyTest: Make mocks explicit.	2021-11-14 11:44:24 +01:00
Haelwenn (lanodan) Monnier	23161526d4	object_validators: Group common fields in CommonValidations ... Notes: - QuestionValidator didn't have a :name field but that seems like a mistake - `_fields` functions can't inherit others because of some Validators - bto/bcc fields were absent in activities, also seems like a mistake (Well IIRC we don't or barely support bto/bcc anyway)	2021-10-10 02:50:06 +02:00
Haelwenn (lanodan) Monnier	a17910a6c6	CI: Bump lint stage to elixir-1.12 ... Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`	2021-10-06 08:11:05 +02:00
Haelwenn	92a8ff59aa	Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' ... Allow users to remove their emails if instance does not need email to register See merge request pleroma/pleroma!3522	2021-10-06 05:44:44 +00:00
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	2021-09-07 16:41:53 +00:00
Tusooa Zhu	198250dcef	Allow users to remove their emails if instance does not need email to register	2021-09-05 21:27:02 -04:00
Sean King	33f063204e	Add unit test for Pleroma API app controller	2021-08-28 23:18:12 -06:00
Ilja	53b0dd4ecc	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510	2021-08-28 18:23:49 +02:00
Haelwenn	bc62a35282	Merge branch 'features/ingestion-no-nil' into 'develop' ... ObjectValidator.stringify_keys: filter out nil values See merge request pleroma/pleroma!3506	2021-08-28 16:07:35 +00:00
Alex Gleason	b11dbbf403	UserController: fall back to frontend when user isn't found	2021-08-17 18:32:32 -05:00
Haelwenn	84ec0fbeaa	Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop' ... List available frontends also when no static/frontends folder is present yet Closes admin-fe#201 See merge request pleroma/pleroma!3510	2021-08-14 18:42:12 +00:00
Ilja	f9bafc17fb	List available frontends also when no static/frontends folder is present yet ... * To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already	2021-08-14 18:42:12 +00:00
Haelwenn	773708cfe8	Merge branch 'builder-note' into 'develop' ... CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1 See merge request pleroma/pleroma!3511	2021-08-14 18:32:40 +00:00
Alex Gleason	ba6049aa81	Builder.note/1: return {:ok, map(), keyword()} like other Builder functions	2021-08-14 11:24:55 -05:00
Alex Gleason	a2eacfc525	CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1	2021-08-14 11:01:06 -05:00
Haelwenn (lanodan) Monnier	0e2aebd036	TwitterAPI: Make change_email require body params instead of query ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier	3961422f85	TwitterAPI: Make change_password require body params instead of query ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503	2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier	8baaa36a16	ObjectAgePolicy: Fix pattern matching on published ... Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500	2021-08-13 17:56:46 +02:00
Haelwenn (lanodan) Monnier	61d233921c	ObjectValidator.stringify_keys: filter out nil values	2021-08-11 21:38:10 +02:00
Haelwenn	7c1243178b	Merge branch 'bugfix/change_password' into 'develop' ... TwitterAPI: Make change_password require body params instead of query Closes #2740 See merge request pleroma/pleroma!3503	2021-08-10 18:40:13 +00:00
Haelwenn (lanodan) Monnier	197cdebca9	TwitterAPI: Make change_email require body params instead of query	2021-08-10 20:33:00 +02:00
Haelwenn (lanodan) Monnier	09dcb2b522	TwitterAPI: Make change_password require body params instead of query ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740	2021-08-10 20:01:11 +02:00
Haelwenn (lanodan) Monnier	c64eae40a2	ObjectAgePolicy: Fix pattern matching on published	2021-08-10 07:41:06 +02:00
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' ... MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	2021-08-09 10:02:37 +00:00
Sean King	1841bd8383	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	2021-08-06 08:08:20 -06:00
Ilja	03030b47c2	quarantine instances info ... Added a new field in the nodeinfo called quarantined_instances_info This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`	2021-08-06 07:59:53 +02:00
Ilja	47fc57bbcc	Change what nodeinfo returns without breaking backwards compatibility ... * Only for SimplePolicy for now * I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info	2021-08-06 07:59:53 +02:00
Ilja	7fdc3cde06	Return maps in node_info ... It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE, but for FE maps like %{"instance": "instance", "reason", "reason"} are better. I changed it so that node_info returns maps now for simple_policy and quarantined instances.	2021-08-06 07:59:53 +02:00
Ilja	dfeb3862da	config :mrf, :transparency_exclusions works with tumples now	2021-08-06 07:59:52 +02:00
Ilja	27fe7b0274	Make quarentine work with list of tuples instead of strings	2021-08-06 07:59:52 +02:00
Ilja	dd947d9bc8	Add tests for setting :instance, :quarantined_instances ... No test was done for quarantined instances yet. I added a factory for followers_only notes and checked * That no followers only post is send when the target server is quarantined * That a followers only post is send when the target server is not quarantined	2021-08-06 07:59:52 +02:00
Ilja	4ba0beb60c	Make mrfSimple work with tuples ... * Changed SimplePolicy * I also grepped in test/ for ':mrf_simple' to see what other things could be affected	2021-08-06 07:58:58 +02:00
Alex Gleason	44ede0657f	Merge remote-tracking branch 'pleroma/develop' into staff-plug	2021-08-04 11:48:57 -05:00
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
Alex Gleason	0b1c05ca1e	Poll notification: trigger PollWorker through common_pipeline	2021-07-18 11:10:23 -05:00
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	2021-07-17 22:19:38 -05:00
Alex Gleason	3674179b26	Merge remote-tracking branch 'pleroma/develop' into instance-deletion	2021-07-17 15:03:43 -05:00
Alex Gleason	bad79f79e6	AdminAPI.InstanceController: clean up tests, rename actions	2021-07-17 15:00:15 -05:00
Alex Gleason	54dbcfe02a	AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance	2021-07-17 14:55:05 -05:00
Alex Gleason	25676c84be	Create AdminAPI.InstanceController	2021-07-17 13:05:25 -05:00
feld	3f58213646	Merge branch 'admin-api-users-sort' into 'develop' ... AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481	2021-07-14 14:39:14 +00:00
Alex Gleason	1a2fe96d56	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date	2021-07-14 09:02:55 -05:00
Alex Gleason	167e14416b	AdminAPI: add date to users	2021-07-14 08:54:59 -05:00
Alex Gleason	deb3f91136	Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort	2021-07-13 22:47:47 -05:00
Alex Gleason	5e88796784	AdminAPI: sort user results by ID descending	2021-07-13 22:47:02 -05:00
Alex Gleason	1f093cb216	Moderators: reorganize :admin_api pipeline in Router	2021-07-12 22:11:32 -05:00
Alex Gleason	9bc1e79c56	Moderators: add UserIsStaffPlug	2021-07-12 21:57:52 -05:00
Haelwenn	173e977e28	Merge branch 'features/ingestion-page' into 'develop' ... Pipeline Ingestion: Page See merge request pleroma/pleroma!3097	2021-07-12 05:05:49 +00:00
Haelwenn (lanodan) Monnier	6dc78f5f6f	AP C2S: Remove restrictions and make it go through pipeline	2021-07-12 06:49:41 +02:00
Sean King	9758f636b2	Delete MastoFE Controller Test	2021-07-10 11:13:25 -06:00
Sean King	5d279a22b1	Merge develop branch upstream	2021-07-10 11:04:16 -06:00
Haelwenn (lanodan) Monnier	fc6ab78a84	Add test on changing [:instance, :upload_limit]	2021-06-22 12:25:25 +02:00
feld	406dadb56b	Merge branch 'fix/twittercard-video-dimensions' into 'develop' ... Generate Twittercard/OGP metadata with correct dimensions See merge request pleroma/pleroma!3456	2021-06-10 15:03:58 +00:00
Mark Felder	f37db23848	Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy	2021-06-09 11:46:31 -05:00