From 595c8dda60746e171dbbb905b355561334e2a5c8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 1 Sep 2016 13:21:48 +0200 Subject: [PATCH] Favouriting works, reblogging is a little broken because of --- .../components/actions/compose.jsx | 5 +- .../components/actions/interactions.jsx | 81 +++++++++++++++++++ .../components/components/icon_button.jsx | 8 +- .../components/components/status.jsx | 16 +++- .../components/components/status_list.jsx | 7 +- .../containers/status_list_container.jsx | 15 +++- .../components/reducers/timelines.jsx | 24 ++++-- app/assets/stylesheets/components.scss | 4 + app/models/account.rb | 2 +- app/models/favourite.rb | 2 + 10 files changed, 145 insertions(+), 19 deletions(-) create mode 100644 app/assets/javascripts/components/actions/interactions.jsx diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx index cf534507899..de4fe744537 100644 --- a/app/assets/javascripts/components/actions/compose.jsx +++ b/app/assets/javascripts/components/actions/compose.jsx @@ -49,9 +49,10 @@ export function submitComposeRequest() { }; } -export function submitComposeSuccess(response) { +export function submitComposeSuccess(status) { return { - type: COMPOSE_SUBMIT_SUCCESS + type: COMPOSE_SUBMIT_SUCCESS, + status: status }; } diff --git a/app/assets/javascripts/components/actions/interactions.jsx b/app/assets/javascripts/components/actions/interactions.jsx new file mode 100644 index 00000000000..281d3be87fb --- /dev/null +++ b/app/assets/javascripts/components/actions/interactions.jsx @@ -0,0 +1,81 @@ +import api from '../api' + +export const REBLOG = 'REBLOG'; +export const REBLOG_REQUEST = 'REBLOG_REQUEST'; +export const REBLOG_SUCCESS = 'REBLOG_SUCCESS'; +export const REBLOG_FAIL = 'REBLOG_FAIL'; + +export const FAVOURITE = 'FAVOURITE'; +export const FAVOURITE_REQUEST = 'FAVOURITE_REQUEST'; +export const FAVOURITE_SUCCESS = 'FAVOURITE_SUCCESS'; +export const FAVOURITE_FAIL = 'FAVOURITE_FAIL'; + +export function reblog(status) { + return function (dispatch, getState) { + dispatch(reblogRequest(status)); + + api(getState).post(`/api/statuses/${status.get('id')}/reblog`).then(function (response) { + dispatch(reblogSuccess(status, response.data)); + }).catch(function (error) { + dispatch(reblogFail(status, error)); + }); + }; +} + +export function reblogRequest(status) { + return { + type: REBLOG_REQUEST, + status: status + }; +} + +export function reblogSuccess(status, response) { + return { + type: REBLOG_SUCCESS, + status: status, + response: response + }; +} + +export function reblogFail(status, error) { + return { + type: REBLOG_FAIL, + status: status, + error: error + }; +} + +export function favourite(status) { + return function (dispatch, getState) { + dispatch(favouriteRequest(status)); + + api(getState).post(`/api/statuses/${status.get('id')}/favourite`).then(function (response) { + dispatch(favouriteSuccess(status, response.data)); + }).catch(function (error) { + dispatch(favouriteFail(status, error)); + }); + }; +} + +export function favouriteRequest(status) { + return { + type: FAVOURITE_REQUEST, + status: status + }; +} + +export function favouriteSuccess(status, response) { + return { + type: FAVOURITE_SUCCESS, + status: status, + response: response + }; +} + +export function favouriteFail(status, error) { + return { + type: FAVOURITE_FAIL, + status: status, + error: error + }; +} diff --git a/app/assets/javascripts/components/components/icon_button.jsx b/app/assets/javascripts/components/components/icon_button.jsx index c23f977e45f..b417528905c 100644 --- a/app/assets/javascripts/components/components/icon_button.jsx +++ b/app/assets/javascripts/components/components/icon_button.jsx @@ -6,12 +6,14 @@ const IconButton = React.createClass({ title: React.PropTypes.string.isRequired, icon: React.PropTypes.string.isRequired, onClick: React.PropTypes.func.isRequired, - size: React.PropTypes.number + size: React.PropTypes.number, + active: React.PropTypes.bool }, getDefaultProps () { return { - size: 18 + size: 18, + active: false }; }, @@ -24,7 +26,7 @@ const IconButton = React.createClass({ render () { return ( - + ); diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index e17df86d9a2..7885360e6d9 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -8,7 +8,9 @@ const Status = React.createClass({ propTypes: { status: ImmutablePropTypes.map.isRequired, - onReply: React.PropTypes.func + onReply: React.PropTypes.func, + onFavourite: React.PropTypes.func, + onReblog: React.PropTypes.func }, mixins: [PureRenderMixin], @@ -17,6 +19,14 @@ const Status = React.createClass({ this.props.onReply(this.props.status); }, + handleFavouriteClick () { + this.props.onFavourite(this.props.status); + }, + + handleReblogClick () { + this.props.onReblog(this.props.status); + }, + render () { var content = { __html: this.props.status.get('content') }; var status = this.props.status; @@ -43,8 +53,8 @@ const Status = React.createClass({
-
-
+
+
); diff --git a/app/assets/javascripts/components/components/status_list.jsx b/app/assets/javascripts/components/components/status_list.jsx index 5a89d6d602f..5bd21edec26 100644 --- a/app/assets/javascripts/components/components/status_list.jsx +++ b/app/assets/javascripts/components/components/status_list.jsx @@ -5,7 +5,10 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const StatusList = React.createClass({ propTypes: { - statuses: ImmutablePropTypes.list.isRequired + statuses: ImmutablePropTypes.list.isRequired, + onReply: React.PropTypes.func, + onReblog: React.PropTypes.func, + onFavourite: React.PropTypes.func }, mixins: [PureRenderMixin], @@ -15,7 +18,7 @@ const StatusList = React.createClass({
{this.props.statuses.map((status) => { - return ; + return ; })}
diff --git a/app/assets/javascripts/components/containers/status_list_container.jsx b/app/assets/javascripts/components/containers/status_list_container.jsx index 9cdd7f4c214..cc6333a819d 100644 --- a/app/assets/javascripts/components/containers/status_list_container.jsx +++ b/app/assets/javascripts/components/containers/status_list_container.jsx @@ -1,6 +1,7 @@ -import { connect } from 'react-redux'; -import StatusList from '../components/status_list'; -import { replyCompose } from '../actions/compose'; +import { connect } from 'react-redux'; +import StatusList from '../components/status_list'; +import { replyCompose } from '../actions/compose'; +import { reblog, favourite } from '../actions/interactions'; const mapStateToProps = function (state, props) { return { @@ -12,6 +13,14 @@ const mapDispatchToProps = function (dispatch) { return { onReply: function (status) { dispatch(replyCompose(status)); + }, + + onFavourite: function (status) { + dispatch(favourite(status)); + }, + + onReblog: function (status) { + dispatch(reblog(status)); } }; }; diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx index 2e0f70c24a4..983518df7a9 100644 --- a/app/assets/javascripts/components/reducers/timelines.jsx +++ b/app/assets/javascripts/components/reducers/timelines.jsx @@ -1,16 +1,30 @@ -import { TIMELINE_SET, TIMELINE_UPDATE } from '../actions/timelines'; -import Immutable from 'immutable'; +import { TIMELINE_SET, TIMELINE_UPDATE } from '../actions/timelines'; +import { REBLOG_SUCCESS, FAVOURITE_SUCCESS } from '../actions/interactions'; +import Immutable from 'immutable'; const initialState = Immutable.Map(); +function updateMatchingStatuses(state, needle, callback) { + return state.map(function (list) { + return list.map(function (status) { + if (status.get('id') === needle.get('id')) { + return callback(status); + } + + return status; + }); + }); +}; + export default function timelines(state = initialState, action) { switch(action.type) { case TIMELINE_SET: return state.set(action.timeline, Immutable.fromJS(action.statuses)); case TIMELINE_UPDATE: - return state.update(action.timeline, function (list) { - return list.unshift(Immutable.fromJS(action.status)); - }); + return state.update(action.timeline, list => list.unshift(Immutable.fromJS(action.status))); + case REBLOG_SUCCESS: + case FAVOURITE_SUCCESS: + return updateMatchingStatuses(state, action.status, () => Immutable.fromJS(action.response)); default: return state; } diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index 11f4cb49f1f..4050babf9ec 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -22,6 +22,10 @@ color: #535b72; cursor: default; } + + &.active { + color: #2b90d9; + } } .compose-drawer__textarea { diff --git a/app/models/account.rb b/app/models/account.rb index cc050dfa32c..8b6300e3557 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -75,7 +75,7 @@ class Account < ApplicationRecord end def ping!(atom_url, hubs) - return unless local? + return unless local? && !Rails.env.development? OStatus2::Publication.new(atom_url, hubs).publish end diff --git a/app/models/favourite.rb b/app/models/favourite.rb index 6032e539cf5..e248ae56191 100644 --- a/app/models/favourite.rb +++ b/app/models/favourite.rb @@ -4,6 +4,8 @@ class Favourite < ApplicationRecord belongs_to :account, inverse_of: :favourites belongs_to :status, inverse_of: :favourites + validates :status_id, uniqueness: { scope: :account_id } + def verb :favorite end