about summary refs log tree commit diff
path: root/app/assets/javascripts/components/reducers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-03 14:01:10 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-03 14:01:42 +0200
commitd0e2733f63a7bd9601e73adee1107da804f85c41 (patch)
tree9268986d2ae72a55d84b9d9b90328fa58bb3bf98 /app/assets/javascripts/components/reducers
parentf24cb32e99afdb9fa31067fb647912fec92e9ed4 (diff)
Fix reblogs of reblogs in UI, add follow form in UI
Diffstat (limited to 'app/assets/javascripts/components/reducers')
-rw-r--r--app/assets/javascripts/components/reducers/timelines.jsx2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index 983518df7..616411186 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -9,6 +9,8 @@ function updateMatchingStatuses(state, needle, callback) {
     return list.map(function (status) {
       if (status.get('id') === needle.get('id')) {
         return callback(status);
+      } else if (status.getIn(['reblog', 'id'], null) === needle.get('id')) {
+        return status.set('reblog', callback(status.get('reblog')));
       }
 
       return status;