forked from treehouse/mastodon
Compare commits
No commits in common. "open-quote-links-in-same-window" and "main" have entirely different histories.
open-quote
...
main
|
@ -293,14 +293,11 @@ export default class StatusContent extends React.PureComponent {
|
|||
id='quote-right'
|
||||
aria-hidden='true'
|
||||
key='icon-quote-right' />
|
||||
<strong class="display-name__html">
|
||||
<a onClick={this.handleAccountClick} href={`/@${quoteStatus.getIn(['account', 'acct'])}`} dangerouslySetInnerHTML={quoteStatusDisplayName} />
|
||||
</strong>
|
||||
<strong class="display-name__html"
|
||||
dangerouslySetInnerHTML={quoteStatusDisplayName} />
|
||||
</span>
|
||||
</bdi>
|
||||
<div>
|
||||
<a onClick={this.handleClick} href={`/@${quoteStatus.getIn(['account', 'acct'])}\/${quoteStatus.get('id')}`} rel='noopener noreferrer' dangerouslySetInnerHTML={quoteStatusContent} />
|
||||
</div>
|
||||
<div dangerouslySetInnerHTML={quoteStatusContent} />
|
||||
</blockquote>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -429,12 +429,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
end
|
||||
|
||||
def guess_quote_url
|
||||
if @object["quoteUri"] && !@object["quoteUri"].empty?
|
||||
@object["quoteUri"]
|
||||
elsif @object["quoteUrl"] && !@object["quoteUrl"].empty?
|
||||
if @object["quoteUrl"] && !@object["quoteUrl"].empty?
|
||||
@object["quoteUrl"]
|
||||
elsif @object["quoteURL"] && !@object["quoteURL"].empty?
|
||||
@object["quoteURL"]
|
||||
elsif @object["_misskey_quote"] && !@object["_misskey_quote"].empty?
|
||||
@object["_misskey_quote"]
|
||||
else
|
||||
|
|
|
@ -77,15 +77,11 @@ class ActivityPub::TagManager
|
|||
# Unlisted and private statuses go out primarily to the followers collection
|
||||
# Others go out only to the people they mention
|
||||
def to(status)
|
||||
to = []
|
||||
|
||||
to << uri_for(status.quote.account) if status.quote?
|
||||
|
||||
case status.visibility
|
||||
when 'public'
|
||||
to << COLLECTIONS[:public]
|
||||
[COLLECTIONS[:public]]
|
||||
when 'unlisted', 'private'
|
||||
to << account_followers_url(status.account)
|
||||
[account_followers_url(status.account)]
|
||||
when 'direct', 'limited'
|
||||
if status.account.silenced?
|
||||
# Only notify followers if the account is locally silenced
|
||||
|
|
|
@ -62,10 +62,6 @@ class StatusEdit < ApplicationRecord
|
|||
end
|
||||
end
|
||||
|
||||
def quote?
|
||||
status.quote?
|
||||
end
|
||||
|
||||
def proper
|
||||
self
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue