6650 Commits

Author	SHA1	Message	Date
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (ThreadMute.exists?/2).	2020-03-27 08:01:03 +03:00
Ivan Tashkinov	6b793d3f83	Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).	2020-03-26 21:54:01 +03:00
lain	29ab1d9f8d	Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-26 17:24:10 +01:00
lain	69fc1dd69f	Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex	2020-03-26 14:45:28 +00:00
lain	0c60c0a76a	Validators: Use correct type for IDs.	2020-03-26 15:44:14 +01:00
lain	0adaab8e75	Bump copyright dates.	2020-03-26 15:37:42 +01:00
lain	eaacc64839	Refactors.	2020-03-26 15:33:10 +01:00
lain	ee979dd6d7	Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-26 15:24:06 +01:00
lain	d7aa0b645b	Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex	2020-03-26 14:23:19 +00:00
lain	4cf1007a7d	ActivityPub: Small refactor.	2020-03-26 15:16:54 +01:00
Egor Kislitsyn	94a6590e3c	Partially restore /api/statusnet/config.json	2020-03-26 17:59:45 +04:00
Egor Kislitsyn	1c3f3a12ed	Add characterLimit and vapidPublicKey to nodeinfo	2020-03-26 16:20:20 +04:00
Ivan Tashkinov	112101ca52	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering ... # Conflicts: # lib/pleroma/thread_mute.ex	2020-03-26 09:43:58 +03:00
rinpatch	af820f8cf1	Merge branch 'benchmark_timeline' into 'develop' ... Benchmarks: Add timeline benchmark See merge request pleroma/pleroma!2325	2020-03-25 18:06:00 +00:00
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	2020-03-25 20:33:34 +03:00
Ivan Tashkinov	be5e2c4dbb	Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).	2020-03-25 17:01:45 +03:00
Ivan Tashkinov	3fa3d45dbe	[#1364] Minor improvements / comments. ... Further fixes of incorrect usage of "relations" as a short form of "relationships".	2020-03-25 13:05:00 +03:00
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-25 09:05:17 +03:00
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	2020-03-25 09:04:00 +03:00
Haelwenn (lanodan) Monnier	212c31c637	Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions	2020-03-24 20:32:49 +01:00
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-24 22:15:37 +03:00
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	2020-03-24 22:14:26 +03:00
feld	8eebc75c15	Merge branch 'fix/activity-deletion' into 'develop' ... Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328	2020-03-24 19:10:32 +00:00
rinpatch	f316882464	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex	2020-03-24 18:37:53 +00:00
lain	aaf00f1ff5	Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex	2020-03-24 18:24:09 +00:00
lain	74560e888e	Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex	2020-03-24 18:20:58 +00:00
lain	1d75d0ed7a	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	2020-03-24 17:34:13 +00:00
Egor Kislitsyn	4a2538967c	Support pagination in conversations	2020-03-24 20:18:27 +04:00
Egor Kislitsyn	d1a9716a98	Fix activity deletion	2020-03-24 17:38:18 +04:00
Egor Kislitsyn	3189c44a0c	Remove some TwitterAPI endpoints	2020-03-24 15:21:40 +04:00
rinpatch	fbf02a3722	Merge branch 'bugfix/profile-bio-newline' into 'develop' ... AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322	2020-03-23 19:32:01 +00:00
lain	3bd2829e5c	Benchmarks: Add timeline benchmark	2020-03-23 18:56:01 +01:00
Ivan Tashkinov	86f2fbc81e	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-23 14:34:58 +03:00
Egor Kislitsyn	5a34dca8ed	Add emoji support in statuses in staticfe	2020-03-23 14:03:31 +04:00
Ivan Tashkinov	3c78e5f327	Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.	2020-03-23 12:01:11 +03:00
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
Ivan Tashkinov	c2e415143b	WIP: preloading of user relations for timeline/statuses rendering (performance improvement).	2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	2020-03-22 16:41:01 +01:00
rinpatch	981e015f1b	Mastodon API Account view: Remove an outdated hack ... The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.	2020-03-22 17:10:37 +03:00
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	2020-03-20 22:08:34 +04:00
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	2020-03-20 20:47:54 +03:00
Egor Kislitsyn	cb8236cda6	Add embeddable posts	2020-03-20 21:46:26 +04:00
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	2020-03-20 16:57:51 +00:00
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-20 14:52:58 +01:00
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	2020-03-20 16:36:20 +03:00
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier	a8aa917530	Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity	2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier	c1fd4f6653	transmogrifier.ex: rework fix_attachment for better IR	2020-03-19 19:10:03 +01:00
lain	9b9d67bbec	Fix linting.	2020-03-19 18:16:12 +01:00
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	2020-03-19 18:00:55 +01:00
Mark Felder	7d275970ab	Add emoji reactions to features in nodeinfo	2020-03-19 10:08:11 -05:00
Haelwenn (lanodan) Monnier	f9d622d25a	WIP	2020-03-19 15:39:11 +01:00
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	2020-03-18 14:08:21 +03:00
Ivan Tashkinov	7438833685	[#1364] Improved notification-related tests.	2020-03-16 21:58:10 +03:00
eugenijm	13cce9c0de	Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.	2020-03-16 20:42:37 +03:00
eugenijm	d198e7fa2a	Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password	2020-03-16 20:32:07 +03:00
Alexander Strizhakov	f3791add99	removing with_move parameter	2020-03-16 20:07:45 +03:00
Ivan Tashkinov	0e07c5ef57	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-16 17:58:42 +03:00
Alexander Strizhakov	bf474ca3c1	fix	2020-03-16 16:23:49 +03:00
Alexander Strizhakov	35471205f8	temp fix for :gun.info MatchError	2020-03-16 15:47:25 +03:00
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	2020-03-16 15:31:31 +04:00
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	2020-03-16 14:25:55 +03:00
Alexander Strizhakov	89e4b3ebbd	fix for content-type header for tag feed	2020-03-16 12:59:18 +03:00
Alexander Strizhakov	91870c8995	adding rss for user feed	2020-03-16 12:45:31 +03:00
Alexander Strizhakov	26e2076659	fix for feed page pagination	2020-03-16 12:33:55 +03:00
Haelwenn (lanodan) Monnier	8176ca9e40	static_fe: Sanitize HTML in users	2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier	0ac6e29654	static_fe: Sanitize HTML in posts ... Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">	2020-03-15 20:44:04 +01:00
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	2020-03-15 19:15:20 +00:00
Ivan Tashkinov	7c8003c3fc	[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.	2020-03-15 21:00:12 +03:00
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	2020-03-15 16:14:54 +00:00
Haelwenn	67a27825b1	Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' ... rate limiter: disable based on if remote ip was found, not on if the plug was enabled Closes #1620 See merge request pleroma/pleroma!2296	2020-03-15 14:22:10 +00:00
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	2020-03-15 15:59:17 +03:00
Haelwenn (lanodan) Monnier	8f7bc07ebc	pleroma_api_controller.ex: Improve conversations error reporting ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1594	2020-03-15 12:35:23 +01:00
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	2020-03-14 15:37:02 +03:00
rinpatch	d88c8a9614	Merge branch 'fix/cache-control-headers' into 'develop' ... Fix Cache Control headers on media See merge request pleroma/pleroma!2295	2020-03-14 11:19:42 +00:00
rinpatch	6a28c198af	uploaded media plug: do not inject compile-time params on every request	2020-03-13 22:12:33 +03:00
rinpatch	38f796a5c6	Merge branch 'feature/mastofe-admin-scope' into 'develop' ... auth_controller.ex: Add admin scope to MastoFE See merge request pleroma/pleroma!2256	2020-03-13 18:58:52 +00:00
rinpatch	994ac4357c	Merge branch 'fix/hashtags-streaming' into 'develop' ... Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294	2020-03-13 18:50:17 +00:00
rinpatch	658f30c0b3	Merge branch 'static-accept-missing' into 'develop' ... Fix static FE plug to handle missing Accept header. See merge request pleroma/pleroma!2260	2020-03-13 18:46:54 +00:00
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	2020-03-13 21:41:17 +03:00
rinpatch	3e0f05f08e	Merge branch 'bugfix/br-vs-newline' into 'develop' ... Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204	2020-03-13 18:22:55 +00:00
Mark Felder	c6eb1c1b92	Merge branch 'develop' into fix/cache-control-headers	2020-03-13 12:54:06 -05:00
Mark Felder	7321429a2e	Lint	2020-03-13 12:42:06 -05:00
Mark Felder	3b1b183b42	Synchronize cache-control header for local media with the mediaproxy	2020-03-13 12:27:50 -05:00
Mark Felder	413177c8f0	Set correct Cache-Control header for local media	2020-03-13 12:02:58 -05:00
Mark Felder	c62195127d	Update comment to reflect what the code is actually doing	2020-03-13 11:46:40 -05:00
Mark Felder	ad31d0726a	Do not trust remote Cache-Control headers for mediaproxy	2020-03-13 11:30:27 -05:00
rinpatch	096c5c52e0	Merge branch 'revert/cache-control' into 'develop' ... Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290	2020-03-13 16:25:10 +00:00
Egor Kislitsyn	fffc382f13	Fix hashtags WebSocket streaming	2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	2020-03-13 16:07:17 +01:00
Alexander Strizhakov	98ed0d1c4b	more clean up	2020-03-13 09:37:57 +03:00
feld	802b991814	Merge branch 'exclude-posts-visible-to-admin' into 'develop' ... Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272	2020-03-12 20:29:51 +00:00
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	2020-03-12 18:31:10 +03:00
Alexander Strizhakov	1306b92997	clean up	2020-03-12 18:29:07 +03:00
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-12 16:02:24 +04:00
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	2020-03-12 12:07:07 +03:00
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	2020-03-11 16:53:05 +00:00
rinpatch	7cdabdc0df	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' ... Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288	2020-03-11 15:16:18 +00:00
feld	f92c447bbc	Merge branch 'relay-list-change' into 'develop' ... Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240	2020-03-11 15:10:09 +00:00
rinpatch	c3b9fbd3a7	Revert "Set better Cache-Control header for static content" ... On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613	2020-03-11 17:58:25 +03:00
Alexander Strizhakov	fce090c1de	using Pleroma.Config instead of ets	2020-03-11 17:22:50 +03:00
Alexander Strizhakov	193d67cde5	compile fix	2020-03-11 16:43:58 +03:00
Alexander Strizhakov	282a93554f	merging release default config on app start	2020-03-11 16:25:53 +03:00
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	2020-03-11 13:46:42 +01:00
Ivan Tashkinov	5b696a8ac1	[#1560] Enforced authentication for non-federating instances in StaticFEController.	2020-03-11 14:05:56 +03:00
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-11 09:15:55 +03:00
Mark Felder	5af798f246	Fix enforcement of character limits	2020-03-10 13:08:00 -05:00
Alexander Strizhakov	f39e1b9eff	add verify tls_opts only when we open connection ... for other requests tesla will add tls_opts	2020-03-10 15:54:11 +03:00
Alexander Strizhakov	426f5ee48a	tesla adapter can't be changed in adminFE	2020-03-10 15:31:44 +03:00
Ivan Tashkinov	5fc92deef3	[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.	2020-03-09 20:51:44 +03:00
Alexander Strizhakov	d9f8941dac	Merge branch 'develop' into gun	2020-03-09 10:56:33 +03:00
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	2020-03-08 14:10:59 +03:00
rinpatch	6cf1958b02	moderation log: fix improperly migrated data ... Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606	2020-03-07 17:00:58 +03:00
Alexander Strizhakov	474ef512df	wait in mix task while pleroma is rebooted	2020-03-07 16:02:55 +03:00
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	2020-03-07 12:41:37 +03:00
rinpatch	6d797b9928	Merge branch 'restart-fix-for-mix-tasks' into 'develop' ... Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225	2020-03-07 09:32:29 +00:00
Alexander Strizhakov	5f42ecc4c7	start gun upload pool, if proxy_remote is enabled	2020-03-07 12:24:39 +03:00
Alexander Strizhakov	78282dc983	little polishing	2020-03-06 21:24:19 +03:00
Alexander Strizhakov	c93c3096d5	little refactor	2020-03-06 21:04:18 +03:00
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-06 11:48:30 +03:00
Ivan Tashkinov	40765875d4	[#1560] Misc. improvements in ActivityPubController federation state restrictions.	2020-03-05 21:19:21 +03:00
Alexander Strizhakov	058c9b01ac	returning, not needed	2020-03-05 18:28:04 +03:00
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	2020-03-05 17:31:06 +03:00
eugenijm	ad22e94f33	Exclude private and direct statuses visible to the admin when using godmode	2020-03-05 15:15:27 +03:00
lain	47604907c9	Merge branch 'proper_error_messages' into 'develop' ... MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270	2020-03-05 11:49:51 +00:00
Haelwenn	927079e2ff	Merge branch 'fix/stats-on-startup' into 'develop' ... Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271	2020-03-05 07:25:23 +00:00
Alexander Strizhakov	eb324467d9	removing try block in getting gun info	2020-03-05 09:51:52 +03:00
Mark Felder	cdb05633a6	Generate instance stats on startup	2020-03-04 13:33:26 -06:00
feld	9b740cfb23	Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' ... Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267	2020-03-04 18:22:37 +00:00
lain	4bce13fa2f	MastodonController: Return 404 errors correctly.	2020-03-04 18:09:06 +01:00
Alexander Strizhakov	d6bebd4f9c	moving some logic to tesla adapter ... - checking original inside gun adapter - flushing streams on max_body error	2020-03-04 18:13:24 +03:00
lain	6f7a8c43a2	Merge branch 'fix/no-email-no-fail' into 'develop' ... Do not fail when user has no email See merge request pleroma/pleroma!2249	2020-03-04 12:43:06 +00:00
Alexander Strizhakov	22d52f5691	same copyright date format	2020-03-04 09:41:23 +03:00
Alexander Strizhakov	6b2fb9160c	otp version	2020-03-04 09:23:42 +03:00
Mark Felder	d9c5ae7c09	Update Copyrights for gun related files	2020-03-03 17:16:24 -06:00
Mark Felder	4427161ca3	Merge branch 'develop' into gun	2020-03-03 17:15:49 -06:00
Mark Felder	05da5f5cca	Update Copyrights	2020-03-03 16:44:49 -06:00
Ivan Tashkinov	b6fc98d9cd	[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.	2020-03-03 22:22:02 +03:00
Alexander Strizhakov	884d9710b2	refactoring for gun api modules	2020-03-03 19:24:14 +03:00
Alexander Strizhakov	f98ee730f0	adapter renaming to adapter_helper	2020-03-03 18:53:44 +03:00
Alexander Strizhakov	8854770fc4	retry and retry_timeout settings default change	2020-03-03 18:01:35 +03:00
Alexander Strizhakov	1ad34bfdba	no try block in checkout connection	2020-03-03 17:44:04 +03:00
Alexander Strizhakov	24bf5c4e89	remove try block from pool request	2020-03-03 17:27:56 +03:00
Alexander Strizhakov	aaa879ce75	proxy parsing errors	2020-03-03 17:27:22 +03:00
Alexander Strizhakov	6ebf389d6e	poolboy timeout fix	2020-03-03 16:51:49 +03:00
Alexander Strizhakov	8fc00b7cbf	return error if connection failed to open	2020-03-03 16:42:24 +03:00
Alexander Strizhakov	7d68924e4f	naming	2020-03-03 16:42:24 +03:00
Alexander Strizhakov	e605e79df9	simplification of formatting host method ... case for format_proxy method	2020-03-03 16:42:03 +03:00
Alexander Strizhakov	ee8071f0d5	removing unused method	2020-03-03 15:12:09 +03:00
Alexander Strizhakov	05429730e4	unnecessary with	2020-03-03 15:11:48 +03:00
Alexander Strizhakov	d0e4d3ca3b	removing unnecessary with ... comment in tesla client impovement	2020-03-03 14:56:49 +03:00
Alexander Strizhakov	24d1ac125c	hiding raise error logic to otp_version module	2020-03-03 13:24:19 +03:00
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	2020-03-03 13:05:28 +03:00
Alexander Strizhakov	151dc4e387	Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex	2020-03-03 09:53:37 +00:00
Alexander Strizhakov	7eb6592992	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:53:31 +00:00
Alexander Strizhakov	a21a66972f	Apply suggestion to lib/pleroma/http/http.ex	2020-03-03 09:52:01 +00:00
Alexander Strizhakov	614e3934f9	Apply suggestion to lib/pleroma/http/http.ex	2020-03-03 09:50:42 +00:00
Alexander Strizhakov	d30ff35d94	Apply suggestion to lib/pleroma/http/request_builder.ex	2020-03-03 09:46:53 +00:00
Alexander Strizhakov	a3ad028973	Apply suggestion to lib/pleroma/http/adapter.ex	2020-03-03 09:34:36 +00:00
Alexander Strizhakov	2c8d80dc0a	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:29:57 +00:00
Alexander Strizhakov	097ad10d02	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:29:51 +00:00
Alexander Strizhakov	4c8569d403	otp_version refactor	2020-03-03 12:21:10 +03:00
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	2020-03-03 10:08:07 +03:00
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-03 00:32:34 +04:00
Ivan Tashkinov	99a6c660a9	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-02 18:41:12 +03:00
eugenijm	7af431c150	Exclude reblogs from GET /api/pleroma/admin/statuses by default	2020-03-02 16:47:31 +03:00
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	2020-03-02 15:35:49 +04:00
Haelwenn	764a50f8a6	Merge branch 'feature/1482-activity_pub_transactions' into 'develop' ... ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089	2020-03-02 07:58:01 +00:00
Alexander Strizhakov	cc98d010ed	relay list shows hosts without accepted follow	2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	2020-03-02 06:08:45 +01:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
Alexander Strizhakov	400fbc7629	wait in mix task while pleroma is rebooted	2020-03-01 12:36:09 +03:00
Alexander Strizhakov	34f1d09f3a	spec fix	2020-03-01 12:01:39 +03:00
Alexander Strizhakov	ba87ed7335	fix for compiling	2020-03-01 12:01:39 +03:00
Alexander Strizhakov	32d1e04817	ActivityPub actions & side-effects in transaction	2020-03-01 12:01:39 +03:00
Phil Hagelberg	523f73dccd	Fix static FE plug to handle missing Accept header.	2020-02-29 18:53:49 -08:00
rinpatch	b5465bf385	timeline controller: add a TODO for replacing copypaste with a macro	2020-03-01 02:03:46 +03:00
rinpatch	ffcebe7e22	timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user	2020-03-01 01:13:08 +03:00
rinpatch	4d416343fa	rate limiter: Fix a race condition ... When multiple requests are processed by rate limiter plug at the same time and the bucket is not yet initialized, both would try to initialize the bucket resulting in an internal server error.	2020-03-01 01:13:07 +03:00
rinpatch	df2173343a	pagination: limit the number of elements returned at one time to 40	2020-03-01 01:11:54 +03:00
rinpatch	19e559fe51	Merge branch 'rate-limiter-runtime-settings' into 'develop' ... RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250	2020-02-29 21:52:33 +00:00
Ivan Tashkinov	c747260989	[#2250] Tiny refactoring per merge request review.	2020-02-29 22:04:09 +03:00
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	2020-02-29 11:34:50 +03:00
Haelwenn (lanodan) Monnier	3ef2ff3e47	auth_controller.ex: Add admin scope to MastoFE ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1265	2020-02-29 01:25:14 +01:00
Ivan Tashkinov	3759b146c4	Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex	2020-02-28 13:33:42 +00:00
feld	f2216287a7	Merge branch 'admin-status-list' into 'develop' ... Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`) Closes #1550 See merge request pleroma/pleroma!2192	2020-02-27 18:11:04 +00:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	2020-02-27 17:27:49 +04:00
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses	2020-02-26 22:35:57 +03:00
eugenijm	e2a6a40367	Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)	2020-02-26 20:21:38 +03:00
Egor Kislitsyn	f446744a6a	Allow account registration without an email	2020-02-26 20:13:53 +04:00
lain	fda6f35a46	Merge branch 'feat/instance-gen-improvements' into 'develop' ... small instance.gen task improvements See merge request pleroma/pleroma!2245	2020-02-26 08:26:16 +00:00
rinpatch	3bbfebd1c2	instance.gen task: make example instance name less confusing ... See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217	2020-02-26 00:32:34 +03:00
rinpatch	359faa8645	instance.gen task: remind to transfer the config to the database after ... migrations	2020-02-25 22:13:08 +03:00
rinpatch	cfa28dee32	instance.gen task: make instance name default to the domain	2020-02-25 21:59:37 +03:00
Egor Kislitsyn	22018adae6	Fix Dialyzer warnings	2020-02-25 18:34:56 +04:00
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	2020-02-25 07:22:56 +03:00
rinpatch	035c2c1415	Merge branch 'fix/instance-gen-custom-static' into 'develop' ... instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237	2020-02-24 20:52:10 +00:00
rinpatch	5e4fe0e8f7	instance.gen task: fix crash when using custom static directory ... Closes #1082	2020-02-24 23:42:24 +03:00
eugenijm	7ad5c51f23	Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope	2020-02-24 21:46:37 +03:00
Alexander Strizhakov	8efae966b1	open conn in separate task	2020-02-24 19:56:27 +03:00
lain	81f29e7c6a	Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' ... Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236	2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier	f9fe6a9e30	Captcha: return invalid when answer_data is nil	2020-02-24 02:49:53 +01:00
Ivan Tashkinov	0cf1d4fcd0	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	2020-02-22 19:48:41 +03:00
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	2020-02-22 09:31:43 +03:00
Alexander Strizhakov	d44f9e3b6c	fix for timeout clause	2020-02-21 16:56:55 +03:00
Alexander Strizhakov	f604f9e470	hackney pool timeout	2020-02-21 14:33:55 +03:00
Alexander Strizhakov	6806df80dd	don't log info ssl messages	2020-02-21 14:28:16 +03:00
Egor Kislitsyn	011ede4536	Update documentation	2020-02-21 14:42:43 +04:00
Alexander Strizhakov	ad8f26c0a4	more info in Connections.checkin timout errors	2020-02-21 12:53:40 +03:00
Alexander Strizhakov	a03c420b84	by default don't use gun retries ... remove conn depends on retry setting from config	2020-02-21 12:32:42 +03:00
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	2020-02-21 10:02:37 +03:00
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' ... Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	2020-02-20 23:50:40 +00:00
Egor Kislitsyn	819cd46717	Auto-expire Create activities only	2020-02-20 22:04:02 +04:00
lain	3eddd9caa6	Merge branch 'require-signature' into 'develop' ... Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071	2020-02-20 12:13:21 +00:00
lain	c69b04c490	Merge branch 'features/remote-follow-userpage-redirect' into 'develop' ... remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123	2020-02-20 12:04:29 +00:00
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs	2020-02-20 15:00:48 +03:00
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' ... New users digest email Closes #1514 See merge request pleroma/pleroma!2128	2020-02-20 11:58:37 +00:00
Ivan Tashkinov	3432294657	[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3	2020-02-20 14:48:46 +03:00
lain	314928333a	Pleroma API: Add endpoint to get reaction information on a single emoji	2020-02-19 17:16:45 +01:00
Alexander Strizhakov	c9db0507f8	removing retry option and changing some logger messages levels	2020-02-19 12:26:57 +03:00
Mark Felder	7d73e7a09a	Spelling	2020-02-18 09:18:09 -06:00
Mark Felder	cf94349287	Merge branch 'develop' into gun	2020-02-18 09:06:27 -06:00
lain	cf8307e71c	Merge branch 'fix/status-view/expires_at' into 'develop' ... Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222	2020-02-18 14:56:59 +00:00
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
lain	3fa2ac68df	Merge branch 'chore/standardize-mrf-behavior' into 'develop' ... Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212	2020-02-18 14:36:10 +00:00
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' ... need_reboot flag for adminFE See merge request pleroma/pleroma!2188	2020-02-18 14:32:03 +00:00
Egor Kislitsyn	2ef70b55f5	Fix status.expires_at type	2020-02-18 14:52:11 +04:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	2020-02-17 08:56:03 +03:00
rinpatch	472132215e	Use floki's new APIs for parsing fragments	2020-02-16 01:55:26 +03:00
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	2020-02-15 00:36:09 +01:00
Mark Felder	478619782b	Standardize @behaviour usage in MRFs	2020-02-14 11:02:24 -06:00
Egor Kislitsyn	57878f8708	Improve readability	2020-02-14 15:50:31 +04:00
Egor Kislitsyn	4d459b0e99	Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4	2020-02-13 22:27:10 +04:00
Egor Kislitsyn	241a3d744a	Add ActivityExpirationPolicy	2020-02-13 22:27:10 +04:00
rinpatch	9906c6fb6f	Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' ... NodeInfo: Fix federating status not being reported when MRF transparency is disabled Closes #1568 See merge request pleroma/pleroma!2206	2020-02-13 18:08:43 +00:00
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	2020-02-13 20:43:34 +03:00
rinpatch	23049a077e	NodeInfo: Fix federating status not being reported when MRF ... transparency is disabled Closes #1568	2020-02-13 19:53:39 +03:00
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	2020-02-13 14:37:55 +00:00
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	2020-02-13 09:20:34 +03:00
Egor Kislitsyn	19516af74e	Fix status.expires_in validation	2020-02-12 20:20:44 +04:00
Mark Felder	ff9fd4ca89	Fix the confusingly named and inverted logic of "no_attachment_links" ... The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.	2020-02-11 15:39:19 -06:00
Egor Kislitsyn	50d9fcbe29	Hotlink logo instead of attachment	2020-02-11 23:33:05 +04:00
feld	237b2068f9	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" ... This reverts merge request !2194	2020-02-11 16:55:18 +00:00
rinpatch	ea1631d7e6	Make Floki use fast_html	2020-02-11 16:17:21 +03:00
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	2020-02-11 08:35:26 +03:00
rinpatch	94e5ca1105	Merge branch 'issue/1383' into 'develop' ... [#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015	2020-02-11 00:04:06 +00:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
rinpatch	c55301e760	Fix a compilation error under certain circumstances ... I've noticed that sometimes when switching from develop to stable and back, develop fails to compile and rm -r ing the _build and deps dirs doesn't help at all. This is due to Admin API controller needing to generate JSON description of the config at compile time. Evaluating `config/description.exs` calls `Generator.list_modules_in_dir/2`, which in turn predicts the module names of files in the directory and tries to convert the predicted name to *existing* atoms. Sometimes the compiler will call that function before compiling the modules in the said directory, so the conversion will of course fail. This fixes it by removing the requirement of the atoms being existent. The function is not subjected to any untrusted user input so this should be safe. An ideal fix would be to block the compilation of docs before all modules are compiled and then get a list of compiled elixir modules under the namespace we want instead of directory hacks, but I have not been able to figure out how to do that.	2020-02-10 18:41:02 +03:00
Maksim Pechnikov	3830cb538b	removed a comments	2020-02-10 09:14:15 +03:00
Maksim Pechnikov	cd040691bd	maked unread_count as virtual field	2020-02-10 09:01:45 +03:00
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	2020-02-10 07:59:52 +03:00
Ivan Tashkinov	24e49d14f2	[#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.	2020-02-09 17:34:48 +03:00
Ivan Tashkinov	6ea3c06d8d	[#1505] Minor refactoring.	2020-02-09 14:09:01 +03:00
Ivan Tashkinov	7c3991f59e	[#1505] Fixed replies serialization (included objects' ids instead of activities' ids).	2020-02-09 10:17:21 +03:00
rinpatch	8fda6303ba	Fix email mix task on OTP releases ... Closes pleroma#1548	2020-02-09 03:27:29 +03:00
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-08 19:59:37 +03:00
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	2020-02-08 19:58:02 +03:00
lain	964b4d82a0	Merge branch 'fix/upload-limit-otp' into 'develop' ... Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185	2020-02-08 14:02:36 +00:00
Alexander Strizhakov	dad23e3766	need_reboot flag	2020-02-08 13:00:02 +03:00
rinpatch	15ea75cd2a	Actually fix upload limit on OTP releases ... Closes #1109	2020-02-07 20:14:06 +03:00
Haelwenn	1262357ddb	Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175	2020-02-07 16:10:43 +00:00
Lain Soykaf	d85bcc8627	Questions: Add timezone to closed property	2020-02-07 16:57:46 +01:00
Lain Soykaf	4538a1ee01	EmojiReactions: Remove old API endpoints	2020-02-07 15:01:45 +01:00
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	2020-02-07 14:52:13 +01:00
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	2020-02-07 16:17:34 +04:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	2020-02-06 16:08:23 +00:00
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	2020-02-06 18:02:33 +04:00
Alexander Strizhakov	c85aa6e87f	removing confusing error	2020-02-06 12:50:36 +03:00
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	2020-02-05 21:04:16 +00:00
rinpatch	72d767998c	Merge branch 'removing-admin-api-endpoint' into 'develop' ... Removing migrate_from_db endpoint from admin api See merge request pleroma/pleroma!2177	2020-02-05 21:03:56 +00:00
feld	b21e59da5f	Merge branch 'remove-linker-scheme-option' into 'develop' ... Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176	2020-02-05 20:32:45 +00:00
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	2020-02-05 20:36:21 +03:00
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker scheme option from the config	2020-02-05 21:13:56 +04:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	2020-02-05 20:22:15 +04:00
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-05 07:56:36 +03:00
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	2020-02-03 21:42:36 +03:00
rinpatch	50f5a92021	fix not being able to pin polls	2020-02-02 14:55:06 +03:00
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	2020-02-02 14:46:32 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
rinpatch	c27d1d65bf	Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' ... Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064	2020-01-30 19:24:04 +00:00
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2020-01-30 22:16:55 +03:00
lain	774cba84f5	Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' ... Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164	2020-01-30 18:47:44 +00:00
lain	a0d9d42eaa	Emoji Reactions: Actually use the validation.	2020-01-30 16:07:37 +01:00
feld	e2f2602fdc	Merge branch 'emoji-api-errors' into 'develop' ... Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161	2020-01-30 14:13:40 +00:00
feld	df200ea7a4	Merge branch 'http-security-warning' into 'develop' ... Warn if HTTPSecurityPlug is disabled Closes #1528 See merge request pleroma/pleroma!2155	2020-01-30 14:11:29 +00:00
feld	b3e9c87724	Update emoji_api_controller.ex	2020-01-30 14:09:41 +00:00
feld	36becd5573	Update http_security_plug.ex	2020-01-30 14:07:41 +00:00
rinpatch	263abe3ba5	Merge branch 'emoji-reactions-reacted' into 'develop' ... Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160	2020-01-30 13:16:04 +00:00
rinpatch	889965141a	RemoteIp: only trust X-Forwarded-For ... Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.	2020-01-30 00:06:58 +03:00
Haelwenn	946de2299c	Merge branch 'fix-streaming-reblog' into 'develop' ... Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156	2020-01-29 20:21:32 +00:00
Egor Kislitsyn	e07e7888d7	Fix credo warning	2020-01-29 18:53:43 +04:00
Egor Kislitsyn	2bd4d6289b	Make the warning more scarier	2020-01-29 18:43:23 +04:00
Alexander Strizhakov	e7fee0d6fa	emoji api error on not writable dir	2020-01-29 15:31:34 +03:00
lain	b3a877d6c9	Emoji Reactions: Correctly handle deleted users	2020-01-29 11:43:36 +01:00
lain	a802e07241	Emoji Reactions: Add reacted field to emoji reactions	2020-01-29 11:39:06 +01:00
Alexander Strizhakov	1f4fbe9d98	title parse improvement	2020-01-29 11:13:34 +03:00
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	2020-01-28 21:11:13 +03:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
lain	cedee2793d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect	2020-01-28 17:52:42 +01:00
lain	12b6fcdb8c	Merge branch 'features/task-test-email' into 'develop' ... Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118	2020-01-28 16:42:57 +00:00
lain	2c121b2623	Merge branch 'fix/1524-link_preview' into 'develop' ... Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157	2020-01-28 16:38:14 +00:00
Alexander Strizhakov	7bd4c14581	meta tag parser respect first title header	2020-01-28 19:29:27 +03:00
lain	d385789a45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed	2020-01-28 17:06:36 +01:00
Haelwenn	271935953a	Merge branch 'whole-db-removal' into 'develop' ... Remove `whole_db` parameter everywhere, it's not used anymore See merge request pleroma/pleroma!2152	2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier	4eb935be78	Create pleroma.email mix task ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061	2020-01-28 16:49:38 +01:00
lain	77f24525ca	Streamer: Correctly handle reblog mutes	2020-01-28 16:40:44 +01:00
Egor Kislitsyn	6302b40791	Warn if HTTPSecurityPlug is disabled	2020-01-28 19:14:09 +04:00
feld	d9cb8acd3e	Merge branch 'fix/attachments-cleanup' into 'develop' ... Fix attachments cleanup with custom base_url See merge request pleroma/pleroma!2154	2020-01-28 14:52:57 +00:00
Roman Chvanikov	d18a2e4e36	Add test for custom base_url when deleting an attachment	2020-01-28 17:22:24 +03:00
Roman Chvanikov	804a702f97	Fix base_url string trimming	2020-01-28 17:07:46 +03:00
Roman Chvanikov	dea968463d	Add logging	2020-01-28 16:52:20 +03:00
lain	46915207b6	Remove whole_db parameter everywhere, it's not used anymore	2020-01-28 14:40:40 +01:00
lain	e3fae3380e	Apply suggestion to lib/pleroma/web/feed/tag_controller.ex	2020-01-28 13:38:49 +00:00
Roman Chvanikov	7f78bd7e37	Fix __MODULE__ usage	2020-01-28 16:38:44 +03:00
lain	95afcae194	Merge branch 'support/update_ecto' into 'develop' ... updated ecto and fixed warning See merge request pleroma/pleroma!2150	2020-01-28 12:49:22 +00:00
lain	4f004ab92e	Merge branch 'fix/attachments-cleanup' into 'develop' ... Fix/attachments cleanup See merge request pleroma/pleroma!2148	2020-01-28 12:40:00 +00:00
Maksim Pechnikov	02c3dd2e3d	update ecto	2020-01-28 10:43:47 +03:00
Roman Chvanikov	eb4870e1cd	Remove unused var	2020-01-28 03:54:54 +03:00
Roman Chvanikov	52e08ec9fd	explicitly describe perform op in AttachmentsClenupWorker	2020-01-28 03:52:50 +03:00
Maksim Pechnikov	bcffa662dc	Merge branch 'develop' into feature/tag_feed	2020-01-27 21:13:13 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	2020-01-27 15:20:47 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
Roman Chvanikov	86c4b76bf0	Fix typo	2020-01-27 04:01:50 +03:00
feld	36838b516f	Merge branch 'fix/runtime-config' into 'develop' ... Fixes for runtime config See merge request pleroma/pleroma!2143	2020-01-26 17:35:21 +00:00
Mark Felder	d770cffce0	Merge branch 'develop' into issue/1280	2020-01-26 11:23:05 -06:00
Alexander Strizhakov	e93cc561cd	restarting pleroma from outside application	2020-01-25 18:42:04 +03:00
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
Alexander Strizhakov	de4102b247	can be changed in runtime	2020-01-25 10:39:10 +03:00
Alexander Strizhakov	6252e82f85	respect settings from database in mix tasks	2020-01-25 10:33:27 +03:00
Maksim Pechnikov	99c0a11c58	added atom feed	2020-01-24 22:12:23 +03:00
Maksim Pechnikov	055edd3d72	Merge branch 'develop' into feature/tag_feed	2020-01-24 21:46:57 +03:00
rinpatch	8533b63d1f	Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop' ... Fix for non existing atom Closes #1532 See merge request pleroma/pleroma!2139	2020-01-24 11:33:02 +00:00
rinpatch	0fceeb44b3	Merge branch 'emoji-reaction-sanity-check' into 'develop' ... Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132	2020-01-24 11:32:25 +00:00
lain	347f3ed2c6	Emoji reactions: Change api format once more	2020-01-24 10:52:24 +01:00
Alexander Strizhakov	6a0f0ac4a2	fix for non existing atom	2020-01-24 12:22:26 +03:00
Maksim Pechnikov	293281fcbd	Merge branch 'develop' into feature/tag_feed	2020-01-24 08:58:07 +03:00
Alexander Strizhakov	6cd2e851d9	parsing Swoosh modules	2020-01-23 18:21:29 +03:00
Alexander Strizhakov	e8e57e398f	restart config id after truncate	2020-01-23 17:48:45 +03:00
Alexander Strizhakov	4344c5d5b9	truncate config table on migrate to db task	2020-01-23 17:23:02 +03:00
Maksim Pechnikov	8589632d09	fixed delete ScheduledActivity	2020-01-23 17:18:23 +03:00
lain	34fc0ca053	Emoji reactions: Add sanity checks for the cache	2020-01-23 12:34:34 +01:00
Maksim Pechnikov	2cfe1b9385	Merge branch 'develop' into feature/tag_feed	2020-01-23 11:42:10 +03:00
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	2020-01-23 11:11:18 +03:00
Maksim Pechnikov	ce7c887a27	removed try/rescue	2020-01-23 11:05:08 +03:00
Maksim	6f77b77428	Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex	2020-01-23 05:49:00 +00:00
Haelwenn	dddebee047	Merge branch 'emoji-notifications' into 'develop' ... Emoji notifications See merge request pleroma/pleroma!2130	2020-01-23 02:12:03 +00:00
Mark Felder	e151dea276	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 15:59:24 -06:00
Mark Felder	ae78059ff4	Merge branch 'develop' into features/remote-follow-userpage-redirect	2020-01-22 15:05:39 -06:00
lain	615b72238e	Notifications: Add emoji reaction notifications	2020-01-22 20:06:12 +01:00
Ivan Tashkinov	cf96c40057	[#1505] Added Mastodon-compatible replies collection to Note federated representation.	2020-01-22 21:10:17 +03:00
rinpatch	6e6f1ead31	Merge branch 'no-error-404' into 'develop' ... Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066	2020-01-22 17:55:49 +00:00
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	2020-01-22 20:20:39 +03:00
minibikini	7c0ac54437	Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex	2020-01-22 17:18:55 +00:00
Egor Kislitsyn	5c842e3b68	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 21:18:27 +04:00
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	2020-01-22 17:13:17 +00:00
Egor Kislitsyn	b6f5b326e7	Fix credo warnings	2020-01-22 20:59:58 +04:00
Egor Kislitsyn	aa0f0d4edd	Disable NewUsersDigestEmail by default	2020-01-22 20:53:06 +04:00
Egor Kislitsyn	df0b8f1d08	Add new users digest email	2020-01-22 20:31:42 +04:00
rinpatch	34aa0c542b	Merge branch 'emoji-reaction-extensions-2' into 'develop' ... Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126	2020-01-22 14:11:01 +00:00
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	2020-01-22 13:57:42 +01:00
Alexander Strizhakov	d5f8a88a37	support for updating env after settings deletion	2020-01-22 15:14:11 +03:00
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	2020-01-22 11:22:31 +03:00
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	2020-01-22 09:30:30 +03:00
Maksim Pechnikov	5ea8596448	Merge branch 'develop' into feature/tag_feed	2020-01-21 20:56:49 +03:00
Roman Chvanikov	22e94bb2c7	Merge branch 'develop' into fix/attachments-cleanup	2020-01-21 19:45:13 +03:00
Haelwenn (lanodan) Monnier	7bfb8ed14d	remote_follow_controller.ex: Redirect to the user page on success ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245	2020-01-21 16:46:16 +01:00
Alexander Strizhakov	f01ab6cd29	some refactor and tests	2020-01-21 18:42:00 +03:00
rinpatch	04c9ca5d68	Merge branch 'emoji-reaction-extensions' into 'develop' ... StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120	2020-01-21 13:13:17 +00:00
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	2020-01-21 10:32:27 +03:00
Alexander Strizhakov	dcae5914d1	fix for db key	2020-01-21 10:14:48 +03:00
Maksim Pechnikov	41e2332007	Merge branch 'develop' into feature/tag_feed	2020-01-21 09:23:35 +03:00
Maksim Pechnikov	6e88a7e591	exclude blocked user posts from search results	2020-01-21 07:40:13 +03:00
lain	7d8b709d29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions	2020-01-20 18:10:55 +01:00
rinpatch	00d08c9231	Merge branch 'favoritng-responses' into 'develop' ... Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119	2020-01-20 16:31:43 +00:00
Alexander Strizhakov	8023fa48db	merge fix	2020-01-20 18:25:00 +03:00
lain	4c5b5f14dc	StatusView: Add emoji_reactions	2020-01-20 16:24:20 +01:00
lain	6a716e3fe5	Merge branch 'credo/version-bump-1.1.5' into 'develop' ... Bump credo to 1.1.5 See merge request pleroma/pleroma!2115	2020-01-20 14:42:43 +00:00
lain	42ea480e95	Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop' ... Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117	2020-01-20 13:49:06 +00:00
lain	510776ba31	CommonAPI: Don't error out on double favs/repeats	2020-01-20 14:27:59 +01:00
lain	c814f22030	Merge branch 'fix-admin-api-scope' into 'develop' ... fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087	2020-01-20 12:07:12 +00:00
lain	5fddf988ea	Pleroma API: emoji_reactions_by does not need authorization	2020-01-20 13:05:35 +01:00
Haelwenn	e8759cb5ba	Merge branch 'hashtag-benchmarks' into 'develop' ... Hashtag benchmarks See merge request pleroma/pleroma!2116	2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	2020-01-20 12:17:14 +01:00
rinpatch	9367b70f37	Merge branch 'features/cleanup-incoming-actor' into 'develop' ... transmogrifier.ex: simplify handle_incoming of actors See merge request pleroma/pleroma!2114	2020-01-20 10:25:17 +00:00
rinpatch	dc0498ab2b	Check for unapplied migrations on startup ... Closes #1328	2020-01-20 12:20:26 +03:00
Roman Chvanikov	cde828ff7d	Fix credo warning	2020-01-19 22:09:47 +03:00
Roman Chvanikov	d6a532bf0f	Delete attachments asynchronously	2020-01-19 19:45:20 +03:00
Haelwenn (lanodan) Monnier	6cf3b19a38	transmogrifier.ex: simplify handle_incoming of actors	2020-01-19 07:06:15 +01:00
Alexander Strizhakov	efb8ef5abe	releases support	2020-01-18 17:14:50 +03:00
Alexander Strizhakov	e699861690	full update for some subkeys	2020-01-18 12:25:56 +03:00
Roman Chvanikov	81133702d4	Delete attachments after object and cache cleanup	2020-01-17 20:20:37 +03:00
Alexander Strizhakov	89e93fb33f	return db key on update requests	2020-01-17 18:15:41 +03:00
Alexander Strizhakov	7676ed8239	some clean up	2020-01-17 16:28:44 +03:00
Alexander Strizhakov	ce027fd0ef	revert non needable	2020-01-17 15:13:24 +03:00
Alexander Strizhakov	9e10b90b5b	configure only console backend	2020-01-17 15:06:42 +03:00
Maksim Pechnikov	108a39c876	updated error messages for authentication process	2020-01-17 15:01:37 +03:00
Alexander Strizhakov	b310feeccb	compile fix	2020-01-17 15:00:20 +03:00
Alexander Strizhakov	58e8963824	fix for config loader	2020-01-17 11:54:22 +03:00
Alexander Strizhakov	60ba2339a2	saving to DB only added by user settings	2020-01-17 11:45:44 +03:00
Alexander Strizhakov	29155137fd	renaming ... Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB	2020-01-16 08:50:27 +03:00
Maksim Pechnikov	a5db044e57	Merge branch 'develop' into feature/tag_feed	2020-01-15 19:11:13 +03:00
Ivan Tashkinov	5304c8cd21	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-15 18:12:08 +03:00
lain	aa9fe3a712	Merge branch 'develop' into 'feature/tag_feed' ... # Conflicts: # CHANGELOG.md	2020-01-15 14:29:56 +00:00
Alexander Strizhakov	59ba5c80b9	little cleanup	2020-01-15 17:10:33 +03:00
Alexander Strizhakov	66de2b159b	don't migrate Pleroma.Web.EndPoint settings ... don't set Logger level to all tasks	2020-01-15 17:08:45 +03:00
Egor Kislitsyn	3849053c6a	Merge branch 'develop' into notifications-from-account	2020-01-15 16:49:45 +04:00
lain	167e9c45ec	Benchmarks: Move to correct folder	2020-01-15 12:37:50 +01:00
Ivan Tashkinov	76c1948880	[#1478] Adjusted AdminAPIController admin subscope requirements.	2020-01-15 12:11:23 +03:00
Maksim Pechnikov	c9f45edeac	Merge branch 'develop' into feature/tag_feed	2020-01-14 21:29:14 +03:00
Roman Chvanikov	0709757e47	Check if object->data is array when looking up attachment objects to delete	2020-01-14 19:53:28 +03:00
lain	2ee6754095	Mix Tasks: Add pleroma.benchmarks.tags	2020-01-14 17:24:26 +01:00
Alexander Strizhakov	70c7a26de8	Merge branch 'develop' into admin-be	2020-01-14 14:52:00 +03:00
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	2020-01-13 12:41:07 +03:00
Roman Chvanikov	88f0eed0f2	Delete attachments when status is deleted	2020-01-12 18:48:58 +00:00
feld	8b4d81609d	Merge branch 'updated-at-on-conversation-read' into 'develop' ... MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080	2020-01-12 18:37:52 +00:00
feld	bb5862ea2f	Merge branch 'issue/1354' into 'develop' ... [#1354] fix remote follow See merge request pleroma/pleroma!2079	2020-01-12 18:20:31 +00:00
Mark Felder	2f5b8fbeb3	Merge branch 'develop' into issue/1354	2020-01-12 12:12:15 -06:00
feld	ea4a462858	Merge branch 'issue/1487' into 'develop' ... [#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090	2020-01-12 17:25:25 +00:00
Hakaba Hitoyo	0c9c62509d	Remove MDII uploader	2020-01-11 17:19:54 +00:00
Alexander Strizhakov	1630ecaa20	Merge branch 'develop' into admin-be	2020-01-11 12:15:42 +03:00
Alexander Strizhakov	3453b27015	don't migrate prometheus settings	2020-01-10 21:24:06 +03:00
Alexander Strizhakov	d933fd3d61	more renamings	2020-01-10 19:51:32 +03:00
Alexander Strizhakov	eadb674c41	don't migrate configurable_from_database setting	2020-01-10 19:44:30 +03:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Alexander Strizhakov	958d0452e4	fix for pleroma assets group update	2020-01-10 18:18:09 +03:00
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	2020-01-10 16:18:32 +03:00
lain	05ca420c09	Merge branch 'issue/1490' into 'develop' ... [#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092	2020-01-10 13:14:20 +00:00
Alexander Strizhakov	88a16bb9fc	deep merge in config update	2020-01-10 15:52:02 +03:00
Alexander	c841174de8	flag for delete fix	2020-01-10 15:52:02 +03:00
Alexander	0b02040327	little fixes and typos fix	2020-01-10 15:52:02 +03:00
Alexander	9c1f3bfeff	fixes for logger backends	2020-01-10 15:52:01 +03:00
Alexander	cda2c1fc63	fix for subgroup tuple ... added settings for swoosh adapters local	2020-01-10 15:52:01 +03:00
Alexander	063ab6d911	logger backends fix	2020-01-10 15:52:01 +03:00
Alexander	583cee4607	parsing proxy url setting	2020-01-10 15:52:01 +03:00
Alexander	a71393dd29	fix for endpoints after env update	2020-01-10 15:52:00 +03:00
Alexander	fea734ca70	errors on endpoints	2020-01-10 15:52:00 +03:00
Alexander	5cacb988b9	partially settings update	2020-01-10 15:52:00 +03:00
Alexander	0656816c77	tests for setttings without an explicit key	2020-01-10 15:51:59 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	2020-01-10 10:52:21 +03:00
Maksim Pechnikov	70410dfafd	fix create service actor	2020-01-08 16:40:49 +03:00
eugenijm	0b6d1292d2	Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list	2020-01-05 17:38:51 +03:00
Maksim Pechnikov	fa7d8e77e6	fixed Metadata.Utils.scrub_html_and_truncate	2020-01-03 16:28:13 +03:00
Ivan Tashkinov	badd0a96ea	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	2020-01-02 13:03:33 +03:00
Maksim Pechnikov	933dc12043	added code of mr#2067	2019-12-25 15:12:43 +03:00
Maksim Pechnikov	385356aad0	fix oauth scopes for AdminApi#reports_update	2019-12-24 20:51:52 +03:00
Maksim Pechnikov	bdd71669da	update test	2019-12-22 21:21:31 +03:00
Maksim	4c505bc615	Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex	2019-12-22 17:58:54 +00:00
Maksim	c9a44ec4a6	Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex	2019-12-22 17:58:45 +00:00
Maksim Pechnikov	5b84156013	moved remote follow in separate controller	2019-12-21 21:27:42 +03:00
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	2019-12-21 20:38:59 +03:00
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	2019-12-21 11:56:24 +00:00
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	2019-12-21 11:41:19 +00:00
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	2019-12-20 16:32:04 -06:00
feld	a54aa5af43	Merge branch 'feature/status-counts-by-scope' into 'develop' ... Stats: return status counts by scope See merge request pleroma/pleroma!2076	2019-12-20 16:30:26 +00:00
Maksim Pechnikov	7bd0bca2ab	fixed remote follow	2019-12-20 16:33:44 +03:00
Maxim Filippov	5fc84552d3	Fix all count	2019-12-19 19:52:55 +03:00
Ivan Tashkinov	ead2d18826	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	2019-12-19 17:24:08 +03:00
Ivan Tashkinov	455e072d27	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
Egor Kislitsyn	34d85f8a54	Return 404 if account to filter notifications from is not found	2019-12-19 20:45:44 +07:00
Egor Kislitsyn	775212121c	Verify HTTP signatures only when request accepts "activity+json" type	2019-12-19 20:17:18 +07:00
Egor Kislitsyn	432b3067d4	Do not crash when remote user follower and following counters are hidden	2019-12-19 19:26:46 +07:00
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	2019-12-18 23:17:34 +03:00
Maksim Pechnikov	b53573a837	add tag feeds	2019-12-18 09:19:37 +03:00
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-12-17 16:16:21 +01:00
Egor Kislitsyn	6c39fa20b1	Add support for account_id param to filter notifications by the account	2019-12-17 17:00:46 +07:00
Maxim Filippov	45180d4c60	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2019-12-17 12:36:56 +03:00
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	2019-12-17 13:34:07 +07:00
Maksim Pechnikov	a879c396bb	Merge branch 'develop' into feature/tag_feed	2019-12-17 09:24:08 +03:00
Egor Kislitsyn	b9a87b1baa	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-16 22:34:21 +07:00
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	2019-12-16 22:24:03 +07:00
Ivan Tashkinov	7973cbdb9f	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	2019-12-15 22:32:42 +03:00
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	2019-12-14 21:44:10 +03:00
Maxim Filippov	eb11c60289	Disable rate limiter for socket/localhost (unless RemoteIp is enabled)	2019-12-14 03:06:43 +03:00
Phil Hagelberg	02c3031e99	Don't log when users or objects are deleted.	2019-12-13 12:05:53 -08:00
rinpatch	bcd16676a7	Publisher: check out a connection for inserting publish_one jobs ... Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.	2019-12-13 14:27:10 +03:00
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-13 01:51:52 +07:00
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	2019-12-12 18:43:21 +00:00
Ivan Tashkinov	81b05340e9	[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). ... PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.	2019-12-12 16:00:06 +03:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
lain	8cb852523a	Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' ... AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054	2019-12-12 09:28:27 +00:00
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	2019-12-12 02:16:23 +03:00
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	2019-12-11 15:02:53 -06:00
Maxim Filippov	82fae3e23f	AdminAPI: Merge account views for list instance statuses	2019-12-11 18:57:36 +03:00
Egor Kislitsyn	ee6805850c	Set log level to debug for not important messages	2019-12-11 17:47:19 +07:00
rinpatch	72f3b22134	Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019	2019-12-11 09:57:00 +00:00
Sadposter	1ad96d667a	remove single-step pipe	2019-12-11 09:08:20 +00:00
lain	1f498ba2bb	Merge branch '1427-oauth-admin-scopes' into 'develop' ... [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053	2019-12-11 08:50:43 +00:00
Ivan Tashkinov	3920244be5	[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.	2019-12-11 11:42:02 +03:00
Sadposter	457821adb0	Apply suggestion to lib/pleroma/user.ex	2019-12-10 18:49:41 +00:00
feld	67a478d709	Merge branch 'fix/unsubscribe-route' into 'develop' ... Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052	2019-12-10 17:25:56 +00:00
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	2019-12-10 16:54:25 +00:00
Sadposter	25f774f7c1	format activity_pub.ex	2019-12-10 16:41:43 +00:00
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	2019-12-10 16:40:12 +00:00
Egor Kislitsyn	75b419d7c8	Do not apply http signature pipeline to the unsubscribe route	2019-12-10 22:36:03 +07:00
minibikini	43d9c06a2a	Merge branch 'develop' into 'feature/custom-runtime-modules' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:38:25 +00:00
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:34:54 +00:00
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
Egor Kislitsyn	a37bd5c255	Change log level	2019-12-10 15:08:57 +07:00
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	2019-12-10 08:55:14 +03:00
Maksim Pechnikov	9dfaa0b832	fix loads config variable with large value from db	2019-12-09 22:29:44 +03:00
rinpatch	37c34ccec3	Merge branch 'fix/prefer-url-over-search' into 'develop' ... status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050	2019-12-09 17:55:48 +00:00
rinpatch	f4b7f32d51	status search: prefer the status fetched by url over other results	2019-12-09 20:45:04 +03:00
Egor Kislitsyn	b7a57d8e38	Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0	2019-12-10 00:38:01 +07:00
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-10 00:16:43 +07:00
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	2019-12-09 19:41:43 +03:00
lain	0d2c13a119	Merge branch 'fix/otp-parsers' into 'develop' ... OTP: Fix runtime upload limit config being ignored Closes #1109 See merge request pleroma/pleroma!2045	2019-12-09 15:10:05 +00:00
lain	b3c80b8404	Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' ... Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957	2019-12-09 14:55:42 +00:00
lain	f3c2363f4a	Merge branch 'fix/user-list-task' into 'develop' ... Fix `mix pleroma.user list` task See merge request pleroma/pleroma!2029	2019-12-09 14:44:56 +00:00
lain	e4ea0e20b3	Merge branch 'issue/1342' into 'develop' ... [#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920	2019-12-09 14:30:35 +00:00
lain	a5e28bf214	Merge branch 'develop' into 'fix/oauth-compile-time' ... # Conflicts: # CHANGELOG.md	2019-12-09 13:52:01 +00:00
Egor Kislitsyn	78299ab182	Set Plug.Logger to log at :debug level	2019-12-09 19:12:24 +07:00
Egor Kislitsyn	ed92784e7c	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
Egor Kislitsyn	84f891ea3e	Add Pleroma.Utils.compile_dir/1	2019-12-09 18:23:07 +07:00
lain	d4bafabfd1	Beginnings of the create validator	2019-12-09 10:39:14 +01:00
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
rinpatch	3c45ed4f47	OTP: Fix runtime upload limit config being ignored ... Closes #1109	2019-12-08 21:08:25 +03:00
rinpatch	d6c89068f3	HTML: Compile Scrubbers on boot ... This makes it possible to configure their behavior on OTP releases.	2019-12-08 20:35:41 +03:00
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	2019-12-08 20:14:28 +03:00
rinpatch	bd3aa8500c	OAuth token cleanup: Get rid of compile-time configuration	2019-12-08 20:03:33 +03:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
rinpatch	af5fef1f22	Merge branch 'fix/clause-never-matches' into 'develop' ... Fix never matching clause See merge request pleroma/pleroma!2042	2019-12-08 13:50:57 +00:00
rinpatch	a21340caa1	Fix never matching clause ... `length/1` is only used with lists.	2019-12-08 16:46:18 +03:00
rinpatch	8404f8c8fb	Merge branch 'improve-move-notificaions-api' into 'develop' ... Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032	2019-12-08 13:07:05 +00:00
rinpatch	29a3f70cba	Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop' ... ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041	2019-12-08 11:23:31 +00:00
Maxim Filippov	a7f77785c2	Implement report notes destruction	2019-12-08 11:27:23 +03:00
Ivan Tashkinov	1770602747	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	2019-12-07 17:49:53 +03:00
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	2019-12-06 20:33:47 +03:00
rinpatch	6cb31edd76	Merge branch 'feature/1455-chat-character-limit' into 'develop' ... Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034	2019-12-06 15:36:30 +00:00
Ivan Tashkinov	93a80ee915	[#1427] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.	2019-12-06 16:56:23 +03:00
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	2019-12-06 14:25:13 +01:00
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	2019-12-06 17:05:09 +07:00
Maxim Filippov	08c89fd2b8	Fix incorrect report count	2019-12-06 17:17:24 +09:00
Egor Kislitsyn	e4292cbfad	Use Kernel.inspect/2 to print loaded custom modules	2019-12-06 15:16:39 +07:00
Egor Kislitsyn	157bceeda9	Move runtime configuration from :instance to :modules	2019-12-06 15:04:46 +07:00
Maksim Pechnikov	22fc271e23	init tag feed	2019-12-06 09:33:40 +03:00
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	2019-12-06 00:26:31 +03:00
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	2019-12-06 00:25:44 +03:00
rinpatch	cdff5b8267	Merge branch 'develop' into fix/mrf-delete	2019-12-06 00:12:21 +03:00
rinpatch	9f99640cfc	ActivityPub: Fix deletes being exempt from MRF ... Closes #1461	2019-12-05 21:45:57 +03:00
lain	67d8df04a4	Merge branch '1335-user-api-id-fields-relations' into 'develop' ... [#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963	2019-12-05 17:16:23 +00:00
feld	d0bd4348b3	Merge branch 'feature/admin-api-render-whole-status' into 'develop' ... Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007	2019-12-05 13:34:34 +00:00
Egor Kislitsyn	1216b546c6	Fix credo warning	2019-12-05 20:29:17 +07:00
Egor Kislitsyn	48ae3c4347	Add support for custom modules	2019-12-05 20:18:25 +07:00
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	2019-12-05 15:46:27 +03:00
lain	1993d7096d	Validators: Add a type for the datetime used in AP.	2019-12-05 12:33:06 +01:00
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	2019-12-05 12:22:19 +03:00
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	2019-12-05 12:18:59 +03:00
Maksim Pechnikov	3c3bba0b7c	fix ScheduledActivity	2019-12-04 21:18:05 +03:00
Ivan Tashkinov	d3bce89edd	[#1335] Merge issue fix.	2019-12-04 19:41:14 +03:00
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	2019-12-04 18:56:31 +03:00
lain	e9993acdbb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	2019-12-04 16:35:59 +01:00
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
Maksim Pechnikov	3a0a400fe1	add @type to ScheduledActivity	2019-12-04 09:53:01 +03:00
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	2019-12-04 09:34:44 +03:00
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	2019-12-04 09:12:17 +03:00
Egor Kislitsyn	05fb8d0084	Fix Pleroma.FollowingRelationship.move_following/2	2019-12-03 22:31:12 +07:00
Maxim Filippov	4b60d41db9	Add report notes	2019-12-04 00:26:37 +09:00
Egor Kislitsyn	624e720aa4	Add with_move query param to the notifications API	2019-12-03 22:13:38 +07:00
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	2019-12-02 16:26:19 +00:00
Egor Kislitsyn	356a936ecb	Fix mix pleroma.user list task	2019-12-02 18:11:45 +07:00
Egor Kislitsyn	cf52106e05	Update Floki dependency	2019-12-02 13:38:35 +07:00
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	2019-12-01 16:18:16 +03:00
rinpatch	0d24ab04c5	Merge branch 'remove-info-from-users' into 'develop' ... Removed users.info field See merge request pleroma/pleroma!2006	2019-11-30 10:42:51 +00:00
kPherox	0326683932	hide follower/following for friendica	2019-11-30 15:43:05 +09:00
Ivan Tashkinov	51111e286b	[#1427] Initial support for OAuth admin scopes.	2019-11-29 18:57:19 +03:00
Egor Kislitsyn	a98cda7758	Fix Pleroma.HTML.extract_first_external_url/2	2019-11-29 15:49:35 +07:00
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	2019-11-29 10:17:59 +03:00
Maksim Pechnikov	a36607c27e	add mix task to set\unset privacy option of notification	2019-11-28 22:13:28 +03:00
Maksim Pechnikov	04a8ffbe84	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	2019-11-28 22:08:30 +03:00
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	2019-11-28 21:27:01 +03:00
Sadposter	c7cc80a9ee	obligatory format commit	2019-11-28 10:40:50 +00:00
Sadposter	fa97eddf8a	make follows take precedence over domain blocks	2019-11-28 10:38:38 +00:00
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	2019-11-28 00:09:00 +09:00
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	2019-11-27 22:54:12 +09:00
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	2019-11-27 14:48:28 +01:00
lain	f36724efb1	User: Never return nil for user follower counts.	2019-11-27 14:13:36 +01:00
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	2019-11-27 15:59:13 +03:00
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	2019-11-27 19:43:47 +07:00
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	2019-11-27 17:52:02 +07:00
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	2019-11-27 13:36:03 +03:00
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	2019-11-27 09:26:37 +03:00
Egor Kislitsyn	4af69f047d	Remove account field from web push payload	2019-11-27 02:32:55 +07:00
Egor Kislitsyn	80ededc04f	Add direct_conversation_id to web push payload	2019-11-26 19:53:43 +07:00
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	2019-11-26 10:54:30 +03:00
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	2019-11-26 10:42:36 +03:00
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	2019-11-26 00:25:43 +09:00
lain	dc9090810d	Merge branch 'fix/ap-disable-remote-render' into 'develop' ... Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010	2019-11-25 15:23:45 +00:00
Maxim Filippov	b3b4e5ca80	AdminAPI: Grouped reports old/new fix ... If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)	2019-11-26 00:20:46 +09:00
Maxim Filippov	1364d303f8	AdminAPI: Fix grouped reports for closed/resolved reports	2019-11-26 00:13:11 +09:00
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
rinpatch	02f7383891	ActivityPub controller: do not render remote users	2019-11-25 17:19:33 +03:00
feld	5f981178d0	Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' ... Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981	2019-11-25 13:29:53 +00:00
feld	9374b52756	Merge branch 'fix/update-reports-old-format' into 'develop' ... Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986	2019-11-25 13:29:22 +00:00
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:46:18 +09:00
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:43:11 +09:00
Maxim Filippov	40059c9b1e	Typo	2019-11-25 00:05:52 +09:00
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	2019-11-25 00:04:29 +09:00
rinpatch	9f29930440	fetcher: move local object checking into a reusable function	2019-11-23 22:55:41 +03:00
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	2019-11-23 14:06:19 +03:00
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	2019-11-22 15:39:19 +00:00
Maxim Filippov	b64c7b35d4	Swap map with each	2019-11-22 09:11:36 +09:00
rinpatch	c2ad9fd5f9	Merge branch 'list-users' into 'develop' ... Add CLI list users command See merge request pleroma/pleroma!1990	2019-11-21 20:33:11 +00:00
Alex Schroeder	fbc379d689	Add CLI list users command	2019-11-21 21:07:06 +01:00
lain	19b727bf8f	Merge branch 'fix/mix-task-logging' into 'develop' ... Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997	2019-11-21 15:04:19 +00:00
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	2019-11-21 16:47:52 +03:00
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	2019-11-21 13:13:14 +00:00
lain	320690f7a5	Object: Use inspect to log missing preload.	2019-11-21 14:03:01 +01:00
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	2019-11-21 16:31:13 +07:00
Mark Felder	edaae845af	Some tasks try to set log level in test environment, but we were stripping logs belog :warn. ... Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.	2019-11-20 11:55:30 -06:00
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
Ivan Tashkinov	555edd01ab	[#1335] User AP ID relations fetching performance optimizations.	2019-11-20 12:19:07 +03:00
Mark Felder	ff9133b978	Allow mix tasks to always run with debug logging	2019-11-19 16:01:17 -06:00
Ivan Tashkinov	565f261338	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-19 23:22:47 +03:00
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
Maksim Pechnikov	708fd234bd	fix order favorites activites	2019-11-19 20:19:41 +03:00
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
Egor Kislitsyn	36686f5245	Support authentication via x-admin-token HTTP header	2019-11-19 15:58:20 +07:00
Maksim Pechnikov	5cee51fac5	fix order by for fetch_favorites	2019-11-18 21:34:54 +03:00
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-18 20:43:19 +03:00
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	2019-11-18 20:38:56 +03:00
Maksim Pechnikov	0937895182	updated fetch_favorites	2019-11-18 16:56:47 +03:00
Maksim Pechnikov	9da4c88b49	fix test	2019-11-18 10:00:48 +03:00
Maksim Pechnikov	4beb3ce5c5	/api/v1/favourites: added sorting for activites by adds to favorites	2019-11-18 09:44:08 +03:00
Maxim Filippov	c506cc48ef	Admin API: Error when trying to update reports in the "old" format	2019-11-16 18:44:48 +09:00
kaniini	81cba405af	Merge branch 'nodeinfo-fields-limit' into 'develop' ... Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983	2019-11-15 20:29:38 +00:00
Maksim Pechnikov	b9041c2097	added recount unread notifications to markers	2019-11-15 22:46:58 +03:00
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-15 21:40:14 +03:00
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized users.mutes as relation to UserMute entity.	2019-11-15 21:38:54 +03:00
rinpatch	22554ac5ca	Merge branch 'bugfix/1395-email-activation' into 'develop' ... Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965	2019-11-15 14:11:48 +00:00
lain	f17e0f8e4f	OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug	2019-11-15 14:13:21 +01:00
kPherox	72d2557e11	Add fieldsLimit to metadata of nodeinfo	2019-11-15 18:52:31 +09:00
Ariadne Conill	eecd64cc07	object age policy: remove debug logging	2019-11-14 19:56:14 -06:00
Ariadne Conill	5705cf0e3e	MRF: add ObjectAgePolicy which deals with old posts being imported	2019-11-14 19:48:10 -06:00
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-14 23:45:29 +09:00
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	2019-11-14 23:44:07 +09:00
rinpatch	09b4f7269e	Merge branch 'fix/conversations-rendering' into 'develop' ... Fix rendering conversations when there's a malformed status Closes #1401 See merge request pleroma/pleroma!1973	2019-11-14 14:40:37 +00:00
rinpatch	94f1cfced8	format the code	2019-11-14 17:26:59 +03:00
feld	1afeaf82fa	Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' ... Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815	2019-11-14 13:35:41 +00:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	2019-11-14 08:47:10 +00:00
Phil Hagelberg	3c60adbc1f	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
Phil Hagelberg	0867cb083e	Support redirecting by object ID in static FE. ... This matches the behavior of pleroma-fe better. Fixes #1412.	2019-11-13 08:02:02 -08:00
lain	facc37aaa6	Merge branch 'static-remote-redirect' into 'develop' ... For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974	2019-11-13 10:16:00 +00:00
Phil Hagelberg	62f3a93049	For remote notices, redirect to the original instead of 404. ... We shouldn't treat these like local statuses, but I don't think a 404 is the right choice either here, because within pleroma-fe, these are valid URLs. So with remote notices you have the awkward situation where clicking a link will behave differently depending on whether you open it in a new tab or not; the new tab will 404 if it hits static-fe. This new redirecting behavior should improve that situation.	2019-11-12 09:40:29 -08:00
Maksim Pechnikov	b5b62f42b2	update Marker.multi_set_unread_count	2019-11-12 15:59:34 +03:00
Egor Kislitsyn	768c1a5de1	Fix tests	2019-11-12 19:13:19 +07:00
Egor Kislitsyn	27cd1374e3	Add a notification for Move activities	2019-11-12 18:48:14 +07:00
Egor Kislitsyn	e6d7e27bd6	Add allow_following_move setting to User	2019-11-12 18:45:28 +07:00
lain	e835cd97f6	Containment: Add a catch-all clause to contain_origin.	2019-11-12 12:07:17 +01:00
Mark Felder	7d101bc9c5	Fix rendering conversations when there's a malformed status	2019-11-11 18:29:55 -06:00
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	2019-11-11 23:57:30 +03:00
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	2019-11-11 19:14:06 +00:00
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	2019-11-11 19:10:44 +00:00
href	b39b49cc14	report federating status in nodeinfo	2019-11-11 19:03:43 +01:00
Maksim Pechnikov	ddbfc995ac	clean sql query	2019-11-11 17:06:41 +03:00
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	2019-11-11 12:27:33 +00:00
lain	417f9a782f	Merge branch 'fix/1399' into 'develop' ... fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964	2019-11-11 12:13:45 +00:00
Steven Fuchs	94627baa5c	New rate limiter	2019-11-11 12:13:06 +00:00
lain	f6056e9c9c	UserEnabledPlug: Don't authenticate unconfirmed users.	2019-11-11 12:43:46 +01:00
lain	8521553ad9	User: Don't let deactivated users authenticate.	2019-11-11 12:37:38 +01:00
Ivan Tashkinov	5cf2c7422b	[#1335] Applied code review suggestions.	2019-11-11 14:16:57 +03:00
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
Maxim Filippov	31343e4321	Code style fixes	2019-11-11 19:06:09 +09:00
Alexander	6a4201e0b4	fix for migrate task	2019-11-10 22:54:37 +03:00
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	2019-11-10 16:30:21 +03:00
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-11-10 11:32:50 +00:00
lain	3a1aaadc18	Merge branch 'issue/1339' into 'develop' ... [#1339] add subject to atom feed See merge request pleroma/pleroma!1961	2019-11-10 11:20:20 +00:00
Maksim Pechnikov	9d0b989521	add subject to atom feed	2019-11-10 11:10:20 +03:00
Phil Hagelberg	3cc49cdb78	Formatter moved to new module.	2019-11-09 18:30:23 -08:00
Phil Hagelberg	ef7c3bdc7a	Add some further test cases. ... Including like ... private visibility, cos that's super important.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	4729027f91	Prevent non-local notices from rendering.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	886a07ba57	Move static_fe config to its own section instead of in :instance.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	b0080fa730	Render errors in HTML, not with JS.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	e27c61218d	Expand subject content automatically when config is set.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	bfd5d79826	Include metadata in static FE conversations and profiles.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	828259fb65	Catch 404s.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	df2f59be91	Pagination for user profiles.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	8969c5522d	Make many of the improvements suggested in review.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	e8bee35578	Static FE plug should only respond to text/html requests.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	dc3b87d153	Move static FE routing into its own plug. ... Previously it was piggybacking on FallbackRedirectController for users and OStatusController for notices; now it's all in one place.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	c6c706161e	Make sure notice link is remote if the post is remote.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	274cc18e8a	Visually separate header.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	2ac1ece652	Fix a bug where reblogs were displayed under the wrong user.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	5d7c44266b	Change date formatting.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	e4b9784c39	Show counts for replies, likes, and announces for selected notice. ... Using text instead of an icon, for now.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	93e9c0cedf	Format dates using CommonAPI utils.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	918e1353f6	Add header to profile/notice pages linking to pleroma-fe.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	33a26b61c3	Remove activity/user representer; move logic to controller.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	41fde63def	Get rid of @data in views and use separate fields.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	e944a2213d	Use gettext for sensitive media warning.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	2d1897e8a7	Apply all suggested changes from reviewers.	2019-11-09 18:07:50 -08:00
Phil Hagelberg	cc1b07132f	Notices should show entire thread from context.	2019-11-09 18:07:08 -08:00
Phil Hagelberg	748d800acb	Show images, video, and audio attachments to notices.	2019-11-09 18:07:08 -08:00
Phil Hagelberg	1d8950798c	Fix activity_representer to work with User.get_or_fetch returning tuple.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	0cf04e1088	Fix OStatus controller to know about StaticFEController. ... But only when it's configured to be on.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	e79d8985ab	Don't show 404 in static-fe controller unless it's actually not found.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	c1fc139986	Add permalinks to the static-fe notice rendering.	2019-11-09 18:06:51 -08:00
Phil Hagelberg	d1320160f4	Looks like source_data is on user directly now.	2019-11-09 18:06:51 -08:00
William Pitcock	ca5ef201ef	static fe: add remote follow button	2019-11-09 18:06:51 -08:00
William Pitcock	b33fbd58e3	static fe: add support for message subjects	2019-11-09 18:06:51 -08:00
William Pitcock	e2904b5777	static fe: reformat activity representer	2019-11-09 18:06:51 -08:00
William Pitcock	2b5bd5236d	static fe: add user profile rendering	2019-11-09 18:06:51 -08:00
William Pitcock	8f08da750a	static fe: use a generic activity representer to render activities	2019-11-09 18:06:51 -08:00
William Pitcock	ff8d0902f3	static fe: formatting	2019-11-09 18:06:51 -08:00
William Pitcock	a4d3a8ec03	static fe: proof of concept	2019-11-09 18:06:51 -08:00
Ariadne Conill	5b60d82592	object containment: handle all cases where ID is invalid (missing, nil, non-string)	2019-11-08 14:51:28 -06:00
Ariadne Conill	532fd38b12	nodeinfo: add multifetch feature (ref pleroma-fe!977).	2019-11-08 12:48:28 -06:00
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
Maxim Filippov	7258db023e	Support old flag format	2019-11-08 18:21:29 +09:00
eugenijm	7888803ffe	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
rinpatch	32afa07995	Fetcher: fix local check returning unwrapped object ... This resulted in error messages about failed refetches being logged.	2019-11-07 01:40:55 +03:00
rinpatch	802d249827	Merge branch 'fix/trailing-format-plug-oauth' into 'develop' ... Fix TrailingFormatPlug not being active for /api/oauth_tokens Closes #1385 See merge request pleroma/pleroma!1944	2019-11-06 14:47:34 +00:00
rinpatch	365657320c	Fix TrailingFormatPlug not being active for /api/oauth_tokens	2019-11-06 17:22:23 +03:00
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	2019-11-06 16:41:19 +03:00
feld	8b19464176	Merge branch 'feature/multiple-users-force-password-reset' into 'develop' ... Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928	2019-11-06 12:24:41 +00:00
Maxim Filippov	f171095960	Grouped reports with status data baked in	2019-11-06 21:25:46 +10:00
rinpatch	54746c6c26	Object Fetcher: set cache after reinjecting ... Probably fixes the issue hj had, where polls would have different counters between endpoints.	2019-11-06 14:00:03 +03:00
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	2019-11-05 23:52:47 +09:00
lain	1bd1f62af5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	2019-11-05 15:21:00 +01:00
lain	faced6236b	NoteValidator: Add very basic validator for Note objects.	2019-11-05 15:02:31 +01:00
lain	3d1b445cbf	Object Validators: Extract common validations.	2019-11-05 15:02:09 +01:00
Maksim Pechnikov	e52955c961	update following_relationship.ex	2019-11-05 10:50:03 +03:00
Maksim Pechnikov	62bc0657e7	excluded invisible users from search results	2019-11-05 08:55:41 +03:00
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	2019-11-05 11:36:47 +10:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	2019-11-04 20:44:24 +03:00
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	2019-11-04 20:24:53 +03:00
rinpatch	fee1276963	Merge branch 'failing-search-fixes' into 'develop' ... User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935	2019-11-04 16:28:55 +00:00
lain	4e53520917	User Search: Remove superfluous setweight and random test. ... The test tested for a behavior that isn't actually enforced anymore.	2019-11-04 16:57:41 +01:00
eugenijm	ed29be24cb	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
Steven Fuchs	5271bbcf11	add missing tesla mocks	2019-11-04 15:18:32 +00:00
kaniini	06cc77e6fb	Merge branch 'faster-user-deactivation' into 'develop' ... User: Don't pull remote users follower count immediately after deactivating. Closes #1369 See merge request pleroma/pleroma!1933	2019-11-04 14:24:21 +00:00
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	2019-11-04 14:11:44 +00:00
lain	0c31258616	User: Don't pull remote users follower count immediately after deactivating. ... The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369	2019-11-04 14:36:54 +01:00
Maksim Pechnikov	57995fa8cf	fix migrate ... update migrate	2019-11-03 20:44:59 +03:00
rinpatch	8dd7c099a7	Merge branch 'bugfix/streamer-follows' into 'develop' ... streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931	2019-11-03 17:09:57 +00:00
kaniini	74135e1318	Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924	2019-11-03 16:19:27 +00:00
kaniini	61bcd4595f	Merge branch 'feature/fast_sanitize' into 'develop' ... Switching to FastSanitize See merge request pleroma/pleroma!1916	2019-11-03 16:18:19 +00:00
Ariadne Conill	4bf942583f	streamer: use direct object for filter checks when there is no valid child object in an activity ... We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291	2019-11-03 09:05:12 -06:00
Maxim Filippov	1b83a0694a	Fix moderation log crash	2019-11-01 19:13:29 +03:00
Maxim Filippov	743b622b7b	Force password reset for multiple users	2019-11-01 18:45:47 +03:00
Maxim Filippov	d75934b0d0	Undo dialyzer fix	2019-11-01 15:14:43 +03:00
Maksim Pechnikov	1b3a942a84	fix format	2019-10-31 17:38:12 +03:00
Maxim Filippov	ced9f92327	Fix count	2019-10-31 15:34:49 +03:00
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	2019-10-31 02:26:02 +03:00
Maxim Filippov	59a149c69a	Fix "the call ... will never return" warning	2019-10-31 02:25:15 +03:00
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	2019-10-30 17:51:15 -05:00
Maksim Pechnikov	209319c8d2	update marker api	2019-10-30 23:49:05 +03:00
Maksim Pechnikov	1b82eb6d41	move sql (update_markers) from migrate to mix task	2019-10-30 23:22:38 +03:00
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	2019-10-30 18:21:49 +07:00
kPherox	363e76d4da	Fix duplicate recipients	2019-10-30 15:40:25 +09:00
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	2019-10-30 09:20:13 +03:00
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	2019-10-29 22:23:19 +03:00
rinpatch	77cfb08b8c	Remove commented-out code	2019-10-29 20:58:54 +03:00
kPherox	0c361eeb25	Add pending to handle incoming for Follow activity	2019-10-29 17:12:49 +09:00
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	2019-10-29 01:18:08 +03:00
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	2019-10-28 15:10:47 +07:00
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	2019-10-28 07:27:45 +00:00
Maxim Filippov	d56bc62275	Fix report parsing	2019-10-27 16:33:58 +03:00
Maxim Filippov	791bcfd90f	Merge branch 'develop' into feature/store-statuses-data-inside-flag	2019-10-27 16:11:25 +03:00
Maxim Filippov	8eff05d4c6	Strip status data from Flag (when federating or closing/resolving report)	2019-10-27 16:05:32 +03:00
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	2019-10-26 02:29:18 +03:00
rinpatch	653054d301	Merge branch 'remove-unsed-info-fields-fn' into 'develop' ... Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882	2019-10-25 14:51:02 +00:00
Egor Kislitsyn	b777083f3f	Add also_known_as field to Pleroma.User	2019-10-25 19:14:18 +07:00
Egor Kislitsyn	dbee53c2df	Remove unused Pleroma.User.info_fields/0	2019-10-25 16:48:01 +07:00
stwf	2ab072f949	object fetcher error handling	2019-10-24 12:08:34 -04:00
Maksim Pechnikov	922e3d082c	add test	2019-10-24 12:17:50 +03:00
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	2019-10-24 09:23:59 +03:00
Maksim Pechnikov	d3fb9e02cc	add tests	2019-10-23 22:48:04 +03:00
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	2019-10-23 21:27:22 +02:00
Maksim Pechnikov	aa64b3108b	fix migrate	2019-10-23 22:02:59 +03:00
Ivan Tashkinov	c0246309a5	[#1304] Extra bullet-proofing.	2019-10-23 19:30:02 +03:00
Ivan Tashkinov	065e9fac12	[#1304] Adjusted User.Info references from Notification.	2019-10-23 17:31:02 +03:00
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	2019-10-23 17:22:42 +03:00
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	2019-10-23 17:15:48 +03:00
lain	1adafa0966	Credo fixes.	2019-10-23 12:18:05 +02:00
lain	97d5c79aa0	Add Pipeline module, test for federation.	2019-10-23 11:52:27 +02:00
Maksim Pechnikov	9a4afbd2a0	added update unread_count for notifications	2019-10-23 11:22:48 +03:00
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	2019-10-22 20:50:46 -05:00
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	2019-10-22 14:51:46 +03:00
kaniini	6281e4795a	Merge branch 'feature/push-subject-for-dm' into 'develop' ... Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864	2019-10-21 23:50:01 +00:00
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	2019-10-21 16:44:17 +00:00
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	2019-10-21 19:27:38 +03:00
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged develop, handled User.Info.invisible.	2019-10-21 11:58:22 +03:00
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	2019-10-21 11:32:28 +03:00
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	2019-10-21 11:05:09 +03:00
Egor Kislitsyn	c6fba62666	Fix Relay	2019-10-21 14:47:07 +07:00
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	2019-10-21 14:19:15 +07:00
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	2019-10-20 22:29:56 +03:00
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	2019-10-20 20:43:18 +03:00
Ivan Tashkinov	b4cbf0568b	[#1304] Analysis issue fix.	2019-10-20 13:58:27 +03:00
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	2019-10-20 13:42:42 +03:00
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	2019-10-19 23:21:37 +00:00
Ariadne Conill	ef659331b0	implement invisible support for remote users	2019-10-19 23:21:37 +00:00
Ariadne Conill	95871cb462	user: implement User.invisible?/1	2019-10-19 23:21:37 +00:00
Ariadne Conill	1469a084d4	relay: set invisible to true	2019-10-19 23:21:37 +00:00
Ariadne Conill	e7333db72a	user info: add invisible field	2019-10-19 23:21:37 +00:00
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	2019-10-19 20:11:58 +00:00
eugenijm	52ed2f8f2d	Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read	2019-10-19 15:24:06 +03:00
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	2019-10-19 12:15:14 +02:00
rinpatch	fd6d05dc45	Merge branch 'mix-emoji-task-pack-json' into 'develop' ... For pleroma.emoji downloaded packs, generate pack.json instead See merge request pleroma/pleroma!1748	2019-10-19 08:51:03 +00:00
Mark Felder	dcb23a85b6	Merge branch 'develop' into feature/push-subject-for-dm	2019-10-18 17:56:15 -05:00
Mark Felder	152caef51d	Direct messages should provide a distinct push notification subject	2019-10-18 17:51:34 -05:00
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	2019-10-18 18:35:58 +02:00
Ariadne Conill	44e64af5e7	object: containment: simplify the pattern match for OStatus testsuite hack	2019-10-18 15:39:15 +00:00
Ariadne Conill	e99fdfc32d	object: containment: only allow OStatus references in test suite environment	2019-10-18 15:37:14 +00:00
Ariadne Conill	3c785b85a6	object: fetcher: fix up formatting	2019-10-18 14:50:10 +00:00
Ariadne Conill	bae96de273	activitypub: tag containment checks for better error tracing	2019-10-18 14:50:10 +00:00
Ariadne Conill	7295a05cee	object: containment: also allow OStatus object IDs through when comparing origins	2019-10-18 14:50:10 +00:00
Ariadne Conill	a177f22e02	object: fetcher: improve error reporting	2019-10-18 14:50:10 +00:00
Ariadne Conill	bf2107743f	object: containment: don't try to contain ostatus objects	2019-10-18 14:50:10 +00:00
Ariadne Conill	6f110fc04c	object fetcher: fix up error handling	2019-10-18 14:50:09 +00:00
Ariadne Conill	48059c03c9	fix up some tests	2019-10-18 14:50:09 +00:00
Ariadne Conill	d379b48769	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
Ariadne Conill	6a1f4c5145	federator: remove OStatus incoming document support	2019-10-18 14:50:09 +00:00
Ariadne Conill	835ad52378	remove Salmon module	2019-10-18 14:50:09 +00:00
Ariadne Conill	beb9861f9d	router: disconnect Salmon	2019-10-18 14:50:09 +00:00
Ariadne Conill	a7b92bba68	webfinger: stop pulling Salmon data out of WebFinger	2019-10-18 14:50:09 +00:00
Ariadne Conill	c00ae10af8	feed: don't advertise salmon endpoint	2019-10-18 14:50:09 +00:00
Ariadne Conill	adb639db56	publisher: move remote_users() from Salmon module	2019-10-18 14:50:09 +00:00
Ariadne Conill	4f82e42e4e	websub: remove entirely	2019-10-18 14:50:09 +00:00
Ariadne Conill	b16a460916	federator: remove websub stuff	2019-10-18 14:50:09 +00:00
Ariadne Conill	25b7ff56c3	application: don't start Federator.init/1 anymore	2019-10-18 14:50:09 +00:00
rinpatch	39e996528c	Fix a migration wiping user info of users that don't have any mutes ... And introduce safe_jsonb_set	2019-10-18 15:22:07 +03:00
Haelwenn (lanodan) Monnier	3c6fd0bb99	upload.ex: Remove deprecated configuration	2019-10-18 12:34:09 +02:00
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	2019-10-18 10:24:29 +02:00
kaniini	7511f3d192	Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop' ... Fix streaming websocket handshake with `Sec-WebSocket-Protocol` See merge request pleroma/pleroma!1847	2019-10-18 04:42:02 +00:00
kaniini	733b73b71c	Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex	2019-10-18 04:36:37 +00:00
lain	203d61b950	Transmogrifier: Make proper use of the LikeValidator.	2019-10-17 19:35:31 +02:00
lain	66452f518f	ObjectValidator: Rewrite LikeValidator with Ecto.	2019-10-17 18:36:52 +02:00
eugenijm	359dd1890e	Mastodon API: Mark the conversation as read for the author when they send a new direct message	2019-10-17 16:49:39 +03:00
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
lain	081e8206ab	Transmogrifier: Use new ingestion pipeline for Likes.	2019-10-16 17:03:21 +02:00
lain	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	2019-10-16 16:16:39 +02:00
lain	1bfdf57fc7	Merge branch 'user-search-experiments' into 'develop' ... User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850	2019-10-16 12:29:08 +00:00
feld	21f0757b0d	Merge branch 'feature/multiple-users-activation-permissions' into 'develop' ... Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825	2019-10-16 12:14:47 +00:00
lain	6977cddff9	Merge branch 'benchmark-finishing' into 'develop' ... Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848	2019-10-16 11:54:49 +00:00
rinpatch	0a5175ecbb	Order fts results by trigram	2019-10-16 13:49:33 +03:00
rinpatch	c10ce113d4	User search: Remove trigram and refactor the module ... - Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees	2019-10-16 12:52:47 +03:00
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	2019-10-15 17:33:29 +02:00
Maxim Filippov	90d516d42b	Store status data inside flag activity	2019-10-15 16:52:41 +02:00
Alexander	e7bb762ec2	don't stream in benchmark env	2019-10-15 15:16:17 +03:00
kPherox	5bd0717de2	Add Sec-WebSocket-Protocol to response header	2019-10-15 21:09:44 +09:00
Ekaterina Vaartis	fbe5a00475	For pleroma.emoji downloaded packs, generate pack.json instead	2019-10-15 09:53:28 +03:00
Egor Kislitsyn	1d46944fbd	Do not add follower_address to following for non local users	2019-10-14 13:50:43 +07:00
eugenijm	a97b642289	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
lain	e3b4a3e96b	Merge branch 'incoming-id-fixes' into 'develop' ... Assorted transmogrifier fixes See merge request pleroma/pleroma!1831	2019-10-13 15:37:49 +00:00
rinpatch	9bdbf0811b	Make MediaProxy failure tracking less brutal ... The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.	2019-10-11 22:52:38 +03:00
Maxim Filippov	cc6875b582	Add GET /api/pleroma/admin/relay endpoint - lists all followed relays	2019-10-11 19:12:29 +03:00
Maxim Filippov	c0aca32dd0	Merge branch 'develop' into feature/multiple-users-activation-permissions	2019-10-11 15:59:35 +03:00
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	2019-10-11 15:58:45 +03:00
lain	422aa6befe	Ostatus DeleteHandler: Fix for new option format.	2019-10-11 12:53:09 +02:00
lain	37812740c4	Transmogrifier: Correctly save incoming ids for Accept/Reject.	2019-10-11 11:48:58 +02:00
lain	9b963064eb	Transmogrifier: Actually store who deleted a note.	2019-10-11 11:25:45 +02:00
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	2019-10-11 00:24:31 +03:00
Egor Kislitsyn	059005ff82	Replace user.following with Pleroma.FollowingRelationship	2019-10-11 02:35:32 +07:00
lain	29647dfd09	Transmogrifier: Save correct ids for incoming deletes.	2019-10-10 17:17:33 +02:00
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	2019-10-10 14:40:59 +02:00
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-10 12:38:51 +00:00
Maxim Filippov	24eecc3cb4	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-10 03:33:55 +03:00
lain	1357ec1a10	Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' ... Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id` See merge request pleroma/pleroma!1822	2019-10-09 15:10:08 +00:00
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	2019-10-09 17:03:54 +03:00
Egor Kislitsyn	d537bfd4e1	Add a task to re-count statuses for all users	2019-10-09 13:11:57 +07:00
eugenijm	580a67f5ca	Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)	2019-10-09 07:27:09 +03:00
Maxim Filippov	aa7fd616c7	Line is too long!	2019-10-07 16:03:23 +03:00
Maxim Filippov	35068baf65	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-07 15:41:41 +03:00
Maxim Filippov	7aceaa517b	Admin API: Reports, grouped by status	2019-10-07 15:39:07 +03:00
lain	6c278cfe09	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-07 12:31:51 +00:00
Ariadne Conill	9a2f71f4d5	mastodon api: fix exclude_replies (closes #1287)	2019-10-07 12:29:33 +00:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
lain	d580eedfe9	Linting.	2019-10-07 12:40:33 +02:00
lain	73b6512907	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-07 12:30:59 +02:00
kaniini	93bdc55306	Merge branch 'mrf/simple_policy/check_actor' into 'develop' ... mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806	2019-10-07 10:19:24 +00:00
Ivan Tashkinov	28fb98d69e	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-07 11:06:30 +03:00
lain	91e90aa807	Merge branch 'misskey-compat' into 'reactions' ... Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783	2019-10-07 07:25:27 +00:00
Haelwenn	b4f3c16885	Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' ... [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643	2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	2019-10-07 03:49:57 +02:00
kaniini	2411d09215	Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' ... Move local keys out of `user.info` See merge request pleroma/pleroma!1799	2019-10-06 14:32:56 +00:00
feld	1d8e956c32	Use the user.id instead of nickname in report URLs ... Ensures links to profiles of remote users work.	2019-10-06 14:13:04 +00:00
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-06 17:12:17 +03:00
rinpatch	fefbd31c6e	Move local keys out of user.info	2019-10-06 16:56:36 +03:00
Ivan Tashkinov	06b3bb54c5	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-06 11:43:49 +03:00
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-06 08:11:47 +00:00
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-06 09:30:49 +03:00
Haelwenn	9e34919dcd	Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' ... Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597	2019-10-06 04:41:06 +00:00
kaniini	7a318d74e6	Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761	2019-10-05 19:28:53 +00:00
kaniini	45b7f03f89	Merge branch 'accept-embedded-announce-object' into 'develop' ... Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770	2019-10-05 19:28:29 +00:00
kaniini	17ff4b43cb	Merge branch 'unread-conversation-count' into 'develop' ... Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796	2019-10-05 19:28:07 +00:00
eugenijm	8249924485	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 15:10:57 +02:00
lain	276a520163	CommonAPI: Create profile updates as public. ... This saves us lots of sending out because we can use sharedInbox.	2019-10-05 14:53:50 +02:00
lain	4b8524f392	ActivityPub / Transmogrifier: Correctly store incoming Update id.	2019-10-05 14:49:45 +02:00
Thibaut Girka	791d93ff0e	Make credo happy	2019-10-05 13:56:40 +02:00
Thibaut Girka	977e711e22	Import object from self-Announce whenever possible	2019-10-05 13:56:40 +02:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	2019-10-05 10:00:05 +00:00
lain	6a85f7d1ea	Transmogrifier: Extend misskey like compatibility.	2019-10-05 10:45:42 +02:00
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 10:42:29 +02:00
Maksim Pechnikov	83631752af	removed legacy api: "/objects/:uuid/likes"	2019-10-04 22:35:26 +03:00
kaniini	e0c0ea9f13	Merge branch 'bugfix/widen-streamer-blocks' into 'develop' ... widen streaming API block effects See merge request pleroma/pleroma!1784	2019-10-04 17:39:06 +00:00
kaniini	5c04e81724	Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737	2019-10-04 17:33:18 +00:00
Maxim Filippov	8dcc2f9f5e	Admin API: Allow changing the state of multiple reports at once	2019-10-04 19:00:58 +03:00
Ariadne Conill	d1d058bf85	streamer: worker: actually use should_send? consistently	2019-10-04 15:42:25 +00:00
Ariadne Conill	5a0c018d2a	streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist	2019-10-04 15:41:55 +00:00
Ariadne Conill	2417b633ed	streamer: add missing copyright headers	2019-10-04 15:21:45 +00:00
lain	43a211bcb1	Transmogrifier: Handle misskey likes with reactions like EmojiReactions.	2019-10-04 17:01:04 +02:00
lain	568a995d64	ActivityPub: Change addressing of Undo.	2019-10-04 16:32:42 +02:00
lain	27110793a7	Merge branch 'featrue/job-monitor' into 'develop' ... Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721	2019-10-04 12:52:11 +00:00
lain	27e914955e	Merge branch 'fix/nickname-fail' into 'develop' ... Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777	2019-10-04 11:54:05 +00:00
rinpatch	8217292085	Fix get_cached_by_nickname_or_id not allowing to get local users by ... nickname Closes #1293	2019-10-04 14:44:09 +03:00
lain	01da6344b9	Merge branch 'bugfix/notification-nil-actor' into 'develop' ... notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779	2019-10-04 11:28:20 +00:00
Egor Kislitsyn	d3ac4e8083	Fix OAuthController	2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier	5dc14c89ce	notification_view.ex: Make sure account isn’t empty ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1203	2019-10-04 07:11:53 +02:00
eugenijm	06d9df79c5	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
lain	c9043c6c80	Transmogrifier: Handle incoming Undos for EmojiReactions.	2019-10-03 18:37:23 +02:00
rinpatch	1cae564b5d	Move config task docs to a separate file and mark it as WIP	2019-10-03 14:12:57 +03:00
rinpatch	e00403af23	Mix tasks: derive moduledoc from doc files	2019-10-03 14:00:23 +03:00
rinpatch	6baa037903	Move database maintenance tasks docs to a separate file	2019-10-03 11:17:29 +03:00
rinpatch	b4ca864c6b	Move user tasks docs to a separate file	2019-10-03 10:15:24 +03:00
rinpatch	d39ccc2e7f	Move uploads task docs to a separate file	2019-10-03 09:35:21 +03:00
rinpatch	808d0a0170	Move relay docs to a separate file	2019-10-03 09:10:31 +03:00
rinpatch	6435ba83cd	Move instance CLI task docs to a text file	2019-10-03 09:06:06 +03:00
rinpatch	869ea2ab90	Move digest email docs to a separate file and improve styling	2019-10-03 01:10:36 +03:00
rinpatch	bd9c7807fb	Move emoji task docs to a separate file	2019-10-03 01:03:47 +03:00
Ivan Tashkinov	64095961fe	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-02 20:42:40 +03:00
lain	4cb603e1df	PleromaAPI: Add unreacting.	2019-10-02 18:19:16 +02:00
lain	391c736292	PleromaAPI: Fix emoji_reactions_by	2019-10-02 18:13:10 +02:00
Egor Kislitsyn	e0c68eeb02	Move :favourites and :bookmarks actions to StatusController	2019-10-02 21:31:19 +07:00
Egor Kislitsyn	7f2bc57725	Move follows, mutes and blocks actions to AccountController	2019-10-02 21:22:21 +07:00
lain	9cfe9a57c5	CommonAPI: Add unreactions.	2019-10-02 15:38:57 +02:00
Egor Kislitsyn	d3c404af12	Add MastoFEController	2019-10-02 20:36:08 +07:00
lain	dfe5c958eb	ActivityPub: Add undo for emoji reactions.	2019-10-02 15:08:20 +02:00
Egor Kislitsyn	1c6e1055c8	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-02 13:27:55 +02:00
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	2019-10-02 10:46:14 +00:00
kaniini	debd0a3066	Merge branch 'accept-embedded-announce-object' into 'develop' ... Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769	2019-10-02 10:45:55 +00:00
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	2019-10-02 12:15:06 +02:00
Thibaut Girka	3d61efa7c9	Rename misleading get_announce_visibility to public_announce?	2019-10-02 10:48:34 +02:00
Egor Kislitsyn	26693292f4	Remove :enqueued counter	2019-10-02 14:50:25 +07:00
Egor Kislitsyn	c8b01f6667	Extract instance actions from MastodonAPIController to InstanceController	2019-10-02 14:13:52 +07:00
kaniini	89ab673d00	Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' ... Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765	2019-10-02 07:04:33 +00:00
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	2019-10-02 07:02:56 +00:00
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	2019-10-02 07:02:24 +00:00
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	2019-10-01 22:16:29 +00:00
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	2019-10-01 22:39:25 +02:00
Sergey Suprunenko	c541b83bef	Track failed proxy urls and don't request them again	2019-10-01 20:00:27 +00:00
Thibaut Girka	43e3db0951	Fix returned visibility of announces in MastodonAPI	2019-10-01 20:38:29 +02:00
Thibaut Girka	4c1f158f5d	Allow users to announce privately, including own private notes	2019-10-01 20:00:59 +02:00
Maxim Filippov	b2273c695e	Discard identifier, if empty	2019-10-01 19:43:22 +03:00
Thibaut Girka	fe538973dd	Ensure self-announces do not widen the audience of the original post	2019-10-01 18:38:57 +02:00
KokaKiwi	1f0be71ea4	Make activity announceable by its author.	2019-10-01 17:47:43 +02:00
Maxim Filippov	0f9c2c8b87	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
Egor Kislitsyn	af690d1033	Extract auth actions from MastodonAPIController to AuthController	2019-10-01 15:54:45 +07:00
Egor Kislitsyn	2dad6dd020	Extract apps actions from MastodonAPIController to AppController	2019-10-01 15:21:46 +07:00
Egor Kislitsyn	39695c4436	Extract suggestions actions from MastodonAPIController to SuggestionController	2019-10-01 15:07:49 +07:00
Egor Kislitsyn	585bc57edb	Extract media actions from MastodonAPIController to MediaController	2019-10-01 14:36:35 +07:00
Egor Kislitsyn	36a34c36fe	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	2019-10-01 01:40:33 +09:00
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	2019-09-30 18:13:05 +02:00
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-09-30 17:41:20 +03:00
lain	19bc0b8c79	.	2019-09-30 16:38:19 +02:00
lain	08256e9299	ActivityPub: Federate reactions.	2019-09-30 15:51:09 +02:00
lain	6068d2254e	PleromaAPIController: Fixes and refactoring.	2019-09-30 15:13:25 +02:00
lain	04a2910f33	Pleroma.Constants: Fix typo.	2019-09-30 15:13:05 +02:00
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from MastodonAPIController to MascotController	2019-09-30 19:32:43 +07:00
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	2019-09-30 19:10:56 +07:00
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	2019-09-30 19:10:55 +07:00
Egor Kislitsyn	e7aef27c00	Fix merge	2019-09-30 19:10:54 +07:00
lain	a7f22c6e93	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:58:14 +02:00
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	2019-09-30 13:57:54 +02:00
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	2019-09-30 11:21:49 +00:00
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	2019-09-30 11:17:30 +00:00
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	2019-09-30 10:49:40 +00:00
Egor Kislitsyn	b7f27a4f58	Extract report actions from MastodonAPIController to ReportController ... Update MastodonAPI.ReportView	2019-09-30 17:44:10 +07:00
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	2019-09-30 10:39:48 +00:00
Ariadne Conill	e653edd182	split scrobble functions into their own controller	2019-09-30 10:39:48 +00:00
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	2019-09-30 10:39:48 +00:00
Ariadne Conill	8b34b221cb	common api: add some missing IR bits for listen activities' children	2019-09-30 10:39:48 +00:00
Ariadne Conill	84712c35f9	activitypub: object view: include child object for Listen activities	2019-09-30 10:39:48 +00:00
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	2019-09-30 10:39:48 +00:00
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	2019-09-30 10:39:17 +00:00
Ariadne Conill	2c82d8603b	common api: implement scrobbling	2019-09-30 10:39:17 +00:00
Ariadne Conill	172c74a77b	activitypub: transmogrifier: implement support for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	1f9de2a8cd	activitypub: implement IR-level considerations for Listen activities	2019-09-30 10:39:17 +00:00
Ariadne Conill	b7877e9b1c	mastodon api: implement rendering of listen activities	2019-09-30 10:39:17 +00:00
Egor Kislitsyn	d4d88b3361	Extract conversation actions from MastodonAPIController to ConversationController	2019-09-30 16:52:07 +07:00
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	2019-09-29 18:43:27 +03:00
kaniini	6d74a7528c	Merge branch 'feature/follow-requests-count' into 'develop' ... Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726	2019-09-29 11:44:31 +00:00
Maksim Pechnikov	1053319cd6	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	2019-09-28 01:53:41 +02:00
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	2019-09-28 01:58:06 +03:00
minibikini	f9380289eb	Add remote_ip plug	2019-09-27 21:59:23 +00:00
kaniini	92d08d4113	Merge branch 'split-masto-api/follow-requests' into 'develop' ... Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730	2019-09-27 07:54:54 +00:00
kaniini	68bf99baf2	Merge branch 'split-masto-api/domain-blocks' into 'develop' ... Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729	2019-09-27 07:54:08 +00:00
kaniini	27a3221d57	Merge branch 'split-masto-api/scheduled-statuses' into 'develop' ... Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728	2019-09-27 07:53:22 +00:00
Egor Kislitsyn	408750b94e	Extract domain blocks actions from MastodonAPIController to DomainBlockController	2019-09-27 14:28:05 +07:00
Egor Kislitsyn	99c5a35890	Extract follow requests actions from MastodonAPIController to FollowRequestController	2019-09-27 14:25:17 +07:00
Egor Kislitsyn	8d31530119	Cleanup ScheduledActivityView	2019-09-27 13:36:28 +07:00
Egor Kislitsyn	0a5b106ddd	Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController	2019-09-27 13:36:28 +07:00
Egor Kislitsyn	621377f378	Extract filter actions from MastodonAPIController to FilterController	2019-09-27 13:06:25 +07:00
Egor Kislitsyn	6c7c35dbe1	Fix SubscriptionNotificationView	2019-09-27 11:55:47 +07:00
kaniini	91e2bcf218	Merge branch 'refactor/status-controller' into 'develop' ... Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719	2019-09-27 04:37:48 +00:00
Ariadne Conill	14294243a2	mastodon api: implement follow_requests_count	2019-09-27 04:22:40 +00:00
Egor Kislitsyn	5ea5c58a85	Move view logic from StatusController.context to StatusView and add a test	2019-09-27 10:52:47 +07:00
kaniini	eb9aa7aa10	Merge branch 'refactor/subscription' into 'develop' ... Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664	2019-09-27 03:51:24 +00:00
Egor Kislitsyn	98d1347a4e	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00
kaniini	219771288c	Merge branch 'refactor/common_api' into 'develop' ... Refactor `CommonAPI.post/2` See merge request pleroma/pleroma!1713	2019-09-27 03:46:02 +00:00
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	2019-09-27 03:42:30 +00:00
Maksim Pechnikov	73ae38ca04	add deprecated tag	2019-09-26 21:08:04 +03:00
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 20:56:59 +03:00
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	2019-09-26 19:01:54 +03:00
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-26 16:16:30 +03:00
Egor Kislitsyn	75290cbfbd	Add Pleroma.JobQueueMonitor	2019-09-26 18:49:57 +07:00
Roman Chvanikov	b4b147000c	Merge develop	2019-09-26 10:38:54 +03:00
Egor Kislitsyn	3572cf29b7	Extract timeline actions from MastodonAPIController into TimelineController	2019-09-26 10:53:42 +07:00
Egor Kislitsyn	c57ad0a402	Cleanup CommonAPI	2019-09-26 10:33:13 +07:00
Egor Kislitsyn	de3e90e536	Add ActivityDraft.with_valid/2	2019-09-26 10:29:34 +07:00
Egor Kislitsyn	eed774d058	Add CommonAPI.ActivityDraft	2019-09-26 10:29:34 +07:00
kaniini	6abe12dced	Merge branch 'refactor/notification-controller' into 'develop' ... Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646	2019-09-26 03:13:22 +00:00
kaniini	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	2019-09-26 03:12:03 +00:00
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	2019-09-26 03:00:38 +00:00
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	2019-09-26 02:57:41 +00:00
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	2019-09-26 02:51:54 +00:00
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	2019-09-26 02:49:45 +00:00
kaniini	1b9cd4c866	Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' ... Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716	2019-09-26 00:03:47 +00:00
rinpatch	f92d7d52c2	Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex	2019-09-25 13:38:45 +00:00
rinpatch	f2880d7d29	Credo considered harmful	2019-09-25 16:36:46 +03:00
rinpatch	c7d8ccd0c4	Remove useless with clause	2019-09-25 16:26:47 +03:00
rinpatch	1ddd403339	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-25 13:20:48 +00:00
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	2019-09-25 15:59:04 +03:00
Ekaterina Vaartis	1fd9c60f87	Fix emoji tags for shareable packs to be "pack:{name}"	2019-09-25 12:34:03 +02:00
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	2019-09-25 12:32:19 +02:00
vaartis	a6e85215e1	Credo fix (remove parens on function definition)	2019-09-25 12:32:19 +02:00
vaartis	f21dbbc021	Move emoji_dir_path & cache_seconds_per_file	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	cdbe7cd37a	When listing emoji packs, be sure to create the directory	2019-09-25 12:32:19 +02:00
Egor Kislitsyn	b5dfe83433	Replace Pleroma.FlakeId with flake_id hex package	2019-09-25 17:14:31 +07:00
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	2019-09-25 12:24:12 +03:00
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	2019-09-24 19:03:06 +02:00
Egor Kislitsyn	035f22f784	Fix Credo warnings	2019-09-24 19:50:09 +07:00
Egor Kislitsyn	1bea67cb5e	Cleanup Pleroma.User	2019-09-24 19:50:09 +07:00
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	2019-09-24 19:50:07 +07:00
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-24 13:00:48 +03:00
Egor Kislitsyn	a66a7a328f	Extract notification actions from MastodonAPIController into NotificationController	2019-09-24 15:16:44 +07:00
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	2019-09-24 15:03:20 +07:00
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-24 08:06:04 +03:00
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	2019-09-23 22:42:34 +00:00
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	2019-09-23 22:41:31 +00:00
kaniini	760df67a7b	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' ... Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703	2019-09-23 22:35:09 +00:00
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	2019-09-23 22:34:52 +00:00
Steven Fuchs	e1d2d69c87	Clean up views	2019-09-23 22:33:59 +00:00
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	2019-09-24 00:37:27 +03:00
Rachel Fae Fox	63af6951fa	add tunable for stream uploads, as needed for jortage to work.	2019-09-23 20:38:53 +00:00
Maksim Pechnikov	494bb6bac6	updated tests	2019-09-23 22:37:30 +03:00
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	2019-09-23 21:41:57 +03:00
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-23 21:32:50 +03:00
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	2019-09-23 18:20:08 +00:00
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	2019-09-23 19:47:35 +02:00
Maxim Filippov	d72d4757a8	Format	2019-09-22 23:13:48 +03:00
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-22 16:58:39 +03:00
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	2019-09-22 16:36:59 +03:00
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	2019-09-22 16:08:07 +03:00
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)	2019-09-20 18:27:00 +03:00
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	2019-09-19 16:53:59 +00:00
D Anzorge	0e6085da10	Fix pagination in AP outbox.json	2019-09-19 16:09:07 +02:00
Alex S	1d285e6fad	moving to separate dir	2019-09-19 14:02:27 +03:00
Alex S	924d7e6aa6	generating remote activities	2019-09-19 12:59:36 +03:00
Ivan Tashkinov	6f67aed3ac	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex	2019-09-19 10:59:09 +03:00
Egor Kislitsyn	95c948110c	Add rel="ugc" to hashtags and mentions	2019-09-19 14:56:10 +07:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
eugenijm	fe5e0b7846	Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)	2019-09-19 08:59:25 +03:00
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	2019-09-19 07:35:34 +03:00
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' ... [#733] added test for Ostatus See merge request pleroma/pleroma!1657	2019-09-18 22:28:10 +00:00
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' ... Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 ... Done via the following command: git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	2019-09-18 23:21:11 +02:00
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	a1325d5fd9	Change path from nodeinfo to metadata->features	2019-09-19 00:16:34 +03:00
Ekaterina Vaartis	d51e5e447e	Move emoji reloading to admin api	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7680aec17d	Move emoji api to pleroma api dir	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	36f2275dc9	A feature for shareable emoji packs, use it in download_from & tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	74fb6d8647	Move EmojiAPIController from EmojiAPI to PleromaAPI	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	6cd651a38b	Make the emoji controller api more RESTy	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	3971bf9c5f	Change :sha to :checksum	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7c784128fd	Change emoji api responses to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f24731788e	Move emoji pack list from /list to /	2019-09-19 00:16:33 +03:00
vaartis	cb125ffaf7	Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8f509e6d1e	Use with w/ pack_info_res	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8790365fef	Remove unused variable	2019-09-19 00:16:33 +03:00
vaartis	b8a214b0ab	Split list_packs	2019-09-19 00:16:33 +03:00
vaartis	f251225cae	Apply suggestions to emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
vaartis	c049c32270	Fixed a typo in create_archive_and_cache	2019-09-19 00:16:33 +03:00
vaartis	163082de6f	Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f6d4acc871	Fix credo warnings	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	87057101b0	Add documentation for the emoji api endpoints	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9eb2ee4df0	Allow importing old (emoji.txt / plain) packs from the filesystem	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	13cd93a0d3	Use && insted of "and" for checking shared-files for packs ... share-files can be nil and "and" does not like that	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	f5131540dc	Add a way to create emoji packs via an endpoint	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	8dbdd5c280	Allow uploading new emojis to packs from URLs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	16edfef12e	Handle empty shortcode/filename/new_shortcode/new_filename	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	9afe7258dd	Implememt emoji pack file updating + write tests	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	261d92f9c2	Update the pack fallback-src sha generation condition ... The old one would not regenerate sha when fallback src changed	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	bcc0bfd0c5	Add an endpoint for emoji pack metadata updating	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b78973d27f	fallback can't have pack.json, reflect that in code ... having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2a94eca096	Change YAML to JSON	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b0ecd412f5	Clean out old emojis on reload	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	2d4b8f3d20	Add an endpoint for deleting emoji packs	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	3a8669b487	Fix responses for emoji pack controlller	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7a0c755d0a	Send ok for emoji reloading as text, not as json	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	ee620ecbf1	Add caching for emoji pack sharing	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7fb7dd9e0e	Only find SHA256 for packs that are shared	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	54b8e683bc	Swap TOML for YAML to get YAML generation for packs from fallbacks ... If fallback url doesn't have a pack.yml file, one from the source will be used	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	b791a08656	Implement API actions on packs ... That incldues listing them and downloading them from other instances or from the remote url	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	6a42641b8d	Add pack.toml loading	2019-09-19 00:16:33 +03:00
feld	ab2ca3038f	Merge branch 'hide-follower-following-count' into 'develop' ... Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663	2019-09-18 21:13:15 +00:00
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	2019-09-18 21:11:37 +00:00
Haelwenn	e32d099a3a	Merge branch 'feature/poll-refresh' into 'develop' ... Poll refetching See merge request pleroma/pleroma!1694	2019-09-18 20:58:53 +00:00
rinpatch	5028b7b578	Fix credo issues	2019-09-18 22:09:03 +03:00
rinpatch	c096dd86e5	Do not refetch local objects	2019-09-18 20:01:26 +03:00
rinpatch	eb87a86b5b	Preserve internal fields when reinjecting	2019-09-18 19:53:51 +03:00
rinpatch	d32894ae51	Move object internal fields to a constant	2019-09-18 19:24:20 +03:00
rinpatch	e3f902b3a1	Set updated_at even if the object stayed the same	2019-09-18 19:07:25 +03:00
rinpatch	a9c700ff15	Fix wrong argument order when calling NaiveDateTime.diff	2019-09-18 18:52:33 +03:00
rinpatch	7ef575d11e	Initial poll refresh support ... Implement refreshing the object with an interval and call the function when getting the poll.	2019-09-18 18:13:21 +03:00
Maxim Filippov	384b7dd40d	Fix response	2019-09-18 18:06:49 +03:00
Maxim Filippov	f89728ad95	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-18 16:44:11 +03:00
Ivan Tashkinov	e4f3d7f69d	Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex	2019-09-18 10:31:10 +00:00
Ivan Tashkinov	551f2fa59e	[#1234] Added changelog entry, removed admin OAuth scopes.	2019-09-18 12:31:33 +03:00
Ivan Tashkinov	c98e761d28	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions	2019-09-18 12:06:38 +03:00
Alex S	a18f1e7cd7	namings	2019-09-18 10:49:14 +03:00
Alex S	2263c8b6b9	little fixes	2019-09-18 10:49:14 +03:00
Alex S	4faf2b1555	post for creating invite tokens in admin api	2019-09-18 10:49:14 +03:00