misc: switch to universal vote function

This commit is contained in:
Xyphyn committed 2023-08-19 14:06:16 -07:00
1 parent 8915759031
commit 76b9864a3b
9 files changed
+134 -102

No files matched your search

+65 -11
View File
@@ -1,22 +1,33 @@
import { getClient } from '$lib/lemmy.js'
import { isComment, isPost } from '$lib/lemmy/item.js'
import type { CommentView, Person, PostView } from 'lemmy-js-client'
import { isComment, isCommentView, isPostView } from '$lib/lemmy/item.js'
import type {
CommentView,
Person,
PostView,
Comment,
Post,
} from 'lemmy-js-client'
export type Submission = PostView | CommentView
export type SubmissionView = PostView | CommentView
export type Submission = Post | Comment
export interface ContentView {
type: 'post' | 'comment'
title?: string
body: string
creator: Person
creator?: Person
id: number
}
const isSubmissionView = (
item: SubmissionView | ContentView
): item is SubmissionView => !('type' in item)
const isSubmission = (item: Submission | ContentView): item is Submission =>
!('type' in item)
export const contentView = (item: Submission): ContentView => {
if (isComment(item))
export const contentView = (item: SubmissionView): ContentView => {
if (isCommentView(item))
return {
type: 'comment',
body: item.comment.content,
@@ -33,12 +44,28 @@ export const contentView = (item: Submission): ContentView => {
}
}
export const contentItem = (item: Submission): ContentView => {
if (isComment(item))
return {
type: 'comment',
body: item.content,
id: item.id,
}
else
return {
type: 'post',
body: item.body ?? item.name,
title: item.name,
id: item.id,
}
}
export async function save(
item: ContentView | Submission,
item: ContentView | SubmissionView,
save: boolean,
jwt: string
): Promise<boolean> {
if (isSubmission(item)) item = contentView(item)
if (isSubmissionView(item)) item = contentView(item)
if (item.type == 'post') {
return (
@@ -61,11 +88,11 @@ export async function save(
}
export async function deleteItem(
item: ContentView | Submission,
item: ContentView | SubmissionView,
deleted: boolean,
jwt: string
): Promise<boolean> {
if (isSubmission(item)) item = contentView(item)
if (isSubmissionView(item)) item = contentView(item)
if (item.type == 'post') {
return (
@@ -82,7 +109,34 @@ export async function deleteItem(
comment_id: item.id,
deleted: deleted,
})
).comment_view.post.deleted
).comment_view.comment.deleted
}
return deleted
}
export async function vote(
item: ContentView | Submission,
vote: number,
jwt: string
): Promise<number> {
if (isSubmission(item)) item = contentItem(item)
if (item.type == 'post') {
return (
await getClient().likePost({
auth: jwt,
post_id: item.id,
score: vote,
})
).post_view.counts.score
} else if (item.type == 'comment') {
return (
await getClient().likeComment({
auth: jwt,
comment_id: item.id,
score: vote,
})
).comment_view.counts.score
}
return 0
}
+12 -4
View File
@@ -2,17 +2,20 @@ import type {
CommentReportView,
CommentView,
CommunityView,
Comment,
PersonView,
PostReportView,
PostView,
PrivateMessage,
Post,
PrivateMessageReportView,
PrivateMessageView,
} from 'lemmy-js-client'
export type Result =
| PostView
| Post
| CommentView
| Comment
| PersonView
| CommunityView
| PrivateMessageView
@@ -38,13 +41,18 @@ export function getItemPublished(item: Result) {
return ''
}
export const isPost = (item: Result): item is PostView =>
export const isPostView = (item: Result): item is PostView =>
'post' in item && !('comment' in item)
export const isComment = (item: Result): item is CommentView =>
export const isPost = (item: Result): item is Post =>
'name' in item && !('content' in item)
export const isCommentView = (item: Result): item is CommentView =>
'comment' in item
export const isCommunity = (item: Result): item is CommunityView =>
export const isComment = (item: Result): item is Comment => 'content' in item
export const isCommunityView = (item: Result): item is CommunityView =>
'community' in item
export const isUser = (item: Result): item is PersonView => 'person' in item