AkkomaGang/fedibird-fe
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

fixup! Add the ability to change to a new circle by replying to a circle

Browse source
This commit is contained in:
noellabo 2021-07-17 11:44:59 +09:00
parent a27fcf5e30
commit 96258f2a86
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/circles/index.js
View file

@ -48,7 +48,7 @@ class Circles extends ImmutablePureComponent {
} }
render () { render () {
const { intl, shouldUpdateScroll, circles, multiColumn } = this.props; const { intl, circles, multiColumn } = this.props;
if (!circles) { if (!circles) {
return ( return (
@ -68,7 +68,6 @@ class Circles extends ImmutablePureComponent {
<ScrollableList <ScrollableList
scrollKey='circles' scrollKey='circles'
shouldUpdateScroll={shouldUpdateScroll}
emptyMessage={emptyMessage} emptyMessage={emptyMessage}
prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />} prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
bindToDocument={!multiColumn} bindToDocument={!multiColumn}

4
app/javascript/mastodon/features/mentions/index.js
View file

@ -22,7 +22,6 @@ class Mentions extends ImmutablePureComponent {
static propTypes = { static propTypes = {
params: PropTypes.object.isRequired, params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
shouldUpdateScroll: PropTypes.func,
accountIds: ImmutablePropTypes.list, accountIds: ImmutablePropTypes.list,
multiColumn: PropTypes.bool, multiColumn: PropTypes.bool,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
@ -41,7 +40,7 @@ class Mentions extends ImmutablePureComponent {
} }
render () { render () {
const { shouldUpdateScroll, accountIds, multiColumn } = this.props; const { accountIds, multiColumn } = this.props;
if (!accountIds) { if (!accountIds) {
return ( return (
@ -62,7 +61,6 @@ class Mentions extends ImmutablePureComponent {
<ScrollableList <ScrollableList
scrollKey='mentions' scrollKey='mentions'
shouldUpdateScroll={shouldUpdateScroll}
emptyMessage={emptyMessage} emptyMessage={emptyMessage}
bindToDocument={!multiColumn} bindToDocument={!multiColumn}
> >

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

@ -360,8 +360,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return conversation if @object['context'].nil? return conversation if @object['context'].nil?
uri = value_or_id(@object['context']) uri = value_or_id(@object['context'])
conversation ||= ActivityPub::TagManager.instance.uri_to_resource(uri, Conversation) context_conversation = ActivityPub::TagManager.instance.uri_to_resource(uri, Conversation)
conversation ||= context_conversation
return conversation if (conversation.present? && (conversation.local? || conversation.uri == uri)) || !uri.start_with?('https://') return conversation if (conversation.present? && (conversation.local? || conversation.uri == uri)) || !uri.start_with?('https://')
@ -375,6 +376,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return conversation if conversation_json.blank? return conversation if conversation_json.blank?
conversation = context_conversation if context_conversation.present?
conversation ||= Conversation.new conversation ||= Conversation.new
conversation.uri = uri conversation.uri = uri
conversation.inbox_url = conversation_json['inbox'] conversation.inbox_url = conversation_json['inbox']