mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 00:54:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix #99 - public timeline not just reblogs, fix #98 infinite scrolling issues

Browse Source
This commit is contained in:
Eugen Rochko 2016-10-17 01:23:41 +02:00
parent 13ee88926d
commit b5c6d00afa
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/actions/accounts.jsx
View File

@ -1,5 +1,6 @@
import api from '../api' import api from '../api'
import axios from 'axios'; import axios from 'axios';
import Immutable from 'immutable';
export const ACCOUNT_SET_SELF = 'ACCOUNT_SET_SELF'; export const ACCOUNT_SET_SELF = 'ACCOUNT_SET_SELF';
@ -66,7 +67,7 @@ export function fetchAccountTimeline(id) {
export function expandAccountTimeline(id) { export function expandAccountTimeline(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
const lastId = getState().getIn(['timelines', 'accounts_timelines', id]).last(); const lastId = getState().getIn(['timelines', 'accounts_timelines', id], Immutable.List()).last();
dispatch(expandAccountTimelineRequest(id)); dispatch(expandAccountTimelineRequest(id));

2
app/assets/javascripts/components/features/account_timeline/index.jsx
View File

@ -66,7 +66,7 @@ const AccountTimeline = React.createClass({
}, },
handleScrollToBottom () { handleScrollToBottom () {
this.props.dispatch(expandAccountTimeline(this.props.account.get('id'))); this.props.dispatch(expandAccountTimeline(Number(this.props.params.accountId)));
}, },
render () { render () {

4
app/models/concerns/paginable.rb
View File

@ -4,8 +4,8 @@ module Paginable
included do included do
def self.paginate_by_max_id(limit, max_id = nil, since_id = nil) def self.paginate_by_max_id(limit, max_id = nil, since_id = nil)
query = order('id desc').limit(limit) query = order('id desc').limit(limit)
query = query.where('id < ?', max_id) unless max_id.blank? query = query.where(arel_table[:id].lt(max_id)) unless max_id.blank?
query = query.where('id > ?', since_id) unless since_id.blank? query = query.where(arel_table[:id].gt(since_id)) unless since_id.blank?
query query
end end
end end

2
app/models/status.rb
View File

@ -86,7 +86,7 @@ class Status < ApplicationRecord
end end
def self.as_public_timeline(account) def self.as_public_timeline(account)
joins('LEFT JOIN statuses AS reblogs ON reblogs.id = statuses.reblog_of_id').where('reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id).with_includes.with_counters joins('LEFT OUTER JOIN statuses AS reblogs ON reblogs.id = statuses.reblog_of_id').where('reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id).with_includes.with_counters
end end
def self.favourites_map(status_ids, account_id) def self.favourites_map(status_ids, account_id)