Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@unkn0wn-root
unkn0wn-root committed Jan 12, 2024
1 parent a7a5bae commit b4e96ac
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 49 deletions.
43 changes: 17 additions & 26 deletions src/api/confessionRouter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ export interface AcceptConfessionOptions {
isPlus18?: boolean
}

async function getConfessionMiddleware(req: RequestWithConfession, res: Response, next: NextFunction) {
async function getConfessionMiddleware(req: RequestWithConfession, _: Response, next: NextFunction) {
try {
const confession = await confessionModel.findById(req.params.id)

if (!confession)
return next(new NotFoundError('Confession not found'))

if (!confession) return next(new NotFoundError('Confession not found'))
req.confession = confession
return next()
} catch (err) {
Expand All @@ -49,7 +46,7 @@ confessionRouter.get('/', async (req: RequestWithUser, res: Response, next: Next
.sort({ _id: -1 })
.lean()

const paginationObject = await getPage(req, confessionModel, query)
const paginationObject = await getPage(req, confessionModel, query)
return res.json(makeAPIResponse(res, paginationObject))
} catch (err) {
return next(new InternalServerError('Cannot get confessions. Server error occured', err))
Expand Down Expand Up @@ -95,7 +92,6 @@ confessionRouter.delete('/confession/:id',
))

const { status } = req.confession

return res.json(makeAPIResponse(res, {
message: `Usunięto wpis ID: ${req.confession.slug}`,
patchObject: { status },
Expand All @@ -120,24 +116,21 @@ confessionRouter.post('/confession/:id/accept',
)
}

if (confession.status === ConfessionStatus.DECLINED) {
if (confession.status === ConfessionStatus.DECLINED)
return next(new ConflictError('Cannot add declined entry'))
}

try {
const entryBody = await bodyBuilder.getEntryBody(confession, req.user)
const adultMedia = req.body.isPlus18 || confession.tags.map(x => x[0]).includes('#nsfw')
const embed = req.body.includeEmbed ? confession.embed : undefined
const response = await hejtoController.acceptConfession(entryBody, embed, adultMedia)

confession.slug = response.slug

const action = await createAction(req.user._id, ActionType.ACCEPT_ENTRY).save()
confession.slug = response.slug

const action = await createAction(req.user._id, ActionType.ACCEPT_ENTRY).save()
confession.actions.push(action)
confession.status = ConfessionStatus.ACCEPTED
confession.addedBy = req.user.username

confession.save().then(() => {
const { status, addedBy, slug } = confession
return res.json(makeAPIResponse(res, {
Expand All @@ -159,13 +152,14 @@ confessionRouter.put('/confession/:id/status',
return next(new ClientSyntaxError('Wrong status'))

if (req.confession.status === req.body.status)
return res.status(200).json(makeAPIResponse(res, { patchObject: { status: req.confession.status } }))
return res.status(200).json(
makeAPIResponse(res, { patchObject: { status: req.confession.status } })
)

const note = req.body.note
req.confession.status = req.body.status

const actionType = req.body.status === ConfessionStatus.DECLINED ?
ActionType.DECLINE_ENTRY
const actionType = req.body.status === ConfessionStatus.DECLINED
? ActionType.DECLINE_ENTRY
: ActionType.REVERT_ENTRY_DECLINE

const action = await createAction(req.user._id, actionType, note).save()
Expand Down Expand Up @@ -196,17 +190,18 @@ confessionRouter.put('/confession/:id/tags',
`${req.body.tag} ${tagValue ? '✓' : '✗'}`)
.save()

const newTags = prepareArrayRefactored(req.confession.tags, req.body.tag, tagValue)
const newTags = prepareArrayRefactored(req.confession.tags, req.body.tag, tagValue)

try {
try {
await req.confession.updateOne({
$set: {
tags: newTags,
},
$push: { actions: action._id },
})

return res.status(200).json(makeAPIResponse(res, { patchObject: { tags: newTags }, action }))
return res.status(200).json(
makeAPIResponse(res, { patchObject: { tags: newTags }, action })
)
} catch (err) {
return next(new InternalServerError('Tags were not updated', err))
}
Expand All @@ -220,10 +215,7 @@ confessionRouter.get('/confession/:id/ip',
try {
const confession = await confessionModel.findById(req.params.id)
.select('_id IPAdress')

if (!confession)
return next(new NotFoundError())

if (!confession) return next(new NotFoundError())
return res.status(200).json(makeAPIResponse(res, confession))
} catch (err) {
return next(new InternalServerError('IP could not be retrieved. Server error', err))
Expand All @@ -239,7 +231,6 @@ confessionRouter.get('/confession/:id/otherFromIp',
const confessions = await confessionModel
.find({ IPAdress: req.confession.IPAdress }, { _id: 1, status: 1 })
.sort({ _id: -1 })

return res.json(makeAPIResponse(res, { confessions }))
} catch (err) {
return next(new InternalServerError('IP could not be retrieved. Server error', err))
Expand Down
19 changes: 7 additions & 12 deletions src/api/replyRouter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@ import {
NotFoundError
} from '../exceptions/httpExceptions'

export const replyRouter = Router()

type RequestWithReply = RequestWithUser & { reply: IReply }
export const replyRouter = Router()

async function getReplyMiddleware(req: RequestWithReply, res: Response, next: NextFunction) {
async function getReplyMiddleware(req: RequestWithReply, _: Response, next: NextFunction) {
try {
const reply = await replyModel.findById(req.params.id)

if (!reply) return next(new NotFoundError('Reply not found'))

req.reply = reply
return next()
} catch (err) {
Expand All @@ -42,7 +40,7 @@ replyRouter.get('/', async (req: RequestWithUser, res: Response, next: NextFunct
.sort({ _id: -1 })
.lean()

const paginationObject = await getPage(req, replyModel, query)
const paginationObject = await getPage(req, replyModel, query)
return res.json(makeAPIResponse(res, paginationObject))
} catch (err) {
return next(new InternalServerError(undefined, err))
Expand All @@ -55,10 +53,8 @@ replyRouter.delete('/reply/:id/',
async (req: RequestWithReply, res: Response, next: NextFunction) => {
try {
const reply = await req.reply.populate([{ path: 'parentID', select: ['slug', 'actions'] }])

const commentService = new CommentService(reply.parentID.slug)
await commentService.deleteComment(reply.commentGuid)

const action = await createAction(
req.user._id,
ActionType.DELETE_REPLY,
Expand All @@ -70,8 +66,7 @@ replyRouter.delete('/reply/:id/',
reply.status = ConfessionStatus.DECLINED,
reply.commentGuid = null

await Promise.all([reply.save(), reply.parentID.save()])

await Promise.all([reply.save(), reply.parentID.save()])
return res.json(makeAPIResponse(res,
{ action, patchObject: {
status: reply.status,
Expand Down Expand Up @@ -107,7 +102,6 @@ replyRouter.get('/reply/:id/accept',
await confession.updateOne({ _id: reply.parentID }, { $push: { actions: action } })

const { status, addedBy, commentGuid } = reply

return res.json(makeAPIResponse(res, {
patchObject: { status, addedBy, commentGuid },
action,
Expand All @@ -126,7 +120,9 @@ replyRouter.put('/reply/:id/status',
return next(new ClientSyntaxError('Wrong status'))

if (req.reply.status === req.body.status)
return res.status(200).json(makeAPIResponse(res, { patchObject: { status: req.reply.status } }))
return res.status(200).json(
makeAPIResponse(res, { patchObject: { status: req.reply.status } })
)

req.reply.status = req.body.status

Expand All @@ -137,7 +133,6 @@ replyRouter.put('/reply/:id/status',
`${req.reply._id} => ${ConfessionStatus[req.reply.status]}`).save()

await confession.updateOne({ _id: req.reply.parentID }, { $push: { actions: action } })

try {
await req.reply.save()
return res.status(200).json(makeAPIResponse(res, { patchObject: { status: req.reply.status }, action }))
Expand Down
4 changes: 2 additions & 2 deletions src/api/userRouter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ userRouter.get('/me', authentication, (req: RequestWithUser, res) => {
userRouter.get('/',
authentication,
accessMiddleware('accessModsList'),
(req, res) => {
(_, res) => {
user.find({}, { username: 1, flags: 1 }).lean().then(userList => {
const userPermissionList = userList.map((user: any) => {
user.permissions = getFlagPermissions(user.flags)
Expand Down Expand Up @@ -103,7 +103,7 @@ userRouter.post('/login', async (req: Request, res: Response, next: NextFunction
}
})

userRouter.get('/logout', (req, res) => {
userRouter.get('/logout', (_, res) => {
res.clearCookie('token')
return res.json(makeAPIResponse(res, {}))
})
20 changes: 11 additions & 9 deletions src/services/conversation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ conversationRouter.get(
if (req.params.parent.substr(0, 2) === 'U_') {
const username = req.params.parent.substr(2)
const userObject = await userModel.findOne({ username: username }, { _id: 1, username: 1 })
if (!userObject) return next(new NotFoundError())
return renderConversationRoute(req, res, { type: 'user', userObject })
if (!userObject) return next(new NotFoundError())

return renderConversationRoute(req, res, { type: 'user', userObject })
}

confessionModel.findById(req.params.parent, (err, confession) => {
Expand Down Expand Up @@ -68,8 +69,9 @@ conversationRouter.post(
if (req.params.parent.substr(0, 2) === 'U_') {
const username = req.params.parent.substr(2)
const userObject = await userModel.findOne({ username: username }, { _id: 1, username: 1 })
if (!userObject) return next(new NotFoundError())
res.locals.conversationParent = userObject
if (!userObject) return next(new NotFoundError())

res.locals.conversationParent = userObject
return next()
}

Expand All @@ -92,8 +94,10 @@ conversationRouter.get(
if (!req.params.auth && req.user !== undefined && req.user._id) req.params.auth = req.user._id.toString()

conversationController.getConversation(req.params.conversationid, req.params.auth, (err, conversation) => {
if (err) return next(new InternalServerError('Conversation could not be loaded right now', err))
return renderConversationRoute(req, res, { conversation })
if (err)
return next(new InternalServerError('Conversation could not be loaded right now', err))

return renderConversationRoute(req, res, { conversation })
})
})

Expand All @@ -102,9 +106,7 @@ conversationRouter.post(
csrfErrorHander,
(req: RequestWithUser, res: Response, next: NextFunction) => {
if (!req.params.conversationid) return next(new ClientSyntaxError('Missing conversationid'))
if (!req.params.auth && req.user !== undefined && req.user._id) {
req.params.auth = req.user._id.toString()
}
if (!req.params.auth && req.user !== undefined && req.user._id) req.params.auth = req.user._id.toString()

conversationController.newMessage(
req.params.conversationid,
Expand Down

0 comments on commit b4e96ac

Please sign in to comment.