* Nascent tag menu on frontend * Hook up frontend to search * Tag intersection backend first pass * Update yarnlock * WIP * Fix for tags not searching correctly * Make radio buttons function * Simplify radio buttons with modeOption * Better naming * Rearrange options * Add all/any/none functionality on backend * Small PR cleanup * Move to service from scope * Small cleanup, add proper service tests * Don't use send with user input :D * Set appropriate column header * Handle auto updating timeline * Fix up toggle function * Use tag value correctly * A bit more correct to use 'self' rather than 'all' in status scope * Fix some style issues * Fix more code style issues * Style select dropdown more better * Only use to_id'ed value to ensure no SQL injection * Revamp frontend to allow for multiple selects * Update backend / col header to account for more flexible tagging * Update brakeman ignore * Codeclimate suggestions * Fix presenter tag_url * Implement initial PR feedback * Handle additional tag streaming * CodeClimate tweakmaster
@@ -45,7 +45,7 @@ class Api::V1::Timelines::TagController < Api::BaseController | |||
end | |||
def tag_timeline_statuses | |||
Status.as_tag_timeline(@tag, current_account, truthy_param?(:local)) | |||
HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local)) | |||
end | |||
def insert_pagination_headers | |||
@@ -16,14 +16,15 @@ class TagsController < ApplicationController | |||
end | |||
format.rss do | |||
@statuses = Status.as_tag_timeline(@tag).limit(PAGE_SIZE) | |||
@statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none)).limit(PAGE_SIZE) | |||
@statuses = cache_collection(@statuses, Status) | |||
render xml: RSS::TagSerializer.render(@tag, @statuses) | |||
end | |||
format.json do | |||
@statuses = Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(PAGE_SIZE, params[:max_id]) | |||
@statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, params[:local]) | |||
.paginate_by_max_id(PAGE_SIZE, params[:max_id]) | |||
@statuses = cache_collection(@statuses, Status) | |||
render json: collection_presenter, | |||
@@ -46,7 +47,7 @@ class TagsController < ApplicationController | |||
def collection_presenter | |||
ActivityPub::CollectionPresenter.new( | |||
id: tag_url(@tag), | |||
id: tag_url(@tag, params.slice(:any, :all, :none)), | |||
type: :ordered, | |||
size: @tag.statuses.count, | |||
items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) } | |||
@@ -12,7 +12,7 @@ import { getLocale } from '../locales'; | |||
const { messages } = getLocale(); | |||
export function connectTimelineStream (timelineId, path, pollingRefresh = null) { | |||
export function connectTimelineStream (timelineId, path, pollingRefresh = null, accept = null) { | |||
return connectStream (path, pollingRefresh, (dispatch, getState) => { | |||
const locale = getState().getIn(['meta', 'locale']); | |||
@@ -24,7 +24,7 @@ export function connectTimelineStream (timelineId, path, pollingRefresh = null) | |||
onReceive (data) { | |||
switch(data.event) { | |||
case 'update': | |||
dispatch(updateTimeline(timelineId, JSON.parse(data.payload))); | |||
dispatch(updateTimeline(timelineId, JSON.parse(data.payload), accept)); | |||
break; | |||
case 'delete': | |||
dispatch(deleteFromTimelines(data.payload)); | |||
@@ -51,6 +51,6 @@ const refreshHomeTimelineAndNotification = (dispatch, done) => { | |||
export const connectUserStream = () => connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification); | |||
export const connectCommunityStream = ({ onlyMedia } = {}) => connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`); | |||
export const connectPublicStream = ({ onlyMedia } = {}) => connectTimelineStream(`public${onlyMedia ? ':media' : ''}`, `public${onlyMedia ? ':media' : ''}`); | |||
export const connectHashtagStream = tag => connectTimelineStream(`hashtag:${tag}`, `hashtag&tag=${tag}`); | |||
export const connectHashtagStream = (id, tag, accept) => connectTimelineStream(`hashtag:${id}`, `hashtag&tag=${tag}`, null, accept); | |||
export const connectDirectStream = () => connectTimelineStream('direct', 'direct'); | |||
export const connectListStream = id => connectTimelineStream(`list:${id}`, `list&list=${id}`); |
@@ -4,6 +4,7 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; | |||
export const TIMELINE_UPDATE = 'TIMELINE_UPDATE'; | |||
export const TIMELINE_DELETE = 'TIMELINE_DELETE'; | |||
export const TIMELINE_CLEAR = 'TIMELINE_CLEAR'; | |||
export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST'; | |||
export const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS'; | |||
@@ -13,10 +14,14 @@ export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP'; | |||
export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT'; | |||
export function updateTimeline(timeline, status) { | |||
export function updateTimeline(timeline, status, accept) { | |||
return (dispatch, getState) => { | |||
const references = status.reblog ? getState().get('statuses').filter((item, itemId) => (itemId === status.reblog.id || item.get('reblog') === status.reblog.id)).map((_, itemId) => itemId) : []; | |||
if (typeof accept === 'function' && !accept(status)) { | |||
return; | |||
} | |||
dispatch(importFetchedStatus(status)); | |||
dispatch({ | |||
@@ -44,8 +49,20 @@ export function deleteFromTimelines(id) { | |||
}; | |||
}; | |||
export function clearTimeline(timeline) { | |||
return (dispatch) => { | |||
dispatch({ type: TIMELINE_CLEAR, timeline }); | |||
}; | |||
}; | |||
const noOp = () => {}; | |||
const parseTags = (tags = {}, mode) => { | |||
return (tags[mode] || []).map((tag) => { | |||
return tag.value; | |||
}); | |||
}; | |||
export function expandTimeline(timelineId, path, params = {}, done = noOp) { | |||
return (dispatch, getState) => { | |||
const timeline = getState().getIn(['timelines', timelineId], ImmutableMap()); | |||
@@ -79,9 +96,17 @@ export const expandCommunityTimeline = ({ maxId, onlyMedia } = {}, done = | |||
export const expandAccountTimeline = (accountId, { maxId, withReplies } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId }); | |||
export const expandAccountFeaturedTimeline = accountId => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true }); | |||
export const expandAccountMediaTimeline = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true }); | |||
export const expandHashtagTimeline = (hashtag, { maxId } = {}, done = noOp) => expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, { max_id: maxId }, done); | |||
export const expandListTimeline = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done); | |||
export const expandHashtagTimeline = (hashtag, { maxId, tags } = {}, done = noOp) => { | |||
return expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, { | |||
max_id: maxId, | |||
any: parseTags(tags, 'any'), | |||
all: parseTags(tags, 'all'), | |||
none: parseTags(tags, 'none'), | |||
}, done); | |||
}; | |||
export function expandTimelineRequest(timeline) { | |||
return { | |||
type: TIMELINE_EXPAND_REQUEST, | |||
@@ -0,0 +1,102 @@ | |||
import React from 'react'; | |||
import PropTypes from 'prop-types'; | |||
import ImmutablePropTypes from 'react-immutable-proptypes'; | |||
import { injectIntl, FormattedMessage } from 'react-intl'; | |||
import Toggle from 'react-toggle'; | |||
import AsyncSelect from 'react-select/lib/Async'; | |||
@injectIntl | |||
export default class ColumnSettings extends React.PureComponent { | |||
static propTypes = { | |||
settings: ImmutablePropTypes.map.isRequired, | |||
onChange: PropTypes.func.isRequired, | |||
onLoad: PropTypes.func.isRequired, | |||
intl: PropTypes.object.isRequired, | |||
}; | |||
state = { | |||
open: this.hasTags(), | |||
}; | |||
hasTags () { | |||
return ['all', 'any', 'none'].map(mode => this.tags(mode).length > 0).includes(true); | |||
} | |||
tags (mode) { | |||
let tags = this.props.settings.getIn(['tags', mode]) || []; | |||
if (tags.toJSON) { | |||
return tags.toJSON(); | |||
} else { | |||
return tags; | |||
} | |||
}; | |||
onSelect = (mode) => { | |||
return (value) => { | |||
this.props.onChange(['tags', mode], value); | |||
}; | |||
}; | |||
onToggle = () => { | |||
if (this.state.open && this.hasTags()) { | |||
this.props.onChange('tags', {}); | |||
} | |||
this.setState({ open: !this.state.open }); | |||
}; | |||
modeSelect (mode) { | |||
return ( | |||
<div className='column-settings__section'> | |||
{this.modeLabel(mode)} | |||
<AsyncSelect | |||
isMulti | |||
autoFocus | |||
value={this.tags(mode)} | |||
settings={this.props.settings} | |||
settingPath={['tags', mode]} | |||
onChange={this.onSelect(mode)} | |||
loadOptions={this.props.onLoad} | |||
classNamePrefix='column-settings__hashtag-select' | |||
name='tags' | |||
/> | |||
</div> | |||
); | |||
} | |||
modeLabel (mode) { | |||
switch(mode) { | |||
case 'any': return <FormattedMessage id='hashtag.column_settings.tag_mode.any' defaultMessage='Any of these' />; | |||
case 'all': return <FormattedMessage id='hashtag.column_settings.tag_mode.all' defaultMessage='All of these' />; | |||
case 'none': return <FormattedMessage id='hashtag.column_settings.tag_mode.none' defaultMessage='None of these' />; | |||
} | |||
return ''; | |||
}; | |||
render () { | |||
return ( | |||
<div> | |||
<div className='column-settings__row'> | |||
<div className='setting-toggle'> | |||
<Toggle | |||
id='hashtag.column_settings.tag_toggle' | |||
onChange={this.onToggle} | |||
checked={this.state.open} | |||
/> | |||
<span className='setting-toggle__label'> | |||
<FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' /> | |||
</span> | |||
</div> | |||
</div> | |||
{this.state.open && | |||
<div className='column-settings__hashtags'> | |||
{this.modeSelect('any')} | |||
{this.modeSelect('all')} | |||
{this.modeSelect('none')} | |||
</div> | |||
} | |||
</div> | |||
); | |||
} | |||
} |
@@ -0,0 +1,31 @@ | |||
import { connect } from 'react-redux'; | |||
import ColumnSettings from '../components/column_settings'; | |||
import { changeColumnParams } from '../../../actions/columns'; | |||
import api from '../../../api'; | |||
const mapStateToProps = (state, { columnId }) => { | |||
const columns = state.getIn(['settings', 'columns']); | |||
const index = columns.findIndex(c => c.get('uuid') === columnId); | |||
if (!(columnId && index >= 0)) { | |||
return {}; | |||
} | |||
return { settings: columns.get(index).get('params') }; | |||
}; | |||
const mapDispatchToProps = (dispatch, { columnId }) => ({ | |||
onChange (key, value) { | |||
dispatch(changeColumnParams(columnId, key, value)); | |||
}, | |||
onLoad (value) { | |||
return api().get('/api/v2/search', { params: { q: value } }).then(response => { | |||
return (response.data.hashtags || []).map((tag) => { | |||
return { value: tag.name, label: `#${tag.name}` }; | |||
}); | |||
}); | |||
}, | |||
}); | |||
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings); |
@@ -4,7 +4,8 @@ import PropTypes from 'prop-types'; | |||
import StatusListContainer from '../ui/containers/status_list_container'; | |||
import Column from '../../components/column'; | |||
import ColumnHeader from '../../components/column_header'; | |||
import { expandHashtagTimeline } from '../../actions/timelines'; | |||
import ColumnSettingsContainer from './containers/column_settings_container'; | |||
import { expandHashtagTimeline, clearTimeline } from '../../actions/timelines'; | |||
import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; | |||
import { FormattedMessage } from 'react-intl'; | |||
import { connectHashtagStream } from '../../actions/streaming'; | |||
@@ -16,6 +17,8 @@ const mapStateToProps = (state, props) => ({ | |||
export default @connect(mapStateToProps) | |||
class HashtagTimeline extends React.PureComponent { | |||
disconnects = []; | |||
static propTypes = { | |||
params: PropTypes.object.isRequired, | |||
columnId: PropTypes.string, | |||
@@ -35,6 +38,30 @@ class HashtagTimeline extends React.PureComponent { | |||
} | |||
} | |||
title = () => { | |||
let title = [this.props.params.id]; | |||
if (this.additionalFor('any')) { | |||
title.push(<FormattedMessage id='hashtag.column_header.tag_mode.any' values={{ additional: this.additionalFor('any') }} defaultMessage=' or {additional}' />); | |||
} | |||
if (this.additionalFor('all')) { | |||
title.push(<FormattedMessage id='hashtag.column_header.tag_mode.all' values={{ additional: this.additionalFor('all') }} defaultMessage=' and {additional}' />); | |||
} | |||
if (this.additionalFor('none')) { | |||
title.push(<FormattedMessage id='hashtag.column_header.tag_mode.none' values={{ additional: this.additionalFor('none') }} defaultMessage=' without {additional}' />); | |||
} | |||
return title; | |||
} | |||
additionalFor = (mode) => { | |||
const { tags } = this.props.params; | |||
if (tags && (tags[mode] || []).length > 0) { | |||
return tags[mode].map(tag => tag.value).join('/'); | |||
} else { | |||
return ''; | |||
} | |||
} | |||
handleMove = (dir) => { | |||
const { columnId, dispatch } = this.props; | |||
dispatch(moveColumn(columnId, dir)); | |||
@@ -44,30 +71,40 @@ class HashtagTimeline extends React.PureComponent { | |||
this.column.scrollTop(); | |||
} | |||
_subscribe (dispatch, id) { | |||
this.disconnect = dispatch(connectHashtagStream(id)); | |||
_subscribe (dispatch, id, tags = {}) { | |||
let any = (tags.any || []).map(tag => tag.value); | |||
let all = (tags.all || []).map(tag => tag.value); | |||
let none = (tags.none || []).map(tag => tag.value); | |||
[id, ...any].map((tag) => { | |||
this.disconnects.push(dispatch(connectHashtagStream(id, tag, (status) => { | |||
let tags = status.tags.map(tag => tag.name); | |||
return all.filter(tag => tags.includes(tag)).length === all.length && | |||
none.filter(tag => tags.includes(tag)).length === 0; | |||
}))); | |||
}); | |||
} | |||
_unsubscribe () { | |||
if (this.disconnect) { | |||
this.disconnect(); | |||
this.disconnect = null; | |||
} | |||
this.disconnects.map(disconnect => disconnect()); | |||
this.disconnects = []; | |||
} | |||
componentDidMount () { | |||
const { dispatch } = this.props; | |||
const { id } = this.props.params; | |||
const { id, tags } = this.props.params; | |||
dispatch(expandHashtagTimeline(id)); | |||
this._subscribe(dispatch, id); | |||
dispatch(expandHashtagTimeline(id, { tags })); | |||
} | |||
componentWillReceiveProps (nextProps) { | |||
if (nextProps.params.id !== this.props.params.id) { | |||
this.props.dispatch(expandHashtagTimeline(nextProps.params.id)); | |||
const { dispatch, params } = this.props; | |||
const { id, tags } = nextProps.params; | |||
if (id !== params.id || tags !== params.tags) { | |||
this._unsubscribe(); | |||
this._subscribe(this.props.dispatch, nextProps.params.id); | |||
this._subscribe(dispatch, id, tags); | |||
this.props.dispatch(clearTimeline(`hashtag:${id}`)); | |||
this.props.dispatch(expandHashtagTimeline(id, { tags })); | |||
} | |||
} | |||
@@ -80,7 +117,8 @@ class HashtagTimeline extends React.PureComponent { | |||
} | |||
handleLoadMore = maxId => { | |||
this.props.dispatch(expandHashtagTimeline(this.props.params.id, { maxId })); | |||
const { id, tags } = this.props.params; | |||
this.props.dispatch(expandHashtagTimeline(id, { maxId, tags })); | |||
} | |||
render () { | |||
@@ -93,14 +131,16 @@ class HashtagTimeline extends React.PureComponent { | |||
<ColumnHeader | |||
icon='hashtag' | |||
active={hasUnread} | |||
title={id} | |||
title={this.title()} | |||
onPin={this.handlePin} | |||
onMove={this.handleMove} | |||
onClick={this.handleHeaderClick} | |||
pinned={pinned} | |||
multiColumn={multiColumn} | |||
showBackButton | |||
/> | |||
> | |||
{columnId && <ColumnSettingsContainer columnId={columnId} />} | |||
</ColumnHeader> | |||
<StatusListContainer | |||
trackScroll={!pinned} | |||
@@ -27,7 +27,7 @@ class HashtagTimeline extends React.PureComponent { | |||
const { dispatch, hashtag } = this.props; | |||
dispatch(expandHashtagTimeline(hashtag)); | |||
this.disconnect = dispatch(connectHashtagStream(hashtag)); | |||
this.disconnect = dispatch(connectHashtagStream(hashtag, hashtag)); | |||
} | |||
componentWillUnmount () { | |||
@@ -137,6 +137,13 @@ | |||
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", | |||
"getting_started.security": "Security", | |||
"getting_started.terms": "Terms of service", | |||
"hashtag.column_settings.tag_toggle": "Include additional tags for this column", | |||
"hashtag.column_settings.tag_mode.any": "Any of these", | |||
"hashtag.column_settings.tag_mode.all": "All of these", | |||
"hashtag.column_settings.tag_mode.none": "None of these", | |||
"hashtag.column_header.tag_mode.any": "{tag} or {additional}", | |||
"hashtag.column_header.tag_mode.all": "{tag} and {additional}", | |||
"hashtag.column_header.tag_mode.none": "{tag} without {additional}", | |||
"home.column_settings.basic": "Basic", | |||
"home.column_settings.show_reblogs": "Show boosts", | |||
"home.column_settings.show_replies": "Show replies", | |||
@@ -1,6 +1,7 @@ | |||
import { | |||
TIMELINE_UPDATE, | |||
TIMELINE_DELETE, | |||
TIMELINE_CLEAR, | |||
TIMELINE_EXPAND_SUCCESS, | |||
TIMELINE_EXPAND_REQUEST, | |||
TIMELINE_EXPAND_FAIL, | |||
@@ -86,6 +87,10 @@ const deleteStatus = (state, id, accountId, references) => { | |||
return state; | |||
}; | |||
const clearTimeline = (state, timeline) => { | |||
return state.updateIn([timeline, 'items'], list => list.clear()); | |||
}; | |||
const filterTimelines = (state, relationship, statuses) => { | |||
let references; | |||
@@ -126,6 +131,8 @@ export default function timelines(state = initialState, action) { | |||
return updateTimeline(state, action.timeline, fromJS(action.status)); | |||
case TIMELINE_DELETE: | |||
return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf); | |||
case TIMELINE_CLEAR: | |||
return clearTimeline(state, action.timeline); | |||
case ACCOUNT_BLOCK_SUCCESS: | |||
case ACCOUNT_MUTE_SUCCESS: | |||
return filterTimelines(state, action.relationship, action.statuses); | |||
@@ -10,3 +10,34 @@ | |||
height: $size; | |||
background-size: $size $size; | |||
} | |||
@mixin search-input() { | |||
outline: 0; | |||
box-sizing: border-box; | |||
width: 100%; | |||
border: none; | |||
box-shadow: none; | |||
font-family: inherit; | |||
background: $ui-base-color; | |||
color: $darker-text-color; | |||
font-size: 14px; | |||
margin: 0; | |||
&::-moz-focus-inner { | |||
border: 0; | |||
} | |||
&::-moz-focus-inner, | |||
&:focus, | |||
&:active { | |||
outline: 0 !important; | |||
} | |||
&:focus { | |||
background: lighten($ui-base-color, 4%); | |||
} | |||
@media screen and (max-width: 600px) { | |||
font-size: 16px; | |||
} | |||
} |
@@ -3022,6 +3022,26 @@ a.status-card.compact:hover { | |||
display: block; | |||
font-weight: 500; | |||
margin-bottom: 10px; | |||
.column-settings__hashtag-select { | |||
&__control { | |||
@include search-input(); | |||
} | |||
&__multi-value { | |||
background: lighten($ui-base-color, 8%); | |||
} | |||
&__multi-value__label, | |||
&__input { | |||
color: $darker-text-color; | |||
} | |||
&__indicator-separator, | |||
&__dropdown-indicator { | |||
display: none; | |||
} | |||
} | |||
} | |||
.column-settings__row { | |||
@@ -3473,36 +3493,10 @@ a.status-card.compact:hover { | |||
} | |||
.search__input { | |||
outline: 0; | |||
box-sizing: border-box; | |||
display: block; | |||
width: 100%; | |||
border: none; | |||
padding: 10px; | |||
padding-right: 30px; | |||
font-family: inherit; | |||
background: $ui-base-color; | |||
color: $darker-text-color; | |||
font-size: 14px; | |||
margin: 0; | |||
&::-moz-focus-inner { | |||
border: 0; | |||
} | |||
&::-moz-focus-inner, | |||
&:focus, | |||
&:active { | |||
outline: 0 !important; | |||
} | |||
&:focus { | |||
background: lighten($ui-base-color, 4%); | |||
} | |||
@media screen and (max-width: 600px) { | |||
font-size: 16px; | |||
} | |||
@include search-input(); | |||
} | |||
.search__icon { | |||
@@ -82,6 +82,17 @@ class Status < ApplicationRecord | |||
scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) } | |||
scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) } | |||
scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) } | |||
scope :tagged_with_all, ->(tags) { | |||
Array(tags).map(&:id).map(&:to_i).reduce(self) do |result, id| | |||
result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}") | |||
end | |||
} | |||
scope :tagged_with_none, ->(tags) { | |||
Array(tags).map(&:id).map(&:to_i).reduce(self) do |result, id| | |||
result.joins("LEFT OUTER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}") | |||
.where("t#{id}.tag_id IS NULL") | |||
end | |||
} | |||
cache_associated :account, | |||
:application, | |||
@@ -0,0 +1,21 @@ | |||
# frozen_string_literal: true | |||
class HashtagQueryService < BaseService | |||
def call(tag, params, account = nil, local = false) | |||
any = tags_for(params[:any]) | |||
all = tags_for(params[:all]) | |||
none = tags_for(params[:none]) | |||
@query = Status.as_tag_timeline(tag, account, local) | |||
.tagged_with_all(all) | |||
.tagged_with_none(none) | |||
@query = @query.distinct.or(self.class.new.call(any, params.except(:any), account, local).distinct) if any | |||
@query | |||
end | |||
private | |||
def tags_for(tags) | |||
Tag.where(name: tags.map(&:downcase)) if tags.presence | |||
end | |||
end |
@@ -7,7 +7,7 @@ | |||
"check_name": "SQL", | |||
"message": "Possible SQL injection", | |||
"file": "app/models/report.rb", | |||
"line": 86, | |||
"line": 90, | |||
"link": "https://brakemanscanner.org/docs/warning_types/sql_injection/", | |||
"code": "Admin::ActionLog.from(\"(#{[Admin::ActionLog.where(:target_type => \"Report\", :target_id => id, :created_at => ((created_at..updated_at))).unscope(:order), Admin::ActionLog.where(:target_type => \"Account\", :target_id => target_account_id, :created_at => ((created_at..updated_at))).unscope(:order), Admin::ActionLog.where(:target_type => \"Status\", :target_id => status_ids, :created_at => ((created_at..updated_at))).unscope(:order)].map do\n \"(#{query.to_sql})\"\n end.join(\" UNION ALL \")}) AS admin_action_logs\")", | |||
"render_path": null, | |||
@@ -40,6 +40,26 @@ | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "SQL Injection", | |||
"warning_code": 0, | |||
"fingerprint": "19df3740b8d02a9fe0eb52c939b4b87d3a2a591162a6adfa8d64e9c26aeebe6d", | |||
"check_name": "SQL", | |||
"message": "Possible SQL injection", | |||
"file": "app/models/status.rb", | |||
"line": 84, | |||
"link": "https://brakemanscanner.org/docs/warning_types/sql_injection/", | |||
"code": "result.joins(\"INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}\")", | |||
"render_path": null, | |||
"location": { | |||
"type": "method", | |||
"class": "Status", | |||
"method": null | |||
}, | |||
"user_input": "id", | |||
"confidence": "Weak", | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "Cross-Site Scripting", | |||
"warning_code": 4, | |||
"fingerprint": "1fc29c578d0c89bf13bd5476829d272d54cd06b92ccf6df18568fa1f2674926e", | |||
@@ -175,6 +195,26 @@ | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "SQL Injection", | |||
"warning_code": 0, | |||
"fingerprint": "6f075c1484908e3ec9bed21ab7cf3c7866be8da3881485d1c82e13093aefcbd7", | |||
"check_name": "SQL", | |||
"message": "Possible SQL injection", | |||
"file": "app/models/status.rb", | |||
"line": 89, | |||
"link": "https://brakemanscanner.org/docs/warning_types/sql_injection/", | |||
"code": "result.joins(\"LEFT OUTER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}\")", | |||
"render_path": null, | |||
"location": { | |||
"type": "method", | |||
"class": "Status", | |||
"method": null | |||
}, | |||
"user_input": "id", | |||
"confidence": "Weak", | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "Cross-Site Scripting", | |||
"warning_code": 4, | |||
"fingerprint": "82f7b0d09beb3ab68e0fa16be63cedf4e820f2490326e9a1cec05761d92446cd", | |||
@@ -311,25 +351,6 @@ | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "Dynamic Render Path", | |||
"warning_code": 15, | |||
"fingerprint": "c5d6945d63264af106d49367228d206aa2f176699ecdce2b98fac101bc6a96cf", | |||
"check_name": "Render", | |||
"message": "Render path contains parameter value", | |||
"file": "app/views/admin/reports/index.html.haml", | |||
"line": 22, | |||
"link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/", | |||
"code": "render(action => filtered_reports.page(params[:page]), {})", | |||
"render_path": [{"type":"controller","class":"Admin::ReportsController","method":"index","line":10,"file":"app/controllers/admin/reports_controller.rb"}], | |||
"location": { | |||
"type": "template", | |||
"template": "admin/reports/index" | |||
}, | |||
"user_input": "params[:page]", | |||
"confidence": "Weak", | |||
"note": "" | |||
}, | |||
{ | |||
"warning_type": "Cross-Site Scripting", | |||
"warning_code": 4, | |||
"fingerprint": "e04aafe1e06cf8317fb6ac0a7f35783e45aa1274272ee6eaf28d39adfdad489b", | |||
@@ -355,7 +376,7 @@ | |||
"check_name": "PermitAttributes", | |||
"message": "Potentially dangerous key allowed for mass assignment", | |||
"file": "app/controllers/api/v1/reports_controller.rb", | |||
"line": 42, | |||
"line": 37, | |||
"link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/", | |||
"code": "params.permit(:account_id, :comment, :forward, :status_ids => ([]))", | |||
"render_path": null, | |||
@@ -388,6 +409,6 @@ | |||
"note": "" | |||
} | |||
], | |||
"updated": "2018-08-30 21:55:10 +0200", | |||
"updated": "2018-10-20 23:24:45 +1300", | |||
"brakeman_version": "4.2.1" | |||
} |
@@ -104,6 +104,7 @@ | |||
"react-redux-loading-bar": "^2.9.3", | |||
"react-router-dom": "^4.1.1", | |||
"react-router-scroll-4": "^1.0.0-beta.1", | |||
"react-select": "^2.0.0", | |||
"react-sparklines": "^1.7.0", | |||
"react-swipeable-views": "^0.12.17", | |||
"react-textarea-autosize": "^5.2.1", | |||
@@ -0,0 +1,60 @@ | |||
require 'rails_helper' | |||
describe HashtagQueryService, type: :service do | |||
describe '.call' do | |||
let(:account) { Fabricate(:account) } | |||
let(:tag1) { Fabricate(:tag) } | |||
let(:tag2) { Fabricate(:tag) } | |||
let!(:status1) { Fabricate(:status, tags: [tag1]) } | |||
let!(:status2) { Fabricate(:status, tags: [tag2]) } | |||
let!(:both) { Fabricate(:status, tags: [tag1, tag2]) } | |||
it 'can add tags in "any" mode' do | |||
results = subject.call(tag1, { any: [tag2.name] }) | |||
expect(results).to include status1 | |||
expect(results).to include status2 | |||
expect(results).to include both | |||
end | |||
it 'can remove tags in "all" mode' do | |||
results = subject.call(tag1, { all: [tag2.name] }) | |||
expect(results).to_not include status1 | |||
expect(results).to_not include status2 | |||
expect(results).to include both | |||
end | |||
it 'can remove tags in "none" mode' do | |||
results = subject.call(tag1, { none: [tag2.name] }) | |||
expect(results).to include status1 | |||
expect(results).to_not include status2 | |||
expect(results).to_not include both | |||
end | |||
it 'ignores an invalid mode' do | |||
results = subject.call(tag1, { wark: [tag2.name] }) | |||
expect(results).to include status1 | |||
expect(results).to_not include status2 | |||
expect(results).to include both | |||
end | |||
it 'handles being passed non existant tag names' do | |||
results = subject.call(tag1, { any: ['wark'] }) | |||
expect(results).to include status1 | |||
expect(results).to_not include status2 | |||
expect(results).to include both | |||
end | |||
it 'can restrict to an account' do | |||
BlockService.new.call(account, status1.account) | |||
results = subject.call(tag1, { none: [tag2.name] }, account) | |||
expect(results).to_not include status1 | |||
end | |||
it 'can restrict to local' do | |||
status1.account.update(domain: 'example.com') | |||
status1.update(local: false, uri: 'example.com/toot') | |||
results = subject.call(tag1, { any: [tag2.name] }, nil, true) | |||
expect(results).to_not include status1 | |||
end | |||
end | |||
end |
@@ -731,6 +731,50 @@ | |||
resolved "https://registry.yarnpkg.com/@csstools/sass-import-resolve/-/sass-import-resolve-1.0.0.tgz#32c3cdb2f7af3cd8f0dca357b592e7271f3831b5" | |||
integrity sha512-pH4KCsbtBLLe7eqUrw8brcuFO8IZlN36JjdKlOublibVdAIPHCzEnpBWOVUXK5sCf+DpBi8ZtuWtjF0srybdeA== | |||
"@emotion/babel-utils@^0.6.4": | |||
version "0.6.9" | |||
resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.9.tgz#bb074fadad65c443a575d3379488415fd194fc75" | |||
dependencies: | |||
"@emotion/hash" "^0.6.5" | |||
"@emotion/memoize" "^0.6.5" | |||
"@emotion/serialize" "^0.9.0" | |||
convert-source-map "^1.5.1" | |||
find-root "^1.1.0" | |||
source-map "^0.7.2" | |||
"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.5": | |||
version "0.6.5" | |||
resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.5.tgz#097729b84a5164f71f9acd2570ecfd1354d7b360" | |||
"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.5": | |||
version "0.6.5" | |||
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.5.tgz#f868c314b889e7c3d84868a1d1cc323fbb40ca86" | |||
"@emotion/serialize@^0.9.0": | |||
version "0.9.0" | |||
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.0.tgz#ac5577cb98c7557c1a24a94cc101c5da6dc18322" | |||
dependencies: | |||
"@emotion/hash" "^0.6.5" | |||
"@emotion/memoize" "^0.6.5" | |||
"@emotion/unitless" "^0.6.6" | |||
"@emotion/utils" "^0.8.1" | |||
"@emotion/stylis@^0.6.10": | |||
version "0.6.12" | |||
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.6.12.tgz#3fb58220e0fc9e380bcabbb3edde396ddc1dfe6e" | |||
"@emotion/stylis@^0.7.0": | |||
version "0.7.0" | |||
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.0.tgz#4c30e6fccc9555e42fa6fef98b3bd0788b954684" | |||
"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.6": | |||
version "0.6.6" | |||
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.6.tgz#988957ecd0a9be00ee9de27172f8c56d41595a93" | |||
"@emotion/utils@^0.8.1": | |||
version "0.8.1" | |||
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.1.tgz#f3a81587ad8d0ef33cdad6f3b4310774fcc1053e" | |||
"@types/node@*": | |||
version "10.9.4" | |||
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897" | |||
@@ -1324,7 +1368,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: | |||
esutils "^2.0.2" | |||
js-tokens "^3.0.2" | |||
babel-core@^6.0.0, babel-core@^6.26.0: | |||
babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3: | |||
version "6.26.3" | |||
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" | |||
integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== | |||
@@ -1413,6 +1457,24 @@ babel-messages@^6.23.0: | |||
dependencies: | |||
babel-runtime "^6.22.0" | |||
babel-plugin-emotion@^9.2.9: | |||
version "9.2.9" | |||
resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.9.tgz#7b3c72fd6a333127abafe7fb693bcb421e7f5b9f" | |||
dependencies: | |||
"@babel/helper-module-imports" "^7.0.0" | |||
"@emotion/babel-utils" "^0.6.4" | |||
"@emotion/hash" "^0.6.2" | |||
"@emotion/memoize" "^0.6.1" | |||
"@emotion/stylis" "^0.7.0" | |||
babel-core "^6.26.3" | |||
babel-plugin-macros "^2.0.0" | |||
babel-plugin-syntax-jsx "^6.18.0" | |||
convert-source-map "^1.5.0" | |||
find-root "^1.1.0" | |||
mkdirp "^0.5.1" | |||
source-map "^0.5.7" | |||
touch "^1.0.0" | |||
babel-plugin-istanbul@^4.1.6: | |||
version "4.1.6" | |||
resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" | |||
@@ -1439,7 +1501,7 @@ babel-plugin-lodash@^3.3.4: | |||
lodash "^4.17.10" | |||
require-package-name "^2.0.1" | |||
babel-plugin-macros@^2.2.2: | |||
babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.2.2: | |||
version "2.4.0" | |||
resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.4.0.tgz#6c5f9836e1f6c0a9743b3bab4af29f73e437e544" | |||
integrity sha512-flIBfrqAdHWn+4l2cS/4jZEyl+m5EaBHVzTb0aOF+eu/zR7E41/MoCFHPhDNL8Wzq1nyelnXeT+vcL2byFLSZw== | |||
@@ -1463,6 +1525,10 @@ babel-plugin-react-intl@^3.0.0: | |||
intl-messageformat-parser "^1.2.0" | |||
mkdirp "^0.5.1" | |||
babel-plugin-syntax-jsx@^6.18.0: | |||
version "6.18.0" | |||
resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" | |||
babel-plugin-syntax-object-rest-spread@^6.13.0: | |||
version "6.13.0" | |||
resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" | |||
@@ -2278,7 +2344,7 @@ content-type@~1.0.4: | |||
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" | |||
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== | |||
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1: | |||
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: | |||
version "1.6.0" | |||
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" | |||
integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== | |||
@@ -2354,6 +2420,18 @@ create-ecdh@^4.0.0: | |||
bn.js "^4.1.0" | |||
elliptic "^6.0.0" | |||
create-emotion@^9.2.6: | |||
version "9.2.6" | |||
resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.6.tgz#f64cf1c64cf82fe7d22725d1d77498ddd2d39edb" | |||
dependencies: | |||
"@emotion/hash" "^0.6.2" | |||
"@emotion/memoize" "^0.6.1" | |||
"@emotion/stylis" "^0.6.10" | |||
"@emotion/unitless" "^0.6.2" | |||
csstype "^2.5.2" | |||
stylis "^3.5.0" | |||
stylis-rule-sheet "^0.0.10" | |||
create-hash@^1.1.0, create-hash@^1.1.2: | |||
version "1.2.0" | |||
resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" | |||
@@ -2552,6 +2630,10 @@ csstype@^2.2.0: | |||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.6.tgz#2ae1db2319642d8b80a668d2d025c6196071e788" | |||
integrity sha512-tKPyhy0FmfYD2KQYXD5GzkvAYLYj96cMLXr648CKGd3wBe0QqoPipImjGiLze9c8leJK8J3n7ap90tpk3E6HGQ== | |||
csstype@^2.5.2: | |||
version "2.5.7" | |||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff" | |||
currently-unhandled@^0.4.1: | |||
version "0.4.1" | |||
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" | |||
@@ -2985,6 +3067,13 @@ emojis-list@^2.0.0: | |||
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" | |||
integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= | |||
emotion@^9.1.2: | |||
version "9.2.9" | |||
resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.9.tgz#c2028705acc60a138ecb69d3fc1d2056764f61a1" | |||
dependencies: | |||
babel-plugin-emotion "^9.2.9" | |||
create-emotion "^9.2.6" | |||
encodeurl@~1.0.2: | |||
version "1.0.2" | |||
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" | |||
@@ -3712,6 +3801,10 @@ find-cache-dir@^2.0.0: | |||
make-dir "^1.0.0" | |||
pkg-dir "^3.0.0" | |||
find-root@^1.1.0: | |||
version "1.1.0" | |||
resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" | |||
find-up@^1.0.0: | |||
version "1.1.2" | |||
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" | |||
@@ -5897,6 +5990,10 @@ mem@^4.0.0: | |||
mimic-fn "^1.0.0" | |||
p-is-promise "^1.1.0" | |||
memoize-one@^4.0.0: | |||
version "4.0.2" | |||
resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.0.2.tgz#3fb8db695aa14ab9c0f1644e1585a8806adc1aee" | |||
memory-fs@^0.4.0, memory-fs@~0.4.1: | |||
version "0.4.1" | |||
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" | |||
@@ -6427,6 +6524,12 @@ nopt@^4.0.1: | |||
abbrev "1" | |||
osenv "^0.1.4" | |||
nopt@~1.0.10: | |||
version "1.0.10" | |||
resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" | |||
dependencies: | |||
abbrev "1" | |||
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: | |||
version "2.4.0" | |||
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" | |||
@@ -7881,6 +7984,12 @@ react-immutable-pure-component@^1.1.1: | |||
optionalDependencies: | |||
"@types/react" "16.4.6" | |||
react-input-autosize@^2.2.1: | |||
version "2.2.1" | |||
resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8" | |||
dependencies: | |||
prop-types "^15.5.8" | |||
react-intl-translations-manager@^5.0.3: | |||
version "5.0.3" | |||
resolved "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz#aee010ecf35975673e033ca5d7d3f4147894324d" | |||
@@ -7991,6 +8100,18 @@ react-router@^4.3.1: | |||
prop-types "^15.6.1" | |||
warning "^4.0.1" | |||
react-select@^2.0.0: | |||
version "2.0.0" | |||
resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.0.0.tgz#7e7ba31eff360b37ffc52b343a720f4248bd9b3b" | |||
dependencies: | |||
classnames "^2.2.5" | |||
emotion "^9.1.2" | |||
memoize-one "^4.0.0" | |||
prop-types "^15.6.0" | |||
raf "^3.4.0" | |||
react-input-autosize "^2.2.1" | |||
react-transition-group "^2.2.1" | |||
react-sparklines@^1.7.0: | |||
version "1.7.0" | |||
resolved "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz#9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60" | |||
@@ -8054,7 +8175,7 @@ react-toggle@^4.0.1: | |||
dependencies: | |||
classnames "^2.2.5" | |||
react-transition-group@^2.2.0: | |||
react-transition-group@^2.2.0, react-transition-group@^2.2.1: | |||
version "2.4.0" | |||
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.4.0.tgz#1d9391fabfd82e016f26fabd1eec329dbd922b5a" | |||
integrity sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA== | |||
@@ -8981,6 +9102,10 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: | |||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" | |||
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== | |||
source-map@^0.7.2: | |||
version "0.7.3" | |||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" | |||
spdx-correct@^3.0.0: | |||
version "3.0.0" | |||
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" | |||
@@ -9267,6 +9392,14 @@ style-loader@^0.23.0: | |||
loader-utils "^1.1.0" | |||
schema-utils "^0.4.5" | |||
stylis-rule-sheet@^0.0.10: | |||
version "0.0.10" | |||
resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" | |||
stylis@^3.5.0: | |||
version "3.5.3" | |||
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546" | |||
substring-trie@^1.0.2: | |||
version "1.0.2" | |||
resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz#7b42592391628b4f2cb17365c6cce4257c7b7af5" | |||
@@ -9481,6 +9614,12 @@ to-regex@^3.0.1, to-regex@^3.0.2: | |||
regex-not "^1.0.2" | |||
safe-regex "^1.1.0" | |||
touch@^1.0.0: | |||
version "1.0.0" | |||
resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de" | |||
dependencies: | |||
nopt "~1.0.10" | |||
tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3: | |||
version "2.4.3" | |||
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" | |||