5598 commits

Author	SHA1	Message	Date
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	3562eaeedc	fix flaky test_user_relationship_test.exs:81 ... The problem was double. On the one hand, the function didn't actually return what was in the DB. On the other hand the test was flaky because it used NaiveDateTime.utc_now() so test could fail or pass depending on a difference of microseconds. Both are fixed now.	2022-10-23 13:31:01 +02:00
Ilja	a59d310982	fix flaky test filter_controller_test.exs:200	2022-10-23 13:07:02 +02:00
ilja	e6ceea3553	fix flaky participation_test.exs ... It was tested if the updated_at after marking as "read" was equal as the updated_at at insertion, but that seems wrong. Firstly, if a record is updated, you expect the updated_at to also update. Secondly, the insert and update happen almost at the same time, so it's flaky regardless. Here I make sure it has a much older updated_at during insert so we can clealy see the effect after update. I also check that the updated_at is actually updated because I expect that this is the expected behaviour and it's also the current behaviour.	2022-10-23 12:33:31 +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	edf7d5089f	Merge pull request 'Check that the signature matches the creator' (#230) from domain-blocks into develop ... Reviewed-on: #230	2022-10-14 11:41:34 +00:00
FloatingGhost	03662501c3	Check that the signature matches the creator	2022-10-14 11:48:32 +01:00
FloatingGhost	cb9b0d3720	optimise notifications query	2022-10-11 11:40:43 +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
floatingghost	b2aa82cee5	Fix false error in meilisearch index (#221) ... the schema changed https://docs.meilisearch.com/reference/api/documents.html#add-or-update-documents this wasn't breaking anything, it would just report errors that were actually successes Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #221	2022-09-20 10:36:21 +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
a1batross	77596a3021	User: search: exclude deactivated users from user search ... This way we don't pollute search results with deactivated and deleted users	2022-09-15 21:21:06 -04:00
Tusooa Zhu	2aa8e66527	Fix User.get_or_fetch/1 with usernames starting with http	2022-09-11 20:29:05 +01:00
FloatingGhost	b4261b0335	Use set of pregenerated RSA keys ... Randomness is a huge resource sink, so let's just use a some that we made earlier	2022-09-11 20:14:58 +01: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	7a90d71e8d	ensure .exs config is used before default (#197) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #197	2022-09-02 22:05:39 +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	c3fde9577d	Allow listing languages, setting source language (#192) ... Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: #192	2022-08-30 14:58:54 +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	37a1001b97	add finch outbound proxy support (#158) ... Reviewed-on: #158	2022-08-14 23:13:49 +00:00
FloatingGhost	967c325b0d	fix tests	2022-08-11 19:21:43 +01:00
FloatingGhost	366889f97c	remove default emoji file	2022-08-11 19:05:41 +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	2796a9acaf	backend-i18n (#121) ... Reviewed-on: #121	2022-07-27 21:56:59 +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	c4e9c4bc95	extend custom runtime system (#108) ... Reviewed-on: #108	2022-07-24 16:42:43 +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	85e2e64c82	fix resolution of GTS user keys	2022-07-18 15:21:27 +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
floatingghost	364b6969eb	Use finch everywhere (#33) ... Reviewed-on: #33	2022-07-04 16:30:38 +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	05081cd81b	Add collection fetching module	2022-07-03 19:20:59 +01: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	635a3c223a	Add elasticsearch tests	2022-06-30 16:53:21 +01:00
FloatingGhost	1ecdb19de5	Refactor ES on top of search behaviour	2022-06-30 16:28:31 +01:00
Ekaterina Vaartis	09ea3bb694	Actually, unlisted posts are indexed	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	7aebff799b	Fix meilisearch tests and jobs for oban	2022-06-29 20:49:45 +01:00
Ekaterina Vaartis	c128798418	Rename Activity.Search to Search.DatabaseSearch	2022-06-29 20:49:44 +01:00
Ekaterina Vaartis	0769f06bd1	Style fixes	2022-06-29 20:49:00 +01:00
Ekaterina Vaartis	88891e9d76	Add tests for local post indexing for meilisearch	2022-06-29 20:48:29 +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	7726148472	Send emails i18n'd using backend-stored user language	2022-06-29 20:45:19 +01:00
Tusooa Zhu	4ed0a780b7	Fix digest test	2022-06-29 20:45:05 +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	1048bc1bb9	Delete report notifs when demoting from superuser ... When someone isn't a superuser any more, they shouldn't see the reporsts any more either. Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.	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
Sam Therapy	8de65de3b9	Add unicode 14 support ... and add a test with a unicode 14 emoji	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	e6cd61619f	Purge SSH frontend (#23) ... Reviewed-on: #23	2022-06-27 11:32:06 +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