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