zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Bump api@0.0.5 and use the type guard helpers

Browse source
This commit is contained in:
Paul Frazee 2023-01-02 20:56:35 -06:00
parent f6a0e634d7
commit 6885fb2b41
4 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/state/models/post-thread-view.ts
View file

@ -4,11 +4,6 @@ import {AtUri} from '../../third-party/uri'
import {RootStoreModel} from './root-store'
import * as apilib from '../lib/api'
interface UnknownPost {
$type: string
[k: string]: unknown
}
function* reactKeyGenerator(): Generator<string> {
let counter = 0
while (true) {
@ -16,17 +11,6 @@ function* reactKeyGenerator(): Generator<string> {
}
}
function isThreadViewPost(
v: GetPostThread.ThreadViewPost | GetPostThread.NotFoundPost | UnknownPost,
): v is GetPostThread.ThreadViewPost {
return v.$type === 'app.bksy.feed.getPostThread#threadViewPost'
}
function isNotFoundPost(
v: GetPostThread.ThreadViewPost | GetPostThread.NotFoundPost | UnknownPost,
): v is GetPostThread.NotFoundPost {
return v.$type === 'app.bsky.feed.getPostThread#notFoundPost'
}
export class PostThreadViewPostModel {
// ui state
_reactKey: string = ''
@ -58,7 +42,7 @@ export class PostThreadViewPostModel {
) {
// parents
if (includeParent && v.parent) {
if (isThreadViewPost(v.parent)) {
if (GetPostThread.isThreadViewPost(v.parent)) {
const parentModel = new PostThreadViewPostModel(
this.rootStore,
keyGen.next().value,
@ -69,7 +53,7 @@ export class PostThreadViewPostModel {
parentModel.assignTreeModels(keyGen, v.parent, true, false)
}
this.parent = parentModel
} else if (isNotFoundPost(v.parent)) {
} else if (GetPostThread.isNotFoundPost(v.parent)) {
this.parent = v.parent
}
}
@ -77,7 +61,7 @@ export class PostThreadViewPostModel {
if (includeChildren && v.replies) {
const replies = []
for (const item of v.replies) {
if (isThreadViewPost(item)) {
if (GetPostThread.isThreadViewPost(item)) {
const itemModel = new PostThreadViewPostModel(
this.rootStore,
keyGen.next().value,
@ -88,7 +72,7 @@ export class PostThreadViewPostModel {
itemModel.assignTreeModels(keyGen, item, false, true)
}
replies.push(itemModel)
} else if (isNotFoundPost(item)) {
} else if (GetPostThread.isNotFoundPost(item)) {
replies.push(item)
}
}

28
src/view/com/util/PostEmbeds.tsx
View file

@ -1,5 +1,5 @@
import React from 'react'
import {ImageStyle, StyleSheet, StyleProp, View, ViewStyle} from 'react-native'
import {StyleSheet, StyleProp, View, ViewStyle} from 'react-native'
import {AppBskyEmbedImages, AppBskyEmbedExternal} from '@atproto/api'
import {Link} from '../util/Link'
import {Text} from './text/Text'
@ -23,39 +23,38 @@ export function PostEmbeds({
}) {
const pal = usePalette('default')
const store = useStores()
if (embed?.$type === 'app.bsky.embed.images#presented') {
const imgEmbed = embed as AppBskyEmbedImages.Presented
if (imgEmbed.images.length > 0) {
const uris = imgEmbed.images.map(img => img.fullsize)
if (AppBskyEmbedImages.isPresented(embed)) {
if (embed.images.length > 0) {
const uris = embed.images.map(img => img.fullsize)
const openLightbox = (index: number) => {
store.shell.openLightbox(new ImagesLightbox(uris, index))
}
if (imgEmbed.images.length === 4) {
if (embed.images.length === 4) {
return (
<View style={styles.imagesContainer}>
<ImageLayoutGrid
type="four"
uris={imgEmbed.images.map(img => img.thumb)}
uris={embed.images.map(img => img.thumb)}
onPress={openLightbox}
/>
</View>
)
} else if (imgEmbed.images.length === 3) {
} else if (embed.images.length === 3) {
return (
<View style={styles.imagesContainer}>
<ImageLayoutGrid
type="three"
uris={imgEmbed.images.map(img => img.thumb)}
uris={embed.images.map(img => img.thumb)}
onPress={openLightbox}
/>
</View>
)
} else if (imgEmbed.images.length === 2) {
} else if (embed.images.length === 2) {
return (
<View style={styles.imagesContainer}>
<ImageLayoutGrid
type="two"
uris={imgEmbed.images.map(img => img.thumb)}
uris={embed.images.map(img => img.thumb)}
onPress={openLightbox}
/>
</View>
@ -64,7 +63,7 @@ export function PostEmbeds({
return (
<View style={styles.imagesContainer}>
<AutoSizedImage
uri={imgEmbed.images[0].thumb}
uri={embed.images[0].thumb}
onPress={() => openLightbox(0)}
containerStyle={{borderRadius: 4}}
/>
@ -73,9 +72,8 @@ export function PostEmbeds({
}
}
}
if (embed?.$type === 'app.bsky.embed.external#presented') {
const externalEmbed = embed as AppBskyEmbedExternal.Presented
const link = externalEmbed.external
if (AppBskyEmbedExternal.isPresented(embed)) {
const link = embed.external
return (
<Link
style={[styles.extOuter, pal.view, pal.border, style]}