mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-07-24 17:38:40 -06:00
chore: Improve code consistency and readability
Refactored the initialization of `LocalSettings` in `channel.service.ts` to only set the properties that have been explicitly provided. This refactoring improves code consistency and readability. Also, removed the unused `initStoreFolders` method from `repository.service.ts` and its related imports. In addition, updated the import style for `PrismaClient` in `repository.service.ts`. The modified files are: - src/api/controllers/instance.controller.ts - src/api/repository/repository.service.ts - src/api/services/channel.service.ts - src/api/services/channels/whatsapp.baileys.service.ts
This commit is contained in:
parent
457628b996
commit
228dcf8aa5
@ -373,13 +373,13 @@ export class InstanceController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const settings: wa.LocalSettings = {
|
const settings: wa.LocalSettings = {
|
||||||
rejectCall: rejectCall || false,
|
rejectCall: rejectCall === true,
|
||||||
msgCall: msgCall || '',
|
msgCall: msgCall || '',
|
||||||
groupsIgnore: groupsIgnore || true,
|
groupsIgnore: groupsIgnore === true,
|
||||||
alwaysOnline: alwaysOnline || false,
|
alwaysOnline: alwaysOnline === true,
|
||||||
readMessages: readMessages || false,
|
readMessages: readMessages === true,
|
||||||
readStatus: readStatus || false,
|
readStatus: readStatus === true,
|
||||||
syncFullHistory: syncFullHistory ?? false,
|
syncFullHistory: syncFullHistory === true,
|
||||||
};
|
};
|
||||||
|
|
||||||
await this.settingsService.create(instance, settings);
|
await this.settingsService.create(instance, settings);
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
import { PrismaClient } from '@prisma/client';
|
import { PrismaClient } from '@prisma/client';
|
||||||
import fs from 'fs';
|
|
||||||
import { join } from 'path';
|
|
||||||
|
|
||||||
import { ConfigService } from '../../config/env.config';
|
import { ConfigService } from '../../config/env.config';
|
||||||
import { Logger } from '../../config/logger.config';
|
import { Logger } from '../../config/logger.config';
|
||||||
@ -15,30 +13,6 @@ export class Query<T> {
|
|||||||
export class PrismaRepository extends PrismaClient {
|
export class PrismaRepository extends PrismaClient {
|
||||||
constructor(private readonly configService: ConfigService) {
|
constructor(private readonly configService: ConfigService) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.initStoreFolders();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async initStoreFolders() {
|
|
||||||
try {
|
|
||||||
const storePath = join(process.cwd(), 'store');
|
|
||||||
|
|
||||||
this.logger.verbose('creating store path: ' + storePath);
|
|
||||||
|
|
||||||
const tempDir = join(storePath, 'temp');
|
|
||||||
const chatwootDir = join(storePath, 'chatwoot');
|
|
||||||
|
|
||||||
if (!fs.existsSync(chatwootDir)) {
|
|
||||||
this.logger.verbose('creating chatwoot dir: ' + chatwootDir);
|
|
||||||
fs.mkdirSync(chatwootDir, { recursive: true });
|
|
||||||
}
|
|
||||||
if (!fs.existsSync(tempDir)) {
|
|
||||||
this.logger.verbose('creating temp dir: ' + tempDir);
|
|
||||||
fs.mkdirSync(tempDir, { recursive: true });
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.logger.error(error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly logger = new Logger(PrismaRepository.name);
|
private readonly logger = new Logger(PrismaRepository.name);
|
||||||
|
@ -189,7 +189,13 @@ export class ChannelStartupService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
Object.assign(this.localSettings, data);
|
this.localSettings.rejectCall = data?.rejectCall;
|
||||||
|
this.localSettings.msgCall = data?.msgCall;
|
||||||
|
this.localSettings.groupsIgnore = data?.groupsIgnore;
|
||||||
|
this.localSettings.alwaysOnline = data?.alwaysOnline;
|
||||||
|
this.localSettings.readMessages = data?.readMessages;
|
||||||
|
this.localSettings.readStatus = data?.readStatus;
|
||||||
|
this.localSettings.syncFullHistory = data?.syncFullHistory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async findSettings() {
|
public async findSettings() {
|
||||||
|
@ -256,7 +256,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
public async getProfileStatus() {
|
public async getProfileStatus() {
|
||||||
const status = await this.client.fetchStatus(this.instance.wuid);
|
const status = await this.client.fetchStatus(this.instance.wuid);
|
||||||
|
|
||||||
return status[0]?.status;
|
return status?.status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public get profilePictureUrl() {
|
public get profilePictureUrl() {
|
||||||
@ -551,6 +551,8 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
|
|
||||||
this.logger.info(log);
|
this.logger.info(log);
|
||||||
|
|
||||||
|
this.logger.info(`Group Ignore: ${this.localSettings.groupsIgnore}`);
|
||||||
|
|
||||||
let options;
|
let options;
|
||||||
|
|
||||||
if (this.localProxy.enabled) {
|
if (this.localProxy.enabled) {
|
||||||
@ -625,7 +627,6 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
},
|
},
|
||||||
userDevicesCache: this.userDevicesCache,
|
userDevicesCache: this.userDevicesCache,
|
||||||
transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 2500 },
|
transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 2500 },
|
||||||
// forceGroupsPrekey: false,
|
|
||||||
patchMessageBeforeSending(message) {
|
patchMessageBeforeSending(message) {
|
||||||
if (
|
if (
|
||||||
message.deviceSentMessage?.message?.listMessage?.listType ===
|
message.deviceSentMessage?.message?.listMessage?.listType ===
|
||||||
@ -1667,7 +1668,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
try {
|
try {
|
||||||
return {
|
return {
|
||||||
wuid: jid,
|
wuid: jid,
|
||||||
status: (await this.client.fetchStatus(jid))[0]?.status,
|
status: (await this.client.fetchStatus(jid))?.status,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
|
Loading…
Reference in New Issue
Block a user