Skip to content
Snippets Groups Projects
Commit 05abd977 authored by Eugen Rochko's avatar Eugen Rochko
Browse files

Fix preview cards layout, do preview card crawling for remote statuses

parent f4e28785
No related branches found
No related tags found
No related merge requests found
......@@ -14,16 +14,20 @@ const outerStyle = {
};
const contentStyle = {
flex: '2',
flex: '1 1 auto',
padding: '8px',
paddingLeft: '14px'
paddingLeft: '14px',
overflow: 'hidden'
};
const titleStyle = {
display: 'block',
fontWeight: '500',
marginBottom: '5px',
color: '#d9e1e8'
color: '#d9e1e8',
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap'
};
const descriptionStyle = {
......@@ -31,7 +35,7 @@ const descriptionStyle = {
};
const imageOuterStyle = {
flex: '1',
flex: '0 0 100px',
background: '#373b4a'
};
......@@ -84,8 +88,8 @@ const Card = React.createClass({
{image}
<div style={contentStyle}>
<strong style={titleStyle}>{card.get('title')}</strong>
<p style={descriptionStyle}>{card.get('description')}</p>
<strong style={titleStyle} title={card.get('title')}>{card.get('title')}</strong>
<p style={descriptionStyle}>{card.get('description').substring(0, 50)}</p>
<span style={hostStyle}>{getHostname(card.get('url'))}</span>
</div>
</a>
......
......@@ -45,7 +45,7 @@ class ProcessFeedService < BaseService
status = status_from_xml(@xml)
return if status.nil?
if verb == :share
original_status = status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
status.reblog = original_status
......@@ -61,6 +61,7 @@ class ProcessFeedService < BaseService
status.save!
NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
LinkCrawlWorker.perform_async(status.reblog? ? status.reblog_of_id : status.id)
Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
DistributionWorker.perform_async(status.id)
status
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment