M app/javascript/flavours/glitch/containers/status_container.js => app/javascript/flavours/glitch/containers/status_container.js +1 -1
@@ 293,7 293,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
modalProps: {
type,
accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ url: status.get('uri'),
},
}));
},
A app/javascript/flavours/glitch/containers/status_container.js.orig => app/javascript/flavours/glitch/containers/status_container.js.orig +303 -0
@@ 0,0 1,303 @@
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initBoostModal } from 'flavours/glitch/actions/boosts';
+import {
+ replyCompose,
+ mentionCompose,
+ directCompose,
+} from 'flavours/glitch/actions/compose';
+import {
+ initAddFilter,
+} from 'flavours/glitch/actions/filters';
+import {
+ reblog,
+ favourite,
+ bookmark,
+ unreblog,
+ unfavourite,
+ unbookmark,
+ pin,
+ unpin,
+} from 'flavours/glitch/actions/interactions';
+import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
+import { initReport } from 'flavours/glitch/actions/reports';
+import {
+ muteStatus,
+ unmuteStatus,
+ deleteStatus,
+ hideStatus,
+ revealStatus,
+ editStatus,
+ translateStatus,
+ undoStatusTranslation,
+} from 'flavours/glitch/actions/statuses';
+import Status from 'flavours/glitch/components/status';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
+
+import { showAlertForError } from '../actions/alerts';
+
+const messages = defineMessages({
+ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
+ deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
+ redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
+ redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
+ replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+ replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+ editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
+ editMessage: { id: 'confirmations.edit.message', defaultMessage: 'Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+ unfilterConfirm: { id: 'confirmations.unfilter.confirm', defaultMessage: 'Show' },
+ author: { id: 'confirmations.unfilter.author', defaultMessage: 'Author' },
+ matchingFilters: { id: 'confirmations.unfilter.filters', defaultMessage: 'Matching {count, plural, one {filter} other {filters}}' },
+ editFilter: { id: 'confirmations.unfilter.edit_filter', defaultMessage: 'Edit filter' },
+});
+
+const makeMapStateToProps = () => {
+ const getStatus = makeGetStatus();
+ const getPictureInPicture = makeGetPictureInPicture();
+
+ const mapStateToProps = (state, props) => {
+
+ let status = getStatus(state, props);
+ let reblogStatus = status ? status.get('reblog', null) : null;
+ let account = undefined;
+ let prepend = undefined;
+
+ if (props.featured && status) {
+ account = status.get('account');
+ prepend = 'featured';
+ } else if (reblogStatus !== null && typeof reblogStatus === 'object') {
+ account = status.get('account');
+ status = reblogStatus;
+ prepend = 'reblogged_by';
+ }
+
+ return {
+ containerId: props.containerId || props.id, // Should match reblogStatus's id for reblogs
+ status: status,
+ nextInReplyToId: props.nextId ? state.getIn(['statuses', props.nextId, 'in_reply_to_id']) : null,
+ account: account || props.account,
+ settings: state.get('local_settings'),
+ prepend: prepend || props.prepend,
+ pictureInPicture: getPictureInPicture(state, props),
+ };
+ };
+
+ return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
+
+ onReply (status, router) {
+ dispatch((_, getState) => {
+ let state = getState();
+
+ if (state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0) {
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
+ onConfirm: () => dispatch(replyCompose(status, router)),
+ },
+ }));
+ } else {
+ dispatch(replyCompose(status, router));
+ }
+ });
+ },
+
+ onModalReblog (status, privacy) {
+ if (status.get('reblogged')) {
+ dispatch(unreblog(status));
+ } else {
+ dispatch(reblog(status, privacy));
+ }
+ },
+
+ onReblog (status, e) {
+ dispatch((_, getState) => {
+ let state = getState();
+ if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
+ dispatch(initBoostModal({ status, onReblog: this.onModalReblog, missingMediaDescription: true }));
+ } else if (e.shiftKey || !boostModal) {
+ this.onModalReblog(status);
+ } else {
+ dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+ }
+ });
+ },
+
+ onBookmark (status) {
+ if (status.get('bookmarked')) {
+ dispatch(unbookmark(status));
+ } else {
+ dispatch(bookmark(status));
+ }
+ },
+
+ onModalFavourite (status) {
+ dispatch(favourite(status));
+ },
+
+ onFavourite (status, e) {
+ if (status.get('favourited')) {
+ dispatch(unfavourite(status));
+ } else {
+ if (e.shiftKey || !favouriteModal) {
+ this.onModalFavourite(status);
+ } else {
+ dispatch(openModal({
+ modalType: 'FAVOURITE',
+ modalProps: {
+ status,
+ onFavourite: this.onModalFavourite,
+ },
+ }));
+ }
+ }
+ },
+
+ onPin (status) {
+ if (status.get('pinned')) {
+ dispatch(unpin(status));
+ } else {
+ dispatch(pin(status));
+ }
+ },
+
+ onEmbed (status) {
+ dispatch(openModal({
+ modalType: 'EMBED',
+ modalProps: {
+ id: status.get('id'),
+ onError: error => dispatch(showAlertForError(error)),
+ },
+ }));
+ },
+
+ onDelete (status, history, withRedraft = false) {
+ if (!deleteModal) {
+ dispatch(deleteStatus(status.get('id'), history, withRedraft));
+ } else {
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+ confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ },
+ }));
+ }
+ },
+
+ onEdit (status, history) {
+ dispatch((_, getState) => {
+ let state = getState();
+ if (state.getIn(['compose', 'text']).trim().length !== 0) {
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.editMessage),
+ confirm: intl.formatMessage(messages.editConfirm),
+ onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+ },
+ }));
+ } else {
+ dispatch(editStatus(status.get('id'), history));
+ }
+ });
+ },
+
+ onTranslate (status) {
+ if (status.get('translation')) {
+ dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
+ } else {
+ dispatch(translateStatus(status.get('id')));
+ }
+ },
+
+ onDirect (account, router) {
+ dispatch(directCompose(account, router));
+ },
+
+ onMention (account, router) {
+ dispatch(mentionCompose(account, router));
+ },
+
+ onOpenMedia (statusId, media, index, lang) {
+ dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { statusId, media, index, lang },
+ }));
+ },
+
+ onOpenVideo (statusId, media, lang, options) {
+ dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { statusId, media, lang, options },
+ }));
+ },
+
+ onBlock (status) {
+ const account = status.get('account');
+ dispatch(initBlockModal(account));
+ },
+
+ onReport (status) {
+ dispatch(initReport(status.get('account'), status));
+ },
+
+ onAddFilter (status) {
+ dispatch(initAddFilter(status, { contextType }));
+ },
+
+ onMute (account) {
+ dispatch(initMuteModal(account));
+ },
+
+ onMuteConversation (status) {
+ if (status.get('muted')) {
+ dispatch(unmuteStatus(status.get('id')));
+ } else {
+ dispatch(muteStatus(status.get('id')));
+ }
+ },
+
+ onToggleHidden (status) {
+ if (status.get('hidden')) {
+ dispatch(revealStatus(status.get('id')));
+ } else {
+ dispatch(hideStatus(status.get('id')));
+ }
+ },
+
+ deployPictureInPicture (status, type, mediaProps) {
+ dispatch((_, getState) => {
+ if (getState().getIn(['local_settings', 'media', 'pop_in_player'])) {
+ dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
+ }
+ });
+ },
+
+ onInteractionModal (type, status) {
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type,
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
+ }));
+ },
+
+});
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
M => +1 -1
@@ 83,7 83,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
modalProps: {
type: 'follow',
accountId: account.get('id'),
url: account.get('url'),
url: account.get('uri'),
},
}));
},
M app/javascript/flavours/glitch/features/interaction_modal/index.jsx => app/javascript/flavours/glitch/features/interaction_modal/index.jsx +245 -53
@@ 1,95 1,296 @@
import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames';
import { connect } from 'react-redux';
+import { throttle, escapeRegExp } from 'lodash';
+
import { openModal, closeModal } from 'flavours/glitch/actions/modal';
+import api from 'flavours/glitch/api';
+import Button from 'flavours/glitch/components/button';
import { Icon } from 'flavours/glitch/components/icon';
import { registrationsOpen } from 'flavours/glitch/initial_state';
+const messages = defineMessages({
+ loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },
+});
+
const mapStateToProps = (state, { accountId }) => ({
displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
- signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
});
const mapDispatchToProps = (dispatch) => ({
onSignupClick() {
- dispatch(closeModal({
- modalType: undefined,
- ignoreFocus: false,
- }));
- dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
+ dispatch(closeModal());
+ dispatch(openModal('CLOSED_REGISTRATIONS'));
},
});
-class Copypaste extends PureComponent {
+const PERSISTENCE_KEY = 'flavours/glitch_home';
+
+const isValidDomain = value => {
+ const url = new URL('https:///path');
+ url.hostname = value;
+ return url.hostname === value;
+};
+
+const valueToDomain = value => {
+ // If the user starts typing an URL
+ if (/^https?:\/\//.test(value)) {
+ try {
+ const url = new URL(value);
+
+ // Consider that if there is a path, the URL is more meaningful than a bare domain
+ if (url.pathname.length > 1) {
+ return '';
+ }
+
+ return url.host;
+ } catch {
+ return undefined;
+ }
+ // If the user writes their full handle including username
+ } else if (value.includes('@')) {
+ if (value.replace(/^@/, '').split('@').length > 2) {
+ return undefined;
+ }
+ return '';
+ }
+
+ return value;
+};
+
+const addInputToOptions = (value, options) => {
+ value = value.trim();
+
+ if (value.includes('.') && isValidDomain(value)) {
+ return [value].concat(options.filter((x) => x !== value));
+ }
+
+ return options;
+};
+
+class LoginForm extends React.PureComponent {
static propTypes = {
- value: PropTypes.string,
+ resourceUrl: PropTypes.string,
+ intl: PropTypes.object.isRequired,
};
state = {
- copied: false,
+ value: localStorage ? (localStorage.getItem(PERSISTENCE_KEY) || '') : '',
+ expanded: false,
+ selectedOption: -1,
+ isLoading: false,
+ isSubmitting: false,
+ error: false,
+ options: [],
+ networkOptions: [],
};
setRef = c => {
this.input = c;
};
- handleInputClick = () => {
- this.setState({ copied: false });
- this.input.focus();
- this.input.select();
- this.input.setSelectionRange(0, this.input.value.length);
+ handleChange = ({ target }) => {
+ this.setState(state => ({ value: target.value, isLoading: true, error: false, options: addInputToOptions(target.value, state.networkOptions) }), () => this._loadOptions());
};
- handleButtonClick = () => {
- const { value } = this.props;
- navigator.clipboard.writeText(value);
- this.input.blur();
- this.setState({ copied: true });
- this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
+ handleMessage = (event) => {
+ const { resourceUrl } = this.props;
+
+ if (event.origin !== window.origin || event.source !== this.iframeRef.contentWindow) {
+ return;
+ }
+
+ if (event.data?.type === 'fetchInteractionURL-failure') {
+ this.setState({ isSubmitting: false, error: true });
+ } else if (event.data?.type === 'fetchInteractionURL-success') {
+ if (/^https?:\/\//.test(event.data.template)) {
+ if (localStorage) {
+ localStorage.setItem(PERSISTENCE_KEY, event.data.uri_or_domain);
+ }
+
+ window.location.href = event.data.template.replace('{uri}', encodeURIComponent(resourceUrl));
+ } else {
+ this.setState({ isSubmitting: false, error: true });
+ }
+ }
};
+ componentDidMount () {
+ window.addEventListener('message', this.handleMessage);
+ }
+
componentWillUnmount () {
- if (this.timeout) clearTimeout(this.timeout);
+ window.removeEventListener('message', this.handleMessage);
}
+ handleSubmit = () => {
+ const { value } = this.state;
+
+ this.setState({ isSubmitting: true });
+
+ this.iframeRef.contentWindow.postMessage({
+ type: 'fetchInteractionURL',
+ uri_or_domain: value.trim(),
+ }, window.origin);
+ };
+
+ setIFrameRef = (iframe) => {
+ this.iframeRef = iframe;
+ }
+
+ handleFocus = () => {
+ this.setState({ expanded: true });
+ };
+
+ handleBlur = () => {
+ this.setState({ expanded: false });
+ };
+
+ handleKeyDown = (e) => {
+ const { options, selectedOption } = this.state;
+
+ switch(e.key) {
+ case 'ArrowDown':
+ e.preventDefault();
+
+ if (options.length > 0) {
+ this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) });
+ }
+
+ break;
+ case 'ArrowUp':
+ e.preventDefault();
+
+ if (options.length > 0) {
+ this.setState({ selectedOption: Math.max(selectedOption - 1, -1) });
+ }
+
+ break;
+ case 'Enter':
+ e.preventDefault();
+
+ if (selectedOption === -1) {
+ this.handleSubmit();
+ } else if (options.length > 0) {
+ this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit());
+ }
+
+ break;
+ }
+ };
+
+ handleOptionClick = e => {
+ const index = Number(e.currentTarget.getAttribute('data-index'));
+ const option = this.state.options[index];
+
+ e.preventDefault();
+ this.setState({ selectedOption: index, value: option, error: false }, () => this.handleSubmit());
+ };
+
+ _loadOptions = throttle(() => {
+ const { value } = this.state;
+
+ const domain = valueToDomain(value.trim());
+
+ if (typeof domain === 'undefined') {
+ this.setState({ options: [], networkOptions: [], isLoading: false, error: true });
+ return;
+ }
+
+ if (domain.length === 0) {
+ this.setState({ options: [], networkOptions: [], isLoading: false });
+ return;
+ }
+
+ api().get('/api/v1/peers/search', { params: { q: domain } }).then(({ data }) => {
+ if (!data) {
+ data = [];
+ }
+
+ this.setState((state) => ({ networkOptions: data, options: addInputToOptions(state.value, data), isLoading: false }));
+ }).catch(() => {
+ this.setState({ isLoading: false });
+ });
+ }, 200, { leading: true, trailing: true });
+
render () {
- const { value } = this.props;
- const { copied } = this.state;
+ const { intl } = this.props;
+ const { value, expanded, options, selectedOption, error, isSubmitting } = this.state;
+ const domain = (valueToDomain(value) || '').trim();
+ const domainRegExp = new RegExp(`(${escapeRegExp(domain)})`, 'gi');
+ const hasPopOut = domain.length > 0 && options.length > 0;
return (
- <div className={classNames('copypaste', { copied })}>
- <input
- type='text'
- ref={this.setRef}
- value={value}
- readOnly
- onClick={this.handleInputClick}
+ <div className={classNames('interaction-modal__login', { focused: expanded, expanded: hasPopOut, invalid: error })}>
+
+ <iframe
+ ref={this.setIFrameRef}
+ style={{display: 'none'}}
+ src='/remote_interaction_helper'
+ sandbox='allow-scripts allow-same-origin'
+ title='remote interaction helper'
/>
- <button className='button' onClick={this.handleButtonClick}>
- {copied ? <FormattedMessage id='copypaste.copied' defaultMessage='Copied' /> : <FormattedMessage id='copypaste.copy' defaultMessage='Copy' />}
- </button>
+ <div className='interaction-modal__login__input'>
+ <input
+ ref={this.setRef}
+ type='text'
+ value={value}
+ placeholder={intl.formatMessage(messages.loginPrompt)}
+ aria-label={intl.formatMessage(messages.loginPrompt)}
+ autoFocus
+ onChange={this.handleChange}
+ onFocus={this.handleFocus}
+ onBlur={this.handleBlur}
+ onKeyDown={this.handleKeyDown}
+ />
+
+ <Button onClick={this.handleSubmit} disabled={isSubmitting}><FormattedMessage id='interaction_modal.login.action' defaultMessage='Take me home' /></Button>
+ </div>
+
+ {hasPopOut && (
+ <div className='search__popout'>
+ <div className='search__popout__menu'>
+ {options.map((option, i) => (
+ <button key={option} onMouseDown={this.handleOptionClick} data-index={i} className={classNames('search__popout__menu__item', { selected: selectedOption === i })}>
+ {option.split(domainRegExp).map((part, i) => (
+ part.toLowerCase() === domain.toLowerCase() ? (
+ <mark key={i}>
+ {part}
+ </mark>
+ ) : (
+ <span key={i}>
+ {part}
+ </span>
+ )
+ ))}
+ </button>
+ ))}
+ </div>
+ </div>
+ )}
</div>
);
}
}
-class InteractionModal extends PureComponent {
+const IntlLoginForm = injectIntl(LoginForm);
+
+class InteractionModal extends React.PureComponent {
static propTypes = {
displayNameHtml: PropTypes.string,
url: PropTypes.string,
type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
onSignupClick: PropTypes.func.isRequired,
- signupUrl: PropTypes.string.isRequired,
};
handleSignupClick = () => {
@@ 97,7 298,7 @@ class InteractionModal extends PureComponent {
};
render () {
- const { url, type, displayNameHtml, signupUrl } = this.props;
+ const { url, type, displayNameHtml } = this.props;
const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
@@ 130,13 331,13 @@ class InteractionModal extends PureComponent {
if (registrationsOpen) {
signupButton = (
- <a href={signupUrl} className='button button--block button-tertiary'>
+ <a href='/auth/sign_up' className='link-button'>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</a>
);
} else {
signupButton = (
- <button className='button button--block button-tertiary' onClick={this.handleSignupClick}>
+ <button className='link-button' onClick={this.handleSignupClick}>
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
</button>
);
@@ 146,22 347,13 @@ class InteractionModal extends PureComponent {
<div className='modal-root__modal interaction-modal'>
<div className='interaction-modal__lead'>
<h3><span className='interaction-modal__icon'>{icon}</span> {title}</h3>
- <p>{actionDescription} <FormattedMessage id='interaction_modal.preamble' defaultMessage="Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one." /></p>
+ <p>{actionDescription} <strong><FormattedMessage id='interaction_modal.sign_in' defaultMessage='You are not logged in to this server. Where is your account hosted?' /></strong></p>
</div>
- <div className='interaction-modal__choices'>
- <div className='interaction-modal__choices__choice'>
- <h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
- <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
- {signupButton}
- </div>
+ <IntlLoginForm resourceUrl={url} />
- <div className='interaction-modal__choices__choice'>
- <h3><FormattedMessage id='interaction_modal.on_another_server' defaultMessage='On a different server' /></h3>
- <p><FormattedMessage id='interaction_modal.other_server_instructions' defaultMessage='Copy and paste this URL into the search field of your favorite Mastodon app or the web interface of your Mastodon server.' /></p>
- <Copypaste value={url} />
- </div>
- </div>
+ <p className='hint'><FormattedMessage id='interaction_modal.sign_in_hint' defaultMessage="Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)" /></p>
+ <p><FormattedMessage id='interaction_modal.no_account_yet' defaultMessage='Not on Mastodon?' /> {signupButton}</p>
</div>
);
}
M => +3 -3
@@ 93,7 93,7 @@ class Footer extends ImmutablePureComponent {
modalProps: {
type: 'reply',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
url: status.get('uri'),
},
}));
}
@@ 115,7 115,7 @@ class Footer extends ImmutablePureComponent {
modalProps: {
type: 'favourite',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
url: status.get('uri'),
},
}));
}
@@ 144,7 144,7 @@ class Footer extends ImmutablePureComponent {
modalProps: {
type: 'reblog',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
url: status.get('uri'),
},
}));
}
A => +232 -0
@@ 0,0 1,232 @@
import PropTypes from 'prop-types';
import { defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { initBoostModal } from 'flavours/glitch/actions/boosts';
import { replyCompose } from 'flavours/glitch/actions/compose';
import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions';
import { openModal } from 'flavours/glitch/actions/modal';
import { IconButton } from 'flavours/glitch/components/icon_button';
import { me, boostModal } from 'flavours/glitch/initial_state';
import { makeGetStatus } from 'flavours/glitch/selectors';
const messages = defineMessages({
reply: { id: 'status.reply', defaultMessage: 'Reply' },
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
open: { id: 'status.open', defaultMessage: 'Expand this status' },
});
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const mapStateToProps = (state, { statusId }) => ({
status: getStatus(state, { id: statusId }),
askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
showReplyCount: state.getIn(['local_settings', 'show_reply_count']),
});
return mapStateToProps;
};
class Footer extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object,
identity: PropTypes.object,
};
static propTypes = {
statusId: PropTypes.string.isRequired,
status: ImmutablePropTypes.map.isRequired,
intl: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
askReplyConfirmation: PropTypes.bool,
showReplyCount: PropTypes.bool,
withOpenButton: PropTypes.bool,
onClose: PropTypes.func,
};
_performReply = () => {
const { dispatch, status, onClose } = this.props;
const { router } = this.context;
if (onClose) {
onClose(true);
}
dispatch(replyCompose(status, router.history));
};
handleReplyClick = () => {
const { dispatch, askReplyConfirmation, status, intl } = this.props;
const { signedIn } = this.context.identity;
if (signedIn) {
if (askReplyConfirmation) {
dispatch(openModal({
modalType: 'CONFIRM',
modalProps: {
message: intl.formatMessage(messages.replyMessage),
confirm: intl.formatMessage(messages.replyConfirm),
onConfirm: this._performReply,
},
}));
} else {
this._performReply();
}
} else {
dispatch(openModal({
modalType: 'INTERACTION',
modalProps: {
type: 'reply',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
},
}));
}
};
handleFavouriteClick = () => {
const { dispatch, status } = this.props;
const { signedIn } = this.context.identity;
if (signedIn) {
if (status.get('favourited')) {
dispatch(unfavourite(status));
} else {
dispatch(favourite(status));
}
} else {
dispatch(openModal({
modalType: 'INTERACTION',
modalProps: {
type: 'favourite',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
},
}));
}
};
_performReblog = (privacy) => {
const { dispatch, status } = this.props;
dispatch(reblog(status, privacy));
};
handleReblogClick = e => {
const { dispatch, status } = this.props;
const { signedIn } = this.context.identity;
if (signedIn) {
if (status.get('reblogged')) {
dispatch(unreblog(status));
} else if ((e && e.shiftKey) || !boostModal) {
this._performReblog();
} else {
dispatch(initBoostModal({ status, onReblog: this._performReblog }));
}
} else {
dispatch(openModal({
modalType: 'INTERACTION',
modalProps: {
type: 'reblog',
accountId: status.getIn(['account', 'id']),
url: status.get('url'),
},
}));
}
};
handleOpenClick = e => {
const { router } = this.context;
if (e.button !== 0 || !router) {
return;
}
const { status, onClose } = this.props;
if (onClose) {
onClose();
}
router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
};
render () {
const { status, intl, showReplyCount, withOpenButton } = this.props;
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'));
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
let replyIcon, replyTitle;
if (status.get('in_reply_to_id', null) === null) {
replyIcon = 'reply';
replyTitle = intl.formatMessage(messages.reply);
} else {
replyIcon = 'reply-all';
replyTitle = intl.formatMessage(messages.replyAll);
}
let reblogTitle = '';
if (status.get('reblogged')) {
reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
} else if (publicStatus) {
reblogTitle = intl.formatMessage(messages.reblog);
} else if (reblogPrivate) {
reblogTitle = intl.formatMessage(messages.reblog_private);
} else {
reblogTitle = intl.formatMessage(messages.cannot_reblog);
}
let replyButton = null;
if (showReplyCount) {
replyButton = (
<IconButton
className='status__action-bar-button'
title={replyTitle}
icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon}
onClick={this.handleReplyClick}
counter={status.get('replies_count')}
obfuscateCount
/>
);
} else {
replyButton = (
<IconButton
className='status__action-bar-button'
title={replyTitle}
icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon}
onClick={this.handleReplyClick}
/>
);
}
return (
<div className='picture-in-picture__footer'>
{replyButton}
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
{withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={status.get('url')} />}
</div>
);
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));
M app/javascript/flavours/glitch/features/status/index.jsx => app/javascript/flavours/glitch/features/status/index.jsx +3 -3
@@ 295,7 295,7 @@ class Status extends ImmutablePureComponent {
modalProps: {
type: 'favourite',
accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ url: status.get('uri'),
},
}));
}
@@ 333,7 333,7 @@ class Status extends ImmutablePureComponent {
modalProps: {
type: 'reply',
accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ url: status.get('uri'),
},
}));
}
@@ 367,7 367,7 @@ class Status extends ImmutablePureComponent {
modalProps: {
type: 'reblog',
accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ url: status.get('uri'),
},
}));
}
A app/javascript/flavours/glitch/features/status/index.jsx.orig => app/javascript/flavours/glitch/features/status/index.jsx.orig +761 -0
@@ 0,0 1,761 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { Helmet } from 'react-helmet';
+
+import Immutable from 'immutable';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+
+import { HotKeys } from 'react-hotkeys';
+
+import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initBoostModal } from 'flavours/glitch/actions/boosts';
+import {
+ replyCompose,
+ mentionCompose,
+ directCompose,
+} from 'flavours/glitch/actions/compose';
+import {
+ favourite,
+ unfavourite,
+ bookmark,
+ unbookmark,
+ reblog,
+ unreblog,
+ pin,
+ unpin,
+} from 'flavours/glitch/actions/interactions';
+import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initReport } from 'flavours/glitch/actions/reports';
+import {
+ fetchStatus,
+ muteStatus,
+ unmuteStatus,
+ deleteStatus,
+ editStatus,
+ hideStatus,
+ revealStatus,
+ translateStatus,
+ undoStatusTranslation,
+} from 'flavours/glitch/actions/statuses';
+import { Icon } from 'flavours/glitch/components/icon';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { textForScreenReader, defaultMediaVisibility } from 'flavours/glitch/components/status';
+import ScrollContainer from 'flavours/glitch/containers/scroll_container';
+import StatusContainer from 'flavours/glitch/containers/status_container';
+import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import Column from 'flavours/glitch/features/ui/components/column';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
+import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
+
+import ColumnHeader from '../../components/column_header';
+import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
+
+import ActionBar from './components/action_bar';
+import DetailedStatus from './components/detailed_status';
+
+const messages = defineMessages({
+ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
+ deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
+ redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
+ redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.' },
+ revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
+ hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
+ statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' },
+ detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
+ replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+ replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+ tootHeading: { id: 'account.posts_with_replies', defaultMessage: 'Posts and replies' },
+});
+
+const makeMapStateToProps = () => {
+ const getStatus = makeGetStatus();
+ const getPictureInPicture = makeGetPictureInPicture();
+
+ const getAncestorsIds = createSelector([
+ (_, { id }) => id,
+ state => state.getIn(['contexts', 'inReplyTos']),
+ ], (statusId, inReplyTos) => {
+ let ancestorsIds = Immutable.List();
+ ancestorsIds = ancestorsIds.withMutations(mutable => {
+ let id = statusId;
+
+ while (id && !mutable.includes(id)) {
+ mutable.unshift(id);
+ id = inReplyTos.get(id);
+ }
+ });
+
+ return ancestorsIds;
+ });
+
+ const getDescendantsIds = createSelector([
+ (_, { id }) => id,
+ state => state.getIn(['contexts', 'replies']),
+ state => state.get('statuses'),
+ ], (statusId, contextReplies, statuses) => {
+ let descendantsIds = [];
+ const ids = [statusId];
+
+ while (ids.length > 0) {
+ let id = ids.pop();
+ const replies = contextReplies.get(id);
+
+ if (statusId !== id) {
+ descendantsIds.push(id);
+ }
+
+ if (replies) {
+ replies.reverse().forEach(reply => {
+ if (!ids.includes(reply) && !descendantsIds.includes(reply) && statusId !== reply) ids.push(reply);
+ });
+ }
+ }
+
+ let insertAt = descendantsIds.findIndex((id) => statuses.get(id).get('in_reply_to_account_id') !== statuses.get(id).get('account'));
+ if (insertAt !== -1) {
+ descendantsIds.forEach((id, idx) => {
+ if (idx > insertAt && statuses.get(id).get('in_reply_to_account_id') === statuses.get(id).get('account')) {
+ descendantsIds.splice(idx, 1);
+ descendantsIds.splice(insertAt, 0, id);
+ insertAt += 1;
+ }
+ });
+ }
+
+ return Immutable.List(descendantsIds);
+ });
+
+ const mapStateToProps = (state, props) => {
+ const status = getStatus(state, { id: props.params.statusId });
+
+ let ancestorsIds = Immutable.List();
+ let descendantsIds = Immutable.List();
+
+ if (status) {
+ ancestorsIds = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
+ descendantsIds = getDescendantsIds(state, { id: status.get('id') });
+ }
+
+ return {
+ isLoading: state.getIn(['statuses', props.params.statusId, 'isLoading']),
+ status,
+ ancestorsIds,
+ descendantsIds,
+ settings: state.get('local_settings'),
+ askReplyConfirmation: state.getIn(['local_settings', 'confirm_before_clearing_draft']) && state.getIn(['compose', 'text']).trim().length !== 0,
+ domain: state.getIn(['meta', 'domain']),
+ pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }),
+ };
+ };
+
+ return mapStateToProps;
+};
+
+const truncate = (str, num) => {
+ const arr = Array.from(str);
+ if (arr.length > num) {
+ return arr.slice(0, num).join('') + '…';
+ } else {
+ return str;
+ }
+};
+
+const titleFromStatus = (intl, status) => {
+ const displayName = status.getIn(['account', 'display_name']);
+ const username = status.getIn(['account', 'username']);
+ const user = displayName.trim().length === 0 ? username : displayName;
+ const text = status.get('search_index');
+ const attachmentCount = status.get('media_attachments').size;
+
+ return text ? `${user}: "${truncate(text, 30)}"` : intl.formatMessage(messages.statusTitleWithAttachments, { user, attachmentCount });
+};
+
+class Status extends ImmutablePureComponent {
+
+ static contextTypes = {
+ router: PropTypes.object,
+ identity: PropTypes.object,
+ };
+
+ static propTypes = {
+ params: PropTypes.object.isRequired,
+ dispatch: PropTypes.func.isRequired,
+ status: ImmutablePropTypes.map,
+ isLoading: PropTypes.bool,
+ settings: ImmutablePropTypes.map.isRequired,
+ ancestorsIds: ImmutablePropTypes.list.isRequired,
+ descendantsIds: ImmutablePropTypes.list.isRequired,
+ intl: PropTypes.object.isRequired,
+ askReplyConfirmation: PropTypes.bool,
+ multiColumn: PropTypes.bool,
+ domain: PropTypes.string.isRequired,
+ pictureInPicture: ImmutablePropTypes.contains({
+ inUse: PropTypes.bool,
+ available: PropTypes.bool,
+ }),
+ };
+
+ state = {
+ fullscreen: false,
+ isExpanded: undefined,
+ threadExpanded: undefined,
+ statusId: undefined,
+ loadedStatusId: undefined,
+ showMedia: undefined,
+ revealBehindCW: undefined,
+ };
+
+ componentDidMount () {
+ attachFullscreenListener(this.onFullScreenChange);
+ this.props.dispatch(fetchStatus(this.props.params.statusId));
+ }
+
+ static getDerivedStateFromProps(props, state) {
+ let update = {};
+ let updated = false;
+
+ if (props.params.statusId && state.statusId !== props.params.statusId) {
+ props.dispatch(fetchStatus(props.params.statusId));
+ update.threadExpanded = undefined;
+ update.statusId = props.params.statusId;
+ updated = true;
+ }
+
+ const revealBehindCW = props.settings.getIn(['media', 'reveal_behind_cw']);
+ if (revealBehindCW !== state.revealBehindCW) {
+ update.revealBehindCW = revealBehindCW;
+ if (revealBehindCW) update.showMedia = defaultMediaVisibility(props.status, props.settings);
+ updated = true;
+ }
+
+ if (props.status && state.loadedStatusId !== props.status.get('id')) {
+ update.showMedia = defaultMediaVisibility(props.status, props.settings);
+ update.loadedStatusId = props.status.get('id');
+ update.isExpanded = autoUnfoldCW(props.settings, props.status);
+ updated = true;
+ }
+
+ return updated ? update : null;
+ }
+
+ handleToggleHidden = () => {
+ const { status } = this.props;
+
+ if (this.props.settings.getIn(['content_warnings', 'shared_state'])) {
+ if (status.get('hidden')) {
+ this.props.dispatch(revealStatus(status.get('id')));
+ } else {
+ this.props.dispatch(hideStatus(status.get('id')));
+ }
+ } else if (this.props.status.get('spoiler_text')) {
+ this.setExpansion(!this.state.isExpanded);
+ }
+ };
+
+ handleToggleMediaVisibility = () => {
+ this.setState({ showMedia: !this.state.showMedia });
+ };
+
+ handleModalFavourite = (status) => {
+ this.props.dispatch(favourite(status));
+ };
+
+ handleFavouriteClick = (status, e) => {
+ const { dispatch } = this.props;
+ const { signedIn } = this.context.identity;
+
+ if (signedIn) {
+ if (status.get('favourited')) {
+ dispatch(unfavourite(status));
+ } else {
+ if ((e && e.shiftKey) || !favouriteModal) {
+ this.handleModalFavourite(status);
+ } else {
+ dispatch(openModal({
+ modalType: 'FAVOURITE',
+ modalProps: {
+ status,
+ onFavourite: this.handleModalFavourite,
+ },
+ }));
+ }
+ }
+ } else {
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'favourite',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
+ }));
+ }
+ };
+
+ handlePin = (status) => {
+ if (status.get('pinned')) {
+ this.props.dispatch(unpin(status));
+ } else {
+ this.props.dispatch(pin(status));
+ }
+ };
+
+ handleReplyClick = (status) => {
+ const { askReplyConfirmation, dispatch, intl } = this.props;
+ const { signedIn } = this.context.identity;
+
+ if (signedIn) {
+ if (askReplyConfirmation) {
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onDoNotAsk: () => dispatch(changeLocalSetting(['confirm_before_clearing_draft'], false)),
+ onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
+ },
+ }));
+ } else {
+ dispatch(replyCompose(status, this.context.router.history));
+ }
+ } else {
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reply',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
+ }));
+ }
+ };
+
+ handleModalReblog = (status, privacy) => {
+ const { dispatch } = this.props;
+
+ if (status.get('reblogged')) {
+ dispatch(unreblog(status));
+ } else {
+ dispatch(reblog(status, privacy));
+ }
+ };
+
+ handleReblogClick = (status, e) => {
+ const { settings, dispatch } = this.props;
+ const { signedIn } = this.context.identity;
+
+ if (signedIn) {
+ if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
+ dispatch(initBoostModal({ status, onReblog: this.handleModalReblog, missingMediaDescription: true }));
+ } else if ((e && e.shiftKey) || !boostModal) {
+ this.handleModalReblog(status);
+ } else {
+ dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+ }
+ } else {
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reblog',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
+ }));
+ }
+ };
+
+ handleBookmarkClick = (status) => {
+ if (status.get('bookmarked')) {
+ this.props.dispatch(unbookmark(status));
+ } else {
+ this.props.dispatch(bookmark(status));
+ }
+ };
+
+ handleDeleteClick = (status, history, withRedraft = false) => {
+ const { dispatch, intl } = this.props;
+
+ if (!deleteModal) {
+ dispatch(deleteStatus(status.get('id'), history, withRedraft));
+ } else {
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+ confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ },
+ }));
+ }
+ };
+
+ handleEditClick = (status, history) => {
+ this.props.dispatch(editStatus(status.get('id'), history));
+ };
+
+ handleDirectClick = (account, router) => {
+ this.props.dispatch(directCompose(account, router));
+ };
+
+ handleMentionClick = (account, router) => {
+ this.props.dispatch(mentionCompose(account, router));
+ };
+
+ handleOpenMedia = (media, index, lang) => {
+ this.props.dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { statusId: this.props.status.get('id'), media, index, lang },
+ }));
+ };
+
+ handleOpenVideo = (media, lang, options) => {
+ this.props.dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { statusId: this.props.status.get('id'), media, lang, options },
+ }));
+ };
+
+ handleHotkeyOpenMedia = e => {
+ const { status } = this.props;
+
+ e.preventDefault();
+
+ if (status.get('media_attachments').size > 0) {
+ if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+ this.handleOpenVideo(status.getIn(['media_attachments', 0]), { startTime: 0 });
+ } else {
+ this.handleOpenMedia(status.get('media_attachments'), 0);
+ }
+ }
+ };
+
+ handleMuteClick = (account) => {
+ this.props.dispatch(initMuteModal(account));
+ };
+
+ handleConversationMuteClick = (status) => {
+ if (status.get('muted')) {
+ this.props.dispatch(unmuteStatus(status.get('id')));
+ } else {
+ this.props.dispatch(muteStatus(status.get('id')));
+ }
+ };
+
+ handleToggleAll = () => {
+ const { status, ancestorsIds, descendantsIds, settings } = this.props;
+ const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
+ let { isExpanded } = this.state;
+
+ if (settings.getIn(['content_warnings', 'shared_state']))
+ isExpanded = !status.get('hidden');
+
+ if (!isExpanded) {
+ this.props.dispatch(revealStatus(statusIds));
+ } else {
+ this.props.dispatch(hideStatus(statusIds));
+ }
+
+ this.setState({ isExpanded: !isExpanded, threadExpanded: !isExpanded });
+ };
+
+ handleTranslate = status => {
+ const { dispatch } = this.props;
+
+ if (status.get('translation')) {
+ dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
+ } else {
+ dispatch(translateStatus(status.get('id')));
+ }
+ };
+
+ handleBlockClick = (status) => {
+ const { dispatch } = this.props;
+ const account = status.get('account');
+ dispatch(initBlockModal(account));
+ };
+
+ handleReport = (status) => {
+ this.props.dispatch(initReport(status.get('account'), status));
+ };
+
+ handleEmbed = (status) => {
+ this.props.dispatch(openModal({
+ modalType: 'EMBED',
+ modalProps: { id: status.get('id') },
+ }));
+ };
+
+ handleHotkeyToggleSensitive = () => {
+ this.handleToggleMediaVisibility();
+ };
+
+ handleHotkeyMoveUp = () => {
+ this.handleMoveUp(this.props.status.get('id'));
+ };
+
+ handleHotkeyMoveDown = () => {
+ this.handleMoveDown(this.props.status.get('id'));
+ };
+
+ handleHotkeyReply = e => {
+ e.preventDefault();
+ this.handleReplyClick(this.props.status);
+ };
+
+ handleHotkeyFavourite = () => {
+ this.handleFavouriteClick(this.props.status);
+ };
+
+ handleHotkeyBoost = () => {
+ this.handleReblogClick(this.props.status);
+ };
+
+ handleHotkeyBookmark = () => {
+ this.handleBookmarkClick(this.props.status);
+ };
+
+ handleHotkeyMention = e => {
+ e.preventDefault();
+ this.handleMentionClick(this.props.status);
+ };
+
+ handleHotkeyOpenProfile = () => {
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
+ };
+
+ handleMoveUp = id => {
+ const { status, ancestorsIds, descendantsIds } = this.props;
+
+ if (id === status.get('id')) {
+ this._selectChild(ancestorsIds.size - 1, true);
+ } else {
+ let index = ancestorsIds.indexOf(id);
+
+ if (index === -1) {
+ index = descendantsIds.indexOf(id);
+ this._selectChild(ancestorsIds.size + index, true);
+ } else {
+ this._selectChild(index - 1, true);
+ }
+ }
+ };
+
+ handleMoveDown = id => {
+ const { status, ancestorsIds, descendantsIds } = this.props;
+
+ if (id === status.get('id')) {
+ this._selectChild(ancestorsIds.size + 1, false);
+ } else {
+ let index = ancestorsIds.indexOf(id);
+
+ if (index === -1) {
+ index = descendantsIds.indexOf(id);
+ this._selectChild(ancestorsIds.size + index + 2, false);
+ } else {
+ this._selectChild(index + 1, false);
+ }
+ }
+ };
+
+ _selectChild (index, align_top) {
+ const container = this.node;
+ const element = container.querySelectorAll('.focusable')[index];
+
+ if (element) {
+ if (align_top && container.scrollTop > element.offsetTop) {
+ element.scrollIntoView(true);
+ } else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
+ element.scrollIntoView(false);
+ }
+ element.focus();
+ }
+ }
+
+ handleHeaderClick = () => {
+ this.column.scrollTop();
+ };
+
+ renderChildren (list, ancestors) {
+ const { params: { statusId } } = this.props;
+
+ return list.map((id, i) => (
+ <StatusContainer
+ key={id}
+ id={id}
+ expanded={this.state.threadExpanded}
+ onMoveUp={this.handleMoveUp}
+ onMoveDown={this.handleMoveDown}
+ contextType='thread'
+ previousId={i > 0 && list.get(i - 1)}
+ nextId={list.get(i + 1) || (ancestors && statusId)}
+ rootId={statusId}
+ />
+ ));
+ }
+
+ setExpansion = value => {
+ this.setState({ isExpanded: value });
+ };
+
+ setRef = c => {
+ this.node = c;
+ };
+
+ setColumnRef = c => {
+ this.column = c;
+ };
+
+ componentDidUpdate (prevProps) {
+ const { status, ancestorsIds, multiColumn } = this.props;
+
+ if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) {
+ window.requestAnimationFrame(() => {
+ this.node?.querySelector('.detailed-status__wrapper')?.scrollIntoView(true);
+
+ // In the single-column interface, `scrollIntoView` will put the post behind the header,
+ // so compensate for that.
+ if (!multiColumn) {
+ const offset = document.querySelector('.column-header__wrapper')?.getBoundingClientRect()?.bottom;
+ if (offset) {
+ const scrollingElement = document.scrollingElement || document.body;
+ scrollingElement.scrollBy(0, -offset);
+ }
+ }
+ });
+ }
+ }
+
+ componentWillUnmount () {
+ detachFullscreenListener(this.onFullScreenChange);
+ }
+
+ onFullScreenChange = () => {
+ this.setState({ fullscreen: isFullscreen() });
+ };
+
+ render () {
+ let ancestors, descendants;
+ const { isLoading, status, settings, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
+ const { fullscreen } = this.state;
+
+ if (isLoading) {
+ return (
+ <Column>
+ <LoadingIndicator />
+ </Column>
+ );
+ }
+
+ if (status === null) {
+ return (
+ <BundleColumnError multiColumn={multiColumn} errorType='routing' />
+ );
+ }
+
+ const isExpanded = settings.getIn(['content_warnings', 'shared_state']) ? !status.get('hidden') : this.state.isExpanded;
+
+ if (ancestorsIds && ancestorsIds.size > 0) {
+ ancestors = <>{this.renderChildren(ancestorsIds, true)}</>;
+ }
+
+ if (descendantsIds && descendantsIds.size > 0) {
+ descendants = <>{this.renderChildren(descendantsIds)}</>;
+ }
+
+ const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1;
+ const isIndexable = !status.getIn(['account', 'noindex']);
+
+ const handlers = {
+ moveUp: this.handleHotkeyMoveUp,
+ moveDown: this.handleHotkeyMoveDown,
+ reply: this.handleHotkeyReply,
+ favourite: this.handleHotkeyFavourite,
+ boost: this.handleHotkeyBoost,
+ bookmark: this.handleHotkeyBookmark,
+ mention: this.handleHotkeyMention,
+ openProfile: this.handleHotkeyOpenProfile,
+ toggleSpoiler: this.handleToggleHidden,
+ toggleSensitive: this.handleHotkeyToggleSensitive,
+ openMedia: this.handleHotkeyOpenMedia,
+ };
+
+ return (
+ <Column bindToDocument={!multiColumn} ref={this.setColumnRef} label={intl.formatMessage(messages.detailedStatus)}>
+ <ColumnHeader
+ icon='comment'
+ title={intl.formatMessage(messages.tootHeading)}
+ onClick={this.handleHeaderClick}
+ showBackButton
+ multiColumn={multiColumn}
+ extraButton={(
+ <button type='button' className='column-header__button' title={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} aria-label={intl.formatMessage(!isExpanded ? messages.revealAll : messages.hideAll)} onClick={this.handleToggleAll}><Icon id={!isExpanded ? 'eye-slash' : 'eye'} /></button>
+ )}
+ />
+
+ <ScrollContainer scrollKey='thread'>
+ <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
+ {ancestors}
+
+ <HotKeys handlers={handlers}>
+ <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader(intl, status, false, isExpanded)}>
+ <DetailedStatus
+ key={`details-${status.get('id')}`}
+ status={status}
+ settings={settings}
+ onOpenVideo={this.handleOpenVideo}
+ onOpenMedia={this.handleOpenMedia}
+ expanded={isExpanded}
+ onToggleHidden={this.handleToggleHidden}
+ onTranslate={this.handleTranslate}
+ domain={domain}
+ showMedia={this.state.showMedia}
+ onToggleMediaVisibility={this.handleToggleMediaVisibility}
+ pictureInPicture={pictureInPicture}
+ />
+
+ <ActionBar
+ key={`action-bar-${status.get('id')}`}
+ status={status}
+ onReply={this.handleReplyClick}
+ onFavourite={this.handleFavouriteClick}
+ onReblog={this.handleReblogClick}
+ onBookmark={this.handleBookmarkClick}
+ onDelete={this.handleDeleteClick}
+ onEdit={this.handleEditClick}
+ onDirect={this.handleDirectClick}
+ onMention={this.handleMentionClick}
+ onMute={this.handleMuteClick}
+ onMuteConversation={this.handleConversationMuteClick}
+ onBlock={this.handleBlockClick}
+ onReport={this.handleReport}
+ onPin={this.handlePin}
+ onEmbed={this.handleEmbed}
+ />
+ </div>
+ </HotKeys>
+
+ {descendants}
+ </div>
+ </ScrollContainer>
+
+ <Helmet>
+ <title>{titleFromStatus(intl, status)}</title>
+ <meta name='robots' content={(isLocal && isIndexable) ? 'all' : 'noindex'} />
+ <link rel='canonical' href={status.get('url')} />
+ </Helmet>
+ </Column>
+ );
+ }
+
+}
+
+export default injectIntl(connect(makeMapStateToProps)(Status));
M app/javascript/flavours/glitch/styles/components/modal.scss => app/javascript/flavours/glitch/styles/components/modal.scss +74 -37
@@ 1306,13 1306,13 @@ img.modal-warning {
.interaction-modal {
max-width: 90vw;
width: 600px;
- background: $ui-base-color;
+ background: var(--modal-background-color);
+ border: 1px solid var(--modal-border-color);
border-radius: 8px;
- overflow-x: hidden;
- overflow-y: auto;
+ overflow: visible;
position: relative;
display: block;
- padding: 20px;
+ padding: 40px;
h3 {
font-size: 22px;
@@ 1321,64 1321,101 @@ img.modal-warning {
text-align: center;
}
+ p {
+ font-size: 17px;
+ line-height: 22px;
+ color: $darker-text-color;
+
+ strong {
+ color: $primary-text-color;
+ font-weight: 700;
+ }
+ }
+
+ p.hint {
+ margin-bottom: 14px;
+ font-size: 14px;
+ }
+
&__icon {
color: $highlight-text-color;
margin: 0 5px;
}
&__lead {
- padding: 20px;
- text-align: center;
+ margin-bottom: 20px;
h3 {
margin-bottom: 15px;
}
-
- p {
- font-size: 17px;
- line-height: 22px;
- color: $darker-text-color;
- }
}
- &__choices {
- display: flex;
+ &__login {
+ position: relative;
+ margin-bottom: 20px;
- &__choice {
- flex: 0 0 auto;
- width: 50%;
- box-sizing: border-box;
- padding: 20px;
+ &__input {
+ @include search-input;
- h3 {
- margin-bottom: 20px;
- }
+ border: 1px solid lighten($ui-base-color, 8%);
+ padding: 4px 6px;
+ color: $primary-text-color;
+ font-size: 16px;
+ line-height: 18px;
+ display: flex;
+ align-items: center;
- p {
- color: $darker-text-color;
- margin-bottom: 20px;
- }
+ input {
+ background: transparent;
+ color: inherit;
+ font: inherit;
+ border: 0;
+ padding: 15px - 4px 15px - 6px;
+ flex: 1 1 auto;
- .button {
- margin-bottom: 10px;
+ &::placeholder {
+ color: lighten($darker-text-color, 4%);
+ }
- &:last-child {
- margin-bottom: 0;
+ &:focus {
+ outline: 0;
}
}
+
+ .button {
+ flex: 0 0 auto;
+ }
+ }
+
+ .search__popout {
+ margin-top: -1px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border: 1px solid lighten($ui-base-color, 8%);
+ }
+
+ &.focused &__input {
+ border-color: $highlight-text-color;
+ background: lighten($ui-base-color, 4%);
}
- }
- @media screen and (max-width: $no-gap-breakpoint - 1px) {
- &__choices {
+ &.invalid &__input {
+ border-color: $error-red;
+ }
+
+ &.expanded .search__popout {
display: block;
+ }
- &__choice {
- width: auto;
- margin-bottom: 20px;
- }
+ &.expanded &__input {
+ border-radius: 4px 4px 0 0;
}
}
+
+ .link-button {
+ font-size: inherit;
+ display: inline;
+ }
}
.copypaste {
A app/javascript/flavours/glitch/styles/components/modal.scss.orig => app/javascript/flavours/glitch/styles/components/modal.scss.orig +1425 -0
@@ 0,0 1,1425 @@
+.modal-container--preloader {
+ background: lighten($ui-base-color, 8%);
+}
+
+.modal-root {
+ position: relative;
+ z-index: 9999;
+}
+
+.modal-root__overlay {
+ position: fixed;
+ top: 0;
+ inset-inline-start: 0;
+ inset-inline-end: 0;
+ bottom: 0;
+ background: rgba($base-overlay-background, 0.7);
+ transition: background 0.5s;
+}
+
+.modal-root__container {
+ position: fixed;
+ top: 0;
+ inset-inline-start: 0;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ align-content: space-around;
+ z-index: 9999;
+ pointer-events: none;
+ user-select: none;
+}
+
+.modal-root__modal {
+ pointer-events: auto;
+ display: flex;
+}
+
+.media-modal__zoom-button {
+ position: absolute;
+ inset-inline-end: 64px;
+ top: 8px;
+ z-index: 100;
+ pointer-events: auto;
+ transition: opacity 0.3s linear;
+ will-change: opacity;
+}
+
+.media-modal__zoom-button--hidden {
+ pointer-events: none;
+ opacity: 0;
+}
+
+.onboarding-modal,
+.error-modal,
+.embed-modal {
+ background: $ui-secondary-color;
+ color: $inverted-text-color;
+ border-radius: 8px;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+}
+
+.onboarding-modal__pager {
+ height: 80vh;
+ width: 80vw;
+ max-width: 520px;
+ max-height: 470px;
+
+ .react-swipeable-view-container > div {
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ display: flex;
+ user-select: text;
+ }
+}
+
+.error-modal__body {
+ height: 80vh;
+ width: 80vw;
+ max-width: 520px;
+ max-height: 420px;
+ position: relative;
+
+ & > div {
+ position: absolute;
+ top: 0;
+ inset-inline-start: 0;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 25px;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ display: flex;
+ opacity: 0;
+ user-select: text;
+ }
+}
+
+.error-modal__body {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+}
+
+@media screen and (width <= 550px) {
+ .onboarding-modal {
+ width: 100%;
+ height: 100%;
+ border-radius: 0;
+ }
+
+ .onboarding-modal__pager {
+ width: 100%;
+ height: auto;
+ max-width: none;
+ max-height: none;
+ flex: 1 1 auto;
+ }
+}
+
+.onboarding-modal__paginator,
+.error-modal__footer {
+ flex: 0 0 auto;
+ background: darken($ui-secondary-color, 8%);
+ display: flex;
+ padding: 25px;
+
+ & > div {
+ min-width: 33px;
+ }
+
+ .onboarding-modal__nav,
+ .error-modal__nav {
+ color: $lighter-text-color;
+ border: 0;
+ font-size: 14px;
+ font-weight: 500;
+ padding: 10px 25px;
+ line-height: inherit;
+ height: auto;
+ margin: -10px;
+ border-radius: 4px;
+ background-color: transparent;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: darken($lighter-text-color, 4%);
+ background-color: darken($ui-secondary-color, 16%);
+ }
+
+ &.onboarding-modal__done,
+ &.onboarding-modal__next {
+ color: $inverted-text-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: lighten($inverted-text-color, 4%);
+ }
+ }
+ }
+}
+
+.error-modal__footer {
+ justify-content: center;
+}
+
+.onboarding-modal__dots {
+ flex: 1 1 auto;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.onboarding-modal__dot {
+ width: 14px;
+ height: 14px;
+ border-radius: 14px;
+ background: darken($ui-secondary-color, 16%);
+ margin: 0 3px;
+ cursor: pointer;
+
+ &:hover {
+ background: darken($ui-secondary-color, 18%);
+ }
+
+ &.active {
+ cursor: default;
+ background: darken($ui-secondary-color, 24%);
+ }
+}
+
+.onboarding-modal__page__wrapper {
+ pointer-events: none;
+ padding: 25px;
+ padding-bottom: 0;
+
+ &.onboarding-modal__page__wrapper--active {
+ pointer-events: auto;
+ }
+}
+
+.onboarding-modal__page {
+ cursor: default;
+ line-height: 21px;
+
+ h1 {
+ font-size: 18px;
+ font-weight: 500;
+ color: $inverted-text-color;
+ margin-bottom: 20px;
+ }
+
+ a {
+ color: $highlight-text-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: lighten($highlight-text-color, 4%);
+ }
+ }
+
+ .navigation-bar a {
+ color: inherit;
+ }
+
+ p {
+ font-size: 16px;
+ color: $lighter-text-color;
+ margin-top: 10px;
+ margin-bottom: 10px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ strong {
+ font-weight: 500;
+ background: $ui-base-color;
+ color: $secondary-text-color;
+ border-radius: 4px;
+ font-size: 14px;
+ padding: 3px 6px;
+
+ @each $lang in $cjk-langs {
+ &:lang(#{$lang}) {
+ font-weight: 700;
+ }
+ }
+ }
+ }
+}
+
+.onboarding-modal__page__wrapper-0 {
+ background: url('~images/elephant_ui_greeting.svg') no-repeat left bottom /
+ auto 250px;
+ height: 100%;
+ padding: 0;
+}
+
+.onboarding-modal__page-one {
+ &__lead {
+ padding: 65px;
+ padding-top: 45px;
+ padding-bottom: 0;
+ margin-bottom: 10px;
+
+ h1 {
+ font-size: 26px;
+ line-height: 36px;
+ margin-bottom: 8px;
+ }
+
+ p {
+ margin-bottom: 0;
+ }
+ }
+
+ &__extra {
+ padding-inline-end: 65px;
+ padding-inline-start: 185px;
+ text-align: center;
+ }
+}
+
+.display-case {
+ text-align: center;
+ font-size: 15px;
+ margin-bottom: 15px;
+
+ &__label {
+ font-weight: 500;
+ color: $inverted-text-color;
+ margin-bottom: 5px;
+ text-transform: uppercase;
+ font-size: 12px;
+ }
+
+ &__case {
+ background: $ui-base-color;
+ color: $secondary-text-color;
+ font-weight: 500;
+ padding: 10px;
+ border-radius: 4px;
+ }
+}
+
+.onboarding-modal__page-two,
+.onboarding-modal__page-three,
+.onboarding-modal__page-four,
+.onboarding-modal__page-five {
+ p {
+ text-align: start;
+ }
+
+ .figure {
+ background: darken($ui-base-color, 8%);
+ color: $secondary-text-color;
+ margin-bottom: 20px;
+ border-radius: 4px;
+ padding: 10px;
+ text-align: center;
+ font-size: 14px;
+ box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.3);
+
+ .onboarding-modal__image {
+ border-radius: 4px;
+ margin-bottom: 10px;
+ }
+
+ &.non-interactive {
+ pointer-events: none;
+ text-align: start;
+ }
+ }
+}
+
+.onboarding-modal__page-four__columns {
+ .row {
+ display: flex;
+ margin-bottom: 20px;
+
+ & > div {
+ flex: 1 1 0;
+ margin: 0 10px;
+
+ &:first-child {
+ margin-inline-start: 0;
+ }
+
+ &:last-child {
+ margin-inline-end: 0;
+ }
+
+ p {
+ text-align: center;
+ }
+ }
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+
+ .column-header {
+ color: $primary-text-color;
+ }
+}
+
+@media screen and (width <= 320px) and (height <= 600px) {
+ .onboarding-modal__page p {
+ font-size: 14px;
+ line-height: 20px;
+ }
+
+ .onboarding-modal__page-two .figure,
+ .onboarding-modal__page-three .figure,
+ .onboarding-modal__page-four .figure,
+ .onboarding-modal__page-five .figure {
+ font-size: 12px;
+ margin-bottom: 10px;
+ }
+
+ .onboarding-modal__page-four__columns .row {
+ margin-bottom: 10px;
+ }
+
+ .onboarding-modal__page-four__columns .column-header {
+ padding: 5px;
+ font-size: 12px;
+ }
+}
+
+.onboard-sliders {
+ display: inline-block;
+ max-width: 30px;
+ max-height: auto;
+ margin-inline-start: 10px;
+}
+
+.doodle-modal,
+.boost-modal,
+.confirmation-modal,
+.report-modal,
+.actions-modal,
+.mute-modal,
+.block-modal,
+.compare-history-modal {
+ background: lighten($ui-secondary-color, 8%);
+ color: $inverted-text-color;
+ border-radius: 8px;
+ overflow: hidden;
+ max-width: 90vw;
+ width: 480px;
+ position: relative;
+ flex-direction: column;
+
+ .status__relative-time {
+ color: $dark-text-color;
+ float: right;
+ font-size: 14px;
+ width: auto;
+ margin: initial;
+ padding: initial;
+ }
+
+ .status__visibility-icon {
+ color: $dark-text-color;
+ font-size: 14px;
+ padding: 0 4px;
+ }
+
+ .status__display-name {
+ display: flex;
+ }
+
+ .status__avatar {
+ height: 48px;
+ width: 48px;
+ }
+
+ .status__content__spoiler-link {
+ color: lighten($secondary-text-color, 8%);
+ }
+}
+
+.boost-modal .status-direct {
+ background-color: inherit;
+}
+
+.actions-modal {
+ .status {
+ background: $white;
+ border-bottom-color: $ui-secondary-color;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ }
+
+ .dropdown-menu__separator {
+ border-bottom-color: $ui-secondary-color;
+ }
+}
+
+.boost-modal__container {
+ overflow-x: scroll;
+ padding: 10px;
+
+ .status {
+ user-select: text;
+ border-bottom: 0;
+ }
+}
+
+.doodle-modal__action-bar,
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.block-modal__action-bar {
+ display: flex;
+ justify-content: space-between;
+ background: $ui-secondary-color;
+ padding: 10px;
+ line-height: 36px;
+
+ & > div {
+ flex: 1 1 auto;
+ text-align: end;
+ color: $lighter-text-color;
+ padding-inline-end: 10px;
+ }
+
+ .button {
+ flex: 0 0 auto;
+ }
+}
+
+.boost-modal__status-header {
+ font-size: 15px;
+}
+
+.boost-modal__status-time {
+ float: right;
+ font-size: 14px;
+}
+
+.mute-modal,
+.block-modal {
+ line-height: 24px;
+}
+
+.mute-modal .react-toggle,
+.block-modal .react-toggle {
+ vertical-align: middle;
+}
+
+.report-modal {
+ width: 90vw;
+ max-width: 700px;
+}
+
+.report-dialog-modal {
+ max-width: 90vw;
+ width: 480px;
+ height: 80vh;
+ background: lighten($ui-secondary-color, 8%);
+ color: $inverted-text-color;
+ border-radius: 8px;
+ overflow: hidden;
+ position: relative;
+ flex-direction: column;
+ display: flex;
+
+ &__container {
+ box-sizing: border-box;
+ border-top: 1px solid $ui-secondary-color;
+ padding: 20px;
+ flex-grow: 1;
+ display: flex;
+ flex-direction: column;
+ min-height: 0;
+ overflow: auto;
+ }
+
+ &__title {
+ font-size: 28px;
+ line-height: 33px;
+ font-weight: 700;
+ margin-bottom: 15px;
+
+ @media screen and (height <= 800px) {
+ font-size: 22px;
+ }
+ }
+
+ &__subtitle {
+ font-size: 17px;
+ font-weight: 600;
+ line-height: 22px;
+ margin-bottom: 4px;
+ }
+
+ &__lead {
+ font-size: 17px;
+ line-height: 22px;
+ color: lighten($inverted-text-color, 16%);
+ margin-bottom: 30px;
+
+ a {
+ text-decoration: none;
+ color: $inverted-text-color;
+ font-weight: 500;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
+
+ &__actions {
+ margin-top: 30px;
+ display: flex;
+
+ .button {
+ flex: 1 1 auto;
+ }
+ }
+
+ &__statuses {
+ flex-grow: 1;
+ min-height: 0;
+ overflow: auto;
+ }
+
+ .status__content a {
+ color: $highlight-text-color;
+ }
+
+ .status__content,
+ .status__content p {
+ color: $inverted-text-color;
+ }
+
+ .status__content__spoiler-link {
+ color: $primary-text-color;
+ background: $ui-primary-color;
+
+ &:hover {
+ background: lighten($ui-primary-color, 8%);
+ }
+ }
+
+ .dialog-option .poll__input {
+ border-color: $inverted-text-color;
+ color: $ui-secondary-color;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+
+ svg {
+ width: 8px;
+ height: auto;
+ }
+
+ &:active,
+ &:focus,
+ &:hover {
+ border-color: lighten($inverted-text-color, 15%);
+ border-width: 4px;
+ }
+
+ &.active {
+ border-color: $inverted-text-color;
+ background: $inverted-text-color;
+ }
+ }
+
+ .poll__option.dialog-option {
+ padding: 15px 0;
+ flex: 0 0 auto;
+ border-bottom: 1px solid $ui-secondary-color;
+
+ &:last-child {
+ border-bottom: 0;
+ }
+
+ & > .poll__option__text {
+ font-size: 13px;
+ color: lighten($inverted-text-color, 16%);
+
+ strong {
+ font-size: 17px;
+ font-weight: 500;
+ line-height: 22px;
+ color: $inverted-text-color;
+ display: block;
+ margin-bottom: 4px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
+ }
+
+ .flex-spacer {
+ background: transparent;
+ }
+
+ &__textarea {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ color: $inverted-text-color;
+ background: $simple-background-color;
+ padding: 10px;
+ font-family: inherit;
+ font-size: 17px;
+ line-height: 22px;
+ resize: vertical;
+ border: 0;
+ outline: 0;
+ border-radius: 4px;
+ margin: 20px 0;
+
+ &::placeholder {
+ color: $dark-text-color;
+ }
+
+ &:focus {
+ outline: 0;
+ }
+ }
+
+ &__toggle {
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+
+ & > span {
+ font-size: 17px;
+ font-weight: 500;
+ margin-inline-start: 10px;
+ }
+ }
+
+ .button.button-secondary {
+ border-color: $ui-button-secondary-border-color;
+ color: $ui-button-secondary-color;
+ flex: 0 0 auto;
+
+ &:hover,
+ &:focus,
+ &:active {
+ border-color: $ui-button-secondary-focus-background-color;
+ color: $ui-button-secondary-focus-color;
+ }
+ }
+
+ hr {
+ border: 0;
+ background: transparent;
+ margin: 15px 0;
+ }
+
+ .emoji-mart-search {
+ padding-inline-end: 10px;
+ }
+
+ .emoji-mart-search-icon {
+ inset-inline-end: 10px + 5px;
+ }
+}
+
+.report-modal__container {
+ display: flex;
+ border-top: 1px solid $ui-secondary-color;
+
+ @media screen and (width <= 480px) {
+ flex-wrap: wrap;
+ overflow-y: auto;
+ }
+}
+
+.report-modal__statuses,
+.report-modal__comment {
+ box-sizing: border-box;
+ width: 50%;
+
+ @media screen and (width <= 480px) {
+ width: 100%;
+ }
+}
+
+.report-modal__statuses,
+.focal-point-modal__content {
+ flex: 1 1 auto;
+ min-height: 20vh;
+ max-height: 80vh;
+ overflow-y: auto;
+ overflow-x: hidden;
+
+ .status__content a {
+ color: $highlight-text-color;
+ }
+
+ @media screen and (width <= 480px) {
+ max-height: 10vh;
+ }
+}
+
+.focal-point-modal__content {
+ @media screen and (width <= 480px) {
+ max-height: 40vh;
+ }
+}
+
+.setting-divider {
+ background: transparent;
+ border: 0;
+ margin: 0;
+ width: 100%;
+ height: 1px;
+ margin-bottom: 29px;
+}
+
+.report-modal__comment {
+ padding: 20px;
+ border-inline-end: 1px solid $ui-secondary-color;
+ max-width: 320px;
+
+ p {
+ font-size: 14px;
+ line-height: 20px;
+ margin-bottom: 20px;
+ }
+
+ .setting-text {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ margin: 0;
+ color: $inverted-text-color;
+ background: $white;
+ padding: 10px;
+ font-family: inherit;
+ font-size: 14px;
+ resize: none;
+ outline: 0;
+ border-radius: 4px;
+ border: 1px solid $ui-secondary-color;
+ min-height: 100px;
+ max-height: 50vh;
+ margin-bottom: 10px;
+
+ &:focus {
+ border: 1px solid darken($ui-secondary-color, 8%);
+ }
+
+ &__wrapper {
+ background: $white;
+ border: 1px solid $ui-secondary-color;
+ margin-bottom: 10px;
+ border-radius: 4px;
+
+ .setting-text {
+ border: 0;
+ margin-bottom: 0;
+ border-radius: 0;
+
+ &:focus {
+ border: 0;
+ }
+ }
+
+ &__modifiers {
+ color: $inverted-text-color;
+ font-family: inherit;
+ font-size: 14px;
+ background: $white;
+ }
+ }
+
+ &__toolbar {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ }
+ }
+
+ .setting-text-label {
+ display: block;
+ color: $inverted-text-color;
+ font-size: 14px;
+ font-weight: 500;
+ margin-bottom: 10px;
+ }
+
+ .setting-toggle {
+ margin-top: 20px;
+ margin-bottom: 24px;
+
+ &__label {
+ color: $inverted-text-color;
+ font-size: 14px;
+ }
+ }
+
+ @media screen and (width <= 480px) {
+ padding: 10px;
+ max-width: 100%;
+ order: 2;
+
+ .setting-toggle {
+ margin-bottom: 4px;
+ }
+ }
+}
+
+.actions-modal {
+ .status {
+ overflow-y: auto;
+ max-height: 300px;
+ }
+
+ strong {
+ display: block;
+ font-weight: 500;
+ }
+
+ max-height: 80vh;
+ max-width: 80vw;
+
+ .actions-modal__item-label {
+ font-weight: 500;
+ }
+
+ ul {
+ overflow-y: auto;
+ flex-shrink: 0;
+ max-height: 80vh;
+
+ &.with-status {
+ max-height: calc(80vh - 75px);
+ }
+
+ li:empty {
+ margin: 0;
+ }
+
+ li:not(:empty) {
+ a {
+ color: $inverted-text-color;
+ display: flex;
+ padding: 12px 16px;
+ font-size: 15px;
+ align-items: center;
+ text-decoration: none;
+
+ &,
+ button {
+ transition: none;
+ }
+
+ &.active,
+ &:hover,
+ &:active,
+ &:focus {
+ &,
+ button {
+ background: $ui-highlight-color;
+ color: $primary-text-color;
+ }
+ }
+
+ & > .react-toggle,
+ & > .icon,
+ button:first-child {
+ margin-inline-end: 10px;
+ }
+ }
+ }
+ }
+}
+
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.block-modal__action-bar {
+ .confirmation-modal__secondary-button {
+ flex-shrink: 1;
+ }
+}
+
+.confirmation-modal__secondary-button,
+.confirmation-modal__cancel-button,
+.mute-modal__cancel-button,
+.block-modal__cancel-button {
+ background-color: transparent;
+ color: $lighter-text-color;
+ font-size: 14px;
+ font-weight: 500;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: darken($lighter-text-color, 4%);
+ background-color: transparent;
+ }
+}
+
+.confirmation-modal__do_not_ask_again {
+ padding-inline-start: 20px;
+ padding-inline-end: 20px;
+ padding-bottom: 10px;
+ font-size: 14px;
+
+ label,
+ input {
+ vertical-align: middle;
+ }
+}
+
+.confirmation-modal__container,
+.mute-modal__container,
+.block-modal__container,
+.report-modal__target {
+ padding: 30px;
+ font-size: 16px;
+
+ strong {
+ font-weight: 500;
+
+ @each $lang in $cjk-langs {
+ &:lang(#{$lang}) {
+ font-weight: 700;
+ }
+ }
+ }
+
+ select {
+ appearance: none;
+ box-sizing: border-box;
+ font-size: 14px;
+ color: $inverted-text-color;
+ display: inline-block;
+ width: auto;
+ outline: 0;
+ font-family: inherit;
+ background: $simple-background-color
+ url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
+ no-repeat right 8px center / auto 16px;
+ border: 1px solid darken($simple-background-color, 14%);
+ border-radius: 4px;
+ padding: 6px 10px;
+ padding-inline-end: 30px;
+ }
+}
+
+.confirmation-modal__container,
+.report-modal__target {
+ text-align: center;
+}
+
+.block-modal,
+.mute-modal {
+ &__explanation {
+ margin-top: 20px;
+ }
+
+ .setting-toggle {
+ margin-top: 20px;
+ margin-bottom: 24px;
+ display: flex;
+ align-items: center;
+
+ &__label {
+ color: $inverted-text-color;
+ margin: 0;
+ margin-inline-start: 8px;
+ }
+ }
+}
+
+.report-modal__target {
+ padding: 15px;
+
+ .report-modal__close {
+ position: absolute;
+ top: 10px;
+ inset-inline-end: 10px;
+ }
+}
+
+.compare-history-modal {
+ .report-modal__target {
+ border-bottom: 1px solid $ui-secondary-color;
+ }
+
+ &__container {
+ padding: 30px;
+ pointer-events: all;
+ overflow-y: auto;
+ }
+
+ .status__content {
+ color: $inverted-text-color;
+ font-size: 19px;
+ line-height: 24px;
+
+ .emojione {
+ width: 24px;
+ height: 24px;
+ margin: -1px 0 0;
+ }
+
+ a {
+ color: $highlight-text-color;
+ }
+
+ hr {
+ height: 0.25rem;
+ padding: 0;
+ background-color: $ui-secondary-color;
+ border: 0;
+ margin: 20px 0;
+ }
+ }
+
+ .media-gallery,
+ .audio-player,
+ .video-player {
+ margin-top: 15px;
+ }
+}
+
+.embed-modal {
+ width: auto;
+ max-width: 80vw;
+ max-height: 80vh;
+
+ h4 {
+ padding: 30px;
+ font-weight: 500;
+ font-size: 16px;
+ text-align: center;
+ }
+
+ .embed-modal__container {
+ padding: 10px;
+
+ .hint {
+ margin-bottom: 15px;
+ }
+
+ .embed-modal__html {
+ outline: 0;
+ box-sizing: border-box;
+ display: block;
+ width: 100%;
+ border: 0;
+ padding: 10px;
+ font-family: mastodon-font-monospace, monospace;
+ background: $ui-base-color;
+ color: $primary-text-color;
+ font-size: 14px;
+ margin: 0;
+ margin-bottom: 15px;
+ border-radius: 4px;
+
+ &::-moz-focus-inner {
+ border: 0;
+ }
+
+ &::-moz-focus-inner,
+ &:focus,
+ &:active {
+ outline: 0 !important;
+ }
+
+ &:focus {
+ background: lighten($ui-base-color, 4%);
+ }
+
+ @media screen and (width <= 600px) {
+ font-size: 16px;
+ }
+ }
+
+ .embed-modal__iframe {
+ width: 400px;
+ max-width: 100%;
+ overflow: hidden;
+ border: 0;
+ border-radius: 4px;
+ }
+ }
+}
+
+.focal-point {
+ position: relative;
+ cursor: move;
+ overflow: hidden;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: $base-shadow-color;
+
+ img,
+ video,
+ canvas {
+ display: block;
+ max-height: 80vh;
+ width: 100%;
+ height: auto;
+ margin: 0;
+ object-fit: contain;
+ background: $base-shadow-color;
+ }
+
+ &__reticle {
+ position: absolute;
+ width: 100px;
+ height: 100px;
+ transform: translate(-50%, -50%);
+ background: url('~images/reticle.png') no-repeat 0 0;
+ border-radius: 50%;
+ box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
+ }
+
+ &__overlay {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ inset-inline-start: 0;
+ }
+
+ &__preview {
+ position: absolute;
+ bottom: 10px;
+ inset-inline-end: 10px;
+ z-index: 2;
+ cursor: move;
+ transition: opacity 0.1s ease;
+
+ &:hover {
+ opacity: 0.5;
+ }
+
+ strong {
+ color: $primary-text-color;
+ font-size: 14px;
+ font-weight: 500;
+ display: block;
+ margin-bottom: 5px;
+ }
+
+ div {
+ border-radius: 4px;
+ box-shadow: 0 0 14px rgba($base-shadow-color, 0.2);
+ }
+ }
+
+ @media screen and (width <= 480px) {
+ img,
+ video {
+ max-height: 100%;
+ }
+
+ &__preview {
+ display: none;
+ }
+ }
+}
+
+.filtered-status-info {
+ text-align: start;
+
+ .spoiler__text {
+ margin-top: 20px;
+ }
+
+ .account {
+ border-bottom: 0;
+ }
+
+ .account__display-name strong {
+ color: $inverted-text-color;
+ }
+
+ .status__content__spoiler {
+ display: none;
+
+ &--visible {
+ display: flex;
+ }
+ }
+
+ ul {
+ padding: 10px;
+ margin-inline-start: 12px;
+ list-style: disc inside;
+ }
+
+ .filtered-status-edit-link {
+ color: $action-button-color;
+ text-decoration: none;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+}
+
+.modal-root__container .privacy-dropdown {
+ flex-grow: 0;
+}
+
+.modal-root__container .privacy-dropdown__dropdown {
+ pointer-events: auto;
+ z-index: 9999;
+}
+
+img.modal-warning {
+ display: block;
+ margin: auto;
+ margin-bottom: 15px;
+ width: 60px;
+}
+
+.interaction-modal {
+ max-width: 90vw;
+ width: 600px;
+ background: $ui-base-color;
+ border-radius: 8px;
+ overflow-x: hidden;
+ overflow-y: auto;
+ position: relative;
+ display: block;
+ padding: 20px;
+
+ h3 {
+ font-size: 22px;
+ line-height: 33px;
+ font-weight: 700;
+ text-align: center;
+ }
+
+ &__icon {
+ color: $highlight-text-color;
+ margin: 0 5px;
+ }
+
+ &__lead {
+ padding: 20px;
+ text-align: center;
+
+ h3 {
+ margin-bottom: 15px;
+ }
+
+ p {
+ font-size: 17px;
+ line-height: 22px;
+ color: $darker-text-color;
+ }
+ }
+
+ &__choices {
+ display: flex;
+
+ &__choice {
+ flex: 0 0 auto;
+ width: 50%;
+ box-sizing: border-box;
+ padding: 20px;
+
+ h3 {
+ margin-bottom: 20px;
+ }
+
+ p {
+ color: $darker-text-color;
+ margin-bottom: 20px;
+ }
+
+ .button {
+ margin-bottom: 10px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ }
+ }
+
+ @media screen and (max-width: $no-gap-breakpoint - 1px) {
+ &__choices {
+ display: block;
+
+ &__choice {
+ width: auto;
+ margin-bottom: 20px;
+ }
+ }
+ }
+}
+
+.copypaste {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+
+ input {
+ display: block;
+ font-family: inherit;
+ background: darken($ui-base-color, 8%);
+ border: 1px solid $highlight-text-color;
+ color: $darker-text-color;
+ border-radius: 4px;
+ padding: 6px 9px;
+ line-height: 22px;
+ font-size: 14px;
+ transition: border-color 300ms linear;
+ flex: 1 1 auto;
+ overflow: hidden;
+
+ &:focus {
+ outline: 0;
+ background: darken($ui-base-color, 4%);
+ }
+ }
+
+ .button {
+ flex: 0 0 auto;
+ transition: background 300ms linear;
+ }
+
+ &.copied {
+ input {
+ border: 1px solid $valid-value-color;
+ transition: none;
+ }
+
+ .button {
+ background: $valid-value-color;
+ transition: none;
+ }
+ }
+}
M app/javascript/flavours/glitch/styles/variables.scss => app/javascript/flavours/glitch/styles/variables.scss +2 -0
@@ 98,4 98,6 @@ $dismiss-overlay-width: 4rem;
--dropdown-background-color: #{lighten($ui-base-color, 4%)};
--dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
+ --modal-background-color: #{darken($ui-base-color, 4%)};
+ --modal-border-color: #{lighten($ui-base-color, 4%)};
}
A app/javascript/flavours/glitch/styles/variables.scss.orig => app/javascript/flavours/glitch/styles/variables.scss.orig +101 -0
@@ 0,0 1,101 @@
+// Commonly used web colors
+$black: #000000; // Black
+$white: #ffffff; // White
+$red-600: #b7253d !default; // Deep Carmine
+$red-500: #df405a !default; // Cerise
+$blurple-600: #563acc; // Iris
+$blurple-500: #6364ff; // Brand purple
+$blurple-300: #858afa; // Faded Blue
+$grey-600: #4e4c5a; // Trout
+$grey-100: #dadaf3; // Topaz
+
+$success-green: #79bd9a !default; // Padua
+$error-red: $red-500 !default; // Cerise
+$warning-red: #ff5050 !default; // Sunset Orange
+$gold-star: #ca8f04 !default; // Dark Goldenrod
+
+$red-bookmark: $warning-red;
+
+// Values from the classic Mastodon UI
+$classic-base-color: #282c37; // Midnight Express
+$classic-primary-color: #9baec8; // Echo Blue
+$classic-secondary-color: #d9e1e8; // Pattens Blue
+$classic-highlight-color: #6364ff; // Brand purple
+
+// Variables for defaults in UI
+$base-shadow-color: $black !default;
+$base-overlay-background: $black !default;
+$base-border-color: $white !default;
+$simple-background-color: $white !default;
+$valid-value-color: $success-green !default;
+$error-value-color: $error-red !default;
+
+// Tell UI to use selected colors
+$ui-base-color: $classic-base-color !default; // Darkest
+$ui-base-lighter-color: lighten(
+ $ui-base-color,
+ 26%
+) !default; // Lighter darkest
+$ui-primary-color: $classic-primary-color !default; // Lighter
+$ui-secondary-color: $classic-secondary-color !default; // Lightest
+$ui-highlight-color: $classic-highlight-color !default;
+$ui-button-color: $white !default;
+$ui-button-background-color: $blurple-500 !default;
+$ui-button-focus-background-color: $blurple-600 !default;
+
+$ui-button-secondary-color: $grey-100 !default;
+$ui-button-secondary-border-color: $grey-100 !default;
+$ui-button-secondary-focus-background-color: $grey-600 !default;
+$ui-button-secondary-focus-color: $white !default;
+
+$ui-button-tertiary-color: $blurple-300 !default;
+$ui-button-tertiary-border-color: $blurple-300 !default;
+$ui-button-tertiary-focus-background-color: $blurple-600 !default;
+$ui-button-tertiary-focus-color: $white !default;
+
+$ui-button-destructive-background-color: $red-500 !default;
+$ui-button-destructive-focus-background-color: $red-600 !default;
+
+// Variables for texts
+$primary-text-color: $white !default;
+$darker-text-color: $ui-primary-color !default;
+$dark-text-color: $ui-base-lighter-color !default;
+$secondary-text-color: $ui-secondary-color !default;
+$highlight-text-color: lighten($ui-highlight-color, 8%) !default;
+$action-button-color: $ui-base-lighter-color !default;
+$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default;
+$passive-text-color: $gold-star !default;
+$active-passive-text-color: $success-green !default;
+
+// For texts on inverted backgrounds
+$inverted-text-color: $ui-base-color !default;
+$lighter-text-color: $ui-base-lighter-color !default;
+$light-text-color: $ui-primary-color !default;
+
+// Language codes that uses CJK fonts
+$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
+
+// Variables for components
+$media-modal-media-max-width: 100%;
+
+// put margins on top and bottom of image to avoid the screen covered by image.
+$media-modal-media-max-height: 80%;
+
+$no-gap-breakpoint: 1175px;
+
+$font-sans-serif: 'mastodon-font-sans-serif' !default;
+$font-display: 'mastodon-font-display' !default;
+$font-monospace: 'mastodon-font-monospace' !default;
+
+// Avatar border size (8% default, 100% for rounded avatars)
+$ui-avatar-border-size: 8%;
+
+// More variables
+$dismiss-overlay-width: 4rem;
+
+:root {
+ --dropdown-border-color: #{lighten($ui-base-color, 12%)};
+ --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+ --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
+ 0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
+}
M app/javascript/flavours/glitch/types/resources.ts => app/javascript/flavours/glitch/types/resources.ts +1 -0
@@ 33,6 33,7 @@ interface AccountApiResponseValues {
note: string;
statuses_count: number;
url: string;
+ uri: string;
username: string;
}