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

Update 6.MessagesSend.ts

Browse Source
This commit is contained in:
Adhiraj
2020-09-23 13:21:57 +05:30
parent 30cee92758
commit 9da88c2db3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WAConnection/6.MessagesSend.ts
View File

@@ -113,11 +113,11 @@ export class WAConnection extends Base {
await generateThumbnail(buffer, mediaType, options) await generateThumbnail(buffer, mediaType, options)
// send a query JSON to obtain the url & auth token to upload our media // send a query JSON to obtain the url & auth token to upload our media
const json = await this.refreshMediaConn () let json = await this.refreshMediaConn ()
const auth = json.auth // the auth token
let mediaUrl: string let mediaUrl: string
for (let host of json.hosts) { for (let host of json.hosts) {
const auth = json.auth // the auth token
const hostname = `https://${host.hostname}${MediaPathMap[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}` const hostname = `https://${host.hostname}${MediaPathMap[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
try { try {
const urlFetch = await this.fetchRequest(hostname, 'POST', body, options.uploadAgent) const urlFetch = await this.fetchRequest(hostname, 'POST', body, options.uploadAgent)
@@ -125,7 +125,7 @@ export class WAConnection extends Base {
if (mediaUrl) break if (mediaUrl) break
else { else {
await this.refreshMediaConn (true) json = await this.refreshMediaConn (true)
throw new Error (`upload failed`) throw new Error (`upload failed`)
} }
} catch (error) { } catch (error) {
@@ -151,7 +151,6 @@ export class WAConnection extends Base {
} }
) )
} }
return WAMessageProto.Message.create(message)// as WAMessageContent return WAMessageProto.Message.create(message)// as WAMessageContent
} }
/** prepares a WAMessage for sending from the given content & options */ /** prepares a WAMessage for sending from the given content & options */
@@ -271,9 +270,9 @@ export class WAConnection extends Base {
content.previewType = 0 content.previewType = 0
return content return content
} }
@Mutex ()
protected async refreshMediaConn (forceGet = false) { protected async refreshMediaConn (forceGet = false) {
if (!this.mediaConn || (new Date().getTime()-this.mediaConn.fetchDate.getTime()) > this.mediaConn.ttl*1000 || forceGet) { if (!this.mediaConn || forceGet || (new Date().getTime()-this.mediaConn.fetchDate.getTime()) > this.mediaConn.ttl*1000) {
const result = await this.query({json: ['query', 'mediaConn']}) const result = await this.query({json: ['query', 'mediaConn']})
this.mediaConn = result.media_conn this.mediaConn = result.media_conn
this.mediaConn.fetchDate = new Date() this.mediaConn.fetchDate = new Date()