treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Will this fix the issue?

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2016-10-18 01:11:00 +02:00
parent 6611e3a2ef
commit fdd30af595
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status.jsx
View File

@ -45,8 +45,6 @@ const Status = React.createClass({
var { status, ...other } = this.props;
console.log(status, this.props);
if (status.get('reblog') !== null) {
let displayName = status.getIn(['account', 'display_name']);

11
app/assets/javascripts/components/selectors/index.jsx
View File

@ -29,15 +29,20 @@ const getAccountTimelineIds = (state, id) => state.getIn(['timelines', 'accounts
const assembleStatus = (id, statuses, accounts) => {
let status = statuses.get(id, null);
let reblog = null;
if (status === null) {
return null;
}
let reblog = statuses.get(status.get('reblog'), null);
if (status.get('reblog', null) !== null) {
reblog = statuses.get(status.get('reblog'), null);
if (reblog !== null) {
reblog = reblog.set('account', accounts.get(reblog.get('account')));
if (reblog !== null) {
reblog = reblog.set('account', accounts.get(reblog.get('account')));
} else {
return null;
}
}
return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));