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 #227 Display attachments in notification #234

Merged
merged 1 commit into from
Dec 29, 2022
Merged

refs #227 Display attachments in notification #234

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
2 changes: 1 addition & 1 deletion src/components/timelines/notification/Notification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const notification = (props: Props) => {
case 'quote':
case 'status':
case 'emoji_reaction':
return <Reaction notification={props.notification} />
return <Reaction notification={props.notification} openMedia={props.openMedia} />
case 'mention':
return (
<Status
Expand Down
22 changes: 14 additions & 8 deletions src/components/timelines/notification/Reaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
import { MouseEventHandler } from 'react'
import { Entity } from 'megalodon'
import { Avatar, FlexboxGrid } from 'rsuite'
import { Avatar, Button, FlexboxGrid } from 'rsuite'
import { Icon } from '@rsuite/icons'
import { BsStar, BsArrowRepeat, BsMenuUp, BsHouseDoor } from 'react-icons/bs'
import { BsStar, BsArrowRepeat, BsMenuUp, BsHouseDoor, BsPaperclip } from 'react-icons/bs'
import { open } from '@tauri-apps/api/shell'

import Time from 'src/components/utils/Time'
import emojify from 'src/utils/emojify'
import { findLink } from 'src/utils/statusParser'
import Body from '../status/Body'

type Props = {
notification: Entity.Notification
openMedia: (media: Entity.Attachment) => void
}

const actionIcon = (notification: Entity.Notification) => {
Expand Down Expand Up @@ -142,12 +145,15 @@ const Reaction: React.FC<Props> = props => {
</FlexboxGrid.Item>
</FlexboxGrid>
</div>
<div
className="status-body"
style={{ wordWrap: 'break-word' }}
dangerouslySetInnerHTML={{ __html: emojify(status.content, status.emojis) }}
onClick={statusClicked}
></div>
<Body status={status} onClick={statusClicked} />
{status.media_attachments.map((media, index) => (
<div key={index}>
<Button appearance="subtle" size="sm" onClick={() => props.openMedia(media)}>
<Icon as={BsPaperclip} />
{media.type}
</Button>
</div>
))}
<div className="toolbox"></div>
</FlexboxGrid.Item>
</FlexboxGrid>
Expand Down