Merge branch 'feature-suggestions' into development

This commit is contained in:
Eugen Rochko 2016-10-15 12:38:28 +02:00
commit 70ab6624f5
21 changed files with 239 additions and 8 deletions

View File

@ -4,3 +4,4 @@ public/system
public/assets public/assets
node_modules node_modules
storybook storybook
neo4j

View File

@ -6,6 +6,8 @@ DB_USER=postgres
DB_NAME=postgres DB_NAME=postgres
DB_PASS= DB_PASS=
DB_PORT=5432 DB_PORT=5432
NEO4J_HOST=neo4j
NEO4J_PORT=7474
# Federation # Federation
LOCAL_DOMAIN=example.com LOCAL_DOMAIN=example.com

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ public/assets
.env .env
.env.* .env.*
node_modules/ node_modules/
neo4j/

View File

@ -39,6 +39,7 @@ gem 'will_paginate'
gem 'rack-attack' gem 'rack-attack'
gem 'sidekiq' gem 'sidekiq'
gem 'ledermann-rails-settings' gem 'ledermann-rails-settings'
gem 'neography'
gem 'react-rails' gem 'react-rails'
gem 'browserify-rails' gem 'browserify-rails'

View File

@ -97,6 +97,7 @@ GEM
dotenv (= 2.1.1) dotenv (= 2.1.1)
railties (>= 4.0, < 5.1) railties (>= 4.0, < 5.1)
erubis (2.7.0) erubis (2.7.0)
excon (0.53.0)
execjs (2.7.0) execjs (2.7.0)
fabrication (2.15.2) fabrication (2.15.2)
fast_blank (1.0.0) fast_blank (1.0.0)
@ -165,13 +166,21 @@ GEM
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.1)
multi_json (1.12.1) multi_json (1.12.1)
neography (1.8.0)
excon (>= 0.33.0)
json (>= 1.7.7)
multi_json (>= 1.3.2)
os (>= 0.9.6)
rake (>= 0.8.7)
rubyzip (>= 1.0.0)
nio4r (1.2.1) nio4r (1.2.1)
nokogiri (1.6.8.1) nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
oj (2.17.3) oj (2.17.3)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (0.9.6)
ostatus2 (1.0.1) ostatus2 (1.0.1)
addressable (~> 2.4) addressable (~> 2.4)
http (~> 2.0) http (~> 2.0)
@ -236,7 +245,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.1.0) rainbow (2.1.0)
rake (11.2.2) rake (11.3.0)
rdoc (4.2.2) rdoc (4.2.2)
json (~> 1.4) json (~> 1.4)
react-rails (1.8.2) react-rails (1.8.2)
@ -281,6 +290,7 @@ GEM
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1) ruby-progressbar (1.8.1)
rubyzip (1.2.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.22) sass (3.4.22)
sass-rails (5.0.6) sass-rails (5.0.6)
@ -370,6 +380,7 @@ DEPENDENCIES
letter_opener letter_opener
link_header link_header
lograge lograge
neography
nokogiri nokogiri
oj oj
ostatus2 ostatus2

View File

@ -0,0 +1,37 @@
import api from '../api';
export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
export const SUGGESTIONS_FETCH_FAIL = 'SUGGESTIONS_FETCH_FAIL';
export function fetchSuggestions() {
return (dispatch, getState) => {
dispatch(fetchSuggestionsRequest());
api(getState).get('/api/v1/accounts/suggestions').then(response => {
dispatch(fetchSuggestionsSuccess(response.data));
}).catch(error => {
dispatch(fetchSuggestionsFail(error));
});
};
};
export function fetchSuggestionsRequest() {
return {
type: SUGGESTIONS_FETCH_REQUEST
};
};
export function fetchSuggestionsSuccess(suggestions) {
return {
type: SUGGESTIONS_FETCH_SUCCESS,
suggestions: suggestions
};
};
export function fetchSuggestionsFail(error) {
return {
type: SUGGESTIONS_FETCH_FAIL,
error: error
};
};

View File

