Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
048c5dc2ec | ||
|
|
eb218da8fb | ||
|
|
65942a4ed4 | ||
|
|
1444155c09 | ||
|
|
84ac1d8cfc | ||
|
|
440e1e879a | ||
|
|
bcecf793d4 | ||
|
|
16c0d827e1 | ||
|
|
94f16a9583 | ||
|
|
4bdac3bbc2 |
No files matched your search
@@ -1,5 +1,6 @@
|
||||
Dockerfile
|
||||
.*sessions
|
||||
sessions
|
||||
files
|
||||
venv
|
||||
.wwebjs_auth
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
.yarn
|
||||
example.ts
|
||||
.*sessions
|
||||
sessions
|
||||
.secrets
|
||||
.minio
|
||||
.media
|
||||
|
||||
+14
-1
@@ -60,7 +60,20 @@ RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
|
||||
# Install fonts if using either chromium or chrome
|
||||
RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
|
||||
apt-get update \
|
||||
&& apt-get install -y fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
|
||||
&& apt-get install -y \
|
||||
fontconfig \
|
||||
fonts-freefont-ttf \
|
||||
fonts-gfs-neohellenic \
|
||||
fonts-indic \
|
||||
fonts-ipafont-gothic \
|
||||
fonts-kacst \
|
||||
fonts-liberation \
|
||||
fonts-noto-cjk \
|
||||
fonts-noto-color-emoji \
|
||||
fonts-roboto \
|
||||
fonts-thai-tlwg \
|
||||
fonts-wqy-zenhei \
|
||||
fonts-open-sans \
|
||||
--no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@ services:
|
||||
restart: always
|
||||
# https://waha.devlike.pro/docs/how-to/engines/#docker-images
|
||||
# https://portal.devlike.pro/docker-image
|
||||
image: devlikeapro/waha-plus:latest
|
||||
image: devlikeapro/waha-plus:chrome
|
||||
# WAHA Core
|
||||
# image: devlikeapro/waha:latest
|
||||
|
||||
@@ -13,7 +13,7 @@ services:
|
||||
|
||||
volumes:
|
||||
# Store sessions in the .sessions folder (comment it if you're using MongoDB)
|
||||
- './.sessions:/app/.sessions'
|
||||
- './sessions:/app/.sessions'
|
||||
|
||||
# Save media files
|
||||
# https://waha.devlike.pro/docs/how-to/storages/#save-media-files-between-the-container-restarts
|
||||
|
||||
@@ -172,6 +172,9 @@ export abstract class WhatsappSession {
|
||||
'--disable-accelerated-2d-canvas',
|
||||
'--disable-application-cache',
|
||||
'--disable-background-networking',
|
||||
// DO NOT disable software rasterizer, it will break the video
|
||||
// https://github.com/devlikeapro/waha/issues/629
|
||||
// '--disable-software-rasterizer',
|
||||
'--disable-cache',
|
||||
'--disable-client-side-phishing-detection',
|
||||
'--disable-component-update',
|
||||
|
||||
@@ -621,6 +621,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
|
||||
const message = {
|
||||
text: request.text,
|
||||
mentions: request.mentions?.map(toJID),
|
||||
linkPreview: this.getLinkPreview(request),
|
||||
};
|
||||
const options = await this.getMessageOptions(request);
|
||||
return this.sock.sendMessage(chatId, message, options);
|
||||
@@ -1686,6 +1687,22 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
|
||||
quoted: quoted,
|
||||
};
|
||||
}
|
||||
|
||||
protected getLinkPreview(request): any {
|
||||
// NOWEB works this way
|
||||
// If it's undefined - it'll generate it
|
||||
// If it's false - it will not generate it
|
||||
let linkPreview: boolean | undefined;
|
||||
switch (request.linkPreview) {
|
||||
case false:
|
||||
linkPreview = false;
|
||||
break;
|
||||
case true:
|
||||
default:
|
||||
linkPreview = undefined;
|
||||
}
|
||||
return linkPreview;
|
||||
}
|
||||
}
|
||||
|
||||
function hasPath(url: string) {
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Label } from '@waha/structures/labels.dto';
|
||||
import { PaginationParams } from '@waha/structures/pagination.dto';
|
||||
import { TextStatus } from '@waha/structures/status.dto';
|
||||
import * as lodash from 'lodash';
|
||||
import { Client } from 'whatsapp-web.js';
|
||||
import { Client, Events } from 'whatsapp-web.js';
|
||||
import { Message } from 'whatsapp-web.js/src/structures';
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||
@@ -19,16 +19,14 @@ const { LoadPaginator } = require('./_Paginator.js');
|
||||
const ChatFactory = require('whatsapp-web.js/src/factories/ChatFactory');
|
||||
|
||||
export class WebjsClient extends Client {
|
||||
async inject() {
|
||||
// Even tho this.inject is not defined as interface in Client.ts
|
||||
// We can still call and override it
|
||||
// @ts-ignore
|
||||
await super.inject();
|
||||
|
||||
// Load util functions (serializers, helper functions)
|
||||
await this.pupPage.evaluate(LoadLodash);
|
||||
await this.pupPage.evaluate(LoadPaginator);
|
||||
await this.pupPage.evaluate(LoadWAHA);
|
||||
constructor(options) {
|
||||
super(options);
|
||||
// Wait until it's READY and inject more utils
|
||||
this.on(Events.READY, async () => {
|
||||
await this.pupPage.evaluate(LoadLodash);
|
||||
await this.pupPage.evaluate(LoadPaginator);
|
||||
await this.pupPage.evaluate(LoadWAHA);
|
||||
});
|
||||
}
|
||||
|
||||
async unpair() {
|
||||
|
||||
@@ -343,7 +343,6 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
|
||||
});
|
||||
|
||||
this.whatsapp.on(Events.AUTHENTICATED, (args) => {
|
||||
this.status = WAHASessionStatus.WORKING;
|
||||
this.qr.save('');
|
||||
this.logger.info({ args: args }, `Session has been authenticated!`);
|
||||
});
|
||||
@@ -1170,6 +1169,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
|
||||
return {
|
||||
mentions: mentions,
|
||||
quotedMessageId: quotedMessageId,
|
||||
linkPreview: request.linkPreview,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@ export class LocalStoreCore extends LocalStore {
|
||||
const engineDir = this.getEngineDirectory();
|
||||
const database = path.join(engineDir, 'waha.sqlite3');
|
||||
this.db = new Database(database);
|
||||
this.db.pragma('journal_mode = WAL;');
|
||||
}
|
||||
return this.db;
|
||||
}
|
||||
|
||||
@@ -156,6 +156,8 @@ export class MessageTextRequest extends ChatRequest {
|
||||
|
||||
@ReplyToProperty()
|
||||
reply_to?: string;
|
||||
|
||||
linkPreview?: boolean = true;
|
||||
}
|
||||
|
||||
export class EditMessageRequest {
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ export function getEngineName(): string {
|
||||
}
|
||||
|
||||
export const VERSION: WAHAEnvironment = {
|
||||
version: '2024.11.1',
|
||||
version: '2024.11.3',
|
||||
engine: getEngineName(),
|
||||
tier: getWAHAVersion(),
|
||||
browser: getBrowserExecutablePath(),
|
||||
|
||||
Reference in new issue
Block a user