Adding hashtags
This commit is contained in:
parent
62292797ec
commit
48b9619439
@ -1,4 +1,5 @@
|
|||||||
import api from '../api'
|
import api from '../api'
|
||||||
|
import Immutable from 'immutable';
|
||||||
|
|
||||||
export const TIMELINE_UPDATE = 'TIMELINE_UPDATE';
|
export const TIMELINE_UPDATE = 'TIMELINE_UPDATE';
|
||||||
export const TIMELINE_DELETE = 'TIMELINE_DELETE';
|
export const TIMELINE_DELETE = 'TIMELINE_DELETE';
|
||||||
@ -54,20 +55,25 @@ export function refreshTimelineRequest(timeline) {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function refreshTimeline(timeline, replace = false) {
|
export function refreshTimeline(timeline, replace = false, id = null) {
|
||||||
return function (dispatch, getState) {
|
return function (dispatch, getState) {
|
||||||
dispatch(refreshTimelineRequest(timeline));
|
dispatch(refreshTimelineRequest(timeline));
|
||||||
|
|
||||||
const ids = getState().getIn(['timelines', timeline]);
|
const ids = getState().getIn(['timelines', timeline], Immutable.List());
|
||||||
const newestId = ids.size > 0 ? ids.first() : null;
|
const newestId = ids.size > 0 ? ids.first() : null;
|
||||||
|
|
||||||
let params = '';
|
let params = '';
|
||||||
|
let path = timeline;
|
||||||
|
|
||||||
if (newestId !== null && !replace) {
|
if (newestId !== null && !replace) {
|
||||||
params = `?since_id=${newestId}`;
|
params = `?since_id=${newestId}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${timeline}${params}`).then(function (response) {
|
if (id) {
|
||||||
|
path = `${path}/${id}`
|
||||||
|
}
|
||||||
|
|
||||||
|
api(getState).get(`/api/v1/statuses/${path}${params}`).then(function (response) {
|
||||||
dispatch(refreshTimelineSuccess(timeline, response.data, replace));
|
dispatch(refreshTimelineSuccess(timeline, response.data, replace));
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
dispatch(refreshTimelineFail(timeline, error));
|
dispatch(refreshTimelineFail(timeline, error));
|
||||||
@ -83,13 +89,19 @@ export function refreshTimelineFail(timeline, error) {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export function expandTimeline(timeline) {
|
export function expandTimeline(timeline, id = null) {
|
||||||
return (dispatch, getState) => {
|
return (dispatch, getState) => {
|
||||||
const lastId = getState().getIn(['timelines', timeline]).last();
|
const lastId = getState().getIn(['timelines', timeline], Immutable.List()).last();
|
||||||
|
|
||||||
dispatch(expandTimelineRequest(timeline));
|
dispatch(expandTimelineRequest(timeline));
|
||||||
|
|
||||||
api(getState).get(`/api/v1/statuses/${timeline}?max_id=${lastId}`).then(response => {
|
let path = timeline;
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
path = `${path}/${id}`
|
||||||
|
}
|
||||||
|
|
||||||
|
api(getState).get(`/api/v1/statuses/${path}?max_id=${lastId}`).then(response => {
|
||||||
dispatch(expandTimelineSuccess(timeline, response.data));
|
dispatch(expandTimelineSuccess(timeline, response.data));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
dispatch(expandTimelineFail(timeline, error));
|
dispatch(expandTimelineFail(timeline, error));
|
||||||
|
@ -23,11 +23,14 @@ const StatusContent = React.createClass({
|
|||||||
|
|
||||||
if (mention) {
|
if (mention) {
|
||||||
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
||||||
|
} else if (link.text[0] === '#' || (link.previousSibling && link.previousSibling.text === '#')) {
|
||||||
|
link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
|
||||||
} else {
|
} else {
|
||||||
link.setAttribute('target', '_blank');
|
link.setAttribute('target', '_blank');
|
||||||
link.setAttribute('rel', 'noopener');
|
link.setAttribute('rel', 'noopener');
|
||||||
link.addEventListener('click', this.onNormalClick, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
link.addEventListener('click', this.onNormalClick, false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -36,8 +39,15 @@ const StatusContent = React.createClass({
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.context.router.push(`/accounts/${mention.get('id')}`);
|
this.context.router.push(`/accounts/${mention.get('id')}`);
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
e.stopPropagation();
|
onHashtagClick (hashtag, e) {
|
||||||
|
hashtag = hashtag.replace(/^#/, '').toLowerCase();
|
||||||
|
|
||||||
|
if (e.button === 0) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.context.router.push(`/statuses/tag/${hashtag}`);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onNormalClick (e) {
|
onNormalClick (e) {
|
||||||
|
@ -30,6 +30,7 @@ import Followers from '../features/followers';
|
|||||||
import Following from '../features/following';
|
import Following from '../features/following';
|
||||||
import Reblogs from '../features/reblogs';
|
import Reblogs from '../features/reblogs';
|
||||||
import Favourites from '../features/favourites';
|
import Favourites from '../features/favourites';
|
||||||
|
import HashtagTimeline from '../features/hashtag_timeline';
|
||||||
|
|
||||||
const store = configureStore();
|
const store = configureStore();
|
||||||
|
|
||||||
@ -85,6 +86,7 @@ const Mastodon = React.createClass({
|
|||||||
<Route path='/statuses/home' component={HomeTimeline} />
|
<Route path='/statuses/home' component={HomeTimeline} />
|
||||||
<Route path='/statuses/mentions' component={MentionsTimeline} />
|
<Route path='/statuses/mentions' component={MentionsTimeline} />
|
||||||
<Route path='/statuses/all' component={PublicTimeline} />
|
<Route path='/statuses/all' component={PublicTimeline} />
|
||||||
|
<Route path='/statuses/tag/:id' component={HashtagTimeline} />
|
||||||
|
|
||||||
<Route path='/statuses/:statusId' component={Status} />
|
<Route path='/statuses/:statusId' component={Status} />
|
||||||
<Route path='/statuses/:statusId/reblogs' component={Reblogs} />
|
<Route path='/statuses/:statusId/reblogs' component={Reblogs} />
|
||||||
|
@ -47,7 +47,7 @@ const Account = React.createClass({
|
|||||||
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillReceiveProps(nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
||||||
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,72 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||||
|
import StatusListContainer from '../ui/containers/status_list_container';
|
||||||
|
import Column from '../ui/components/column';
|
||||||
|
import {
|
||||||
|
refreshTimeline,
|
||||||
|
updateTimeline
|
||||||
|
} from '../../actions/timelines';
|
||||||
|
|
||||||
|
const HashtagTimeline = React.createClass({
|
||||||
|
|
||||||
|
propTypes: {
|
||||||
|
params: React.PropTypes.object.isRequired,
|
||||||
|
dispatch: React.PropTypes.func.isRequired
|
||||||
|
},
|
||||||
|
|
||||||
|
mixins: [PureRenderMixin],
|
||||||
|
|
||||||
|
_subscribe (dispatch, id) {
|
||||||
|
if (typeof App !== 'undefined') {
|
||||||
|
this.subscription = App.cable.subscriptions.create({
|
||||||
|
channel: 'HashtagChannel',
|
||||||
|
tag: id
|
||||||
|
}, {
|
||||||
|
|
||||||
|
received (data) {
|
||||||
|
dispatch(updateTimeline('tag', JSON.parse(data.message)));
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_unsubscribe () {
|
||||||
|
if (typeof this.subscription !== 'undefined') {
|
||||||
|
this.subscription.unsubscribe();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
componentWillMount () {
|
||||||
|
const { dispatch } = this.props;
|
||||||
|
const { id } = this.props.params;
|
||||||
|
|
||||||
|
dispatch(refreshTimeline('tag', true, id));
|
||||||
|
this._subscribe(dispatch, id);
|
||||||
|
},
|
||||||
|
|
||||||
|
componentWillReceiveProps (nextProps) {
|
||||||
|
if (nextProps.params.id !== this.props.params.id) {
|
||||||
|
this.props.dispatch(refreshTimeline('tag', true, nextProps.params.id));
|
||||||
|
this._unsubscribe();
|
||||||
|
this._subscribe(this.props.dispatch, nextProps.params.id);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
componentWillUnmount () {
|
||||||
|
this._unsubscribe();
|
||||||
|
},
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { id } = this.props.params;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Column icon='hashtag' heading={id}>
|
||||||
|
<StatusListContainer type='tag' id={id} />
|
||||||
|
</Column>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
export default connect()(HashtagTimeline);
|
@ -1,15 +1,16 @@
|
|||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import StatusList from '../../../components/status_list';
|
import StatusList from '../../../components/status_list';
|
||||||
import { expandTimeline } from '../../../actions/timelines';
|
import { expandTimeline } from '../../../actions/timelines';
|
||||||
|
import Immutable from 'immutable';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
statusIds: state.getIn(['timelines', props.type])
|
statusIds: state.getIn(['timelines', props.type], Immutable.List())
|
||||||
});
|
});
|
||||||
|
|
||||||
const mapDispatchToProps = function (dispatch, props) {
|
const mapDispatchToProps = function (dispatch, props) {
|
||||||
return {
|
return {
|
||||||
onScrollToBottom () {
|
onScrollToBottom () {
|
||||||
dispatch(expandTimeline(props.type));
|
dispatch(expandTimeline(props.type, props.id));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -25,6 +25,7 @@ const initialState = Immutable.Map({
|
|||||||
home: Immutable.List(),
|
home: Immutable.List(),
|
||||||
mentions: Immutable.List(),
|
mentions: Immutable.List(),
|
||||||
public: Immutable.List(),
|
public: Immutable.List(),
|
||||||
|
tag: Immutable.List(),
|
||||||
accounts_timelines: Immutable.Map(),
|
accounts_timelines: Immutable.Map(),
|
||||||
ancestors: Immutable.Map(),
|
ancestors: Immutable.Map(),
|
||||||
descendants: Immutable.Map()
|
descendants: Immutable.Map()
|
||||||
@ -55,7 +56,7 @@ const normalizeTimeline = (state, timeline, statuses, replace = false) => {
|
|||||||
ids = ids.set(i, status.get('id'));
|
ids = ids.set(i, status.get('id'));
|
||||||
});
|
});
|
||||||
|
|
||||||
return state.update(timeline, list => (replace ? ids : list.unshift(...ids)));
|
return state.update(timeline, Immutable.List(), list => (replace ? ids : list.unshift(...ids)));
|
||||||
};
|
};
|
||||||
|
|
||||||
const appendNormalizedTimeline = (state, timeline, statuses) => {
|
const appendNormalizedTimeline = (state, timeline, statuses) => {
|
||||||
@ -66,7 +67,7 @@ const appendNormalizedTimeline = (state, timeline, statuses) => {
|
|||||||
moreIds = moreIds.set(i, status.get('id'));
|
moreIds = moreIds.set(i, status.get('id'));
|
||||||
});
|
});
|
||||||
|
|
||||||
return state.update(timeline, list => list.push(...moreIds));
|
return state.update(timeline, Immutable.List(), list => list.push(...moreIds));
|
||||||
};
|
};
|
||||||
|
|
||||||
const normalizeAccountTimeline = (state, accountId, statuses, replace = false) => {
|
const normalizeAccountTimeline = (state, accountId, statuses, replace = false) => {
|
||||||
@ -94,7 +95,7 @@ const appendNormalizedAccountTimeline = (state, accountId, statuses) => {
|
|||||||
const updateTimeline = (state, timeline, status, references) => {
|
const updateTimeline = (state, timeline, status, references) => {
|
||||||
state = normalizeStatus(state, status);
|
state = normalizeStatus(state, status);
|
||||||
|
|
||||||
state = state.update(timeline, list => {
|
state = state.update(timeline, Immutable.List(), list => {
|
||||||
if (list.includes(status.get('id'))) {
|
if (list.includes(status.get('id'))) {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
@ -113,7 +114,7 @@ const updateTimeline = (state, timeline, status, references) => {
|
|||||||
|
|
||||||
const deleteStatus = (state, id, accountId, references) => {
|
const deleteStatus = (state, id, accountId, references) => {
|
||||||
// Remove references from timelines
|
// Remove references from timelines
|
||||||
['home', 'mentions', 'public'].forEach(function (timeline) {
|
['home', 'mentions', 'public', 'tag'].forEach(function (timeline) {
|
||||||
state = state.update(timeline, list => list.filterNot(item => item === id));
|
state = state.update(timeline, list => list.filterNot(item => item === id));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1,4 +1,17 @@
|
|||||||
module ApplicationCable
|
module ApplicationCable
|
||||||
class Channel < ActionCable::Channel::Base
|
class Channel < ActionCable::Channel::Base
|
||||||
|
protected
|
||||||
|
|
||||||
|
def hydrate_status(encoded_message)
|
||||||
|
message = ActiveSupport::JSON.decode(encoded_message)
|
||||||
|
status = Status.find_by(id: message['id'])
|
||||||
|
message['message'] = FeedManager.instance.inline_render(current_user.account, status)
|
||||||
|
|
||||||
|
[status, message]
|
||||||
|
end
|
||||||
|
|
||||||
|
def filter?(status)
|
||||||
|
status.nil? || current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
11
app/channels/hashtag_channel.rb
Normal file
11
app/channels/hashtag_channel.rb
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
class HashtagChannel < ApplicationCable::Channel
|
||||||
|
def subscribed
|
||||||
|
tag = params[:tag].downcase
|
||||||
|
|
||||||
|
stream_from "timeline:hashtag:#{tag}", lambda { |encoded_message|
|
||||||
|
status, message = hydrate_status(encoded_message)
|
||||||
|
next if filter?(status)
|
||||||
|
transmit message
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
@ -1,19 +1,9 @@
|
|||||||
# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
|
|
||||||
class PublicChannel < ApplicationCable::Channel
|
class PublicChannel < ApplicationCable::Channel
|
||||||
def subscribed
|
def subscribed
|
||||||
stream_from 'timeline:public', lambda { |encoded_message|
|
stream_from 'timeline:public', lambda { |encoded_message|
|
||||||
message = ActiveSupport::JSON.decode(encoded_message)
|
status, message = hydrate_status(encoded_message)
|
||||||
|
next if filter?(status)
|
||||||
status = Status.find_by(id: message['id'])
|
|
||||||
next if status.nil? || current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account))
|
|
||||||
|
|
||||||
message['message'] = FeedManager.instance.inline_render(current_user.account, status)
|
|
||||||
|
|
||||||
transmit message
|
transmit message
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def unsubscribed
|
|
||||||
# Any cleanup needed when channel is unsubscribed
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
@ -2,8 +2,4 @@ class TimelineChannel < ApplicationCable::Channel
|
|||||||
def subscribed
|
def subscribed
|
||||||
stream_from "timeline:#{current_user.account_id}"
|
stream_from "timeline:#{current_user.account_id}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def unsubscribed
|
|
||||||
# Any cleanup needed when channel is unsubscribed
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
@ -74,6 +74,19 @@ class Api::V1::StatusesController < ApiController
|
|||||||
render action: :index
|
render action: :index
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def tag
|
||||||
|
@tag = Tag.find_by(name: params[:id].downcase)
|
||||||
|
|
||||||
|
if @tag.nil?
|
||||||
|
@statuses = []
|
||||||
|
else
|
||||||
|
@statuses = Status.as_tag_timeline(@tag, current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||||
|
set_maps(@statuses)
|
||||||
|
end
|
||||||
|
|
||||||
|
render action: :index
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def set_status
|
def set_status
|
||||||
|
4
app/controllers/tags_controller.rb
Normal file
4
app/controllers/tags_controller.rb
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
class TagsController < ApplicationController
|
||||||
|
def show
|
||||||
|
end
|
||||||
|
end
|
@ -47,6 +47,10 @@ module AtomBuilderHelper
|
|||||||
xml.author(&block)
|
xml.author(&block)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def category(xml, tag)
|
||||||
|
xml.category(term: tag.name)
|
||||||
|
end
|
||||||
|
|
||||||
def target(xml, &block)
|
def target(xml, &block)
|
||||||
xml['activity'].object(&block)
|
xml['activity'].object(&block)
|
||||||
end
|
end
|
||||||
@ -186,6 +190,10 @@ module AtomBuilderHelper
|
|||||||
stream_entry.target.media_attachments.each do |media|
|
stream_entry.target.media_attachments.each do |media|
|
||||||
link_enclosure xml, media
|
link_enclosure xml, media
|
||||||
end
|
end
|
||||||
|
|
||||||
|
stream_entry.target.tags.each do |tag|
|
||||||
|
category xml, tag
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -198,6 +206,10 @@ module AtomBuilderHelper
|
|||||||
stream_entry.activity.media_attachments.each do |media|
|
stream_entry.activity.media_attachments.each do |media|
|
||||||
link_enclosure xml, media
|
link_enclosure xml, media
|
||||||
end
|
end
|
||||||
|
|
||||||
|
stream_entry.activity.tags.each do |tag|
|
||||||
|
category xml, tag
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
2
app/helpers/tags_helper.rb
Normal file
2
app/helpers/tags_helper.rb
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
module TagsHelper
|
||||||
|
end
|
@ -23,8 +23,8 @@ class FeedManager
|
|||||||
broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status))
|
broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status))
|
||||||
end
|
end
|
||||||
|
|
||||||
def broadcast(account_id, options = {})
|
def broadcast(timeline_id, options = {})
|
||||||
ActionCable.server.broadcast("timeline:#{account_id}", options)
|
ActionCable.server.broadcast("timeline:#{timeline_id}", options)
|
||||||
end
|
end
|
||||||
|
|
||||||
def trim(type, account_id)
|
def trim(type, account_id)
|
||||||
|
@ -2,6 +2,7 @@ require 'singleton'
|
|||||||
|
|
||||||
class Formatter
|
class Formatter
|
||||||
include Singleton
|
include Singleton
|
||||||
|
include RoutingHelper
|
||||||
|
|
||||||
include ActionView::Helpers::TextHelper
|
include ActionView::Helpers::TextHelper
|
||||||
include ActionView::Helpers::SanitizeHelper
|
include ActionView::Helpers::SanitizeHelper
|
||||||
@ -52,7 +53,7 @@ class Formatter
|
|||||||
|
|
||||||
def hashtag_html(match)
|
def hashtag_html(match)
|
||||||
prefix, affix = match.split('#')
|
prefix, affix = match.split('#')
|
||||||
"#{prefix}<a href=\"#\" class=\"mention hashtag\">#<span>#{affix}</span></a>"
|
"#{prefix}<a href=\"#{tag_url(affix.downcase)}\" class=\"mention hashtag\">#<span>#{affix}</span></a>"
|
||||||
end
|
end
|
||||||
|
|
||||||
def mention_html(match, account)
|
def mention_html(match, account)
|
||||||
|
@ -12,6 +12,7 @@ class Status < ApplicationRecord
|
|||||||
has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
|
has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
|
||||||
has_many :mentions, dependent: :destroy
|
has_many :mentions, dependent: :destroy
|
||||||
has_many :media_attachments, dependent: :destroy
|
has_many :media_attachments, dependent: :destroy
|
||||||
|
has_and_belongs_to_many :tags
|
||||||
|
|
||||||
validates :account, presence: true
|
validates :account, presence: true
|
||||||
validates :uri, uniqueness: true, unless: 'local?'
|
validates :uri, uniqueness: true, unless: 'local?'
|
||||||
@ -21,7 +22,7 @@ class Status < ApplicationRecord
|
|||||||
default_scope { order('id desc') }
|
default_scope { order('id desc') }
|
||||||
|
|
||||||
scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') }
|
scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') }
|
||||||
scope :with_includes, -> { includes(:account, :media_attachments, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) }
|
scope :with_includes, -> { includes(:account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) }
|
||||||
|
|
||||||
def local?
|
def local?
|
||||||
uri.nil?
|
uri.nil?
|
||||||
@ -85,29 +86,41 @@ class Status < ApplicationRecord
|
|||||||
Account.where(id: favourites.limit(limit).pluck(:account_id)).with_counters
|
Account.where(id: favourites.limit(limit).pluck(:account_id)).with_counters
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.as_home_timeline(account)
|
class << self
|
||||||
where(account: [account] + account.following).with_includes.with_counters
|
def as_home_timeline(account)
|
||||||
end
|
where(account: [account] + account.following).with_includes.with_counters
|
||||||
|
end
|
||||||
|
|
||||||
def self.as_mentions_timeline(account)
|
def as_mentions_timeline(account)
|
||||||
where(id: Mention.where(account: account).pluck(:status_id)).with_includes.with_counters
|
where(id: Mention.where(account: account).pluck(:status_id)).with_includes.with_counters
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.as_public_timeline(account)
|
def as_public_timeline(account)
|
||||||
joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.reblog_of_id = reblogs.id')
|
joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.reblog_of_id = reblogs.id')
|
||||||
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
|
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
|
||||||
.where('accounts.silenced = FALSE')
|
.where('accounts.silenced = FALSE')
|
||||||
.where('(reblogs.account_id IS NULL OR reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id)
|
.where('(reblogs.account_id IS NULL OR reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id)
|
||||||
.with_includes
|
.with_includes
|
||||||
.with_counters
|
.with_counters
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.favourites_map(status_ids, account_id)
|
def as_tag_timeline(tag, account)
|
||||||
Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
|
tag.statuses
|
||||||
end
|
.joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.reblog_of_id = reblogs.id')
|
||||||
|
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
|
||||||
|
.where('accounts.silenced = FALSE')
|
||||||
|
.where('(reblogs.account_id IS NULL OR reblogs.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)) AND statuses.account_id NOT IN (SELECT target_account_id FROM blocks WHERE account_id = ?)', account.id, account.id)
|
||||||
|
.with_includes
|
||||||
|
.with_counters
|
||||||
|
end
|
||||||
|
|
||||||
def self.reblogs_map(status_ids, account_id)
|
def favourites_map(status_ids, account_id)
|
||||||
select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h
|
Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
|
||||||
|
end
|
||||||
|
|
||||||
|
def reblogs_map(status_ids, account_id)
|
||||||
|
select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
before_validation do
|
before_validation do
|
||||||
|
@ -10,7 +10,7 @@ class StreamEntry < ApplicationRecord
|
|||||||
|
|
||||||
validates :account, :activity, presence: true
|
validates :account, :activity, presence: true
|
||||||
|
|
||||||
STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, mentions: :account, reblog: [:stream_entry, :account, mentions: :account], thread: [:stream_entry, :account]].freeze
|
STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, mentions: :account], thread: [:stream_entry, :account]].freeze
|
||||||
|
|
||||||
scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES, favourite: [:account, :stream_entry, status: STATUS_INCLUDES], follow: [:target_account, :stream_entry]) }
|
scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES, favourite: [:account, :stream_entry, status: STATUS_INCLUDES], follow: [:target_account, :stream_entry]) }
|
||||||
|
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
class Tag < ApplicationRecord
|
class Tag < ApplicationRecord
|
||||||
|
has_and_belongs_to_many :statuses
|
||||||
|
|
||||||
HASHTAG_RE = /[?:^|\s|\.|>]#([[:word:]_]+)/i
|
HASHTAG_RE = /[?:^|\s|\.|>]#([[:word:]_]+)/i
|
||||||
|
|
||||||
validates :name, presence: true, uniqueness: true
|
validates :name, presence: true, uniqueness: true
|
||||||
|
|
||||||
|
def to_param
|
||||||
|
name
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -5,6 +5,10 @@ class FanOutOnWriteService < BaseService
|
|||||||
deliver_to_self(status) if status.account.local?
|
deliver_to_self(status) if status.account.local?
|
||||||
deliver_to_followers(status)
|
deliver_to_followers(status)
|
||||||
deliver_to_mentioned(status)
|
deliver_to_mentioned(status)
|
||||||
|
|
||||||
|
return if status.account.silenced?
|
||||||
|
|
||||||
|
deliver_to_hashtags(status)
|
||||||
deliver_to_public(status)
|
deliver_to_public(status)
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -15,22 +19,27 @@ class FanOutOnWriteService < BaseService
|
|||||||
end
|
end
|
||||||
|
|
||||||
def deliver_to_followers(status)
|
def deliver_to_followers(status)
|
||||||
status.account.followers.each do |follower|
|
status.account.followers.find_each do |follower|
|
||||||
next if !follower.local? || FeedManager.instance.filter?(:home, status, follower)
|
next if !follower.local? || FeedManager.instance.filter?(:home, status, follower)
|
||||||
FeedManager.instance.push(:home, follower, status)
|
FeedManager.instance.push(:home, follower, status)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def deliver_to_mentioned(status)
|
def deliver_to_mentioned(status)
|
||||||
status.mentions.each do |mention|
|
status.mentions.find_each do |mention|
|
||||||
mentioned_account = mention.account
|
mentioned_account = mention.account
|
||||||
next if !mentioned_account.local? || mentioned_account.id == status.account_id || FeedManager.instance.filter?(:mentions, status, mentioned_account)
|
next if !mentioned_account.local? || mentioned_account.id == status.account_id || FeedManager.instance.filter?(:mentions, status, mentioned_account)
|
||||||
FeedManager.instance.push(:mentions, mentioned_account, status)
|
FeedManager.instance.push(:mentions, mentioned_account, status)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def deliver_to_hashtags(status)
|
||||||
|
status.tags.find_each do |tag|
|
||||||
|
FeedManager.instance.broadcast("hashtag:#{tag.name}", id: status.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def deliver_to_public(status)
|
def deliver_to_public(status)
|
||||||
return if status.account.silenced?
|
|
||||||
FeedManager.instance.broadcast(:public, id: status.id)
|
FeedManager.instance.broadcast(:public, id: status.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -9,6 +9,7 @@ class PostStatusService < BaseService
|
|||||||
status = account.statuses.create!(text: text, thread: in_reply_to)
|
status = account.statuses.create!(text: text, thread: in_reply_to)
|
||||||
attach_media(status, media_ids)
|
attach_media(status, media_ids)
|
||||||
process_mentions_service.call(status)
|
process_mentions_service.call(status)
|
||||||
|
process_hashtags_service.call(status)
|
||||||
DistributionWorker.perform_async(status.id)
|
DistributionWorker.perform_async(status.id)
|
||||||
HubPingWorker.perform_async(account.id)
|
HubPingWorker.perform_async(account.id)
|
||||||
status
|
status
|
||||||
@ -26,4 +27,8 @@ class PostStatusService < BaseService
|
|||||||
def process_mentions_service
|
def process_mentions_service
|
||||||
@process_mentions_service ||= ProcessMentionsService.new
|
@process_mentions_service ||= ProcessMentionsService.new
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def process_hashtags_service
|
||||||
|
@process_hashtags_service ||= ProcessHashtagsService.new
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -47,6 +47,12 @@ class ProcessFeedService < BaseService
|
|||||||
record_remote_mentions(status, entry.xpath('./xmlns:link[@rel="mentioned"]'))
|
record_remote_mentions(status, entry.xpath('./xmlns:link[@rel="mentioned"]'))
|
||||||
record_remote_mentions(status.reblog, entry.at_xpath('./activity:object', activity: ACTIVITY_NS).xpath('./xmlns:link[@rel="mentioned"]')) if status.reblog?
|
record_remote_mentions(status.reblog, entry.at_xpath('./activity:object', activity: ACTIVITY_NS).xpath('./xmlns:link[@rel="mentioned"]')) if status.reblog?
|
||||||
|
|
||||||
|
if status.reblog?
|
||||||
|
ProcessHashtagsService.new.call(status.reblog, entry.at_xpath('./activity:object', activity: ACTIVITY_NS).xpath('./xmlns:category').map { |category| category['term'] })
|
||||||
|
else
|
||||||
|
ProcessHashtagsService.new.call(status, entry.xpath('./xmlns:category').map { |category| category['term'] })
|
||||||
|
end
|
||||||
|
|
||||||
process_attachments(entry, status)
|
process_attachments(entry, status)
|
||||||
process_attachments(entry.xpath('./activity:object', activity: ACTIVITY_NS), status.reblog) if status.reblog?
|
process_attachments(entry.xpath('./activity:object', activity: ACTIVITY_NS), status.reblog) if status.reblog?
|
||||||
|
|
||||||
|
11
app/services/process_hashtags_service.rb
Normal file
11
app/services/process_hashtags_service.rb
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
class ProcessHashtagsService < BaseService
|
||||||
|
def call(status, tags = [])
|
||||||
|
if status.local?
|
||||||
|
tags = status.text.scan(Tag::HASHTAG_RE).map(&:first)
|
||||||
|
end
|
||||||
|
|
||||||
|
tags.map(&:downcase).each do |tag|
|
||||||
|
status.tags << Tag.where(name: tag).first_or_initialize(name: tag)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -17,3 +17,7 @@ end
|
|||||||
child :mentions, object_root: false do
|
child :mentions, object_root: false do
|
||||||
extends 'api/v1/statuses/_mention'
|
extends 'api/v1/statuses/_mention'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
child :tags, object_root: false do
|
||||||
|
extends 'api/v1/statuses/_tags'
|
||||||
|
end
|
||||||
|
2
app/views/api/v1/statuses/_tags.rabl
Normal file
2
app/views/api/v1/statuses/_tags.rabl
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
attribute :name
|
||||||
|
node(:url) { |tag| tag_url(tag) }
|
0
app/views/tags/show.html.haml
Normal file
0
app/views/tags/show.html.haml
Normal file
@ -1,6 +1,8 @@
|
|||||||
require 'sidekiq/web'
|
require 'sidekiq/web'
|
||||||
|
|
||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
|
get 'tags/show'
|
||||||
|
|
||||||
mount ActionCable.server => '/cable'
|
mount ActionCable.server => '/cable'
|
||||||
|
|
||||||
authenticate :user, lambda { |u| u.admin? } do
|
authenticate :user, lambda { |u| u.admin? } do
|
||||||
@ -40,6 +42,7 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
|
|
||||||
resources :media, only: [:show]
|
resources :media, only: [:show]
|
||||||
|
resources :tags, only: [:show]
|
||||||
|
|
||||||
namespace :api do
|
namespace :api do
|
||||||
# PubSubHubbub
|
# PubSubHubbub
|
||||||
@ -56,6 +59,7 @@ Rails.application.routes.draw do
|
|||||||
get :home
|
get :home
|
||||||
get :mentions
|
get :mentions
|
||||||
get :public
|
get :public
|
||||||
|
get '/tag/:id', action: :tag
|
||||||
end
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
class CreateStatusesTagsJoinTable < ActiveRecord::Migration[5.0]
|
||||||
|
def change
|
||||||
|
create_join_table :statuses, :tags do |t|
|
||||||
|
t.index :tag_id
|
||||||
|
t.index [:tag_id, :status_id], unique: true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20161104173623) do
|
ActiveRecord::Schema.define(version: 20161105130633) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@ -160,6 +160,13 @@ ActiveRecord::Schema.define(version: 20161104173623) do
|
|||||||
t.index ["uri"], name: "index_statuses_on_uri", unique: true, using: :btree
|
t.index ["uri"], name: "index_statuses_on_uri", unique: true, using: :btree
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "statuses_tags", id: false, force: :cascade do |t|
|
||||||
|
t.integer "status_id", null: false
|
||||||
|
t.integer "tag_id", null: false
|
||||||
|
t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true, using: :btree
|
||||||
|
t.index ["tag_id"], name: "index_statuses_tags_on_tag_id", using: :btree
|
||||||
|
end
|
||||||
|
|
||||||
create_table "stream_entries", force: :cascade do |t|
|
create_table "stream_entries", force: :cascade do |t|
|
||||||
t.integer "account_id"
|
t.integer "account_id"
|
||||||
t.integer "activity_id"
|
t.integer "activity_id"
|
||||||
|
@ -80,6 +80,17 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'GET #tag' do
|
||||||
|
before do
|
||||||
|
post :create, params: { status: 'It is a #test' }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
get :tag, params: { id: 'test' }
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'POST #create' do
|
describe 'POST #create' do
|
||||||
before do
|
before do
|
||||||
post :create, params: { status: 'Hello world' }
|
post :create, params: { status: 'Hello world' }
|
||||||
|
12
spec/controllers/tags_controller_spec.rb
Normal file
12
spec/controllers/tags_controller_spec.rb
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe TagsController, type: :controller do
|
||||||
|
|
||||||
|
describe 'GET #show' do
|
||||||
|
it 'returns http success' do
|
||||||
|
get :show, params: { id: 'test' }
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
5
spec/helpers/tags_helper_spec.rb
Normal file
5
spec/helpers/tags_helper_spec.rb
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe TagsHelper, type: :helper do
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user