Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refs #1078 Hide all contents when CW is specified #1087

Merged
merged 1 commit into from
Aug 12, 2023
Merged

refs #1078 Hide all contents when CW is specified #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/components/fromOtherAccount/Status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ type PostProps = {
function Post(props: PostProps) {
const { status, client } = props
const [showReply, setShowReply] = useState(false)
const [spoilered, setSpoilered] = useState(status.spoiler_text.length > 0)

return (
<>
Expand All @@ -137,15 +138,16 @@ function Post(props: PostProps) {
</FlexboxGrid.Item>
</FlexboxGrid>
</div>
<Body status={status} />
{status.media_attachments.map((media, index) => (
<div key={index}>
<Button appearance="subtle" size="sm">
<Icon as={BsPaperclip} />
{media.id}
</Button>
</div>
))}
<Body status={status} spoilered={spoilered} setSpoilered={setSpoilered} />
{!spoilered &&
status.media_attachments.map((media, index) => (
<div key={index}>
<Button appearance="subtle" size="sm">
<Icon as={BsPaperclip} />
{media.id}
</Button>
</div>
))}
<div className="toolbox">
<Actions
disabled={{
Expand Down
4 changes: 4 additions & 0 deletions src/components/timelines/conversation/Conversation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { BsPaperclip } from 'react-icons/bs'
import Time from 'src/components/utils/Time'
import emojify from 'src/utils/emojify'
import Body from '../status/Body'
import { useState } from 'react'

type Props = {
conversation: Entity.Conversation
Expand All @@ -15,6 +16,7 @@ type Props = {
const Conversation: React.FC<Props> = props => {
const { conversation } = props
const account = conversation.accounts[0]
const [spoilered, setSpoilered] = useState<boolean>(conversation.last_status && conversation.last_status.spoiler_text.length > 0)

return (
<div className="conversation">
Expand Down Expand Up @@ -46,6 +48,8 @@ const Conversation: React.FC<Props> = props => {
status={conversation.last_status}
style={{ color: 'var(--rs-text-tertiary)' }}
onClick={() => props.selectStatus(conversation.id, conversation.last_status)}
spoilered={spoilered}
setSpoilered={setSpoilered}
/>
)}
{conversation.last_status &&
Expand Down
28 changes: 17 additions & 11 deletions src/components/timelines/notification/Reaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MouseEventHandler } from 'react'
import { MouseEventHandler, useState } from 'react'
import { Entity, MegalodonInterface } from 'megalodon'
import { Avatar, Button, FlexboxGrid, toaster, Notification } from 'rsuite'
import { Icon } from '@rsuite/icons'
Expand Down Expand Up @@ -160,6 +160,7 @@ const actionText = (notification: Entity.Notification, setAccountDetail: (accoun
const Reaction: React.FC<Props> = props => {
const { formatMessage } = useIntl()
const status = props.notification.status
const [spoilered, setSpoilered] = useState<boolean>(status.spoiler_text.length > 0)

const refresh = async () => {
const res = await props.client.getStatus(status.id)
Expand Down Expand Up @@ -259,16 +260,21 @@ const Reaction: React.FC<Props> = props => {
</FlexboxGrid.Item>
</FlexboxGrid>
</div>
<Body status={status} onClick={statusClicked} />
{status.poll && <Poll poll={status.poll} client={props.client} pollUpdated={refresh} />}
{status.media_attachments.map((media, index) => (
<div key={index}>
<Button appearance="subtle" size="sm" onClick={() => props.openMedia(status.media_attachments, index)}>
<Icon as={BsPaperclip} />
{media.id}
</Button>
</div>
))}
<Body status={status} onClick={statusClicked} spoilered={spoilered} setSpoilered={setSpoilered} />
{!spoilered && (
<>
{status.poll && <Poll poll={status.poll} client={props.client} pollUpdated={refresh} />}
{status.media_attachments.map((media, index) => (
<div key={index}>
<Button appearance="subtle" size="sm" onClick={() => props.openMedia(status.media_attachments, index)}>
<Icon as={BsPaperclip} />
{media.id}
</Button>
</div>
))}
</>
)}

<div className="toolbox"></div>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/components/timelines/status/Body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { Entity } from 'megalodon'
import { HTMLAttributes, useState } from 'react'
import { Dispatch, HTMLAttributes, SetStateAction } from 'react'
import { FormattedMessage } from 'react-intl'
import { Button } from 'rsuite'
import emojify from 'src/utils/emojify'
import LinkPreview from './LinkPreview'

type Props = {
status: Entity.Status
spoilered: boolean
setSpoilered: Dispatch<SetStateAction<boolean>>
onClick?: (e: any) => void
} & HTMLAttributes<HTMLElement>

const Body: React.FC<Props> = props => {
const [spoilered, setSpoilered] = useState<boolean>(props.status.spoiler_text.length > 0)
const { spoilered, setSpoilered } = props

const spoiler = () => {
if (props.status.spoiler_text.length > 0) {
Expand Down
35 changes: 20 additions & 15 deletions src/components/timelines/status/Status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const Status: React.FC<Props> = props => {
const { client } = props
const [showReply, setShowReply] = useState<boolean>(false)
const [showEdit, setShowEdit] = useState<boolean>(false)
const [spoilered, setSpoilered] = useState<boolean>(props.status.spoiler_text.length > 0)
const toaster = useToaster()

const status = originalStatus(props.status)
Expand Down Expand Up @@ -163,22 +164,26 @@ const Status: React.FC<Props> = props => {
</FlexboxGrid.Item>
</FlexboxGrid>
</div>
<Body status={status} onClick={statusClicked} />
{status.poll && <Poll poll={status.poll} client={props.client} pollUpdated={refresh} />}
{status.media_attachments.length > 0 && (
<Attachments
attachments={status.media_attachments}
sensitive={status.sensitive}
openMedia={props.openMedia}
columnWidth={props.columnWidth}
/>
<Body status={status} onClick={statusClicked} spoilered={spoilered} setSpoilered={setSpoilered} />
{!spoilered && (
<>
{status.poll && <Poll poll={status.poll} client={props.client} pollUpdated={refresh} />}
{status.media_attachments.length > 0 && (
<Attachments
attachments={status.media_attachments}
sensitive={status.sensitive}
openMedia={props.openMedia}
columnWidth={props.columnWidth}
/>
)}
{status.emoji_reactions &&
status.emoji_reactions.map(e => (
<Button appearance="subtle" size="sm" key={e.name} onClick={() => emojiClicked(e)}>
{e.name} {e.count}
</Button>
))}
</>
)}
{status.emoji_reactions &&
status.emoji_reactions.map(e => (
<Button appearance="subtle" size="sm" key={e.name} onClick={() => emojiClicked(e)}>
{e.name} {e.count}
</Button>
))}
<Actions
disabled={props.server.account_id === null}
server={props.server}
Expand Down
Loading