master
Eugen Rochko 8 years ago
parent e906677092
commit 8c0b19012b
  1. 22
      app/assets/javascripts/components/reducers/notifications.jsx
  2. 2
      app/controllers/api/follows_controller.rb
  3. 8
      app/services/follow_remote_account_service.rb
  4. 2
      app/views/api/follows/show.rabl

@ -7,6 +7,23 @@ import Immutable from 'immutable';
const initialState = Immutable.List(); const initialState = Immutable.List();
function notificationFromError(state, error) {
let n = Immutable.Map({
message: ''
});
if (error.response) {
n = n.withMutations(map => {
map.set('message', error.response.statusText);
map.set('title', `${error.response.status}`);
});
} else {
n = n.set('message', `${error}`);
}
return state.push(n);
};
export default function meta(state = initialState, action) { export default function meta(state = initialState, action) {
switch(action.type) { switch(action.type) {
case COMPOSE_SUBMIT_FAIL: case COMPOSE_SUBMIT_FAIL:
@ -15,10 +32,7 @@ export default function meta(state = initialState, action) {
case REBLOG_FAIL: case REBLOG_FAIL:
case FAVOURITE_FAIL: case FAVOURITE_FAIL:
case TIMELINE_REFRESH_FAIL: case TIMELINE_REFRESH_FAIL:
return state.push(Immutable.fromJS({ return notificationFromError(state, action.error);
message: action.error.response.statusText,
title: `${action.error.response.status}`
}));
case NOTIFICATION_DISMISS: case NOTIFICATION_DISMISS:
return state.clear(); return state.clear();
default: default:

@ -7,7 +7,7 @@ class Api::FollowsController < ApiController
raise ActiveRecord::RecordNotFound raise ActiveRecord::RecordNotFound
end end
@follow = FollowService.new.(current_user.account, params[:uri]) @account = FollowService.new.(current_user.account, params[:uri]).try(:target_account)
render action: :show render action: :show
end end
end end

@ -13,8 +13,10 @@ class FollowRemoteAccountService < BaseService
account = Account.find_remote(username, domain) account = Account.find_remote(username, domain)
if account.nil? if account.nil?
Rails.logger.debug "Creating new remote account for #{uri}"
account = Account.new(username: username, domain: domain) account = Account.new(username: username, domain: domain)
elsif account.subscribed? elsif account.subscribed?
Rails.logger.debug "Already subscribed to remote account #{uri}"
return account return account
end end
@ -29,7 +31,10 @@ class FollowRemoteAccountService < BaseService
feed = get_feed(account.remote_url) feed = get_feed(account.remote_url)
hubs = feed.xpath('//xmlns:link[@rel="hub"]') hubs = feed.xpath('//xmlns:link[@rel="hub"]')
return nil if hubs.empty? || hubs.first.attribute('href').nil? || feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').nil? if hubs.empty? || hubs.first.attribute('href').nil? || feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').nil?
Rails.logger.debug "Cannot find PuSH hub or author for #{uri}"
return nil
end
account.uri = feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').content account.uri = feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').content
account.hub_url = hubs.first.attribute('href').value account.hub_url = hubs.first.attribute('href').value
@ -49,6 +54,7 @@ class FollowRemoteAccountService < BaseService
return account return account
rescue Goldfinger::Error, HTTP::Error rescue Goldfinger::Error, HTTP::Error
Rails.logger.debug "Error while fetching data for #{uri}"
nil nil
end end

@ -1,2 +1,2 @@
object @follow.target_account object @account
extends('api/accounts/show') extends('api/accounts/show')

Loading…
Cancel
Save