mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 09:07:01 +00:00
parent
e906677092
commit
8c0b19012b
app
assets/javascripts/components/reducers
controllers/api
services
views/api/follows
|
@ -7,6 +7,23 @@ import Immutable from 'immutable';
|
|||
|
||||
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) {
|
||||
switch(action.type) {
|
||||
case COMPOSE_SUBMIT_FAIL:
|
||||
|
@ -15,10 +32,7 @@ export default function meta(state = initialState, action) {
|
|||
case REBLOG_FAIL:
|
||||
case FAVOURITE_FAIL:
|
||||
case TIMELINE_REFRESH_FAIL:
|
||||
return state.push(Immutable.fromJS({
|
||||
message: action.error.response.statusText,
|
||||
title: `${action.error.response.status}`
|
||||
}));
|
||||
return notificationFromError(state, action.error);
|
||||
case NOTIFICATION_DISMISS:
|
||||
return state.clear();
|
||||
default:
|
||||
|
|
|
@ -7,7 +7,7 @@ class Api::FollowsController < ApiController
|
|||
raise ActiveRecord::RecordNotFound
|
||||
end
|
||||
|
||||
@follow = FollowService.new.(current_user.account, params[:uri])
|
||||
@account = FollowService.new.(current_user.account, params[:uri]).try(:target_account)
|
||||
render action: :show
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,8 +13,10 @@ class FollowRemoteAccountService < BaseService
|
|||
account = Account.find_remote(username, domain)
|
||||
|
||||
if account.nil?
|
||||
Rails.logger.debug "Creating new remote account for #{uri}"
|
||||
account = Account.new(username: username, domain: domain)
|
||||
elsif account.subscribed?
|
||||
Rails.logger.debug "Already subscribed to remote account #{uri}"
|
||||
return account
|
||||
end
|
||||
|
||||
|
@ -29,7 +31,10 @@ class FollowRemoteAccountService < BaseService
|
|||
feed = get_feed(account.remote_url)
|
||||
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.hub_url = hubs.first.attribute('href').value
|
||||
|
@ -49,6 +54,7 @@ class FollowRemoteAccountService < BaseService
|
|||
|
||||
return account
|
||||
rescue Goldfinger::Error, HTTP::Error
|
||||
Rails.logger.debug "Error while fetching data for #{uri}"
|
||||
nil
|
||||
end
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
object @follow.target_account
|
||||
object @account
|
||||
extends('api/accounts/show')
|
||||
|
|
Loading…
Reference in a new issue