bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/next' into next-colors

Browse source
This commit is contained in:
Alex Gleason 2022-03-23 13:05:53 -05:00
commit 12617bf7de
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
70 changed files with 171 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/index.ejs
View file

@ -9,33 +9,6 @@
<link href="/manifest.json" rel="manifest"> <link href="/manifest.json" rel="manifest">
<!--server-generated-meta--> <!--server-generated-meta-->
<link rel="icon" type="image/png" href="/favicon.png"> <link rel="icon" type="image/png" href="/favicon.png">
<link href='/icons/icon-57x57.png' rel='apple-touch-icon' sizes='57x57'>
<link href='/icons/icon-64x64.png' rel='apple-touch-icon' sizes='64x64'>
<link href='/icons/icon-72x72.png' rel='apple-touch-icon' sizes='72x72'>
<link href='/icons/icon-114x114.png' rel='apple-touch-icon' sizes='114x114'>
<link href='/icons/icon-120x120.png' rel='apple-touch-icon' sizes='120x120'>
<link href='/icons/icon-180x180.png' rel='apple-touch-icon' sizes='180x180'>
<link href='/icons/icon-192x192.png' rel='apple-touch-icon' sizes='192x192'>
<link href='/icons/icon-512x512.png' rel='apple-touch-icon' sizes='512x512'>
<script>
if(window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.didBeginLoadingSoapbox) {
window.webkit.messageHandlers.didBeginLoadingSoapbox.postMessage("started");
}
</script>
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//trk.bonsa.net/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '23231245']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
</head> </head>
<body class="theme-mode-light no-reduce-motion"> <body class="theme-mode-light no-reduce-motion">
<div id="soapbox"> <div id="soapbox">

30
app/soapbox/components/account.tsx
View file

