ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor typeof check with isJob function

Browse Source
This commit is contained in:
ekzyis 2023-10-13 22:37:41 +02:00
parent 78745379aa
commit dcfcbfb0ad
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/resolvers/item.js
View File

@ -15,7 +15,7 @@ import { parse } from 'tldts'
import uu from 'url-unshort' import uu from 'url-unshort'
import { advSchema, amountSchema, bountySchema, commentSchema, discussionSchema, jobSchema, linkSchema, pollSchema, ssValidate } from '../../lib/validate' import { advSchema, amountSchema, bountySchema, commentSchema, discussionSchema, jobSchema, linkSchema, pollSchema, ssValidate } from '../../lib/validate'
import { sendUserNotification } from '../webPush' import { sendUserNotification } from '../webPush'
import { defaultCommentSort } from '../../lib/item' import { defaultCommentSort, isJob } from '../../lib/item'
import { notifyItemParents, notifyUserSubscribers, notifyZapped } from '../../lib/push-notifications' import { notifyItemParents, notifyUserSubscribers, notifyZapped } from '../../lib/push-notifications'
export async function commentFilterClause (me, models) { export async function commentFilterClause (me, models) {
@ -1015,11 +1015,11 @@ export const updateItem = async (parent, { sub: subName, forward, options, ...it
// prevent update if it's not explicitly allowed, not their bio, not their job and older than 10 minutes // prevent update if it's not explicitly allowed, not their bio, not their job and older than 10 minutes
const user = await models.user.findUnique({ where: { id: me.id } }) const user = await models.user.findUnique({ where: { id: me.id } })
if (!ITEM_ALLOW_EDITS.includes(old.id) && user.bioId !== old.id && if (!ITEM_ALLOW_EDITS.includes(old.id) && user.bioId !== old.id &&
typeof item.maxBid === 'undefined' && Date.now() > new Date(old.createdAt).getTime() + 10 * 60000) { !isJob(item) && Date.now() > new Date(old.createdAt).getTime() + 10 * 60000) {
throw new GraphQLError('item can no longer be editted', { extensions: { code: 'BAD_INPUT' } }) throw new GraphQLError('item can no longer be editted', { extensions: { code: 'BAD_INPUT' } })
} }
if (item.url && typeof item.maxBid === 'undefined') { if (item.url && !isJob(item)) {
item.url = ensureProtocol(item.url) item.url = ensureProtocol(item.url)
item.url = removeTracking(item.url) item.url = removeTracking(item.url)
} }
@ -1059,7 +1059,7 @@ export const createItem = async (parent, { forward, options, ...item }, { me, mo
item.userId = me ? Number(me.id) : ANON_USER_ID item.userId = me ? Number(me.id) : ANON_USER_ID
const fwdUsers = await getForwardUsers(models, forward) const fwdUsers = await getForwardUsers(models, forward)
if (item.url && typeof item.maxBid === 'undefined') { if (item.url && !isJob(item)) {
item.url = ensureProtocol(item.url) item.url = ensureProtocol(item.url)
item.url = removeTracking(item.url) item.url = removeTracking(item.url)
} }

2
lib/item.js
View File

@ -9,3 +9,5 @@ export const defaultCommentSort = (pinned, bio, createdAt) => {
// everything else sorts by hot // everything else sorts by hot
return 'hot' return 'hot'
} }
export const isJob = item => typeof item.maxBid !== 'undefined'

5
worker/imgproxy.js
View File

@ -1,5 +1,6 @@
import { createHmac } from 'node:crypto' import { createHmac } from 'node:crypto'
import { extractUrls } from '../lib/md.js' import { extractUrls } from '../lib/md.js'
import { isJob } from '../lib/item.js'
const imgProxyEnabled = process.env.NODE_ENV === 'production' || const imgProxyEnabled = process.env.NODE_ENV === 'production' ||
(process.env.NEXT_PUBLIC_IMGPROXY_URL && process.env.IMGPROXY_SALT && process.env.IMGPROXY_KEY) (process.env.NEXT_PUBLIC_IMGPROXY_URL && process.env.IMGPROXY_SALT && process.env.IMGPROXY_KEY)
@ -60,14 +61,12 @@ export function imgproxy ({ models }) {
const item = await models.item.findUnique({ where: { id } }) const item = await models.item.findUnique({ where: { id } })
const isJob = typeof item.maxBid !== 'undefined'
let imgproxyUrls = {} let imgproxyUrls = {}
try { try {
if (item.text) { if (item.text) {
imgproxyUrls = await createImgproxyUrls(id, item.text, { forceFetch }) imgproxyUrls = await createImgproxyUrls(id, item.text, { forceFetch })
} }
if (item.url && !isJob) { if (item.url && !isJob(item)) {
imgproxyUrls = { ...imgproxyUrls, ...(await createImgproxyUrls(id, item.url, { forceFetch })) } imgproxyUrls = { ...imgproxyUrls, ...(await createImgproxyUrls(id, item.url, { forceFetch })) }
} }
} catch (err) { } catch (err) {