mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-12-10 18:39:38 -06:00
Merge pull request #2238 from jamesjhonatan123/feature/quote-message-n8n
Feature/quote message n8n
This commit is contained in:
commit
3c1573c400
@ -51,6 +51,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
|
|||||||
pushName: pushName,
|
pushName: pushName,
|
||||||
keyId: msg?.key?.id,
|
keyId: msg?.key?.id,
|
||||||
fromMe: msg?.key?.fromMe,
|
fromMe: msg?.key?.fromMe,
|
||||||
|
quotedMessage: msg?.contextInfo?.quotedMessage,
|
||||||
instanceName: instance.instanceName,
|
instanceName: instance.instanceName,
|
||||||
serverUrl: this.configService.get<HttpServer>('SERVER').URL,
|
serverUrl: this.configService.get<HttpServer>('SERVER').URL,
|
||||||
apiKey: instance.token,
|
apiKey: instance.token,
|
||||||
|
|||||||
@ -56,7 +56,7 @@ export function makeProxyAgent(proxy: Proxy | string): HttpsProxyAgent<string> |
|
|||||||
return selectProxyAgent(proxyUrl);
|
return selectProxyAgent(proxyUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function makeProxyAgentUndici(proxy: Proxy | string) {
|
export function makeProxyAgentUndici(proxy: Proxy | string): ProxyAgent {
|
||||||
let proxyUrl: string;
|
let proxyUrl: string;
|
||||||
let protocol: string;
|
let protocol: string;
|
||||||
|
|
||||||
@ -67,7 +67,10 @@ export function makeProxyAgentUndici(proxy: Proxy | string) {
|
|||||||
} else {
|
} else {
|
||||||
const { host, password, port, protocol: proto, username } = proxy;
|
const { host, password, port, protocol: proto, username } = proxy;
|
||||||
protocol = (proto || 'http').replace(':', '');
|
protocol = (proto || 'http').replace(':', '');
|
||||||
if (protocol === 'socks') protocol = 'socks5';
|
|
||||||
|
if (protocol === 'socks') {
|
||||||
|
protocol = 'socks5';
|
||||||
|
}
|
||||||
|
|
||||||
const auth = username && password ? `${username}:${password}@` : '';
|
const auth = username && password ? `${username}:${password}@` : '';
|
||||||
proxyUrl = `${protocol}://${auth}${host}:${port}`;
|
proxyUrl = `${protocol}://${auth}${host}:${port}`;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user