me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more quote toot fixups from th

Browse source
This commit is contained in:
Skye 2022-12-28 21:16:52 +09:00
parent ed60885340
commit c6b561902b
Signed by: me
GPG key ID: 0104BC05F41B77B8
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/flavours/glitch/components/status_content.js
View file

@ -347,11 +347,14 @@ 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', 'url'])} dangerouslySetInnerHTML={quoteStatusDisplayName} />
</strong>
</span> </span>
</bdi> </bdi>
<div dangerouslySetInnerHTML={quoteStatusContent} /> <div>
<a href={quoteStatus.get('url')} target='_blank' rel='noopener noreferrer' dangerouslySetInnerHTML={quoteStatusContent} />
</div>
</blockquote> </blockquote>
</div> </div>
); );

6
app/lib/activitypub/activity/create.rb
View file

@ -431,8 +431,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

8
app/lib/activitypub/tag_manager.rb
View file

@ -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

4
app/models/status_edit.rb
View file

@ -62,6 +62,10 @@ class StatusEdit < ApplicationRecord
end end
end end
def quote?
status.quote?
end
def proper def proper
self self
end end