ThibG
6 years ago
committed by
GitHub
commit
74ee5bdf37
@ -0,0 +1,93 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
|
||||
const tooltips = defineMessages({ |
||||
mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, |
||||
favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' }, |
||||
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' }, |
||||
follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, |
||||
}); |
||||
|
||||
export default @injectIntl |
||||
class FilterBar extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
selectFilter: PropTypes.func.isRequired, |
||||
selectedFilter: PropTypes.string.isRequired, |
||||
advancedMode: PropTypes.bool.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
onClick (notificationType) { |
||||
return () => this.props.selectFilter(notificationType); |
||||
} |
||||
|
||||
render () { |
||||
const { selectedFilter, advancedMode, intl } = this.props; |
||||
const renderedElement = !advancedMode ? ( |
||||
<div className='notification__filter-bar'> |
||||
<button |
||||
className={selectedFilter === 'all' ? 'active' : ''} |
||||
onClick={this.onClick('all')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.all' |
||||
defaultMessage='All' |
||||
/> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'mention' ? 'active' : ''} |
||||
onClick={this.onClick('mention')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.mentions' |
||||
defaultMessage='Mentions' |
||||
/> |
||||
</button> |
||||
</div> |
||||
) : ( |
||||
<div className='notification__filter-bar'> |
||||
<button |
||||
className={selectedFilter === 'all' ? 'active' : ''} |
||||
onClick={this.onClick('all')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.all' |
||||
defaultMessage='All' |
||||
/> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'mention' ? 'active' : ''} |
||||
onClick={this.onClick('mention')} |
||||
title={intl.formatMessage(tooltips.mentions)} |
||||
> |
||||
<i className='fa fa-fw fa-at' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'favourite' ? 'active' : ''} |
||||
onClick={this.onClick('favourite')} |
||||
title={intl.formatMessage(tooltips.favourites)} |
||||
> |
||||
<i className='fa fa-fw fa-star' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'reblog' ? 'active' : ''} |
||||
onClick={this.onClick('reblog')} |
||||
title={intl.formatMessage(tooltips.boosts)} |
||||
> |
||||
<i className='fa fa-fw fa-retweet' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'follow' ? 'active' : ''} |
||||
onClick={this.onClick('follow')} |
||||
title={intl.formatMessage(tooltips.follows)} |
||||
> |
||||
<i className='fa fa-fw fa-user-plus' /> |
||||
</button> |
||||
</div> |
||||
); |
||||
return renderedElement; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@ |
||||
import { connect } from 'react-redux'; |
||||
import FilterBar from '../components/filter_bar'; |
||||
import { setFilter } from '../../../actions/notifications'; |
||||
|
||||
const makeMapStateToProps = state => ({ |
||||
selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']), |
||||
advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']), |
||||
}); |
||||
|
||||
const mapDispatchToProps = (dispatch) => ({ |
||||
selectFilter (newActiveFilter) { |
||||
dispatch(setFilter(newActiveFilter)); |
||||
}, |
||||
}); |
||||
|
||||
export default connect(makeMapStateToProps, mapDispatchToProps)(FilterBar); |
||||
@ -0,0 +1,245 @@ |
||||
import { |
||||
NOTIFICATIONS_MOUNT, |
||||
NOTIFICATIONS_UNMOUNT, |
||||
NOTIFICATIONS_SET_VISIBILITY, |
||||
NOTIFICATIONS_UPDATE, |
||||
NOTIFICATIONS_EXPAND_SUCCESS, |
||||
NOTIFICATIONS_EXPAND_REQUEST, |
||||
NOTIFICATIONS_EXPAND_FAIL, |
||||
NOTIFICATIONS_CLEAR, |
||||
NOTIFICATIONS_SCROLL_TOP, |
||||
NOTIFICATIONS_DELETE_MARKED_REQUEST, |
||||
NOTIFICATIONS_DELETE_MARKED_SUCCESS, |
||||
NOTIFICATION_MARK_FOR_DELETE, |
||||
NOTIFICATIONS_DELETE_MARKED_FAIL, |
||||
NOTIFICATIONS_ENTER_CLEARING_MODE, |
||||
NOTIFICATIONS_MARK_ALL_FOR_DELETE, |
||||
} from 'flavours/glitch/actions/notifications'; |
||||
import { |
||||
ACCOUNT_BLOCK_SUCCESS, |
||||
ACCOUNT_MUTE_SUCCESS, |
||||
} from 'flavours/glitch/actions/accounts'; |
||||
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from 'flavours/glitch/actions/timelines'; |
||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; |
||||
import compareId from 'flavours/glitch/util/compare_id'; |
||||
|
||||
const initialState = ImmutableMap({ |
||||
items: ImmutableList(), |
||||
hasMore: true, |
||||
top: true, |
||||
mounted: 0, |
||||
unread: 0, |
||||
lastReadId: '0', |
||||
isLoading: false, |
||||
cleaningMode: false, |
||||
isTabVisible: true, |
||||
// notification removal mark of new notifs loaded whilst cleaningMode is true.
|
||||
markNewForDelete: false, |
||||
}); |
||||
|
||||
const notificationToMap = (state, notification) => ImmutableMap({ |
||||
id: notification.id, |
||||
type: notification.type, |
||||
account: notification.account.id, |
||||
markedForDelete: state.get('markNewForDelete'), |
||||
status: notification.status ? notification.status.id : null, |
||||
}); |
||||
|
||||
const normalizeNotification = (state, notification) => { |
||||
const top = !shouldCountUnreadNotifications(state); |
||||
|
||||
if (top) { |
||||
state = state.set('lastReadId', notification.id); |
||||
} else { |
||||
state = state.update('unread', unread => unread + 1); |
||||
} |
||||
|
||||
return state.update('items', list => { |
||||
if (top && list.size > 40) { |
||||
list = list.take(20); |
||||
} |
||||
|
||||
return list.unshift(notificationToMap(state, notification)); |
||||
}); |
||||
}; |
||||
|
||||
const expandNormalizedNotifications = (state, notifications, next) => { |
||||
const top = !(shouldCountUnreadNotifications(state)); |
||||
const lastReadId = state.get('lastReadId'); |
||||
let items = ImmutableList(); |
||||
|
||||
notifications.forEach((n, i) => { |
||||
items = items.set(i, notificationToMap(state, n)); |
||||
}); |
||||
|
||||
return state.withMutations(mutable => { |
||||
if (!items.isEmpty()) { |
||||
mutable.update('items', list => { |
||||
const lastIndex = 1 + list.findLastIndex( |
||||
item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id')) |
||||
); |
||||
|
||||
const firstIndex = 1 + list.take(lastIndex).findLastIndex( |
||||
item => item !== null && compareId(item.get('id'), items.first().get('id')) > 0 |
||||
); |
||||
|
||||
return list.take(firstIndex).concat(items, list.skip(lastIndex)); |
||||
}); |
||||
} |
||||
|
||||
if (top) { |
||||
if (!items.isEmpty()) { |
||||
mutable.update('lastReadId', id => compareId(id, items.first().get('id')) > 0 ? id : items.first().get('id')); |
||||
} |
||||
} else { |
||||
mutable.update('unread', unread => unread + items.filter(item => compareId(item.get('id'), lastReadId) > 0).size); |
||||
} |
||||
|
||||
if (!next) { |
||||
mutable.set('hasMore', false); |
||||
} |
||||
|
||||
mutable.set('isLoading', false); |
||||
}); |
||||
}; |
||||
|
||||
const filterNotifications = (state, relationship) => { |
||||
return state.update('items', list => list.filterNot(item => item !== null && item.get('account') === relationship.id)); |
||||
}; |
||||
|
||||
const clearUnread = (state) => { |
||||
state = state.set('unread', 0); |
||||
const lastNotification = state.get('items').find(item => item !== null); |
||||
return state.set('lastReadId', lastNotification ? lastNotification.get('id') : '0'); |
||||
} |
||||
|
||||
const updateTop = (state, top) => { |
||||
state = state.set('top', top); |
||||
|
||||
if (!shouldCountUnreadNotifications(state)) { |
||||
state = clearUnread(state); |
||||
} |
||||
|
||||
return state.set('top', top); |
||||
}; |
||||
|
||||
const deleteByStatus = (state, statusId) => { |
||||
const top = !(shouldCountUnreadNotifications(state)); |
||||
if (!top) { |
||||
const lastReadId = state.get('lastReadId'); |
||||
const deletedUnread = state.get('items').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0); |
||||
state = state.update('unread', unread => unread - deletedUnread.size); |
||||
} |
||||
return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId)); |
||||
}; |
||||
|
||||
const markForDelete = (state, notificationId, yes) => { |
||||
return state.update('items', list => list.map(item => { |
||||
if(item.get('id') === notificationId) { |
||||
return item.set('markedForDelete', yes); |
||||
} else { |
||||
return item; |
||||
} |
||||
})); |
||||
}; |
||||
|
||||
const markAllForDelete = (state, yes) => { |
||||
return state.update('items', list => list.map(item => { |
||||
if(yes !== null) { |
||||
return item.set('markedForDelete', yes); |
||||
} else { |
||||
return item.set('markedForDelete', !item.get('markedForDelete')); |
||||
} |
||||
})); |
||||
}; |
||||
|
||||
const unmarkAllForDelete = (state) => { |
||||
return state.update('items', list => list.map(item => item.set('markedForDelete', false))); |
||||
}; |
||||
|
||||
const deleteMarkedNotifs = (state) => { |
||||
return state.update('items', list => list.filterNot(item => item.get('markedForDelete'))); |
||||
}; |
||||
|
||||
const updateMounted = (state) => { |
||||
state = state.update('mounted', count => count + 1); |
||||
if (!shouldCountUnreadNotifications(state)) { |
||||
state = clearUnread(state); |
||||
} |
||||
return state; |
||||
}; |
||||
|
||||
const updateVisibility = (state, visibility) => { |
||||
state = state.set('isTabVisible', visibility); |
||||
if (!shouldCountUnreadNotifications(state)) { |
||||
state = clearUnread(state); |
||||
} |
||||
return state; |
||||
}; |
||||
|
||||
const shouldCountUnreadNotifications = (state) => { |
||||
return !(state.get('isTabVisible') && state.get('top') && state.get('mounted') > 0); |
||||
}; |
||||
|
||||
export default function notifications(state = initialState, action) { |
||||
let st; |
||||
|
||||
switch(action.type) { |
||||
case NOTIFICATIONS_MOUNT: |
||||
return updateMounted(state); |
||||
case NOTIFICATIONS_UNMOUNT: |
||||
return state.update('mounted', count => count - 1); |
||||
case NOTIFICATIONS_SET_VISIBILITY: |
||||
return updateVisibility(state, action.visibility); |
||||
case NOTIFICATIONS_EXPAND_REQUEST: |
||||
case NOTIFICATIONS_DELETE_MARKED_REQUEST: |
||||
return state.set('isLoading', true); |
||||
case NOTIFICATIONS_DELETE_MARKED_FAIL: |
||||
case NOTIFICATIONS_EXPAND_FAIL: |
||||
return state.set('isLoading', false); |
||||
case NOTIFICATIONS_SCROLL_TOP: |
||||
return updateTop(state, action.top); |
||||
case NOTIFICATIONS_UPDATE: |
||||
return normalizeNotification(state, action.notification); |
||||
case NOTIFICATIONS_EXPAND_SUCCESS: |
||||
return expandNormalizedNotifications(state, action.notifications, action.next); |
||||
case ACCOUNT_BLOCK_SUCCESS: |
||||
case ACCOUNT_MUTE_SUCCESS: |
||||
return filterNotifications(state, action.relationship); |
||||
case NOTIFICATIONS_CLEAR: |
||||
return state.set('items', ImmutableList()).set('hasMore', false); |
||||
case TIMELINE_DELETE: |
||||
return deleteByStatus(state, action.id); |
||||
case TIMELINE_DISCONNECT: |
||||
return action.timeline === 'home' ? |
||||
state.update('items', items => items.first() ? items.unshift(null) : items) : |
||||
state; |
||||
|
||||
case NOTIFICATION_MARK_FOR_DELETE: |
||||
return markForDelete(state, action.id, action.yes); |
||||
|
||||
case NOTIFICATIONS_DELETE_MARKED_SUCCESS: |
||||
return deleteMarkedNotifs(state).set('isLoading', false); |
||||
|
||||
case NOTIFICATIONS_ENTER_CLEARING_MODE: |
||||
st = state.set('cleaningMode', action.yes); |
||||
if (!action.yes) { |
||||
return unmarkAllForDelete(st).set('markNewForDelete', false); |
||||
} else { |
||||
return st; |
||||
} |
||||
|
||||
case NOTIFICATIONS_MARK_ALL_FOR_DELETE: |
||||
st = state; |
||||
if (action.yes === null) { |
||||
// Toggle - this is a bit confusing, as it toggles the all-none mode
|
||||
//st = st.set('markNewForDelete', !st.get('markNewForDelete'));
|
||||
} else { |
||||
st = st.set('markNewForDelete', action.yes); |
||||
} |
||||
return markAllForDelete(st, action.yes); |
||||
|
||||
default: |
||||
return state; |
||||
} |
||||
}; |
||||
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 8.8 KiB |
|
After Width: | Height: | Size: 38 KiB |
@ -1,14 +1,8 @@ |
||||
import { openModal } from './modal'; |
||||
import { changeSetting, saveSettings } from './settings'; |
||||
|
||||
export function showOnboardingOnce() { |
||||
return (dispatch, getState) => { |
||||
const alreadySeen = getState().getIn(['settings', 'onboarded']); |
||||
export const INTRODUCTION_VERSION = 20181216044202; |
||||
|
||||
if (!alreadySeen) { |
||||
dispatch(openModal('ONBOARDING')); |
||||
dispatch(changeSetting(['onboarded'], true)); |
||||
export const closeOnboarding = () => dispatch => { |
||||
dispatch(changeSetting(['introductionVersion'], INTRODUCTION_VERSION)); |
||||
dispatch(saveSettings()); |
||||
} |
||||
}; |
||||
}; |
||||
|
||||
@ -0,0 +1,196 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import ReactSwipeableViews from 'react-swipeable-views'; |
||||
import classNames from 'classnames'; |
||||
import { connect } from 'react-redux'; |
||||
import { FormattedMessage } from 'react-intl'; |
||||
import { closeOnboarding } from '../../actions/onboarding'; |
||||
import screenHello from '../../../images/screen_hello.svg'; |
||||
import screenFederation from '../../../images/screen_federation.svg'; |
||||
import screenInteractions from '../../../images/screen_interactions.svg'; |
||||
import logoTransparent from '../../../images/logo_transparent.svg'; |
||||
|
||||
const FrameWelcome = ({ domain, onNext }) => ( |
||||
<div className='introduction__frame'> |
||||
<div className='introduction__illustration' style={{ background: `url(${logoTransparent}) no-repeat center center / auto 80%` }}> |
||||
<img src={screenHello} alt='' /> |
||||
</div> |
||||
|
||||
<div className='introduction__text introduction__text--centered'> |
||||
<h3><FormattedMessage id='introduction.welcome.headline' defaultMessage='First steps' /></h3> |
||||
<p><FormattedMessage id='introduction.welcome.text' defaultMessage="Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name." values={{ domain: <code>{domain}</code> }} /></p> |
||||
</div> |
||||
|
||||
<div className='introduction__action'> |
||||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.welcome.action' defaultMessage="Let's go!" /></button> |
||||
</div> |
||||
</div> |
||||
); |
||||
|
||||
FrameWelcome.propTypes = { |
||||
domain: PropTypes.string.isRequired, |
||||
onNext: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
const FrameFederation = ({ onNext }) => ( |
||||
<div className='introduction__frame'> |
||||
<div className='introduction__illustration'> |
||||
<img src={screenFederation} alt='' /> |
||||
</div> |
||||
|
||||
<div className='introduction__text introduction__text--columnized'> |
||||
<div> |
||||
<h3><FormattedMessage id='introduction.federation.home.headline' defaultMessage='Home' /></h3> |
||||
<p><FormattedMessage id='introduction.federation.home.text' defaultMessage='Posts from people you follow will appear in your home feed. You can follow anyone on any server!' /></p> |
||||
</div> |
||||
|
||||
<div> |
||||
<h3><FormattedMessage id='introduction.federation.local.headline' defaultMessage='Local' /></h3> |
||||
<p><FormattedMessage id='introduction.federation.local.text' defaultMessage='Public posts from people on the same server as you will appear in the local timeline.' /></p> |
||||
</div> |
||||
|
||||
<div> |
||||
<h3><FormattedMessage id='introduction.federation.federated.headline' defaultMessage='Federated' /></h3> |
||||
<p><FormattedMessage id='introduction.federation.federated.text' defaultMessage='Public posts from other servers of the fediverse will appear in the federated timeline.' /></p> |
||||
</div> |
||||
</div> |
||||
|
||||
<div className='introduction__action'> |
||||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.federation.action' defaultMessage='Next' /></button> |
||||
</div> |
||||
</div> |
||||
); |
||||
|
||||
FrameFederation.propTypes = { |
||||
onNext: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
const FrameInteractions = ({ onNext }) => ( |
||||
<div className='introduction__frame'> |
||||
<div className='introduction__illustration'> |
||||
<img src={screenInteractions} alt='' /> |
||||
</div> |
||||
|
||||
<div className='introduction__text introduction__text--columnized'> |
||||
<div> |
||||
<h3><FormattedMessage id='introduction.interactions.reply.headline' defaultMessage='Reply' /></h3> |
||||
<p><FormattedMessage id='introduction.interactions.reply.text' defaultMessage="You can reply to other people's and your own toots, which will chain them together in a conversation." /></p> |
||||
</div> |
||||
|
||||
<div> |
||||
<h3><FormattedMessage id='introduction.interactions.reblog.headline' defaultMessage='Boost' /></h3> |
||||
<p><FormattedMessage id='introduction.interactions.reblog.text' defaultMessage="You can share other people's toots with your followers by boosting them." /></p> |
||||
</div> |
||||
|
||||
<div> |
||||
<h3><FormattedMessage id='introduction.interactions.favourite.headline' defaultMessage='Favourite' /></h3> |
||||
<p><FormattedMessage id='introduction.interactions.favourite.text' defaultMessage='You can save a toot for later, and let the author know that you liked it, by favouriting it.' /></p> |
||||
</div> |
||||
</div> |
||||
|
||||
<div className='introduction__action'> |
||||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.interactions.action' defaultMessage='Finish tutorial!' /></button> |
||||
</div> |
||||
</div> |
||||
); |
||||
|
||||
FrameInteractions.propTypes = { |
||||
onNext: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
@connect(state => ({ domain: state.getIn(['meta', 'domain']) })) |
||||
export default class Introduction extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
domain: PropTypes.string.isRequired, |
||||
dispatch: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
state = { |
||||
currentIndex: 0, |
||||
}; |
||||
|
||||
componentWillMount () { |
||||
this.pages = [ |
||||
<FrameWelcome domain={this.props.domain} onNext={this.handleNext} />, |
||||
<FrameFederation onNext={this.handleNext} />, |
||||
<FrameInteractions onNext={this.handleFinish} />, |
||||
]; |
||||
} |
||||
|
||||
componentDidMount() { |
||||
window.addEventListener('keyup', this.handleKeyUp); |
||||
} |
||||
|
||||
componentWillUnmount() { |
||||
window.addEventListener('keyup', this.handleKeyUp); |
||||
} |
||||
|
||||
handleDot = (e) => { |
||||
const i = Number(e.currentTarget.getAttribute('data-index')); |
||||
e.preventDefault(); |
||||
this.setState({ currentIndex: i }); |
||||
} |
||||
|
||||
handlePrev = () => { |
||||
this.setState(({ currentIndex }) => ({ |
||||
currentIndex: Math.max(0, currentIndex - 1), |
||||
})); |
||||
} |
||||
|
||||
handleNext = () => { |
||||
const { pages } = this; |
||||
|
||||
this.setState(({ currentIndex }) => ({ |
||||
currentIndex: Math.min(currentIndex + 1, pages.length - 1), |
||||
})); |
||||
} |
||||
|
||||
handleSwipe = (index) => { |
||||
this.setState({ currentIndex: index }); |
||||
} |
||||
|
||||
handleFinish = () => { |
||||
this.props.dispatch(closeOnboarding()); |
||||
} |
||||
|
||||
handleKeyUp = ({ key }) => { |
||||
switch (key) { |
||||
case 'ArrowLeft': |
||||
this.handlePrev(); |
||||
break; |
||||
case 'ArrowRight': |
||||
this.handleNext(); |
||||
break; |
||||
} |
||||
} |
||||
|
||||
render () { |
||||
const { currentIndex } = this.state; |
||||
const { pages } = this; |
||||
|
||||
return ( |
||||
<div className='introduction'> |
||||
<ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='introduction__pager'> |
||||
{pages.map((page, i) => ( |
||||
<div key={i} className={classNames('introduction__frame-wrapper', { 'active': i === currentIndex })}>{page}</div> |
||||
))} |
||||
</ReactSwipeableViews> |
||||
|
||||
<div className='introduction__dots'> |
||||
{pages.map((_, i) => ( |
||||
<div |
||||
key={`dot-${i}`} |
||||
role='button' |
||||
tabIndex='0' |
||||
data-index={i} |
||||
onClick={this.handleDot} |
||||
className={classNames('introduction__dot', { active: i === currentIndex })} |
||||
/> |
||||
))} |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,93 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
|
||||
const tooltips = defineMessages({ |
||||
mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, |
||||
favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' }, |
||||
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' }, |
||||
follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, |
||||
}); |
||||
|
||||
export default @injectIntl |
||||
class FilterBar extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
selectFilter: PropTypes.func.isRequired, |
||||
selectedFilter: PropTypes.string.isRequired, |
||||
advancedMode: PropTypes.bool.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
onClick (notificationType) { |
||||
return () => this.props.selectFilter(notificationType); |
||||
} |
||||
|
||||
render () { |
||||
const { selectedFilter, advancedMode, intl } = this.props; |
||||
const renderedElement = !advancedMode ? ( |
||||
<div className='notification__filter-bar'> |
||||
<button |
||||
className={selectedFilter === 'all' ? 'active' : ''} |
||||
onClick={this.onClick('all')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.all' |
||||
defaultMessage='All' |
||||
/> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'mention' ? 'active' : ''} |
||||
onClick={this.onClick('mention')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.mentions' |
||||
defaultMessage='Mentions' |
||||
/> |
||||
</button> |
||||
</div> |
||||
) : ( |
||||
<div className='notification__filter-bar'> |
||||
<button |
||||
className={selectedFilter === 'all' ? 'active' : ''} |
||||
onClick={this.onClick('all')} |
||||
> |
||||
<FormattedMessage |
||||
id='notifications.filter.all' |
||||
defaultMessage='All' |
||||
/> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'mention' ? 'active' : ''} |
||||
onClick={this.onClick('mention')} |
||||
title={intl.formatMessage(tooltips.mentions)} |
||||
> |
||||
<i className='fa fa-fw fa-at' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'favourite' ? 'active' : ''} |
||||
onClick={this.onClick('favourite')} |
||||
title={intl.formatMessage(tooltips.favourites)} |
||||
> |
||||
<i className='fa fa-fw fa-star' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'reblog' ? 'active' : ''} |
||||
onClick={this.onClick('reblog')} |
||||
title={intl.formatMessage(tooltips.boosts)} |
||||
> |
||||
<i className='fa fa-fw fa-retweet' /> |
||||
</button> |
||||
<button |
||||
className={selectedFilter === 'follow' ? 'active' : ''} |
||||
onClick={this.onClick('follow')} |
||||
title={intl.formatMessage(tooltips.follows)} |
||||
> |
||||
<i className='fa fa-fw fa-user-plus' /> |
||||
</button> |
||||
</div> |
||||
); |
||||
return renderedElement; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@ |
||||
import { connect } from 'react-redux'; |
||||
import FilterBar from '../components/filter_bar'; |
||||
import { setFilter } from '../../../actions/notifications'; |
||||
|
||||
const makeMapStateToProps = state => ({ |
||||
selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']), |
||||
advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']), |
||||
}); |
||||
|
||||
const mapDispatchToProps = (dispatch) => ({ |
||||
selectFilter (newActiveFilter) { |
||||
dispatch(setFilter(newActiveFilter)); |
||||
}, |
||||
}); |
||||
|
||||
export default connect(makeMapStateToProps, mapDispatchToProps)(FilterBar); |
||||
@ -1,324 +0,0 @@ |
||||
import React from 'react'; |
||||
import { connect } from 'react-redux'; |
||||
import PropTypes from 'prop-types'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
import ReactSwipeableViews from 'react-swipeable-views'; |
||||
import classNames from 'classnames'; |
||||
import Permalink from '../../../components/permalink'; |
||||
import ComposeForm from '../../compose/components/compose_form'; |
||||
import Search from '../../compose/components/search'; |
||||
import NavigationBar from '../../compose/components/navigation_bar'; |
||||
import ColumnHeader from './column_header'; |
||||
import { List as ImmutableList } from 'immutable'; |
||||
import { me } from '../../../initial_state'; |
||||
|
||||
const noop = () => { }; |
||||
|
||||
const messages = defineMessages({ |
||||
home_title: { id: 'column.home', defaultMessage: 'Home' }, |
||||
notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' }, |
||||
local_title: { id: 'column.community', defaultMessage: 'Local timeline' }, |
||||
federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' }, |
||||
}); |
||||
|
||||
const PageOne = ({ acct, domain }) => ( |
||||
<div className='onboarding-modal__page onboarding-modal__page-one'> |
||||
<div className='onboarding-modal__page-one__lead'> |
||||
<h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1> |
||||
<p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.' /></p> |
||||
</div> |
||||
|
||||
<div className='onboarding-modal__page-one__extra'> |
||||
<div className='display-case'> |
||||
<div className='display-case__label'> |
||||
<FormattedMessage id='onboarding.page_one.full_handle' defaultMessage='Your full handle' /> |
||||
</div> |
||||
|
||||
<div className='display-case__case'> |
||||
@{acct}@{domain} |
||||
</div> |
||||
</div> |
||||
|
||||
<p><FormattedMessage id='onboarding.page_one.handle_hint' defaultMessage='This is what you would tell your friends to search for.' /></p> |
||||
</div> |
||||
</div> |
||||
); |
||||
|
||||
PageOne.propTypes = { |
||||
acct: PropTypes.string.isRequired, |
||||
domain: PropTypes.string.isRequired, |
||||
}; |
||||
|
||||
const PageTwo = ({ myAccount }) => ( |
||||
<div className='onboarding-modal__page onboarding-modal__page-two'> |
||||
<div className='figure non-interactive'> |
||||
<div className='pseudo-drawer'> |
||||
<NavigationBar account={myAccount} /> |
||||
|
||||
<ComposeForm |
||||
text='Awoo! #introductions' |
||||
suggestions={ImmutableList()} |
||||
mentionedDomains={[]} |
||||
spoiler={false} |
||||
onChange={noop} |
||||
onSubmit={noop} |
||||
onPaste={noop} |
||||
onPickEmoji={noop} |
||||
onChangeSpoilerText={noop} |
||||
onClearSuggestions={noop} |
||||
onFetchSuggestions={noop} |
||||
onSuggestionSelected={noop} |
||||
showSearch |
||||
/> |
||||
</div> |
||||
</div> |
||||
|
||||
<p><FormattedMessage id='onboarding.page_two.compose' defaultMessage='Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.' /></p> |
||||
</div> |
||||
); |
||||
|
||||
PageTwo.propTypes = { |
||||
myAccount: ImmutablePropTypes.map.isRequired, |
||||
}; |
||||
|
||||
const PageThree = ({ myAccount }) => ( |
||||
<div className='onboarding-modal__page onboarding-modal__page-three'> |
||||
<div className='figure non-interactive'> |
||||
<Search |
||||
value='' |
||||
onChange={noop} |
||||
onSubmit={noop} |
||||
onClear={noop} |
||||
onShow={noop} |
||||
/> |
||||
|
||||
<div className='pseudo-drawer'> |
||||
<NavigationBar account={myAccount} /> |
||||
</div> |
||||
</div> |
||||
|
||||
<p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.' values={{ illustration: <Permalink to='/timelines/tag/illustration' href='/tags/illustration'>#illustration</Permalink>, introductions: <Permalink to='/timelines/tag/introductions' href='/tags/introductions'>#introductions</Permalink> }} /></p> |
||||
<p><FormattedMessage id='onboarding.page_three.profile' defaultMessage='Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.' /></p> |
||||
</div> |
||||
); |
||||
|
||||
PageThree.propTypes = { |
||||
myAccount: ImmutablePropTypes.map.isRequired, |
||||
}; |
||||
|
||||
const PageFour = ({ domain, intl }) => ( |
||||
<div className='onboarding-modal__page onboarding-modal__page-four'> |
||||
<div className='onboarding-modal__page-four__columns'> |
||||
<div className='row'> |
||||
<div> |
||||
<div className='figure non-interactive'><ColumnHeader icon='home' type={intl.formatMessage(messages.home_title)} /></div> |
||||
<p><FormattedMessage id='onboarding.page_four.home' defaultMessage='The home timeline shows posts from people you follow.' /></p> |
||||
</div> |
||||
|
||||
<div> |
||||
<div className='figure non-interactive'><ColumnHeader icon='bell' type={intl.formatMessage(messages.notifications_title)} /></div> |
||||
<p><FormattedMessage id='onboarding.page_four.notifications' defaultMessage='The notifications column shows when someone interacts with you.' /></p> |
||||
</div> |
||||
</div> |
||||
|
||||
<div className='row'> |
||||
<div> |
||||
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='users' type={intl.formatMessage(messages.local_title)} /></div> |
||||
</div> |
||||
|
||||
<div> |
||||
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='globe' type={intl.formatMessage(messages.federated_title)} /></div> |
||||
</div> |
||||
</div> |
||||
|
||||
<p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p> |
||||
</div> |
||||
</div> |
||||
); |
||||
|
||||
PageFour.propTypes = { |
||||
domain: PropTypes.string.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
const PageSix = ({ admin, domain }) => { |
||||
let adminSection = ''; |
||||
|
||||
if (admin) { |
||||
adminSection = ( |
||||
<p> |
||||
<FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} /> |
||||
<br /> |
||||
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{ domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }} /> |
||||
</p> |
||||
); |
||||
} |
||||
|
||||
return ( |
||||
<div className='onboarding-modal__page onboarding-modal__page-six'> |
||||
<h1><FormattedMessage id='onboarding.page_six.almost_done' defaultMessage='Almost done...' /></h1> |
||||
{adminSection} |
||||
<p><FormattedMessage id='onboarding.page_six.github' defaultMessage='Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.' values={{ github: <a href='https://github.com/tootsuite/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p> |
||||
<p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms.' values={{ apps: <a href='https://joinmastodon.org/apps' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='mobile apps' /></a> }} /></p> |
||||
<p><em><FormattedMessage id='onboarding.page_six.appetoot' defaultMessage='Bon Appetoot!' /></em></p> |
||||
</div> |
||||
); |
||||
}; |
||||
|
||||
PageSix.propTypes = { |
||||
admin: ImmutablePropTypes.map, |
||||
domain: PropTypes.string.isRequired, |
||||
}; |
||||
|
||||
const mapStateToProps = state => ({ |
||||
myAccount: state.getIn(['accounts', me]), |
||||
admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]), |
||||
domain: state.getIn(['meta', 'domain']), |
||||
}); |
||||
|
||||
export default @connect(mapStateToProps) |
||||
@injectIntl |
||||
class OnboardingModal extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
onClose: PropTypes.func.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
myAccount: ImmutablePropTypes.map.isRequired, |
||||
domain: PropTypes.string.isRequired, |
||||
admin: ImmutablePropTypes.map, |
||||
}; |
||||
|
||||
state = { |
||||
currentIndex: 0, |
||||
}; |
||||
|
||||
componentWillMount() { |
||||
const { myAccount, admin, domain, intl } = this.props; |
||||
this.pages = [ |
||||
<PageOne acct={myAccount.get('acct')} domain={domain} />, |
||||
<PageTwo myAccount={myAccount} />, |
||||
<PageThree myAccount={myAccount} />, |
||||
<PageFour domain={domain} intl={intl} />, |
||||
<PageSix admin={admin} domain={domain} />, |
||||
]; |
||||
}; |
||||
|
||||
componentDidMount() { |
||||
window.addEventListener('keyup', this.handleKeyUp); |
||||
} |
||||
|
||||
componentWillUnmount() { |
||||
window.addEventListener('keyup', this.handleKeyUp); |
||||
} |
||||
|
||||
handleSkip = (e) => { |
||||
e.preventDefault(); |
||||
this.props.onClose(); |
||||
} |
||||
|
||||
handleDot = (e) => { |
||||
const i = Number(e.currentTarget.getAttribute('data-index')); |
||||
e.preventDefault(); |
||||
this.setState({ currentIndex: i }); |
||||
} |
||||
|
||||
handlePrev = () => { |
||||
this.setState(({ currentIndex }) => ({ |
||||
currentIndex: Math.max(0, currentIndex - 1), |
||||
})); |
||||
} |
||||
|
||||
handleNext = () => { |
||||
const { pages } = this; |
||||
this.setState(({ currentIndex }) => ({ |
||||
currentIndex: Math.min(currentIndex + 1, pages.length - 1), |
||||
})); |
||||
} |
||||
|
||||
handleSwipe = (index) => { |
||||
this.setState({ currentIndex: index }); |
||||
} |
||||
|
||||
handleKeyUp = ({ key }) => { |
||||
switch (key) { |
||||
case 'ArrowLeft': |
||||
this.handlePrev(); |
||||
break; |
||||
case 'ArrowRight': |
||||
this.handleNext(); |
||||
break; |
||||
} |
||||
} |
||||
|
||||
handleClose = () => { |
||||
this.props.onClose(); |
||||
} |
||||
|
||||
render () { |
||||
const { pages } = this; |
||||
const { currentIndex } = this.state; |
||||
const hasMore = currentIndex < pages.length - 1; |
||||
|
||||
const nextOrDoneBtn = hasMore ? ( |
||||
<button onClick={this.handleNext} className='onboarding-modal__nav onboarding-modal__next shake-bottom'> |
||||
<FormattedMessage id='onboarding.next' defaultMessage='Next' /> <i className='fa fa-fw fa-chevron-right' /> |
||||
</button> |
||||
) : ( |
||||
<button onClick={this.handleClose} className='onboarding-modal__nav onboarding-modal__done shake-bottom'> |
||||
<FormattedMessage id='onboarding.done' defaultMessage='Done' /> <i className='fa fa-fw fa-check' /> |
||||
</button> |
||||
); |
||||
|
||||
return ( |
||||
<div className='modal-root__modal onboarding-modal'> |
||||
<ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='onboarding-modal__pager'> |
||||
{pages.map((page, i) => { |
||||
const className = classNames('onboarding-modal__page__wrapper', `onboarding-modal__page__wrapper-${i}`, { |
||||
'onboarding-modal__page__wrapper--active': i === currentIndex, |
||||
}); |
||||
|
||||
return ( |
||||
<div key={i} className={className}>{page}</div> |
||||
); |
||||
})} |
||||
</ReactSwipeableViews> |
||||
|
||||
<div className='onboarding-modal__paginator'> |
||||
<div> |
||||
<button |
||||
onClick={this.handleSkip} |
||||
className='onboarding-modal__nav onboarding-modal__skip' |
||||
> |
||||
<FormattedMessage id='onboarding.skip' defaultMessage='Skip' /> |
||||
</button> |
||||
</div> |
||||
|
||||
<div className='onboarding-modal__dots'> |
||||
{pages.map((_, i) => { |
||||
const className = classNames('onboarding-modal__dot', { |
||||
active: i === currentIndex, |
||||
}); |
||||
|
||||
return ( |
||||
<div |
||||
key={`dot-${i}`} |
||||
role='button' |
||||
tabIndex='0' |
||||
data-index={i} |
||||
onClick={this.handleDot} |
||||
className={className} |
||||
/> |
||||
); |
||||
})} |
||||
</div> |
||||
|
||||
<div> |
||||
{nextOrDoneBtn} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,153 @@ |
||||
.introduction { |
||||
display: flex; |
||||
flex-direction: column; |
||||
justify-content: center; |
||||
align-items: center; |
||||
|
||||
@media screen and (max-width: 920px) { |
||||
background: darken($ui-base-color, 8%); |
||||
display: block !important; |
||||
} |
||||
|
||||
&__pager { |
||||
background: darken($ui-base-color, 8%); |
||||
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); |
||||
overflow: hidden; |
||||
} |
||||
|
||||
&__pager, |
||||
&__frame { |
||||
border-radius: 10px; |
||||
width: 50vw; |
||||
min-width: 920px; |
||||
|
||||
@media screen and (max-width: 920px) { |
||||
min-width: 0; |
||||
width: 100%; |
||||
border-radius: 0; |
||||
box-shadow: none; |
||||
} |
||||
} |
||||
|
||||
&__frame-wrapper { |
||||
opacity: 0; |
||||
transition: opacity 500ms linear; |
||||
|
||||
&.active { |
||||
opacity: 1; |
||||
transition: opacity 50ms linear; |
||||
} |
||||
} |
||||
|
||||
&__frame { |
||||
overflow: hidden; |
||||
} |
||||
|
||||
&__illustration { |
||||
height: 50vh; |
||||
|
||||
@media screen and (max-width: 630px) { |
||||
height: auto; |
||||
} |
||||
|
||||
img { |
||||
object-fit: cover; |
||||
display: block; |
||||
margin: 0; |
||||
width: 100%; |
||||
height: 100%; |
||||
} |
||||
} |
||||
|
||||
&__text { |
||||
border-top: 2px solid $ui-highlight-color; |
||||
|
||||
&--columnized { |
||||
display: flex; |
||||
|
||||
& > div { |
||||
flex: 1 1 33.33%; |
||||
text-align: center; |
||||
padding: 25px; |
||||
padding-bottom: 30px; |
||||
} |
||||
|
||||
@media screen and (max-width: 630px) { |
||||
display: block; |
||||
padding: 15px 0; |
||||
padding-bottom: 20px; |
||||
|
||||
& > div { |
||||
padding: 10px 25px; |
||||
} |
||||
} |
||||
} |
||||
|
||||
h3 { |
||||
font-size: 24px; |
||||
line-height: 1.5; |
||||
font-weight: 700; |
||||
margin-bottom: 10px; |
||||
} |
||||
|
||||
p { |
||||
font-size: 16px; |
||||
line-height: 24px; |
||||
font-weight: 400; |
||||
color: $darker-text-color; |
||||
|
||||
code { |
||||
display: inline-block; |
||||
background: darken($ui-base-color, 8%); |
||||
font-size: 15px; |
||||
border: 1px solid lighten($ui-base-color, 8%); |
||||
border-radius: 2px; |
||||
padding: 1px 3px; |
||||
} |
||||
} |
||||
|
||||
&--centered { |
||||
padding: 25px; |
||||
padding-bottom: 30px; |
||||
text-align: center; |
||||
} |
||||
} |
||||
|
||||
&__dots { |
||||
display: flex; |
||||
align-items: center; |
||||
justify-content: center; |
||||
padding: 25px; |
||||
|
||||
@media screen and (max-width: 630px) { |
||||
display: none; |
||||
} |
||||
} |
||||
|
||||
&__dot { |
||||
width: 14px; |
||||
height: 14px; |
||||
border-radius: 14px; |
||||
border: 1px solid $ui-highlight-color; |
||||
background: transparent; |
||||
margin: 0 3px; |
||||
cursor: pointer; |
||||
|
||||
&:hover { |
||||
background: lighten($ui-base-color, 8%); |
||||
} |
||||
|
||||
&.active { |
||||
cursor: default; |
||||
background: $ui-highlight-color; |
||||
} |
||||
} |
||||
|
||||
&__action { |
||||
padding: 25px; |
||||
padding-top: 0; |
||||
display: flex; |
||||
align-items: center; |
||||
justify-content: center; |
||||
} |
||||
} |
||||
@ -0,0 +1,46 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Api::V1::Accounts::PinsController, type: :controller do |
||||
let(:john) { Fabricate(:user, account: Fabricate(:account, username: 'john')) } |
||||
let(:kevin) { Fabricate(:user, account: Fabricate(:account, username: 'kevin')) } |
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') } |
||||
|
||||
before do |
||||
kevin.account.followers << john.account |
||||
allow(controller).to receive(:doorkeeper_token) { token } |
||||
end |
||||
|
||||
describe 'POST #create' do |
||||
subject { post :create, params: { account_id: kevin.account.id } } |
||||
|
||||
it 'returns 200' do |
||||
expect(response).to have_http_status(200) |
||||
end |
||||
|
||||
it 'creates account_pin' do |
||||
expect do |
||||
subject |
||||
end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(1) |
||||
end |
||||
end |
||||
|
||||
describe 'DELETE #destroy' do |
||||
subject { delete :destroy, params: { account_id: kevin.account.id } } |
||||
|
||||
before do |
||||
Fabricate(:account_pin, account: john.account, target_account: kevin.account) |
||||
end |
||||
|
||||
it 'returns 200' do |
||||
expect(response).to have_http_status(200) |
||||
end |
||||
|
||||
it 'destroys account_pin' do |
||||
expect do |
||||
subject |
||||
end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(-1) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,17 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Api::V1::EndorsementsController, type: :controller do |
||||
let(:user) { Fabricate(:user) } |
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') } |
||||
|
||||
describe 'GET #index' do |
||||
it 'returns 200' do |
||||
allow(controller).to receive(:doorkeeper_token) { token } |
||||
get :index |
||||
|
||||
expect(response).to have_http_status(200) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,21 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Api::V1::Instances::ActivityController, type: :controller do |
||||
describe 'GET #show' do |
||||
it 'returns 200' do |
||||
get :show |
||||
expect(response).to have_http_status(200) |
||||
end |
||||
|
||||
context '!Setting.activity_api_enabled' do |
||||
it 'returns 404' do |
||||
Setting.activity_api_enabled = false |
||||
|
||||
get :show |
||||
expect(response).to have_http_status(404) |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,21 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Api::V1::Instances::PeersController, type: :controller do |
||||
describe 'GET #index' do |
||||
it 'returns 200' do |
||||
get :index |
||||
expect(response).to have_http_status(200) |
||||
end |
||||
|
||||
context '!Setting.peers_api_enabled' do |
||||
it 'returns 404' do |
||||
Setting.peers_api_enabled = false |
||||
|
||||
get :index |
||||
expect(response).to have_http_status(404) |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,17 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe Api::V1::Timelines::DirectController, type: :controller do |
||||
let(:user) { Fabricate(:user) } |
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') } |
||||
|
||||
describe 'GET #show' do |
||||
it 'returns 200' do |
||||
allow(controller).to receive(:doorkeeper_token) { token } |
||||
get :show |
||||
|
||||
expect(response).to have_http_status(200) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,26 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe AccountableConcern do |
||||
class Hoge |
||||
include AccountableConcern |
||||
attr_reader :current_account |
||||
|
||||
def initialize(current_account) |
||||
@current_account = current_account |
||||
end |
||||
end |
||||
|
||||
let(:user) { Fabricate(:user, account: Fabricate(:account)) } |
||||
let(:target) { Fabricate(:user, account: Fabricate(:account)) } |
||||
let(:hoge) { Hoge.new(user.account) } |
||||
|
||||
describe '#log_action' do |
||||
it 'creates Admin::ActionLog' do |
||||
expect do |
||||
hoge.log_action(:create, target.account) |
||||
end.to change { Admin::ActionLog.count }.by(1) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,17 @@ |
||||
HTTP/1.1 200 OK |
||||
server: nginx |
||||
date: Wed, 12 Dec 2018 13:14:03 GMT |
||||
content-type: text/html |
||||
content-length: 190 |
||||
accept-ranges: bytes |
||||
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<meta http-equiv="Content-Type" content="text/html; charset=windows-1251" /> |
||||
<title>ñýìïë òåêñò</title> |
||||
</head> |
||||
<body> |
||||
<p>ñýìïë òåêñò</p> |
||||
</body> |
||||
</html> |
||||
Loading…
Reference in new issue