Skip to content

Commit f602ba3

Browse files
committed
Merge branch 'hotfix/2.3.3' into develop
2 parents 5512585 + 9d42ad3 commit f602ba3

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

.eslintrc.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,14 @@ module.exports = {
2626
'@typescript-eslint/no-explicit-any': 'off',
2727
'@typescript-eslint/no-empty-function': 'off',
2828
'@typescript-eslint/no-non-null-assertion': 'off',
29-
'@typescript-eslint/no-unused-vars': 'error',
29+
'@typescript-eslint/no-unused-vars': 'warn',
3030
'import/first': 'error',
3131
'import/no-duplicates': 'error',
3232
'simple-import-sort/imports': 'error',
3333
'simple-import-sort/exports': 'error',
34-
'@typescript-eslint/ban-types': [
35-
'error',
36-
{
37-
extendDefaults: true,
38-
types: {
39-
'{}': false,
40-
Object: false,
41-
},
42-
},
43-
],
34+
'@typescript-eslint/no-empty-object-type': 'off',
35+
'@typescript-eslint/no-wrapper-object-types': 'off',
36+
'@typescript-eslint/no-unused-expressions': 'off',
4437
'prettier/prettier': ['error', { endOfLine: 'auto' }],
4538
},
4639
};

src/api/integrations/event/event.manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class EventManager {
105105
instanceName: string;
106106
origin: string;
107107
event: string;
108-
data: Object;
108+
data: object;
109109
serverUrl: string;
110110
dateTime: string;
111111
sender: string;

src/api/services/channel.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export class ChannelStartupService {
431431
return data;
432432
}
433433

434-
public async sendDataWebhook<T = any>(event: Events, data: T, local = true, integration?: string[]) {
434+
public async sendDataWebhook<T extends object = any>(event: Events, data: T, local = true, integration?: string[]) {
435435
const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
436436
const tzoffset = new Date().getTimezoneOffset() * 60000; //offset in milliseconds
437437
const localISOTime = new Date(Date.now() - tzoffset).toISOString();

src/cache/localcache.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class LocalCache implements ICache {
5353

5454
async hGet(key: string, field: string) {
5555
try {
56-
const data = LocalCache.localCache.get(this.buildKey(key)) as Object;
56+
const data = LocalCache.localCache.get(this.buildKey(key)) as object;
5757

5858
if (data && field in data) {
5959
return JSON.parse(data[field], BufferJSON.reviver);
@@ -84,7 +84,7 @@ export class LocalCache implements ICache {
8484

8585
async hDelete(key: string, field: string) {
8686
try {
87-
const data = LocalCache.localCache.get(this.buildKey(key)) as Object;
87+
const data = LocalCache.localCache.get(this.buildKey(key)) as object;
8888

8989
if (data && field in data) {
9090
delete data[field];

0 commit comments

Comments
 (0)