@ -0,0 +1,76 @@
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Avatar from '../../../components/avatar';
import DisplayName from '../../../components/display_name';
import { Link } from 'react-router';
const outerStyle = {
marginBottom: '10px',
borderTop: '1px solid #616b86'
};
const headerStyle = {
fontSize: '14px',
fontWeight: '500',
display: 'block',
padding: '10px',
color: '#9baec8',
background: '#454b5e',
width: '120px',
marginTop: '-18px'
};
const itemStyle = {
display: 'block',
padding: '10px',
color: '#9baec8',
overflow: 'hidden',
textDecoration: 'none'
};
const displayNameStyle = {
display: 'block',
fontWeight: '500'
};
const acctStyle = {
display: 'block'
};
const SuggestionsBox = React.createClass({
propTypes: {
accounts: ImmutablePropTypes.list.isRequired
},
mixins: [PureRenderMixin],
render () {
const accounts = this.props.accounts.take(2);
return (
<div style={outerStyle}>
<strong style={headerStyle}>Who to follow</strong>
{accounts.map(account => {
let displayName = account.get('display_name');
if (displayName.length === 0) {
displayName = account.get('username');
}
return (
<Link key={account.get('id')} style={itemStyle} to={`/accounts/${account.get('id')}`}>
<div style={{ float: 'left', marginRight: '10px' }}><Avatar src={account.get('avatar')} size={36} /></div>
<strong style={displayNameStyle}>{displayName}</strong>
<span style={acctStyle}>{account.get('acct')}</span>
</Link>
)
})}
</div>
);
}
});
export default SuggestionsBox;

View File

@ -0,0 +1,9 @@
import { connect } from 'react-redux';
import { getSuggestions } from '../../../selectors';
import SuggestionsBox from '../components/suggestions_box';
const mapStateToProps = (state) => ({
accounts: getSuggestions(state)
});
export default connect(mapStateToProps)(SuggestionsBox);

View File

@ -4,11 +4,22 @@ import FollowFormContainer from '../ui/containers/follow_form_container';
import UploadFormContainer from '../ui/containers/upload_form_container'; import UploadFormContainer from '../ui/containers/upload_form_container';
import NavigationContainer from '../ui/containers/navigation_container'; import NavigationContainer from '../ui/containers/navigation_container';
import PureRenderMixin from 'react-addons-pure-render-mixin'; import PureRenderMixin from 'react-addons-pure-render-mixin';
import SuggestionsContainer from './containers/suggestions_container';
import { fetchSuggestions } from '../../actions/suggestions';
import { connect } from 'react-redux';
const Compose = React.createClass({ const Compose = React.createClass({
propTypes: {
dispatch: React.PropTypes.func.isRequired
},
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
componentDidMount () {
this.props.dispatch(fetchSuggestions());
},
render () { render () {
return ( return (
<Drawer> <Drawer>
@ -18,6 +29,7 @@ const Compose = React.createClass({
<UploadFormContainer /> <UploadFormContainer />
</div> </div>
<SuggestionsContainer />
<FollowFormContainer /> <FollowFormContainer />
</Drawer> </Drawer>
); );
@ -25,4 +37,4 @@ const Compose = React.createClass({
}); });
export default Compose; export default connect()(Compose);

View File

@ -25,6 +25,7 @@ import {
STATUS_DELETE_SUCCESS STATUS_DELETE_SUCCESS
} from '../actions/statuses'; } from '../actions/statuses';
import { FOLLOW_SUBMIT_SUCCESS } from '../actions/follow'; import { FOLLOW_SUBMIT_SUCCESS } from '../actions/follow';
import { SUGGESTIONS_FETCH_SUCCESS } from '../actions/suggestions';
import Immutable from 'immutable'; import Immutable from 'immutable';
const initialState = Immutable.Map({ const initialState = Immutable.Map({
@ -37,7 +38,8 @@ const initialState = Immutable.Map({
me: null, me: null,
ancestors: Immutable.Map(), ancestors: Immutable.Map(),
descendants: Immutable.Map(), descendants: Immutable.Map(),
relationships: Immutable.Map() relationships: Immutable.Map(),
suggestions: Immutable.List([])
}); });
function normalizeStatus(state, status) { function normalizeStatus(state, status) {
@ -189,6 +191,14 @@ function normalizeContext(state, status, ancestors, descendants) {
}); });
}; };
function normalizeSuggestions(state, accounts) {
accounts.forEach(account => {
state = state.setIn(['accounts', account.get('id')], account);
});
return state.set('suggestions', accounts.map(account => account.get('id')));
};
export default function timelines(state = initialState, action) { export default function timelines(state = initialState, action) {
switch(action.type) { switch(action.type) {
case TIMELINE_REFRESH_SUCCESS: case TIMELINE_REFRESH_SUCCESS:
@ -221,6 +231,8 @@ export default function timelines(state = initialState, action) {
return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses)); return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
case ACCOUNT_TIMELINE_EXPAND_SUCCESS: case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses)); return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
case SUGGESTIONS_FETCH_SUCCESS:
return normalizeSuggestions(state, Immutable.fromJS(action.suggestions));
default: default:
return state; return state;
} }

View File

@ -79,3 +79,9 @@ export const getNotifications = createSelector([getNotificationsBase], (base) =>
return arr; return arr;
}); });
const getSuggestionsBase = (state) => state.getIn(['timelines', 'suggestions']);
export const getSuggestions = createSelector([getSuggestionsBase, getAccounts], (base, accounts) => {
return base.map(accountId => accounts.get(accountId));
});

