mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09:00
[Glitch] Fix Content Warning and filter states not applying to boosted posts properly (refactor only)
Port ec663eaba1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
parent
e86c1c814b
commit
18aa0d8871
@ -586,6 +586,9 @@ class Status extends ImmutablePureComponent {
|
|||||||
|
|
||||||
let prepend, rebloggedByText;
|
let prepend, rebloggedByText;
|
||||||
|
|
||||||
|
const connectUp = previousId && previousId === status.get('in_reply_to_id');
|
||||||
|
const connectToRoot = rootId && rootId === status.get('in_reply_to_id');
|
||||||
|
const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
|
||||||
const matchedFilters = status.get('matched_filters');
|
const matchedFilters = status.get('matched_filters');
|
||||||
|
|
||||||
if (hidden) {
|
if (hidden) {
|
||||||
@ -600,10 +603,6 @@ class Status extends ImmutablePureComponent {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const connectUp = previousId && previousId === status.get('in_reply_to_id');
|
|
||||||
const connectToRoot = rootId && rootId === status.get('in_reply_to_id');
|
|
||||||
const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
|
|
||||||
|
|
||||||
if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
|
if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
|
||||||
const minHandlers = this.props.muted ? {} : {
|
const minHandlers = this.props.muted ? {} : {
|
||||||
moveUp: this.handleHotkeyMoveUp,
|
moveUp: this.handleHotkeyMoveUp,
|
||||||
|
Loading…
Reference in New Issue
Block a user