forked from treehouse/mastodon
parent
13ee88926d
commit
b5c6d00afa
|
@ -1,5 +1,6 @@
|
|||
import api from '../api'
|
||||
import axios from 'axios';
|
||||
import api from '../api'
|
||||
import axios from 'axios';
|
||||
import Immutable from 'immutable';
|
||||
|
||||
export const ACCOUNT_SET_SELF = 'ACCOUNT_SET_SELF';
|
||||
|
||||
|
@ -66,7 +67,7 @@ export function fetchAccountTimeline(id) {
|
|||
|
||||
export function expandAccountTimeline(id) {
|
||||
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));
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ const AccountTimeline = React.createClass({
|
|||
},
|
||||
|
||||
handleScrollToBottom () {
|
||||
this.props.dispatch(expandAccountTimeline(this.props.account.get('id')));
|
||||
this.props.dispatch(expandAccountTimeline(Number(this.props.params.accountId)));
|
||||
},
|
||||
|
||||
render () {
|
||||
|
|
|
@ -4,8 +4,8 @@ module Paginable
|
|||
included do
|
||||
def self.paginate_by_max_id(limit, max_id = nil, since_id = nil)
|
||||
query = order('id desc').limit(limit)
|
||||
query = query.where('id < ?', max_id) unless max_id.blank?
|
||||
query = query.where('id > ?', since_id) unless since_id.blank?
|
||||
query = query.where(arel_table[:id].lt(max_id)) unless max_id.blank?
|
||||
query = query.where(arel_table[:id].gt(since_id)) unless since_id.blank?
|
||||
query
|
||||
end
|
||||
end
|
||||
|
|
|
@ -86,7 +86,7 @@ class Status < ApplicationRecord
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
def self.favourites_map(status_ids, account_id)
|
||||
|
|
Loading…
Reference in New Issue