View File

@ -1,6 +1,6 @@
class Api::V1::AccountsController < ApiController class Api::V1::AccountsController < ApiController
before_action :doorkeeper_authorize! before_action :doorkeeper_authorize!
before_action :set_account, except: :verify_credentials before_action :set_account, except: [:verify_credentials, :suggestions]
respond_to :json respond_to :json
def show def show
@ -19,6 +19,10 @@ class Api::V1::AccountsController < ApiController
@followers = @account.followers @followers = @account.followers
end end
def suggestions
@accounts = FollowSuggestion.get(current_user.account_id)
end
def statuses def statuses
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
end end

View File

@ -22,4 +22,32 @@ class Follow < ApplicationRecord
def title def title
destroyed? ? "#{account.acct} is no longer following #{target_account.acct}" : "#{account.acct} started following #{target_account.acct}" destroyed? ? "#{account.acct} is no longer following #{target_account.acct}" : "#{account.acct} started following #{target_account.acct}"
end end
after_create :add_to_graph
after_destroy :remove_from_graph
def sync!
add_to_graph
end
private
def add_to_graph
neo = Neography::Rest.new
a = neo.create_unique_node('account_index', 'Account', account_id.to_s, account_id: account_id)
b = neo.create_unique_node('account_index', 'Account', target_account_id.to_s, account_id: target_account_id)
neo.create_unique_relationship('follow_index', 'Follow', id.to_s, 'follows', a, b)
rescue Neography::NeographyError, Excon::Error::Socket => e
Rails.logger.error e
end
def remove_from_graph
neo = Neography::Rest.new
rel = neo.get_relationship_index('follow_index', 'Follow', id.to_s)
neo.delete_relationship(rel)
rescue Neography::NeographyError, Excon::Error::Socket => e
Rails.logger.error e
end
end end

View File

@ -0,0 +1,10 @@
class FollowSuggestion
def self.get(for_account_id)
neo = Neography::Rest.new
account_ids = neo.execute_query('START a=node:account_index(Account={id}) MATCH (a)-[:follows]->(b)-[:follows]->(c) WHERE a <> c AND NOT (a)-[:follows]->(c) RETURN DISTINCT c.account_id', id: for_account_id)
Account.where(id: account_ids['data'].first) unless account_ids.empty?
rescue Neography::NeographyError, Excon::Error::Socket => e
Rails.logger.error e
[]
end
end

View File

@ -0,0 +1,2 @@
collection @accounts
extends('api/v1/accounts/show')

View File

@ -22,8 +22,8 @@ module Mastodon
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
config.active_job.queue_adapter = :sidekiq config.active_job.queue_adapter = :sidekiq

View File

@ -0,0 +1,5 @@
Neography.configure do |config|
config.protocol = "http"
config.server = ENV['NEO4J_HOST'] || 'localhost'
config.port = ENV['NEO4J_PORT'] || 7474
end

View File

@ -73,6 +73,7 @@ Rails.application.routes.draw do
collection do collection do
get :relationships get :relationships
get :verify_credentials get :verify_credentials
get :suggestions
end end
member do member do

View File

@ -1,2 +1,2 @@
web_app = Doorkeeper::Application.new(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri) web_app = Doorkeeper::Application.new(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri)
web_app.save(validate: false) web_app.save!

View File

@ -4,6 +4,10 @@ services:
image: postgres image: postgres
redis: redis:
image: redis image: redis
neo4j:
image: neo4j
environment:
- NEO4J_AUTH=none
app: app:
build: . build: .
env_file: .env.production env_file: .env.production
@ -15,6 +19,7 @@ services:
depends_on: depends_on:
- db - db
- redis - redis
- neo4j
volumes: volumes:
- ./public/assets:/mastodon/public/assets - ./public/assets:/mastodon/public/assets
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system
@ -24,5 +29,6 @@ services:
depends_on: depends_on:
- db - db
- redis - redis
- neo4j
volumes: volumes:
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system

View File

@ -41,4 +41,11 @@ namespace :mastodon do
$redis.keys('feed:*').each { |key| $redis.del(key) } $redis.keys('feed:*').each { |key| $redis.del(key) }
end end
end end
namespace :graphs do
desc 'Syncs all follow relationships to Neo4J'
task sync: :environment do
Follow.find_each(&:sync!)
end
end
end end