+++ /dev/null
-# frozen_string_literal: true
-
-class Api::V1::TrendsController < Api::BaseController
- before_action :set_tags
-
- respond_to :json
-
- def index
- render json: @tags, each_serializer: REST::TagSerializer
- end
-
- private
-
- def set_tags
- @tags = TrendingTags.get(limit_param(10))
- end
-end
+++ /dev/null
-import api from '../api';
-
-export const TRENDS_FETCH_REQUEST = 'TRENDS_FETCH_REQUEST';
-export const TRENDS_FETCH_SUCCESS = 'TRENDS_FETCH_SUCCESS';
-export const TRENDS_FETCH_FAIL = 'TRENDS_FETCH_FAIL';
-
-export const fetchTrends = () => (dispatch, getState) => {
- dispatch(fetchTrendsRequest());
-
- api(getState)
- .get('/api/v1/trends')
- .then(({ data }) => dispatch(fetchTrendsSuccess(data)))
- .catch(err => dispatch(fetchTrendsFail(err)));
-};
-
-export const fetchTrendsRequest = () => ({
- type: TRENDS_FETCH_REQUEST,
- skipLoading: true,
-});
-
-export const fetchTrendsSuccess = trends => ({
- type: TRENDS_FETCH_SUCCESS,
- trends,
- skipLoading: true,
-});
-
-export const fetchTrendsFail = error => ({
- type: TRENDS_FETCH_FAIL,
- error,
- skipLoading: true,
- skipAlert: true,
-});
import React from 'react';
-import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../../containers/account_container';
static propTypes = {
results: ImmutablePropTypes.map.isRequired,
- trends: ImmutablePropTypes.list,
- fetchTrends: PropTypes.func.isRequired,
};
- componentDidMount () {
- const { fetchTrends } = this.props;
- fetchTrends();
- }
-
render () {
- const { results, trends } = this.props;
+ const { results } = this.props;
let accounts, statuses, hashtags;
let count = 0;
- if (results.isEmpty()) {
- return (
- <div className='search-results'>
- <div className='trends'>
- <div className='trends__header'>
- <i className='fa fa-fire fa-fw' />
- <FormattedMessage id='trends.header' defaultMessage='Trending now' />
- </div>
-
- {trends && trends.map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
- </div>
- </div>
- );
- }
-
if (results.get('accounts') && results.get('accounts').size > 0) {
count += results.get('accounts').size;
accounts = (
import { connect } from 'react-redux';
import SearchResults from '../components/search_results';
-import { fetchTrends } from '../../../actions/trends';
const mapStateToProps = state => ({
results: state.getIn(['search', 'results']),
- trends: state.getIn(['trends', 'items']),
});
-const mapDispatchToProps = dispatch => ({
- fetchTrends: () => dispatch(fetchTrends()),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
+export default connect(mapStateToProps)(SearchResults);
+++ /dev/null
-import classNames from 'classnames';
-import React from 'react';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage, defineMessages } from 'react-intl';
-import Hashtag from '../../../components/hashtag';
-import { Link } from 'react-router-dom';
-
-const messages = defineMessages({
- refresh_trends: { id: 'trends.refresh', defaultMessage: 'Refresh' },
-});
-
-export default class Trends extends ImmutablePureComponent {
-
- static defaultProps = {
- loading: false,
- };
-
- static propTypes = {
- trends: ImmutablePropTypes.list,
- loading: PropTypes.bool.isRequired,
- showTrends: PropTypes.bool.isRequired,
- fetchTrends: PropTypes.func.isRequired,
- toggleTrends: PropTypes.func.isRequired,
- };
-
- componentDidMount () {
- setTimeout(() => this.props.fetchTrends(), 5000);
- }
-
- handleRefreshTrends = () => {
- this.props.fetchTrends();
- }
-
- handleToggle = () => {
- this.props.toggleTrends(!this.props.showTrends);
- }
-
- render () {
- const { intl, trends, loading, showTrends } = this.props;
-
- if (!trends || trends.size < 1) {
- return null;
- }
-
- return (
- <div className='getting-started__trends'>
- <div className='column-header__wrapper'>
- <h1 className='column-header'>
- <button>
- <i className='fa fa-fire fa-fw' />
- <FormattedMessage id='trends.header' defaultMessage='Trending now' />
- </button>
-
- <div className='column-header__buttons'>
- {showTrends && <button onClick={this.handleRefreshTrends} className='column-header__button' title={intl.formatMessage(messages.refresh_trends)} aria-label={intl.formatMessage(messages.refresh_trends)} disabled={loading}><i className={classNames('fa', 'fa-refresh', { 'fa-spin': loading })} /></button>}
- <button onClick={this.handleToggle} className='column-header__button'><i className={classNames('fa', showTrends ? 'fa-chevron-down' : 'fa-chevron-up')} /></button>
- </div>
- </h1>
- </div>
-
- {showTrends && <div className='getting-started__scrollable'>
- {trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
- <Link to='/trends' className='load-more'><FormattedMessage id='status.load_more' defaultMessage='Load more' /></Link>
- </div>}
- </div>
- );
- }
-
-}
+++ /dev/null
-import { connect } from 'react-redux';
-import { injectIntl } from 'react-intl';
-import { fetchTrends } from '../../../actions/trends';
-import Trends from '../components/trends';
-import { changeSetting } from '../../../actions/settings';
-
-const mapStateToProps = state => ({
- trends: state.getIn(['trends', 'items']),
- loading: state.getIn(['trends', 'isLoading']),
- showTrends: state.getIn(['settings', 'trends', 'show']),
-});
-
-const mapDispatchToProps = dispatch => ({
- fetchTrends: () => dispatch(fetchTrends()),
- toggleTrends: show => dispatch(changeSetting(['trends', 'show'], show)),
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Trends));
import { List as ImmutableList } from 'immutable';
import { Link } from 'react-router-dom';
import NavigationBar from '../compose/components/navigation_bar';
-import TrendsContainer from './containers/trends_container';
const messages = defineMessages({
home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
{navItems}
</div>
- {multiColumn && <TrendsContainer />}
-
{!multiColumn && <div className='flex-spacer' />}
<div className='getting-started getting-started__footer'>
Mutes,
PinnedStatuses,
Lists,
- Trends,
} from './util/async-components';
import { HotKeys } from 'react-hotkeys';
import { me } from '../../initial_state';
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
<WrappedRoute path='/search' component={Compose} content={children} componentParams={{ isSearchPage: true }} />
- <WrappedRoute path='/trends' component={Trends} content={children} />
<WrappedRoute path='/statuses/new' component={Compose} content={children} />
<WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
export function ListEditor () {
return import(/* webpackChunkName: "features/list_editor" */'../../list_editor');
}
-
-export function Trends () {
- return import(/* webpackChunkName: "features/trends" */'../../trends');
-}
import custom_emojis from './custom_emojis';
import lists from './lists';
import listEditor from './list_editor';
-import trends from './trends';
const reducers = {
dropdown_menu,
custom_emojis,
lists,
listEditor,
- trends,
};
export default combineReducers(reducers);
+++ /dev/null
-import { TRENDS_FETCH_REQUEST, TRENDS_FETCH_SUCCESS, TRENDS_FETCH_FAIL } from '../actions/trends';
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-
-const initialState = ImmutableMap({
- items: ImmutableList(),
- isLoading: false,
-});
-
-export default function trendsReducer(state = initialState, action) {
- switch(action.type) {
- case TRENDS_FETCH_REQUEST:
- return state.set('isLoading', true);
- case TRENDS_FETCH_SUCCESS:
- return state.withMutations(map => {
- map.set('items', fromJS(action.trends));
- map.set('isLoading', false);
- });
- case TRENDS_FETCH_FAIL:
- return state.set('isLoading', false);
- default:
- return state;
- }
-};
# frozen_string_literal: true
class TrendingTags
- KEY = 'trending_tags'
EXPIRE_HISTORY_AFTER = 7.days.seconds
- THRESHOLD = 5
class << self
def record_use!(tag, account, at_time = Time.now.utc)
increment_historical_use!(tag.id, at_time)
increment_unique_use!(tag.id, account.id, at_time)
- increment_vote!(tag.id, at_time)
- end
-
- def get(limit)
- tag_ids = redis.zrevrange(KEY, 0, limit).map(&:to_i)
- tags = Tag.where(id: tag_ids).to_a.map { |tag| [tag.id, tag] }.to_h
- tag_ids.map { |tag_id| tags[tag_id] }.compact
end
private
- def increment_vote!(tag_id, at_time)
- expected = redis.pfcount("activity:tags:#{tag_id}:#{(at_time - 1.day).beginning_of_day.to_i}:accounts").to_f
- expected = 1.0 if expected.zero?
- observed = redis.pfcount("activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}:accounts").to_f
-
- if expected > observed || observed < THRESHOLD
- redis.zrem(KEY, tag_id.to_s)
- else
- score = ((observed - expected)**2) / expected
- redis.zadd(KEY, score, tag_id.to_s)
- end
- end
-
def increment_historical_use!(tag_id, at_time)
key = "activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}"
redis.incrby(key, 1)
resources :mutes, only: [:index]
resources :favourites, only: [:index]
resources :reports, only: [:index, :create]
- resources :trends, only: [:index]
namespace :apps do
get :verify_credentials, to: 'credentials#show'
cat aescling's git repositories / mastodon.git / commitdiff