@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
import VerificationBadge from 'soapbox/components/verification_badge'; import VerificationBadge from 'soapbox/components/verification_badge';
import ActionButton from 'soapbox/features/ui/components/action_button'; import ActionButton from 'soapbox/features/ui/components/action_button';
import { useAppSelector } from 'soapbox/hooks'; import { useAppSelector, useOnScreen } from 'soapbox/hooks';
import { getAcct } from 'soapbox/utils/accounts'; import { getAcct } from 'soapbox/utils/accounts';
import { displayFqn } from 'soapbox/utils/state'; import { displayFqn } from 'soapbox/utils/state';
@ -52,8 +52,9 @@ const Account = ({
timestampUrl, timestampUrl,
withRelationship = true, withRelationship = true,
}: IAccount) => { }: IAccount) => {
const overflowRef = React.useRef(null); const overflowRef = React.useRef<HTMLDivElement>(null);
const actionRef = React.useRef(null); const actionRef = React.useRef<HTMLDivElement>(null);
const isOnScreen = useOnScreen(overflowRef);
const [style, setStyle] = React.useState<React.CSSProperties>({ visibility: 'hidden' }); const [style, setStyle] = React.useState<React.CSSProperties>({ visibility: 'hidden' });
@ -93,18 +94,19 @@ const Account = ({
}; };
React.useEffect(() => { React.useEffect(() => {
const style: React.CSSProperties = {}; if (isOnScreen) {
const style: React.CSSProperties = {};
const actionWidth = actionRef.current?.clientWidth;
const actionWidth = actionRef.current?.clientWidth; if (overflowRef.current) {
style.maxWidth = overflowRef.current.clientWidth - 30 - avatarSize - actionWidth;
} else {
style.visibility = 'hidden';
}
if (overflowRef.current) { setStyle(style);
style.maxWidth = overflowRef.current.clientWidth - 30 - avatarSize - actionWidth;
} else {
style.visibility = 'hidden';
} }
}, [isOnScreen, overflowRef, actionRef]);
setStyle(style);
}, [overflowRef, actionRef]);
if (!account) { if (!account) {
return null; return null;
@ -161,8 +163,8 @@ const Account = ({
</LinkEl> </LinkEl>
</ProfilePopper> </ProfilePopper>
<HStack alignItems='center' space={1}> <HStack alignItems='center' space={1} style={style}>
<Text theme='muted' size='sm'>@{username}</Text> <Text theme='muted' size='sm' truncate>@{username}</Text>
{(timestamp) ? ( {(timestamp) ? (
<> <>

2
app/soapbox/components/avatar.js
View file

@ -8,7 +8,7 @@ import StillImage from 'soapbox/components/still_image';
export default class Avatar extends React.PureComponent { export default class Avatar extends React.PureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
size: PropTypes.number, size: PropTypes.number,
style: PropTypes.object, style: PropTypes.object,
className: PropTypes.string, className: PropTypes.string,

2
app/soapbox/components/avatar_overlay.js
View file

@ -6,7 +6,7 @@ import StillImage from 'soapbox/components/still_image';
export default class AvatarOverlay extends React.PureComponent { export default class AvatarOverlay extends React.PureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
friend: ImmutablePropTypes.map.isRequired, friend: ImmutablePropTypes.map.isRequired,
}; };

2
app/soapbox/components/display_name.js
View file

@ -22,7 +22,7 @@ export default @connect(mapStateToProps)
class DisplayName extends React.PureComponent { class DisplayName extends React.PureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
displayFqn: PropTypes.bool, displayFqn: PropTypes.bool,
others: ImmutablePropTypes.list, others: ImmutablePropTypes.list,
children: PropTypes.node, children: PropTypes.node,

2
app/soapbox/components/dropdown_menu.js
View file

@ -207,7 +207,7 @@ class Dropdown extends React.PureComponent {
pressed: PropTypes.bool, pressed: PropTypes.bool,
title: PropTypes.string, title: PropTypes.string,
disabled: PropTypes.bool, disabled: PropTypes.bool,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
isUserTouching: PropTypes.func, isUserTouching: PropTypes.func,
isModalOpen: PropTypes.bool.isRequired, isModalOpen: PropTypes.bool.isRequired,
onOpen: PropTypes.func.isRequired, onOpen: PropTypes.func.isRequired,

5
app/soapbox/components/icon.js
View file

@ -17,15 +17,16 @@ export default class Icon extends React.PureComponent {
id: PropTypes.string, id: PropTypes.string,
src: PropTypes.string, src: PropTypes.string,
className: PropTypes.string, className: PropTypes.string,
fixedWidth: PropTypes.bool,
}; };
render() { render() {
const { id, src, ...rest } = this.props; const { id, src, fixedWidth, ...rest } = this.props;
if (src) { if (src) {
return <SvgIcon src={src} {...rest} />; return <SvgIcon src={src} {...rest} />;
} else { } else {
return <ForkAwesomeIcon id={id} {...rest} />; return <ForkAwesomeIcon id={id} fixedWidth={fixedWidth} {...rest} />;
} }
} }

2
app/soapbox/components/media_gallery.js
View file

@ -45,7 +45,7 @@ const shouldLetterbox = attachment => {
class Item extends React.PureComponent { class Item extends React.PureComponent {
static propTypes = { static propTypes = {
attachment: ImmutablePropTypes.map.isRequired, attachment: ImmutablePropTypes.record.isRequired,
standalone: PropTypes.bool, standalone: PropTypes.bool,
index: PropTypes.number.isRequired, index: PropTypes.number.isRequired,
size: PropTypes.number.isRequired, size: PropTypes.number.isRequired,

39
app/soapbox/components/permalink.js
View file

@ -1,39 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import { withRouter } from 'react-router-dom';
export default @withRouter
class Permalink extends React.PureComponent {
static propTypes = {
className: PropTypes.string,
href: PropTypes.string.isRequired,
to: PropTypes.string.isRequired,
children: PropTypes.node,
onInterceptClick: PropTypes.func,
history: PropTypes.object,
};
handleClick = e => {
if (this.props.onInterceptClick && this.props.onInterceptClick()) {
e.preventDefault();
return;
}
if (this.props.history && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
e.preventDefault();
this.props.history.push(this.props.to);
}
}
render() {
const { href, children, className, onInterceptClick, ...other } = this.props;
return (
<a target='_blank' href={href} onClick={this.handleClick} {...other} className={`permalink${className ? ' ' + className : ''}`}>
{children}
</a>
);
}
}

37
app/soapbox/components/permalink.tsx Normal file
View file

@ -0,0 +1,37 @@
import * as React from 'react';
import { useHistory } from 'react-router-dom';
interface IPermaLink extends Pick<React.HTMLAttributes<HTMLAnchorElement>, 'dangerouslySetInnerHTML'> {
className?: string,
href: string,
title?: string,
to: string,
}
const Permalink: React.FC<IPermaLink> = (props) => {
const history = useHistory();
const { className, href, title, to, children, ...filteredProps } = props;
const handleClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {
event.preventDefault();
history.push(to);
}
};
return (
<a
target='_blank'
href={href}
onClick={handleClick}
title={title}
className={`permalink${className ? ' ' + className : ''}`}
{...filteredProps}
>
{children}
</a>
);
};
export default Permalink;

2
app/soapbox/components/profile_hover_card.js
View file

@ -134,7 +134,7 @@ export const ProfileHoverCard = ({ visible }) => {
ProfileHoverCard.propTypes = { ProfileHoverCard.propTypes = {
visible: PropTypes.bool, visible: PropTypes.bool,
accountId: PropTypes.string, accountId: PropTypes.string,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
}; };
ProfileHoverCard.defaultProps = { ProfileHoverCard.defaultProps = {

2
app/soapbox/components/scrollable_list.js
View file

@ -43,7 +43,7 @@ class ScrollableList extends PureComponent {
children: PropTypes.node, children: PropTypes.node,
onScrollToTop: PropTypes.func, onScrollToTop: PropTypes.func,
onScroll: PropTypes.func, onScroll: PropTypes.func,
placeholderComponent: PropTypes.func, placeholderComponent: PropTypes.object,
placeholderCount: PropTypes.number, placeholderCount: PropTypes.number,
autoload: PropTypes.bool, autoload: PropTypes.bool,
onRefresh: PropTypes.func, onRefresh: PropTypes.func,

4
app/soapbox/components/status.js
View file

@ -55,8 +55,8 @@ export default @injectIntl @withRouter
class Status extends ImmutablePureComponent { class Status extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
otherAccounts: ImmutablePropTypes.list, otherAccounts: ImmutablePropTypes.list,
onClick: PropTypes.func, onClick: PropTypes.func,
onReply: PropTypes.func, onReply: PropTypes.func,

2
app/soapbox/components/status_action_bar.js
View file

@ -69,7 +69,7 @@ const messages = defineMessages({
class StatusActionBar extends ImmutablePureComponent { class StatusActionBar extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
onOpenUnauthorizedModal: PropTypes.func.isRequired, onOpenUnauthorizedModal: PropTypes.func.isRequired,
onOpenReblogsModal: PropTypes.func.isRequired, onOpenReblogsModal: PropTypes.func.isRequired,
onReply: PropTypes.func, onReply: PropTypes.func,

2
app/soapbox/components/status_content.js
View file

@ -28,7 +28,7 @@ export default @connect(mapStateToProps)
class StatusContent extends React.PureComponent { class StatusContent extends React.PureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
reblogContent: PropTypes.string, reblogContent: PropTypes.string,
expanded: PropTypes.bool, expanded: PropTypes.bool,
onExpandedToggle: PropTypes.func, onExpandedToggle: PropTypes.func,

2
app/soapbox/components/status_list.js
View file

@ -223,7 +223,7 @@ export default class StatusList extends ImmutablePureComponent {
isLoading={isLoading} isLoading={isLoading}
showLoading={isLoading && statusIds.size === 0} showLoading={isLoading && statusIds.size === 0}
onLoadMore={onLoadMore && this.handleLoadOlder} onLoadMore={onLoadMore && this.handleLoadOlder}
placeholderComponent={() => <PlaceholderStatus />} placeholderComponent={PlaceholderStatus}
placeholderCount={20} placeholderCount={20}
ref={this.setRef} ref={this.setRef}
className={divideType === 'border' ? 'divide-y divide-solid divide-gray-200' : 'sm:space-y-3 divide-y divide-solid divide-gray-200 sm:divide-none'} className={divideType === 'border' ? 'divide-y divide-solid divide-gray-200' : 'sm:space-y-3 divide-y divide-solid divide-gray-200 sm:divide-none'}

2
app/soapbox/components/status_reply_mentions.js
View file

@ -23,7 +23,7 @@ export default @connect(null, mapDispatchToProps)
class StatusReplyMentions extends ImmutablePureComponent { class StatusReplyMentions extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
onOpenMentionsModal: PropTypes.func, onOpenMentionsModal: PropTypes.func,
} }

2
app/soapbox/components/thumb_navigation.js
View file

@ -33,7 +33,7 @@ class ThumbNavigation extends React.PureComponent {
static propTypes = { static propTypes = {
logo: PropTypes.string, logo: PropTypes.string,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
dashboardCount: PropTypes.number, dashboardCount: PropTypes.number,
notificationCount: PropTypes.number, notificationCount: PropTypes.number,
chatsCount: PropTypes.number, chatsCount: PropTypes.number,

1
app/soapbox/components/ui/hstack/hstack.tsx
View file

@ -29,6 +29,7 @@ interface IHStack {
justifyContent?: 'between' | 'center', justifyContent?: 'between' | 'center',
space?: 0.5 | 1 | 1.5 | 2 | 3 | 4 | 6, space?: 0.5 | 1 | 1.5 | 2 | 3 | 4 | 6,
grow?: boolean, grow?: boolean,
style?: React.CSSProperties
} }
const HStack: React.FC<IHStack> = (props) => { const HStack: React.FC<IHStack> = (props) => {

2
app/soapbox/containers/soapbox.js
View file

@ -97,7 +97,7 @@ class SoapboxMount extends React.PureComponent {
static propTypes = { static propTypes = {
showIntroduction: PropTypes.bool, showIntroduction: PropTypes.bool,
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
instanceLoaded: PropTypes.bool, instanceLoaded: PropTypes.bool,
reduceMotion: PropTypes.bool, reduceMotion: PropTypes.bool,
underlineLinks: PropTypes.bool, underlineLinks: PropTypes.bool,

4
app/soapbox/features/account/components/header.js
View file

@ -86,8 +86,8 @@ export default @connect(mapStateToProps)
class Header extends ImmutablePureComponent { class Header extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
meAccount: ImmutablePropTypes.map, meaccount: ImmutablePropTypes.record,
identity_props: ImmutablePropTypes.list, identity_props: ImmutablePropTypes.list,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
username: PropTypes.string, username: PropTypes.string,

2
app/soapbox/features/account_timeline/components/header.js
View file

@ -12,7 +12,7 @@ export default @withRouter
class Header extends ImmutablePureComponent { class Header extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
identity_proofs: ImmutablePropTypes.list, identity_proofs: ImmutablePropTypes.list,
onFollow: PropTypes.func.isRequired, onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired, onBlock: PropTypes.func.isRequired,

2
app/soapbox/features/admin/components/report_status.js
View file

@ -22,7 +22,7 @@ export default @connect()
class ReportStatus extends ImmutablePureComponent { class ReportStatus extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
report: ImmutablePropTypes.map, report: ImmutablePropTypes.map,
}; };

2
app/soapbox/features/admin/components/unapproved_account.js
View file

@ -35,7 +35,7 @@ class UnapprovedAccount extends ImmutablePureComponent {
static propTypes = { static propTypes = {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
}; };
handleApprove = () => { handleApprove = () => {

2
app/soapbox/features/admin/index.js
View file

@ -50,7 +50,7 @@ class Dashboard extends ImmutablePureComponent {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
instance: ImmutablePropTypes.map.isRequired, instance: ImmutablePropTypes.map.isRequired,
supportsEmailList: PropTypes.bool, supportsEmailList: PropTypes.bool,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
}; };
handleSubscribersClick = e => { handleSubscribersClick = e => {

2
app/soapbox/features/aliases/components/account.js
View file

@ -49,7 +49,7 @@ export default @connect(makeMapStateToProps, mapDispatchToProps)
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
apId: PropTypes.string.isRequired, apId: PropTypes.string.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
onAdd: PropTypes.func.isRequired, onAdd: PropTypes.func.isRequired,

2
app/soapbox/features/birthdays/account.js
View file

@ -36,7 +36,7 @@ class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
accountId: PropTypes.string.isRequired, accountId: PropTypes.string.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
}; };
static defaultProps = { static defaultProps = {

2
app/soapbox/features/compose/components/privacy_dropdown.js
View file

@ -256,8 +256,6 @@ class PrivacyDropdown extends React.PureComponent {
className='text-gray-400 hover:text-gray-600' className='text-gray-400 hover:text-gray-600'
src={valueOption.icon} src={valueOption.icon}
title={intl.formatMessage(messages.change_privacy)} title={intl.formatMessage(messages.change_privacy)}
expanded={open}
active={open}
onClick={this.handleToggle} onClick={this.handleToggle}
onMouseDown={this.handleMouseDown} onMouseDown={this.handleMouseDown}
onKeyDown={this.handleButtonKeyDown} onKeyDown={this.handleButtonKeyDown}

2
app/soapbox/features/compose/components/reply_indicator.js
View file

@ -12,7 +12,7 @@ import { isRtl } from '../../../rtl';
export default class ReplyIndicator extends ImmutablePureComponent { export default class ReplyIndicator extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
onCancel: PropTypes.func.isRequired, onCancel: PropTypes.func.isRequired,
hideActions: PropTypes.bool, hideActions: PropTypes.bool,
}; };

2
app/soapbox/features/developers/apps/create.js
View file

@ -40,7 +40,7 @@ class CreateApp extends ImmutablePureComponent {
static propTypes = { static propTypes = {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
defaultScopes: PropTypes.string, defaultScopes: PropTypes.string,
} }

2
app/soapbox/features/directory/components/account_card.js
View file

@ -34,7 +34,7 @@ class AccountCard extends ImmutablePureComponent {
static propTypes = { static propTypes = {
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
autoPlayGif: PropTypes.bool, autoPlayGif: PropTypes.bool,
}; };

2
app/soapbox/features/edit_profile/components/profile_preview.js
View file

@ -39,7 +39,7 @@ const ProfilePreview = ({ account, displayFqn }) => (
); );
ProfilePreview.propTypes = { ProfilePreview.propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
displayFqn: PropTypes.bool, displayFqn: PropTypes.bool,
}; };

2
app/soapbox/features/edit_profile/index.js
View file

@ -88,7 +88,7 @@ class EditProfile extends ImmutablePureComponent {
static propTypes = { static propTypes = {
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
maxFields: PropTypes.number, maxFields: PropTypes.number,
verifiedCanEditName: PropTypes.bool, verifiedCanEditName: PropTypes.bool,
}; };

2
app/soapbox/features/follow_recommendations/components/account.js
View file

@ -30,7 +30,7 @@ export default @connect(makeMapStateToProps)
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
}; };

2
app/soapbox/features/follow_requests/components/account_authorize.js
View file

@ -18,7 +18,7 @@ export default @injectIntl
class AccountAuthorize extends ImmutablePureComponent { class AccountAuthorize extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
onAuthorize: PropTypes.func.isRequired, onAuthorize: PropTypes.func.isRequired,
onReject: PropTypes.func.isRequired, onReject: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,

2
app/soapbox/features/groups/timeline/index.js
View file

@ -35,7 +35,7 @@ class GroupTimeline extends React.PureComponent {
hasUnread: PropTypes.bool, hasUnread: PropTypes.bool,
group: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]), group: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
relationships: ImmutablePropTypes.map, relationships: ImmutablePropTypes.map,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
}; };

2
app/soapbox/features/list_adder/components/account.js
View file

@ -24,7 +24,7 @@ export default @connect(makeMapStateToProps)
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
}; };
render() { render() {

2
app/soapbox/features/list_adder/index.js
View file

@ -51,7 +51,7 @@ class ListAdder extends ImmutablePureComponent {
onInitialize: PropTypes.func.isRequired, onInitialize: PropTypes.func.isRequired,
onReset: PropTypes.func.isRequired, onReset: PropTypes.func.isRequired,
listIds: ImmutablePropTypes.list.isRequired, listIds: ImmutablePropTypes.list.isRequired,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
}; };
componentDidMount() { componentDidMount() {

2
app/soapbox/features/list_editor/components/account.js
View file

@ -37,7 +37,7 @@ export default @connect(makeMapStateToProps, mapDispatchToProps)
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
onRemove: PropTypes.func.isRequired, onRemove: PropTypes.func.isRequired,
onAdd: PropTypes.func.isRequired, onAdd: PropTypes.func.isRequired,

2
app/soapbox/features/notifications/components/follow_request.js
View file

@ -18,7 +18,7 @@ export default @injectIntl
class FollowRequest extends ImmutablePureComponent { class FollowRequest extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
onAuthorize: PropTypes.func.isRequired, onAuthorize: PropTypes.func.isRequired,
onReject: PropTypes.func.isRequired, onReject: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,

2
app/soapbox/features/notifications/components/notification.js
View file

@ -228,7 +228,7 @@ const Notification = (props) => {
Notification.propTypes = { Notification.propTypes = {
hidden: PropTypes.bool, hidden: PropTypes.bool,
notification: ImmutablePropTypes.map.isRequired, notification: ImmutablePropTypes.record.isRequired,
onMoveUp: PropTypes.func.isRequired, onMoveUp: PropTypes.func.isRequired,
onMoveDown: PropTypes.func.isRequired, onMoveDown: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired, onMention: PropTypes.func.isRequired,

2
app/soapbox/features/report/components/status_check_box.js
View file

@ -11,7 +11,7 @@ import { MediaGallery, Video, Audio } from '../../ui/util/async-components';
export default class StatusCheckBox extends React.PureComponent { export default class StatusCheckBox extends React.PureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
checked: PropTypes.bool, checked: PropTypes.bool,
onToggle: PropTypes.func.isRequired, onToggle: PropTypes.func.isRequired,
disabled: PropTypes.bool, disabled: PropTypes.bool,

2
app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js
View file

@ -48,7 +48,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
class ScheduledStatusActionBar extends ImmutablePureComponent { class ScheduledStatusActionBar extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
onCancelClick: PropTypes.func.isRequired, onCancelClick: PropTypes.func.isRequired,

2
app/soapbox/features/status/components/action_bar.js
View file

@ -84,7 +84,7 @@ const mapDispatchToProps = (dispatch, { status }) => ({
class ActionBar extends React.PureComponent { class ActionBar extends React.PureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
onReply: PropTypes.func.isRequired, onReply: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired, onReblog: PropTypes.func.isRequired,
onQuote: PropTypes.func.isRequired, onQuote: PropTypes.func.isRequired,

2
app/soapbox/features/status/components/card.js
View file

@ -61,7 +61,7 @@ const addAutoPlay = html => {
export default class Card extends React.PureComponent { export default class Card extends React.PureComponent {
static propTypes = { static propTypes = {
card: ImmutablePropTypes.map, card: ImmutablePropTypes.record,
maxDescription: PropTypes.number, maxDescription: PropTypes.number,
onOpenMedia: PropTypes.func.isRequired, onOpenMedia: PropTypes.func.isRequired,
compact: PropTypes.bool, compact: PropTypes.bool,

2
app/soapbox/features/status/components/detailed_status.js
View file

@ -27,7 +27,7 @@ export default @injectIntl
class DetailedStatus extends ImmutablePureComponent { class DetailedStatus extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
onOpenMedia: PropTypes.func.isRequired, onOpenMedia: PropTypes.func.isRequired,
onOpenVideo: PropTypes.func.isRequired, onOpenVideo: PropTypes.func.isRequired,
onToggleHidden: PropTypes.func.isRequired, onToggleHidden: PropTypes.func.isRequired,

2
app/soapbox/features/status/components/quoted_status.js
View file

@ -20,7 +20,7 @@ export default @injectIntl @withRouter
class QuotedStatus extends ImmutablePureComponent { class QuotedStatus extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
onCancel: PropTypes.func, onCancel: PropTypes.func,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
compose: PropTypes.bool, compose: PropTypes.bool,

2
app/soapbox/features/status/components/status_interaction_bar.js
View file

@ -55,7 +55,7 @@ export default @connect(mapStateToProps, mapDispatchToProps)
class StatusInteractionBar extends ImmutablePureComponent { class StatusInteractionBar extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
allowedEmoji: ImmutablePropTypes.list, allowedEmoji: ImmutablePropTypes.list,
features: PropTypes.object.isRequired, features: PropTypes.object.isRequired,

2
app/soapbox/features/status/index.js
View file

@ -165,7 +165,7 @@ class Status extends ImmutablePureComponent {
static propTypes = { static propTypes = {
params: PropTypes.object.isRequired, params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
ancestorsIds: ImmutablePropTypes.orderedSet, ancestorsIds: ImmutablePropTypes.orderedSet,
descendantsIds: ImmutablePropTypes.orderedSet, descendantsIds: ImmutablePropTypes.orderedSet,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,

2
app/soapbox/features/ui/components/action_button.js
View file

@ -68,7 +68,7 @@ export default @connect(mapStateToProps, mapDispatchToProps)
class ActionButton extends ImmutablePureComponent { class ActionButton extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
onFollow: PropTypes.func.isRequired, onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired, onBlock: PropTypes.func.isRequired,
onOpenUnauthorizedModal: PropTypes.func.isRequired, onOpenUnauthorizedModal: PropTypes.func.isRequired,

2
app/soapbox/features/ui/components/actions_modal.js
View file

@ -74,7 +74,7 @@ const ActionsModal = ({ status, actions, onClick, onClose }) => {
}; };
ActionsModal.propTypes = { ActionsModal.propTypes = {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
actions: PropTypes.array, actions: PropTypes.array,
onClick: PropTypes.func, onClick: PropTypes.func,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,

2
app/soapbox/features/ui/components/boost_modal.js
View file

@ -18,7 +18,7 @@ export default @injectIntl @withRouter
class BoostModal extends ImmutablePureComponent { class BoostModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.record.isRequired,
onReblog: PropTypes.func.isRequired, onReblog: PropTypes.func.isRequired,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,

2
app/soapbox/features/ui/components/compose_modal.js
View file

@ -29,7 +29,7 @@ const mapStateToProps = state => {
class ComposeModal extends ImmutablePureComponent { class ComposeModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
composeText: PropTypes.string, composeText: PropTypes.string,

40
app/soapbox/features/ui/components/link_footer.js
View file

@ -6,10 +6,11 @@ import { connect } from 'react-redux';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { logOut } from 'soapbox/actions/auth'; import { logOut } from 'soapbox/actions/auth';
import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { Text } from 'soapbox/components/ui'; import { Text } from 'soapbox/components/ui';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';
import { getBaseURL } from 'soapbox/utils/accounts'; import { getBaseURL } from 'soapbox/utils/accounts';
// import sourceCode from 'soapbox/utils/code'; import sourceCode from 'soapbox/utils/code';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { openModal } from '../../../actions/modals'; import { openModal } from '../../../actions/modals';
@ -19,9 +20,11 @@ const mapStateToProps = state => {
const account = state.getIn(['accounts', me]); const account = state.getIn(['accounts', me]);
const instance = state.get('instance'); const instance = state.get('instance');
const features = getFeatures(instance); const features = getFeatures(instance);
const soapboxConfig = getSoapboxConfig(state);
return { return {
account, account,
soapboxConfig,
profileDirectory: features.profileDirectory, profileDirectory: features.profileDirectory,
federating: features.federating, federating: features.federating,
showAliases: features.accountAliasesAPI, showAliases: features.accountAliasesAPI,
@ -41,7 +44,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
}, },
}); });
const LinkFooter = ({ onOpenHotkeys, account, profileDirectory, federating, showAliases, importAPI, onClickLogOut, baseURL }) => ( const LinkFooter = ({ onOpenHotkeys, account, profileDirectory, federating, showAliases, importAPI, onClickLogOut, baseURL, soapboxConfig }) => (
<div className='space-y-2'> <div className='space-y-2'>
<ul className='flex flex-wrap items-center divide-x-dot'> <ul className='flex flex-wrap items-center divide-x-dot'>
{account && <> {account && <>
@ -68,26 +71,29 @@ const LinkFooter = ({ onOpenHotkeys, account, profileDirectory, federating, show
</ul> </ul>
<Text theme='muted' size='sm'> <Text theme='muted' size='sm'>
{/*<FormattedMessage {soapboxConfig.get('linkFooterMessage') ? (
id='getting_started.open_source_notice' <span
defaultMessage='{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).' className='inline-block align-middle'
values={{ dangerouslySetInnerHTML={{ __html: emojify(soapboxConfig.get('linkFooterMessage')) }}
code_name: sourceCode.displayName, />
code_link: <a href={sourceCode.url} rel='noopener' target='_blank'>{sourceCode.repository}</a>, ) : (
code_version: sourceCode.version, <FormattedMessage
}} id='getting_started.open_source_notice'
/>*/} defaultMessage='{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).'
<FormattedMessage values={{
id='link_footer.made_in_usa' code_name: sourceCode.displayName,
defaultMessage='Proudly made in the United States of America. {emoji}' code_link: <a href={sourceCode.url} rel='noopener' target='_blank'>{sourceCode.repository}</a>,
values={{ emoji: <span className='inline-block align-middle' dangerouslySetInnerHTML={{ __html: emojify('🇺🇸') }} /> }} code_version: sourceCode.version,
/> }}
/>
)}
</Text> </Text>
</div> </div>
); );
LinkFooter.propTypes = { LinkFooter.propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
soapboxConfig: ImmutablePropTypes.map,
profileDirectory: PropTypes.bool, profileDirectory: PropTypes.bool,
federating: PropTypes.bool, federating: PropTypes.bool,
showAliases: PropTypes.bool, showAliases: PropTypes.bool,

4
app/soapbox/features/ui/components/media_modal.js
View file

@ -26,8 +26,8 @@ class MediaModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
media: ImmutablePropTypes.list.isRequired, media: ImmutablePropTypes.list.isRequired,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
index: PropTypes.number.isRequired, index: PropTypes.number.isRequired,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,

2
app/soapbox/features/ui/components/profile-dropdown.tsx
View file

@ -116,7 +116,7 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
const itemProps = menuItem.action ? { onSelect: menuItem.action } : { to: menuItem.to, as: Link }; const itemProps = menuItem.action ? { onSelect: menuItem.action } : { to: menuItem.to, as: Link };
return ( return (
<Comp key={idx} {...itemProps}> <Comp key={idx} {...itemProps} className='truncate'>
{menuItem.text} {menuItem.text}
</Comp> </Comp>
); );

2
app/soapbox/features/ui/components/profile_info_panel.js
View file

@ -37,7 +37,7 @@ const messages = defineMessages({
class ProfileInfoPanel extends ImmutablePureComponent { class ProfileInfoPanel extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
identity_proofs: ImmutablePropTypes.list, identity_proofs: ImmutablePropTypes.list,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
username: PropTypes.string, username: PropTypes.string,

2
app/soapbox/features/ui/components/profile_media_panel.js
View file

@ -16,7 +16,7 @@ import MediaItem from '../../account_gallery/components/media_item';
class ProfileMediaPanel extends ImmutablePureComponent { class ProfileMediaPanel extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
attachments: ImmutablePropTypes.list, attachments: ImmutablePropTypes.list,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
}; };

2
app/soapbox/features/ui/components/profile_stats.js
View file

@ -18,7 +18,7 @@ class ProfileStats extends React.PureComponent {
static propTypes = { static propTypes = {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
className: PropTypes.string, className: PropTypes.string,
onClickHandler: PropTypes.func, onClickHandler: PropTypes.func,
} }

2
app/soapbox/features/ui/components/report_modal.js
View file

@ -53,7 +53,7 @@ class ReportModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
isSubmitting: PropTypes.bool, isSubmitting: PropTypes.bool,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
statusIds: ImmutablePropTypes.orderedSet.isRequired, statusIds: ImmutablePropTypes.orderedSet.isRequired,
comment: PropTypes.string.isRequired, comment: PropTypes.string.isRequired,
forward: PropTypes.bool, forward: PropTypes.bool,

2
app/soapbox/features/ui/components/subscription_button.js
View file

@ -49,7 +49,7 @@ export default @connect(mapStateToProps, mapDispatchToProps)
class SubscriptionButton extends ImmutablePureComponent { class SubscriptionButton extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
features: PropTypes.object.isRequired, features: PropTypes.object.isRequired,
}; };

2
app/soapbox/features/ui/components/user_panel.js
View file

@ -19,7 +19,7 @@ import { makeGetAccount } from '../../../selectors';
class UserPanel extends ImmutablePureComponent { class UserPanel extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
displayFqn: PropTypes.bool, displayFqn: PropTypes.bool,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
domain: PropTypes.string, domain: PropTypes.string,

4
app/soapbox/features/ui/components/video_modal.js
View file

@ -12,8 +12,8 @@ class VideoModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
media: ImmutablePropTypes.map.isRequired, media: ImmutablePropTypes.map.isRequired,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.record,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
time: PropTypes.number, time: PropTypes.number,
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
history: PropTypes.object, history: PropTypes.object,

2
app/soapbox/features/ui/components/welcome_button.js
View file

@ -40,7 +40,7 @@ class WelcomeButton extends ImmutablePureComponent {
static propTypes = { static propTypes = {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.record.isRequired,
onClick: PropTypes.func.isRequired, onClick: PropTypes.func.isRequired,
}; };

2
app/soapbox/features/ui/util/react_router_helpers.js
View file

@ -30,7 +30,7 @@ class WrappedRoute extends React.Component {
content: PropTypes.node, content: PropTypes.node,
componentParams: PropTypes.object, componentParams: PropTypes.object,
layout: PropTypes.object, layout: PropTypes.object,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
settings: ImmutablePropTypes.map.isRequired, settings: ImmutablePropTypes.map.isRequired,
publicRoute: PropTypes.bool, publicRoute: PropTypes.bool,
staffOnly: PropTypes.bool, staffOnly: PropTypes.bool,

1
app/soapbox/hooks/index.ts
View file

@ -1 +1,2 @@
export { useAppSelector } from './useAppSelector'; export { useAppSelector } from './useAppSelector';
export { useOnScreen } from './useOnScreen';

19
app/soapbox/hooks/useOnScreen.ts Normal file
View file

@ -0,0 +1,19 @@
import * as React from 'react';
export const useOnScreen = (ref: React.MutableRefObject<HTMLElement>) => {
const [isIntersecting, setIntersecting] = React.useState(false);
const observer = new IntersectionObserver(
([entry]) => setIntersecting(entry.isIntersecting),
);
React.useEffect(() => {
observer.observe(ref.current);
return () => {
observer.disconnect();
};
}, []);
return isIntersecting;
};

2
app/soapbox/pages/groups_page.js
View file

@ -20,7 +20,7 @@ export default @connect(mapStateToProps)
class GroupsPage extends ImmutablePureComponent { class GroupsPage extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
}; };
render() { render() {

2
app/soapbox/pages/profile_page.js
View file

@ -68,7 +68,7 @@ export default @connect(mapStateToProps)
class ProfilePage extends ImmutablePureComponent { class ProfilePage extends ImmutablePureComponent {
static propTypes = { static propTypes = {
account: ImmutablePropTypes.map, account: ImmutablePropTypes.record,
accountUsername: PropTypes.string.isRequired, accountUsername: PropTypes.string.isRequired,
displayFqn: PropTypes.bool, displayFqn: PropTypes.bool,
features: PropTypes.object, features: PropTypes.object,

9
app/styles/components/snackbar.scss
View file

@ -40,7 +40,7 @@
} }
.notification-bar-wrapper { .notification-bar-wrapper {
@apply p-4 flex items-start; @apply p-4 flex items-center justify-between w-full space-x-2;
} }
.notification-bar-title { .notification-bar-title {
@ -50,3 +50,10 @@
.notification-bar-message { .notification-bar-message {
@apply text-sm text-gray-700; @apply text-sm text-gray-700;
} }
.notification-bar-action a {
@apply inline-flex items-center px-2.5 py-1 border border-solid border-gray-300
shadow-sm text-xs font-medium rounded-full text-gray-700 bg-white
hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2
focus:ring-primary-500;
}