11565539664

Committed 29 Oct 2024 01:24AM UTC coverage: 31.344% (-0.01%) from 31.355%

Build # 11565539664

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9915 from ForumMagnum/master

Merge master to lw-deploy 2024 10 28

Run Details

5031 of 42360 branches covered (11.88%)

Branch coverage included in aggregate %.

51 of 117 new or added lines in 25 files covered. (43.59%)

6 existing lines in 5 files now uncovered.

29648 of 68281 relevant lines covered (43.42%)

173.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

15.25

/packages/lesswrong/components/editor/RateLimitWarning.tsx

import React from 'react';
import { Components, registerComponent } from '../../lib/vulcan-lib';
import moment from 'moment';
import { isEAForum } from '../../lib/instanceSettings';
import AlarmIcon from '@material-ui/icons/Alarm';
import { isFriendlyUI } from '../../themes/forumTheme';

const styles = (theme: ThemeType): JssStyles => ({
  lwBanner: {
    padding: 12,
    backgroundColor: theme.palette.background.warningTranslucent,
    display: "flex",
    alignItems: "center",
    '& p': {
      marginBottom: 6,
    }
  },
  icon: {
    marginLeft: 8,
    marginRight: 16,
    height: 24,
    color: theme.palette.grey[500]
  }
});

// Tells the user when they can next comment or post if they're rate limited, and a brief explanation
const RateLimitWarning = ({lastRateLimitExpiry, rateLimitMessage, classes}: {
  lastRateLimitExpiry: Date,
  rateLimitMessage?: string,
  classes: ClassesType
}) => {
  const { ContentStyles, ContentItemBody } = Components

  const getTimeUntilNextPost = () => {
    const lastExpiry = moment(lastRateLimitExpiry)
    const now = moment()
    const diffInSeconds = lastExpiry.diff(now, 'seconds')
    const diffInMin = lastExpiry.diff(now, 'minutes')
    const diffInHours = lastExpiry.diff(now, 'hours')
    const diffInDays = lastExpiry.diff(now, 'days')
    const diffInWeeks =lastExpiry.diff(now, 'weeks')
    if (diffInSeconds < 60) {
      return `${diffInSeconds} second${diffInSeconds > 1 ? 's' : ''}`
    }
    if (diffInMin < 60) {
      return `${diffInMin} minute${diffInMin > 1 ? 's' : ''}`
    }
    if (diffInHours < 24) {
      return `${diffInHours} hour${diffInHours > 1 ? 's' : ''}`
    }
    if (diffInDays < 7) {
      return `${diffInDays} day${diffInDays > 1 ? 's' : ''}`
    }
    return `${diffInWeeks} week${diffInWeeks > 1 ? 's' : ''}`
  }

  let message = `<p>You can submit again in ${getTimeUntilNextPost()}.</p> ${rateLimitMessage ?? ''}`
  if (isEAForum) {
    message = `You've written more than 3 comments in the last 30 minutes. Please wait ${getTimeUntilNextPost()} before commenting again. ${rateLimitMessage ?? ''}`
  }

  if (isFriendlyUI) {
    return <Components.WarningBanner message={message}/>
  } else {
    return <ContentStyles contentType="comment" className={classes.lwBanner}>
      <AlarmIcon className={classes.icon} />
      <ContentItemBody dangerouslySetInnerHTML={{__html: message }}/>
    </ContentStyles>
  }
}

const RateLimitWarningComponent = registerComponent('RateLimitWarning', RateLimitWarning, {styles});

declare global {
  interface ComponentTypes {
    RateLimitWarning: typeof RateLimitWarningComponent
  }
}

1	import React from 'react';	1✔
2	import { Components, registerComponent } from '../../lib/vulcan-lib';	1✔
3	import moment from 'moment';	1✔
4	import { isEAForum } from '../../lib/instanceSettings';	1✔
5	import AlarmIcon from '@material-ui/icons/Alarm';	1✔
6	import { isFriendlyUI } from '../../themes/forumTheme';	1✔
7
8	const styles = (theme: ThemeType): JssStyles => ({	1✔
9	lwBanner: {
10	padding: 12,
11	backgroundColor: theme.palette.background.warningTranslucent,
12	display: "flex",
13	alignItems: "center",
14	'& p': {
15	marginBottom: 6,
16	}
17	},
18	icon: {
19	marginLeft: 8,
20	marginRight: 16,
21	height: 24,
22	color: theme.palette.grey[500]
23	}
24	});
25
26	// Tells the user when they can next comment or post if they're rate limited, and a brief explanation
27	const RateLimitWarning = ({lastRateLimitExpiry, rateLimitMessage, classes}: {	1✔
28	lastRateLimitExpiry: Date,
29	rateLimitMessage?: string,
30	classes: ClassesType
31	}) => {
32	const { ContentStyles, ContentItemBody } = Components	×
33
34	const getTimeUntilNextPost = () => {	×
35	const lastExpiry = moment(lastRateLimitExpiry)	×
36	const now = moment()	×
37	const diffInSeconds = lastExpiry.diff(now, 'seconds')	×
38	const diffInMin = lastExpiry.diff(now, 'minutes')	×
39	const diffInHours = lastExpiry.diff(now, 'hours')	×
40	const diffInDays = lastExpiry.diff(now, 'days')	×
41	const diffInWeeks =lastExpiry.diff(now, 'weeks')	×
42	if (diffInSeconds < 60) {	×
43	return `${diffInSeconds} second${diffInSeconds > 1 ? 's' : ''}`	×
44	}
45	if (diffInMin < 60) {	×
46	return `${diffInMin} minute${diffInMin > 1 ? 's' : ''}`	×
47	}
48	if (diffInHours < 24) {	×
49	return `${diffInHours} hour${diffInHours > 1 ? 's' : ''}`	×
50	}
51	if (diffInDays < 7) {	×
52	return `${diffInDays} day${diffInDays > 1 ? 's' : ''}`	×
53	}
54	return `${diffInWeeks} week${diffInWeeks > 1 ? 's' : ''}`	×
55	}
56
NEW 57	let message = `<p>You can submit again in ${getTimeUntilNextPost()}.</p> ${rateLimitMessage ?? ''}`	×
58	if (isEAForum) {	×
59	message = `You've written more than 3 comments in the last 30 minutes. Please wait ${getTimeUntilNextPost()} before commenting again. ${rateLimitMessage ?? ''}`	×
60	}
61
62	if (isFriendlyUI) {	×
63	return <Components.WarningBanner message={message}/>	×
64	} else {
65	return <ContentStyles contentType="comment" className={classes.lwBanner}>	×
66	<AlarmIcon className={classes.icon} />
67	<ContentItemBody dangerouslySetInnerHTML={{__html: message }}/>
68	</ContentStyles>
69	}
70	}
71
72	const RateLimitWarningComponent = registerComponent('RateLimitWarning', RateLimitWarning, {styles});	1✔
73
74	declare global {
75	interface ComponentTypes {
76	RateLimitWarning: typeof RateLimitWarningComponent
77	}
78	}

ForumMagnum / ForumMagnum / 11565539664

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous