nasso.dev
my fork of the bluesky client
Merge branch 'main' of https://github.com/haideralipunjabi/social-app into main
+64
-5
+1
src/lib/constants.ts
+1
src/lib/constants.ts
+5
src/lib/strings/helpers.ts
+5
src/lib/strings/helpers.ts
+19
-2
src/view/com/post-thread/PostThreadItem.tsx
+19
-2
src/view/com/post-thread/PostThreadItem.tsx
···
8
FontAwesomeIconStyle,
9
} from '@fortawesome/react-native-fontawesome'
10
import {PostThreadItemModel} from 'state/models/content/post-thread-item'
11
-
import {Link} from '../util/Link'
12
import {RichText} from '../util/text/RichText'
13
import {Text} from '../util/text/Text'
14
import {PostDropdownBtn} from '../util/forms/PostDropdownBtn'
···
18
import {niceDate} from 'lib/strings/time'
19
import {sanitizeDisplayName} from 'lib/strings/display-names'
20
import {sanitizeHandle} from 'lib/strings/handles'
21
-
import {pluralize} from 'lib/strings/helpers'
22
import {isEmbedByEmbedder} from 'lib/embeds'
23
import {getTranslatorLink, isPostInLanguage} from '../../../locale/helpers'
24
import {useStores} from 'state/index'
···
35
import {TimeElapsed} from 'view/com/util/TimeElapsed'
36
import {makeProfileLink} from 'lib/routes/links'
37
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
38
39
export const PostThreadItem = observer(function PostThreadItem({
40
item,
···
50
const pal = usePalette('default')
51
const store = useStores()
52
const [deleted, setDeleted] = React.useState(false)
53
const styles = useStyles()
54
const record = item.postRecord
55
const hasEngagement = item.post.likeCount || item.post.repostCount
···
150
},
151
)
152
}, [item, store])
153
154
if (!record) {
155
return <ErrorMessage message="Invalid or unsupported post record" />
···
489
richText={item.richText}
490
style={[pal.text, s.flex1]}
491
lineHeight={1.3}
492
/>
493
</View>
494
) : undefined}
495
{item.post.embed && (
496
<ContentHider
···
8
FontAwesomeIconStyle,
9
} from '@fortawesome/react-native-fontawesome'
10
import {PostThreadItemModel} from 'state/models/content/post-thread-item'
11
+
import {Link, TextLink} from '../util/Link'
12
import {RichText} from '../util/text/RichText'
13
import {Text} from '../util/text/Text'
14
import {PostDropdownBtn} from '../util/forms/PostDropdownBtn'
···
18
import {niceDate} from 'lib/strings/time'
19
import {sanitizeDisplayName} from 'lib/strings/display-names'
20
import {sanitizeHandle} from 'lib/strings/handles'
21
+
import {countLines, pluralize} from 'lib/strings/helpers'
22
import {isEmbedByEmbedder} from 'lib/embeds'
23
import {getTranslatorLink, isPostInLanguage} from '../../../locale/helpers'
24
import {useStores} from 'state/index'
···
35
import {TimeElapsed} from 'view/com/util/TimeElapsed'
36
import {makeProfileLink} from 'lib/routes/links'
37
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
38
+
import {MAX_POST_LINES} from 'lib/constants'
39
40
export const PostThreadItem = observer(function PostThreadItem({
41
item,
···
51
const pal = usePalette('default')
52
const store = useStores()
53
const [deleted, setDeleted] = React.useState(false)
54
+
const [limitLines, setLimitLines] = React.useState(
55
+
countLines(item.richText?.text) >= MAX_POST_LINES,
56
+
)
57
const styles = useStyles()
58
const record = item.postRecord
59
const hasEngagement = item.post.likeCount || item.post.repostCount
···
154
},
155
)
156
}, [item, store])
157
+
158
+
const onPressShowMore = React.useCallback(() => {
159
+
setLimitLines(false)
160
+
}, [setLimitLines])
161
162
if (!record) {
163
return <ErrorMessage message="Invalid or unsupported post record" />
···
497
richText={item.richText}
498
style={[pal.text, s.flex1]}
499
lineHeight={1.3}
500
+
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
501
/>
502
</View>
503
+
) : undefined}
504
+
{limitLines ? (
505
+
<TextLink
506
+
text="Show More"
507
+
style={pal.link}
508
+
onPress={onPressShowMore}
509
+
href="#"
510
+
/>
511
) : undefined}
512
{item.post.embed && (
513
<ContentHider
+19
-2
src/view/com/post/Post.tsx
+19
-2
src/view/com/post/Post.tsx
···
14
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
15
import {PostThreadModel} from 'state/models/content/post-thread'
16
import {PostThreadItemModel} from 'state/models/content/post-thread-item'
17
-
import {Link} from '../util/Link'
18
import {UserInfoText} from '../util/UserInfoText'
19
import {PostMeta} from '../util/PostMeta'
20
import {PostEmbeds} from '../util/post-embeds'
···
30
import {usePalette} from 'lib/hooks/usePalette'
31
import {getTranslatorLink} from '../../../locale/helpers'
32
import {makeProfileLink} from 'lib/routes/links'
33
34
export const Post = observer(function PostImpl({
35
view,
···
103
}) {
104
const pal = usePalette('default')
105
const store = useStores()
106
-
107
const itemUri = item.post.uri
108
const itemCid = item.post.cid
109
const itemUrip = new AtUri(item.post.uri)
···
182
)
183
}, [item, setDeleted, store])
184
185
return (
186
<Link href={itemHref} style={[styles.outer, pal.view, pal.border, style]}>
187
{showReplyLine && <View style={styles.replyLine} />}
···
239
type="post-text"
240
richText={item.richText}
241
lineHeight={1.3}
242
style={s.flex1}
243
/>
244
</View>
245
) : undefined}
246
{item.post.embed ? (
247
<ContentHider
···
14
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
15
import {PostThreadModel} from 'state/models/content/post-thread'
16
import {PostThreadItemModel} from 'state/models/content/post-thread-item'
17
+
import {Link, TextLink} from '../util/Link'
18
import {UserInfoText} from '../util/UserInfoText'
19
import {PostMeta} from '../util/PostMeta'
20
import {PostEmbeds} from '../util/post-embeds'
···
30
import {usePalette} from 'lib/hooks/usePalette'
31
import {getTranslatorLink} from '../../../locale/helpers'
32
import {makeProfileLink} from 'lib/routes/links'
33
+
import {MAX_POST_LINES} from 'lib/constants'
34
+
import {countLines} from 'lib/strings/helpers'
35
36
export const Post = observer(function PostImpl({
37
view,
···
105
}) {
106
const pal = usePalette('default')
107
const store = useStores()
108
+
const [limitLines, setLimitLines] = React.useState(
109
+
countLines(item.richText?.text) >= MAX_POST_LINES,
110
+
)
111
const itemUri = item.post.uri
112
const itemCid = item.post.cid
113
const itemUrip = new AtUri(item.post.uri)
···
186
)
187
}, [item, setDeleted, store])
188
189
+
const onPressShowMore = React.useCallback(() => {
190
+
setLimitLines(false)
191
+
}, [setLimitLines])
192
+
193
return (
194
<Link href={itemHref} style={[styles.outer, pal.view, pal.border, style]}>
195
{showReplyLine && <View style={styles.replyLine} />}
···
247
type="post-text"
248
richText={item.richText}
249
lineHeight={1.3}
250
+
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
251
style={s.flex1}
252
/>
253
</View>
254
+
) : undefined}
255
+
{limitLines ? (
256
+
<TextLink
257
+
text="Show More"
258
+
style={pal.link}
259
+
onPress={onPressShowMore}
260
+
href="#"
261
+
/>
262
) : undefined}
263
{item.post.embed ? (
264
<ContentHider
+19
-1
src/view/com/posts/FeedItem.tsx
+19
-1
src/view/com/posts/FeedItem.tsx
···
9
} from '@fortawesome/react-native-fontawesome'
10
import {PostsFeedItemModel} from 'state/models/feeds/post'
11
import {FeedSourceInfo} from 'lib/api/feed/types'
12
-
import {Link, TextLinkOnWebOnly} from '../util/Link'
13
import {Text} from '../util/text/Text'
14
import {UserInfoText} from '../util/UserInfoText'
15
import {PostMeta} from '../util/PostMeta'
···
30
import {getTranslatorLink} from '../../../locale/helpers'
31
import {makeProfileLink} from 'lib/routes/links'
32
import {isEmbedByEmbedder} from 'lib/embeds'
33
34
export const FeedItem = observer(function FeedItemImpl({
35
item,
···
49
const pal = usePalette('default')
50
const {track} = useAnalytics()
51
const [deleted, setDeleted] = useState(false)
52
const record = item.postRecord
53
const itemUri = item.post.uri
54
const itemCid = item.post.cid
···
135
},
136
)
137
}, [track, item, setDeleted, store])
138
139
const outerStyles = [
140
styles.outer,
···
307
type="post-text"
308
richText={item.richText}
309
lineHeight={1.3}
310
style={s.flex1}
311
/>
312
</View>
313
) : undefined}
314
{item.post.embed ? (
315
<ContentHider
···
9
} from '@fortawesome/react-native-fontawesome'
10
import {PostsFeedItemModel} from 'state/models/feeds/post'
11
import {FeedSourceInfo} from 'lib/api/feed/types'
12
+
import {Link, TextLinkOnWebOnly, TextLink} from '../util/Link'
13
import {Text} from '../util/text/Text'
14
import {UserInfoText} from '../util/UserInfoText'
15
import {PostMeta} from '../util/PostMeta'
···
30
import {getTranslatorLink} from '../../../locale/helpers'
31
import {makeProfileLink} from 'lib/routes/links'
32
import {isEmbedByEmbedder} from 'lib/embeds'
33
+
import {MAX_POST_LINES} from 'lib/constants'
34
+
import {countLines} from 'lib/strings/helpers'
35
36
export const FeedItem = observer(function FeedItemImpl({
37
item,
···
51
const pal = usePalette('default')
52
const {track} = useAnalytics()
53
const [deleted, setDeleted] = useState(false)
54
+
const [limitLines, setLimitLines] = useState(
55
+
countLines(item.richText?.text) >= MAX_POST_LINES,
56
+
)
57
const record = item.postRecord
58
const itemUri = item.post.uri
59
const itemCid = item.post.cid
···
140
},
141
)
142
}, [track, item, setDeleted, store])
143
+
144
+
const onPressShowMore = React.useCallback(() => {
145
+
setLimitLines(false)
146
+
}, [setLimitLines])
147
148
const outerStyles = [
149
styles.outer,
···
316
type="post-text"
317
richText={item.richText}
318
lineHeight={1.3}
319
+
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
320
style={s.flex1}
321
/>
322
</View>
323
+
) : undefined}
324
+
{limitLines ? (
325
+
<TextLink
326
+
text="Show More"
327
+
style={pal.link}
328
+
onPress={onPressShowMore}
329
+
href="#"
330
+
/>
331
) : undefined}
332
{item.post.embed ? (
333
<ContentHider
+1
src/view/com/util/text/RichText.tsx
+1
src/view/com/util/text/RichText.tsx