franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: downloadMediaMessage return type matched parameter (#757)

Browse Source 
* fix: downloadMediaMessage return type matched parameter

* chore: keyword-spacing eslint rule warn instead of error

* chore: linting

aaaaaaaaaaaaaaaaaaaa
This commit is contained in:
arthur simas
2024-05-15 12:34:06 -03:00
committed by GitHub
parent 17ce9df557
commit 2ae664c655
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.json
View File

@@ -27,6 +27,9 @@
"selector": "TSEnumDeclaration", "selector": "TSEnumDeclaration",
"message": "Don't declare enums, use literals instead" "message": "Don't declare enums, use literals instead"
} }
],
"keyword-spacing": [
"warn"
] ]
} }
} }

37
src/Utils/messages.ts
View File

@@ -3,6 +3,7 @@ import axios from 'axios'
import { randomBytes } from 'crypto' import { randomBytes } from 'crypto'
import { promises as fs } from 'fs' import { promises as fs } from 'fs'
import { Logger } from 'pino' import { Logger } from 'pino'
import { type Transform } from 'stream'
import { proto } from '../../WAProto' import { proto } from '../../WAProto'
import { MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults' import { MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults'
import { import {
@@ -868,31 +869,31 @@ const REUPLOAD_REQUIRED_STATUS = [410, 404]
/** /**
* Downloads the given message. Throws an error if it's not a media message * Downloads the given message. Throws an error if it's not a media message
*/ */
export const downloadMediaMessage = async( export const downloadMediaMessage = async<Type extends 'buffer' | 'stream'>(
message: WAMessage, message: WAMessage,
type: 'buffer' | 'stream', type: Type,
options: MediaDownloadOptions, options: MediaDownloadOptions,
ctx?: DownloadMediaMessageContext ctx?: DownloadMediaMessageContext
) => { ) => {
try { const result = await downloadMsg()
const result = await downloadMsg() .catch(async(error) => {
return result if(ctx) {
} catch(error) { if(axios.isAxiosError(error)) {
if(ctx) { // check if the message requires a reupload
if(axios.isAxiosError(error)) { if(REUPLOAD_REQUIRED_STATUS.includes(error.response?.status!)) {
// check if the message requires a reupload ctx.logger.info({ key: message.key }, 'sending reupload media request...')
if(REUPLOAD_REQUIRED_STATUS.includes(error.response?.status!)) { // request reupload
ctx.logger.info({ key: message.key }, 'sending reupload media request...') message = await ctx.reuploadRequest(message)
// request reupload const result = await downloadMsg()
message = await ctx.reuploadRequest(message) return result
const result = await downloadMsg() }
return result
} }
} }
}
throw error throw error
} })
return result as Type extends 'buffer' ? Buffer : Transform
async function downloadMsg() { async function downloadMsg() {
const mContent = extractMessageContent(message.message) const mContent = extractMessageContent(message.message)