Show text from poll too

This commit is contained in:
Lim Chee Aun 2024-03-07 12:34:38 +08:00
parent 7f6ef4ff96
commit cf1c10b338
2 changed files with 22 additions and 12 deletions

View file

@ -32,12 +32,12 @@ import { oklab2rgb, rgb2oklab } from '../utils/color-utils';
import db from '../utils/db'; import db from '../utils/db';
import emojifyText from '../utils/emojify-text'; import emojifyText from '../utils/emojify-text';
import { isFiltered } from '../utils/filters'; import { isFiltered } from '../utils/filters';
import getHTMLText from '../utils/getHTMLText';
import htmlContentLength from '../utils/html-content-length'; import htmlContentLength from '../utils/html-content-length';
import niceDateTime from '../utils/nice-date-time'; import niceDateTime from '../utils/nice-date-time';
import shortenNumber from '../utils/shorten-number'; import shortenNumber from '../utils/shorten-number';
import showToast from '../utils/show-toast'; import showToast from '../utils/show-toast';
import states, { statusKey } from '../utils/states'; import states, { statusKey } from '../utils/states';
import statusPeek from '../utils/status-peek';
import store from '../utils/store'; import store from '../utils/store';
import { getCurrentAccountNS } from '../utils/store-utils'; import { getCurrentAccountNS } from '../utils/store-utils';
import { assignFollowedTags } from '../utils/timeline-utils'; import { assignFollowedTags } from '../utils/timeline-utils';
@ -1484,7 +1484,7 @@ function PostPeek({ post, filterInfo }) {
const isThread = const isThread =
(inReplyToId && inReplyToAccountId === account.id) || !!_thread; (inReplyToId && inReplyToAccountId === account.id) || !!_thread;
const showMedia = !spoilerText && !sensitive; const showMedia = !spoilerText && !sensitive;
const postText = content ? getHTMLText(content) : ''; const postText = content ? statusPeek(post) : '';
return ( return (
<div class="post-peek" title={!spoilerText ? postText : ''}> <div class="post-peek" title={!spoilerText ? postText : ''}>
@ -1518,19 +1518,27 @@ function PostPeek({ post, filterInfo }) {
<span class="post-peek-tag post-peek-thread">Thread</span>{' '} <span class="post-peek-tag post-peek-thread">Thread</span>{' '}
</> </>
)} )}
{content ? ( {!!content && (
<div <div
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: emojifyText(content, emojis), __html: emojifyText(content, emojis),
}} }}
/> />
) : mediaAttachments?.length === 1 && )}
mediaAttachments[0].description ? ( {!!poll?.options?.length &&
<> poll.options.map((o) => (
<span class="post-peek-tag post-peek-alt">ALT</span>{' '} <div>
<div>{mediaAttachments[0].description}</div> {poll.multiple ? '▪️' : '•'} {o.title}
</> </div>
) : null} ))}
{!content &&
mediaAttachments?.length === 1 &&
mediaAttachments[0].description && (
<>
<span class="post-peek-tag post-peek-alt">ALT</span>{' '}
<div>{mediaAttachments[0].description}</div>
</>
)}
</div> </div>
)} )}
</span> </span>

View file

@ -9,8 +9,10 @@ function statusPeek(status) {
text += getHTMLText(content); text += getHTMLText(content);
} }
text = text.trim(); text = text.trim();
if (poll) { if (poll?.options?.length) {
text += ' 📊'; text += `\n\n📊:\n${poll.options
.map((o) => `${poll.multiple ? '▪️' : '•'} ${o.title}`)
.join('\n')}`;
} }
if (mediaAttachments?.length) { if (mediaAttachments?.length) {
text += text +=