{statusIds.map((statusId) => {
return
;
diff --git a/app/assets/javascripts/components/features/account_timeline/index.jsx b/app/assets/javascripts/components/features/account_timeline/index.jsx
index 4a66dbbf5ab..5c09839f715 100644
--- a/app/assets/javascripts/components/features/account_timeline/index.jsx
+++ b/app/assets/javascripts/components/features/account_timeline/index.jsx
@@ -9,7 +9,8 @@ import StatusList from '../../components/status_list';
import LoadingIndicator from '../../components/loading_indicator';
const mapStateToProps = (state, props) => ({
- statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId)]),
+ statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items']),
+ isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']),
me: state.getIn(['meta', 'me'])
});
@@ -19,6 +20,7 @@ const AccountTimeline = React.createClass({
params: React.PropTypes.object.isRequired,
dispatch: React.PropTypes.func.isRequired,
statusIds: ImmutablePropTypes.list,
+ isLoading: React.PropTypes.bool,
me: React.PropTypes.number.isRequired
},
@@ -39,13 +41,13 @@ const AccountTimeline = React.createClass({
},
render () {
- const { statusIds, me } = this.props;
+ const { statusIds, isLoading, me } = this.props;
if (!statusIds) {
return
;
}
- return
+ return
}
});
diff --git a/app/assets/javascripts/components/features/notifications/index.jsx b/app/assets/javascripts/components/features/notifications/index.jsx
index d243f178fa7..366d8f5e9c9 100644
--- a/app/assets/javascripts/components/features/notifications/index.jsx
+++ b/app/assets/javascripts/components/features/notifications/index.jsx
@@ -62,6 +62,7 @@ const Notifications = React.createClass({
if (trackScroll) {
return (
+
{scrollableArea}
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
index ffb6f6e79da..8af7b0c3ca5 100644
--- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
+++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
@@ -33,7 +33,8 @@ const getStatusIds = createSelector([
}));
const mapStateToProps = (state, props) => ({
- statusIds: getStatusIds(state, props)
+ statusIds: getStatusIds(state, props),
+ isLoading: state.getIn(['timelines', props.type, 'isLoading'], true)
});
const mapDispatchToProps = (dispatch, { type, id }) => ({
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index c5e3a253f52..6f2d26dcb79 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -1,9 +1,12 @@
import {
TIMELINE_REFRESH_REQUEST,
TIMELINE_REFRESH_SUCCESS,
+ TIMELINE_REFRESH_FAIL,
TIMELINE_UPDATE,
TIMELINE_DELETE,
TIMELINE_EXPAND_SUCCESS,
+ TIMELINE_EXPAND_REQUEST,
+ TIMELINE_EXPAND_FAIL,
TIMELINE_SCROLL_TOP
} from '../actions/timelines';
import {
@@ -13,37 +16,43 @@ import {
UNFAVOURITE_SUCCESS
} from '../actions/interactions';
import {
- ACCOUNT_FETCH_SUCCESS,
+ ACCOUNT_TIMELINE_FETCH_REQUEST,
ACCOUNT_TIMELINE_FETCH_SUCCESS,
+ ACCOUNT_TIMELINE_FETCH_FAIL,
+ ACCOUNT_TIMELINE_EXPAND_REQUEST,
ACCOUNT_TIMELINE_EXPAND_SUCCESS,
+ ACCOUNT_TIMELINE_EXPAND_FAIL,
ACCOUNT_BLOCK_SUCCESS
} from '../actions/accounts';
import {
- STATUS_FETCH_SUCCESS,
CONTEXT_FETCH_SUCCESS
} from '../actions/statuses';
import Immutable from 'immutable';
const initialState = Immutable.Map({
home: Immutable.Map({
+ isLoading: false,
loaded: false,
top: true,
items: Immutable.List()
}),
mentions: Immutable.Map({
+ isLoading: false,
loaded: false,
top: true,
items: Immutable.List()
}),
public: Immutable.Map({
+ isLoading: false,
loaded: false,
top: true,
items: Immutable.List()
}),
tag: Immutable.Map({
+ isLoading: false,
id: null,
loaded: false,
top: true,
@@ -82,6 +91,7 @@ const normalizeTimeline = (state, timeline, statuses, replace = false) => {
});
state = state.setIn([timeline, 'loaded'], true);
+ state = state.setIn([timeline, 'isLoading'], false);
return state.updateIn([timeline, 'items'], Immutable.List(), list => (loaded ? list.unshift(...ids) : ids));
};
@@ -94,6 +104,8 @@ const appendNormalizedTimeline = (state, timeline, statuses) => {
moreIds = moreIds.set(i, status.get('id'));
});
+ state = state.setIn([timeline, 'isLoading'], false);
+
return state.updateIn([timeline, 'items'], Immutable.List(), list => list.push(...moreIds));
};
@@ -105,7 +117,10 @@ const normalizeAccountTimeline = (state, accountId, statuses, replace = false) =
ids = ids.set(i, status.get('id'));
});
- return state.updateIn(['accounts_timelines', accountId], Immutable.List([]), list => (replace ? ids : list.unshift(...ids)));
+ return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map
+ .set('isLoading', false)
+ .set('loaded', true)
+ .update('items', Immutable.List(), list => (replace ? ids : list.unshift(...ids))));
};
const appendNormalizedAccountTimeline = (state, accountId, statuses) => {
@@ -116,7 +131,9 @@ const appendNormalizedAccountTimeline = (state, accountId, statuses) => {
moreIds = moreIds.set(i, status.get('id'));
});
- return state.updateIn(['accounts_timelines', accountId], Immutable.List([]), list => list.push(...moreIds));
+ return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map
+ .set('isLoading', false)
+ .update('items', list => list.push(...moreIds)));
};
const updateTimeline = (state, timeline, status, references) => {
@@ -157,7 +174,7 @@ const deleteStatus = (state, id, accountId, references, reblogOf) => {
});
// Remove references from account timelines
- state = state.updateIn(['accounts_timelines', accountId], Immutable.List([]), list => list.filterNot(item => item === id));
+ state = state.updateIn(['accounts_timelines', accountId, 'items'], Immutable.List([]), list => list.filterNot(item => item === id));
// Remove references from context
state.getIn(['descendants', id], Immutable.List()).forEach(descendantId => {
@@ -207,8 +224,11 @@ const resetTimeline = (state, timeline, id) => {
if (timeline === 'tag' && state.getIn([timeline, 'id']) !== id) {
state = state.update(timeline, map => map
.set('id', id)
+ .set('isLoading', true)
.set('loaded', false)
.update('items', list => list.clear()));
+ } else {
+ state = state.setIn([timeline, 'isLoading'], true);
}
return state;
@@ -216,27 +236,37 @@ const resetTimeline = (state, timeline, id) => {
export default function timelines(state = initialState, action) {
switch(action.type) {
- case TIMELINE_REFRESH_REQUEST:
- return resetTimeline(state, action.timeline, action.id);
- case TIMELINE_REFRESH_SUCCESS:
- return normalizeTimeline(state, action.timeline, Immutable.fromJS(action.statuses));
- case TIMELINE_EXPAND_SUCCESS:
- return appendNormalizedTimeline(state, action.timeline, Immutable.fromJS(action.statuses));
- case TIMELINE_UPDATE:
- return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
- case TIMELINE_DELETE:
- return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
- case CONTEXT_FETCH_SUCCESS:
- return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants));
- case ACCOUNT_TIMELINE_FETCH_SUCCESS:
- return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses), action.replace);
- case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
- return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
- case ACCOUNT_BLOCK_SUCCESS:
- return filterTimelines(state, action.relationship, action.statuses);
- case TIMELINE_SCROLL_TOP:
- return state.setIn([action.timeline, 'top'], action.top);
- default:
- return state;
+ case TIMELINE_REFRESH_REQUEST:
+ case TIMELINE_EXPAND_REQUEST:
+ return resetTimeline(state, action.timeline, action.id);
+ case TIMELINE_REFRESH_FAIL:
+ case TIMELINE_EXPAND_FAIL:
+ return state.setIn([action.timeline, 'isLoading'], false);
+ case TIMELINE_REFRESH_SUCCESS:
+ return normalizeTimeline(state, action.timeline, Immutable.fromJS(action.statuses));
+ case TIMELINE_EXPAND_SUCCESS:
+ return appendNormalizedTimeline(state, action.timeline, Immutable.fromJS(action.statuses));
+ case TIMELINE_UPDATE:
+ return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
+ case TIMELINE_DELETE:
+ return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
+ case CONTEXT_FETCH_SUCCESS:
+ return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants));
+ case ACCOUNT_TIMELINE_FETCH_REQUEST:
+ case ACCOUNT_TIMELINE_EXPAND_REQUEST:
+ return state.updateIn(['accounts_timelines', action.id], Immutable.Map(), map => map.set('isLoading', true));
+ case ACCOUNT_TIMELINE_FETCH_FAIL:
+ case ACCOUNT_TIMELINE_EXPAND_FAIL:
+ return state.updateIn(['accounts_timelines', action.id], Immutable.Map(), map => map.set('isLoading', false));
+ case ACCOUNT_TIMELINE_FETCH_SUCCESS:
+ return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses), action.replace);
+ case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
+ return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
+ case ACCOUNT_BLOCK_SUCCESS:
+ return filterTimelines(state, action.relationship, action.statuses);
+ case TIMELINE_SCROLL_TOP:
+ return state.setIn([action.timeline, 'top'], action.top);
+ default:
+ return state;
}
};
diff --git a/app/assets/stylesheets/boost.scss b/app/assets/stylesheets/boost.scss
new file mode 100644
index 00000000000..c45d4ff8eca
--- /dev/null
+++ b/app/assets/stylesheets/boost.scss
@@ -0,0 +1,9 @@
+@import 'variables';
+
+@function url-friendly-colour($colour) {
+ @return '%23' + str-slice('#{$colour}', 2, -1)
+}
+
+button i.fa-retweet {
+background-image: url("data:image/svg+xml;utf8,");
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 681259861af..dee53dcc783 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -60,6 +60,19 @@
}
}
+.invisible {
+ font-size: 0;
+ line-height: 0;
+ display: inline-block;
+ width: 0;
+}
+
+.ellipsis {
+ &:after {
+ content: "…";
+ }
+}
+
.lightbox .icon-button {
color: $color1;
}
@@ -699,12 +712,14 @@
}
}
+@import 'boost';
+
+
button i.fa-retweet {
height: 19px;
width: 22px;
- background: image-url('boost_sprite.png') no-repeat;
background-position: 0 0;
- transition: background-position 0.9s steps(11);
+ transition: background-position 0.9s steps(10);
transition-duration: 0s;
&::before {
@@ -714,7 +729,7 @@ button i.fa-retweet {
button.active i.fa-retweet {
transition-duration: 0.9s;
- background-position: 0 -209px;
+ background-position: 0 100%;
}
.status-card {
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 234844ed767..d97010c0e54 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -16,13 +16,13 @@ class Api::V1::AccountsController < ApiController
end
def following
- results = Follow.where(account: @account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+ results = Follow.where(account: @account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.target_account_id] }
set_account_counters_maps(@accounts)
- next_path = following_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ next_path = following_api_v1_account_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = following_api_v1_account_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
@@ -31,13 +31,13 @@ class Api::V1::AccountsController < ApiController
end
def followers
- results = Follow.where(target_account: @account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+ results = Follow.where(target_account: @account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.account_id] }
set_account_counters_maps(@accounts)
- next_path = followers_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ next_path = followers_api_v1_account_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = followers_api_v1_account_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
@@ -46,13 +46,13 @@ class Api::V1::AccountsController < ApiController
end
def statuses
- @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses, Status)
set_maps(@statuses)
set_counters_maps(@statuses)
- next_path = statuses_api_v1_account_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
+ next_path = statuses_api_v1_account_url(max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = statuses_api_v1_account_url(since_id: @statuses.first.id) unless @statuses.empty?
set_pagination_headers(next_path, prev_path)
@@ -65,7 +65,7 @@ class Api::V1::AccountsController < ApiController
end
def block
- BlockWorker.perform_async(current_user.account_id, @account.id)
+ BlockService.new.call(current_user.account, @account)
@following = { @account.id => false }
@followed_by = { @account.id => false }
@@ -98,8 +98,7 @@ class Api::V1::AccountsController < ApiController
end
def search
- limit = params[:limit] ? [DEFAULT_ACCOUNTS_LIMIT, params[:limit].to_i].min : DEFAULT_ACCOUNTS_LIMIT
- @accounts = SearchService.new.call(params[:q], limit, params[:resolve] == 'true')
+ @accounts = SearchService.new.call(params[:q], limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:resolve] == 'true')
set_account_counters_maps(@accounts) unless @accounts.nil?
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 8629242ab1a..b9816e052b3 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -7,13 +7,13 @@ class Api::V1::BlocksController < ApiController
respond_to :json
def index
- results = Block.where(account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+ results = Block.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.target_account_id] }
set_account_counters_maps(@accounts)
- next_path = api_v1_blocks_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ next_path = api_v1_blocks_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = api_v1_blocks_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index ea799fd5554..ef0a4854aba 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -7,13 +7,13 @@ class Api::V1::FavouritesController < ApiController
respond_to :json
def index
- results = Favourite.where(account: current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ results = Favourite.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(Status.where(id: results.map(&:status_id)), Status)
set_maps(@statuses)
set_counters_maps(@statuses)
- next_path = api_v1_favourites_url(max_id: results.last.id) if results.size == DEFAULT_STATUSES_LIMIT
+ next_path = api_v1_favourites_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_favourites_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index ee12446d821..157a88e1467 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -7,7 +7,7 @@ class Api::V1::NotificationsController < ApiController
respond_to :json
def index
- @notifications = Notification.where(account: current_account).browserable.paginate_by_max_id(20, params[:max_id], params[:since_id])
+ @notifications = Notification.where(account: current_account).browserable.paginate_by_max_id(limit_param(15), params[:max_id], params[:since_id])
@notifications = cache_collection(@notifications, Notification)
statuses = @notifications.select { |n| !n.target_status.nil? }.map(&:target_status)
@@ -15,7 +15,7 @@ class Api::V1::NotificationsController < ApiController
set_counters_maps(statuses)
set_account_counters_maps(@notifications.map(&:from_account))
- next_path = api_v1_notifications_url(max_id: @notifications.last.id) if @notifications.size == 20
+ next_path = api_v1_notifications_url(max_id: @notifications.last.id) if @notifications.size == limit_param(15)
prev_path = api_v1_notifications_url(since_id: @notifications.first.id) unless @notifications.empty?
set_pagination_headers(next_path, prev_path)
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 0155b64a3e4..09d5a82fa76 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -27,13 +27,13 @@ class Api::V1::StatusesController < ApiController
end
def reblogged_by
- results = @status.reblogs.paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+ results = @status.reblogs.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |r| accounts[r.account_id] }
set_account_counters_maps(@accounts)
- next_path = reblogged_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ next_path = reblogged_by_api_v1_status_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = reblogged_by_api_v1_status_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
@@ -42,13 +42,13 @@ class Api::V1::StatusesController < ApiController
end
def favourited_by
- results = @status.favourites.paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
+ results = @status.favourites.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.account_id] }
set_account_counters_maps(@accounts)
- next_path = favourited_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
+ next_path = favourited_by_api_v1_status_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = favourited_by_api_v1_status_url(since_id: results.first.id) unless results.empty?
set_pagination_headers(next_path, prev_path)
diff --git a/app/controllers/api/v1/timelines_controller.rb b/app/controllers/api/v1/timelines_controller.rb
index 9727797e593..5042550db8b 100644
--- a/app/controllers/api/v1/timelines_controller.rb
+++ b/app/controllers/api/v1/timelines_controller.rb
@@ -7,14 +7,14 @@ class Api::V1::TimelinesController < ApiController
respond_to :json
def home
- @statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = Feed.new(:home, current_account).get(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
- next_path = api_v1_home_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
+ next_path = api_v1_home_timeline_url(max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_home_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
set_pagination_headers(next_path, prev_path)
@@ -23,14 +23,14 @@ class Api::V1::TimelinesController < ApiController
end
def mentions
- @statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = Feed.new(:mentions, current_account).get(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
- next_path = api_v1_mentions_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
+ next_path = api_v1_mentions_timeline_url(max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_mentions_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
set_pagination_headers(next_path, prev_path)
@@ -39,14 +39,14 @@ class Api::V1::TimelinesController < ApiController
end
def public
- @statuses = Status.as_public_timeline(current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = Status.as_public_timeline(current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
- next_path = api_v1_public_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
+ next_path = api_v1_public_timeline_url(max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_public_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?
set_pagination_headers(next_path, prev_path)
@@ -56,14 +56,14 @@ class Api::V1::TimelinesController < ApiController
def tag
@tag = Tag.find_by(name: params[:id].downcase)
- @statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
+ @statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
set_account_counters_maps(@statuses.flat_map { |s| [s.account, s.reblog? ? s.reblog.account : nil] }.compact.uniq)
- next_path = api_v1_hashtag_timeline_url(params[:id], max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
+ next_path = api_v1_hashtag_timeline_url(params[:id], max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
prev_path = api_v1_hashtag_timeline_url(params[:id], since_id: @statuses.first.id) unless @statuses.empty?
set_pagination_headers(next_path, prev_path)
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 00528d94d5a..5d2bd9a225e 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -62,6 +62,11 @@ class ApiController < ApplicationController
response.headers['Link'] = LinkHeader.new(links)
end
+ def limit_param(default_limit)
+ return default_limit unless params[:limit]
+ [params[:limit].to_i.abs, default_limit * 2].min
+ end
+
def current_resource_owner
@current_user ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index ccdef03827d..72cd3d23467 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -80,8 +80,11 @@ class Formatter
end
def link_html(url)
- link_text = truncate(url.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30)
- "#{link_text}"
+ prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
+ text = url[prefix.length, 30]
+ suffix = url[prefix.length + 30..-1]
+
+ "#{prefix}#{text}#{suffix}"
end
def hashtag_html(match)
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
new file mode 100644
index 00000000000..8c6197f2c34
--- /dev/null
+++ b/app/services/after_block_service.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class AfterBlockService < BaseService
+ def call(account, target_account)
+ clear_timelines(account, target_account)
+ clear_notifications(account, target_account)
+ end
+
+ private
+
+ def clear_timelines(account, target_account)
+ mentions_key = FeedManager.instance.key(:mentions, account.id)
+ home_key = FeedManager.instance.key(:home, account.id)
+
+ target_account.statuses.select('id').find_each do |status|
+ redis.zrem(mentions_key, status.id)
+ redis.zrem(home_key, status.id)
+ end
+ end
+
+ def clear_notifications(account, target_account)
+ Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all
+ end
+
+ def redis
+ Redis.current
+ end
+end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index b08cf8ca83d..e04b6cc392f 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -9,32 +9,7 @@ class BlockService < BaseService
block = account.block!(target_account)
- clear_timelines(account, target_account)
- clear_notifications(account, target_account)
-
+ BlockWorker.perform_async(account.id, target_account.id)
NotificationWorker.perform_async(block.stream_entry.id, target_account.id) unless target_account.local?
end
-
- private
-
- def clear_timelines(account, target_account)
- mentions_key = FeedManager.instance.key(:mentions, account.id)
- home_key = FeedManager.instance.key(:home, account.id)
-
- target_account.statuses.select('id').find_each do |status|
- redis.zrem(mentions_key, status.id)
- redis.zrem(home_key, status.id)
- end
- end
-
- def clear_notifications(account, target_account)
- Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all
- Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all
- Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all
- Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all
- end
-
- def redis
- Redis.current
- end
end
diff --git a/app/workers/block_worker.rb b/app/workers/block_worker.rb
index dc00db197da..0820490d39f 100644
--- a/app/workers/block_worker.rb
+++ b/app/workers/block_worker.rb
@@ -4,6 +4,6 @@ class BlockWorker
include Sidekiq::Worker
def perform(account_id, target_account_id)
- BlockService.new.call(Account.find(account_id), Account.find(target_account_id))
+ AfterBlockService.new.call(Account.find(account_id), Account.find(target_account_id))
end
end
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
index 7b8259fa62c..6ec28f5d88e 100644
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Formatter do
end
it 'contains a link' do
- expect(subject).to match('google.com')
+ expect(subject).to match('http://google.com')
end
end