@social-mail/social-mail-web-server 1.8.364 → 1.8.367

package/src/server/services/socket/AppSocketService.ts

@@ -2,11 +2,8 @@ import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/
 import SocketService from "@entity-access/server-pages/dist/socket/SocketService.js";
 
 import Cluster from "node:cluster";
-import pg from "pg";
 import { createAdapter } from "@socket.io/cluster-adapter";
-import { globalEnv } from "../../../common/globalEnv.js";
 import MailboxNamespace from "./rooms/MailboxNamespace.js";
-const { Pool } = pg;
 @RegisterSingleton
 export default class AppSocketService extends SocketService {
 

package/src/server/services/socket/rooms/MailboxNamespace.ts

@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
-import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
 import SocketNamespace, { Send, SocketNamespaceClient } from "@entity-access/server-pages/dist/socket/SocketNamespace.js";
-import { Socket } from "socket.io";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { IClassOf } from "@entity-access/entity-access/dist/decorators/IClassOf.js";
 
 class MailboxNamespaceClient extends SocketNamespaceClient {

package/src/server/services/store/LedgerPaymentGateway.ts

@@ -1,6 +1,5 @@
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import { StoreJournal } from "../../model/entities/StoreJournal.js";
-import { StoreAccount } from "../../model/entities/StoreAccount.js";
 import StorePaymentAttempt from "../../model/entities/StorePaymentAttempt.js";
 import StorePaymentGateway from "../../model/entities/StorePaymentGateway.js";
 

package/src/server/services/store/gateways/phone-pe.tsx

@@ -92,11 +92,6 @@ export default class extends LedgerPaymentGateway {
         const keyIndex = gateway.saltIndex;
         const url = gateway.url;
 
-        const statusRequest = {
-            merchantId,
-            merchantTransactionId,
-        };
-
         const request = `/pg/v1/status/${merchantId}/${merchantTransactionId}`;
 
         const { verify } = signRequest(keyIndex, key, request);

package/src/server/services/ui/renderUIClient.tsx

@@ -1,4 +1,4 @@
-import Inject, { RegisterTransient, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import HtmlDocument from "@entity-access/server-pages/dist/html/HtmlDocument.js";
 import WebAtomsLogo from "@entity-access/server-pages/dist/html/WebAtomsLogo.js";

package/src/server/services/user/email-verification/EmailVerificationService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import VerificationToken from "../../../model/entities/VerificationToken.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { globalEnv } from "../../../../common/globalEnv.js";

package/src/server/services/user/otp-to-user/2-factor.in/index.ts

@@ -4,7 +4,6 @@ import BaseOtpToUserService from "../BaseOtpToUserService.js";
 import { globalEnv } from "../../../../../common/globalEnv.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import RateLimiterService from "../../../rate-limiter/RateLimiterService.js";
-import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 
 export default class extends BaseOtpToUserService {
 

package/src/server/services/user/otp-to-user/OtpToUserService.ts

@@ -1,5 +1,4 @@
 import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
 import BaseOtpToUserService from "./BaseOtpToUserService.js";
 import { globalEnv } from "../../../../common/globalEnv.js";

package/src/server/services/user/otp-to-user/twilio.com/index.ts

@@ -3,7 +3,6 @@ import { globalEnv } from "../../../../../common/globalEnv.js";
 import RateLimiterService from "../../../rate-limiter/RateLimiterService.js";
 import BaseOtpToUserService from "../BaseOtpToUserService.js";
 import twilio from "twilio";
-import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 
 const verifyClient = (() => {
     const client = twilio(globalEnv.otpToUser.providerTwilio.sid, globalEnv.otpToUser.providerTwilio.authToken);

package/src/server/smtp/client/SMTPClient.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-base-to-string */
 /* eslint-disable no-console */
-import SMTPConnection from "nodemailer/lib/smtp-connection/index.js";
 import { globalServices } from "../../../globalServices.js";
 import DnsService from "../dns/DnsService.js";
 import TimeoutError from "../../../common/errors/TimeoutError.js";
@@ -9,7 +8,6 @@ import SimpleLogger from "../../../common/SimpleLogger.js";
 import ESmtpClient from "../../../protocols/smtp/ESmtpClient.js";
 import SmtpError from "../services/SmtpError.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import { globalEnv } from "../../../common/globalEnv.js";
 
 
 export interface ISmtpClientEnvelope {
@@ -70,7 +68,7 @@ export default class SMTPClient {
     }
 
     async send(envelope: ISmtpClientEnvelope, file: LocalFile): Promise<ISmtpResponse> {
-        using a = this.logger.newScope();
+        using _a = this.logger.newScope();
         try {
             await this.client.send(envelope.from, envelope.to, file);
             return {

package/src/server/smtp/services/CachedEmailService.ts

@@ -9,7 +9,6 @@ import { Email, EmailLog } from "../../model/entities/Email.js";
 import EmailLogService from "../../services/email-logs/EmailLogService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import { globalEnv } from "../../../common/globalEnv.js";
 import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
 
 @RegisterScoped
@@ -61,14 +60,12 @@ export default class CachedEmailService {
             this.db.verifyFilters = false;
 
             let emailHtmlFile: LocalFile;
-            let text = "";
             if (logFile) {
                 const els = ServiceProvider.resolve(this, EmailLogService);
                 emailHtmlFile = await els.load(logFile);
                 const emailSerializerService = ServiceProvider.resolve(this, EmailParserService);
                 const mail = await emailSerializerService.parse(emailHtmlFile);
                 html = mail.html || mail.textAsHtml || "";
-                text = mail.text;
             }
             const htmlService = ServiceProvider.resolve(this, BlogContentTransformer);
             if (status !== "draft") {

package/src/server/smtp/services/EmailPostReceiveService.ts

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import ChannelService from "./ChannelService.js";

package/src/server/smtp/services/EmailReferenceService.ts

@@ -13,7 +13,6 @@ import EngagementService from "./EngagementService.js";
 import Hashtags from "../../../common/Hashtags.js";
 import TagService from "../../services/tags/TagService.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 
 export type IMailboxThreadInfo = Partial<MailboxContact> & {
     sent?: boolean,
@@ -37,9 +36,6 @@ export default class EmailReferenceService {
     @Inject
     private db: SocialMailContext;
 
-    @Inject
-    private eternity: AppWorkflowContext;
-
     @Inject
     private socketService: SocketService;
 
@@ -71,7 +67,7 @@ export default class EmailReferenceService {
             emailAddressID,
             lastEmailID:
             emailID,
-            sent,
+            // sent,
             silent,
             dateUpdated = DateTime.now,
             engagement,
@@ -86,7 +82,7 @@ export default class EmailReferenceService {
 
         let { timeRead } = mt;
 
-        const { eternity , db, socketService, emailAddressService } = this;
+        const { db, socketService, emailAddressService } = this;
 
         // await eternity.queue(UpdateMailboxStorage, mailboxID, { id: `update-mailbox-storage-${mailboxID}`});
 
@@ -107,9 +103,6 @@ export default class EmailReferenceService {
             engagement
         });
 
-        const senderID = sent ? mailboxID : emailAddressID;
-        const recipientID = sent ? emailAddressID : mailboxID;
-
         if (mailbox) {
             if (mailbox.parentID) {
                 // run action...
@@ -411,7 +404,7 @@ export default class EmailReferenceService {
 
         email.recipients ??= [];
 
-        const { senderID, status } = email;
+        const { senderID } = email;
 
         const senderMailbox = email.senderEmail?.mailbox;
 

package/src/server/smtp/services/EmailSerializerService.ts

@@ -3,7 +3,7 @@ import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.
 import TempFileService from "../../storage/TempFileService.js";
 import { AddressObject } from "mailparser";
 import BaseStorage from "../../storage/BaseStorage.js";
-import { EmailLog, emailStatusType } from "../../model/entities/Email.js";
+import { emailStatusType } from "../../model/entities/Email.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import type { contentDispositionTypes } from "../../model/entities/AppFile.js";
@@ -66,22 +66,22 @@ const combineAddresses = (type: string, items: AddressObject | AddressObject[]):
     return r;
 };
 
-const stripDuplicates = (addresses: IEmailRecipientInfo[]) => {
-    const r = [];
-    const set = new Set<string>();
-    for (const iterator of addresses) {
-        if (!iterator.emailAddress) {
-            continue;
-        }
-        iterator.emailAddress = iterator.emailAddress.trim().toLocaleLowerCase();
-        if (set.has(iterator.emailAddress)) {
-            continue;
-        }
-        r.push(iterator);
-        set.add(iterator.emailAddress);
-    }
-    return r;
-};
+// const stripDuplicates = (addresses: IEmailRecipientInfo[]) => {
+//     const r = [];
+//     const set = new Set<string>();
+//     for (const iterator of addresses) {
+//         if (!iterator.emailAddress) {
+//             continue;
+//         }
+//         iterator.emailAddress = iterator.emailAddress.trim().toLocaleLowerCase();
+//         if (set.has(iterator.emailAddress)) {
+//             continue;
+//         }
+//         r.push(iterator);
+//         set.add(iterator.emailAddress);
+//     }
+//     return r;
+// };
 
 export interface IEmailInfo {
     externalEmailID: string,
@@ -308,8 +308,6 @@ export default class EmailSerializerService {
             }
         }
 
-        let headerFrom;
-
         if (replyTo) {
             headerObj.replyTo = replyTo.value.map((x) => x.address);
         }
@@ -504,7 +502,7 @@ export default class EmailSerializerService {
                 }
 
                 const f = await tempFileService.createFrom(filename, x.content, contentType);
-                const af = await this.storage.saveFile(f, {
+                await this.storage.saveFile(f, {
                     contentDisposition: contentDisposition as contentDispositionTypes,
                     contentID: contentId,
                     emailID: email.emailID

package/src/server/smtp/services/EngagementService.ts

@@ -143,17 +143,17 @@ export default class EngagementService {
         }
     }
 
-    private async getRelatedEmail(db: SocialMailContext, engagement: any, mailboxes: any[], senderID: any, uid: any) {
-        return await db.subscriberActivities
-            .where({
-                engagement,
-                mailboxes,
-                subscriberID: senderID,
-                uid
-            }, (p) => (x) => x.mailboxID in p.mailboxes && x.emailAddressID === p.subscriberID
-                && x.activityID === p.uid
-            ).first();
-    }
+    // private async getRelatedEmail(db: SocialMailContext, engagement: any, mailboxes: any[], senderID: any, uid: any) {
+    //     return await db.subscriberActivities
+    //         .where({
+    //             engagement,
+    //             mailboxes,
+    //             subscriberID: senderID,
+    //             uid
+    //         }, (p) => (x) => x.mailboxID in p.mailboxes && x.emailAddressID === p.subscriberID
+    //             && x.activityID === p.uid
+    //         ).first();
+    // }
 
     private async trackActivity(email: Email) {
         if (!email.parentID) {

package/src/server/smtp/services/MailAuthService.ts

@@ -5,7 +5,6 @@ import { isTestMode } from "../../../globalServices.js";
 import SmtpError from "./SmtpError.js";
 import { SmtpStatusCodes } from "../client/SmtpStatusCodes.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 
 @RegisterTransient

package/src/server/smtp/services/MailReceiverService.ts

@@ -3,11 +3,10 @@ import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-a
 import SocialMailContext from "../../model/SocialMailContext.js";
 import * as smtpServer from "smtp-server";
 import * as fsp from "node:fs/promises";
-import BaseStorage from "../../storage/BaseStorage.js";
 import SmtpError from "./SmtpError.js";
 import Mailbox from "../../model/entities/Mailbox.js";
 import TempFileService from "../../storage/TempFileService.js";
-import { AddressObject, ParsedMail, simpleParser } from "mailparser";
+import { AddressObject } from "mailparser";
 import { authenticate } from "mailauth";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import { SmtpStatusCodes } from "../client/SmtpStatusCodes.js";
@@ -24,32 +23,6 @@ import TagService from "../../services/tags/TagService.js";
 import DomainReputationService from "./DomainReputationService.js";
 import MessagingService from "../../services/message-events/MessagingService.js";
 
-const stripBrackets = (text: string) => {
-    if (!text) {
-        return text;
-    }
-    text = text.trim();
-    let index = text.indexOf('<');
-    if (index !== -1) {
-        text = text.substring(index + 1);
-    }
-    index = text.indexOf('>');
-    if (index !== -1) {
-        text = text.substring(0, index);
-    }
-    return text;
-    // if (text.startsWith("<")) {
-    //     if (text.endsWith(">")) {
-    //         return text.substring(1, text.length - 1);
-    //     }
-    //     return text.substring(1);
-    // }
-    // if (text.endsWith(">")) {
-    //     return text.substring(0, text.length - 1);
-    // }
-    // return text;
-};
-
 export interface IEmailRecipientInfo {
     emailAddress: string;
     type: string;
@@ -194,7 +167,7 @@ export default class MailReceiverService {
         let unacceptable = false;
         if (contact) {
             isBlocked = contact.blocked;
-            unacceptable = !mailbox.isChannel && contact.folderTagID === newTagID && contact.total > 3
+            unacceptable = !mailbox.isChannel && contact.folderTagID === newTagID && contact.total > 3;
         }
 
         if (isBlocked) {
@@ -282,17 +255,17 @@ export default class MailReceiverService {
 
     }
 
-    private async parse(file: LocalFile) {
-        return new Promise<ParsedMail>((resolve, reject) => {
-            simpleParser(file.openRead(), (error, result) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve(result);
-            });
-        });
-    }
+    // private async parse(file: LocalFile) {
+    //     return new Promise<ParsedMail>((resolve, reject) => {
+    //         simpleParser(file.openRead(), (error, result) => {
+    //             if (error) {
+    //                 reject(error);
+    //                 return;
+    //             }
+    //             resolve(result);
+    //         });
+    //     });
+    // }
 
     private async authenticate(tempFile: LocalFile) {
 
@@ -325,7 +298,7 @@ export default class MailReceiverService {
             seal
         });
 
-        const { authenticationResults, dmarc, headers: authHeaders } = logs;
+        const { dmarc, headers: authHeaders } = logs;
 
         if(!isTestMode) {
             if (dmarc) {

package/src/server/storage/BaseStorage.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { Readable, Stream } from "stream";
+import { Readable } from "stream";
 // import TempFileService, { LocalFile } from "./TempFileService.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../model/SocialMailContext.js";
@@ -266,7 +266,7 @@ export default abstract class BaseStorage {
                 break;
             }
 
-            await using dbLock = await this.dbLockService.lock(`file-content-lock-${contentHash}-${contentSize}`,
+            await using _dbLock = await this.dbLockService.lock(`file-content-lock-${contentHash}-${contentSize}`,
                 DateTime.now.addMinutes(15));
 
             for (const iterator of fileContents) {

package/src/server/storage/EmailAttachmentStorage.ts

@@ -1,10 +1,7 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../model/SocialMailContext.js";
 import TempFileService from "./TempFileService.js";
-import { parse } from "path";
-import { Attachment } from "mailparser";
 import EmailParserService from "../smtp/services/EmailParserService.js";
-import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 
 @RegisterScoped
 export default class EmailAttachmentStorage {

package/src/server/storage/LockFile.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import { join } from "node:path";
-import { existsSync, mkdirSync, openSync, constants, writeSync, closeSync, unlinkSync, statSync, fdatasyncSync, utimesSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, unlinkSync, statSync, utimesSync, writeFileSync } from "node:fs";
 import { createHash } from "node:crypto";
 import sleep from "../../common/sleep.js";
 import { globalEnv } from "../../common/globalEnv.js";
@@ -17,11 +17,6 @@ const seconds = 1000;
 const minutes = 60*seconds;
 const hours = 60*minutes;
 
-const { O_EXCL, O_DIRECT, O_SYNC } = constants;
-
-// eslint-disable-next-line no-bitwise
-const openMode = O_EXCL | O_DIRECT | O_SYNC;
-
 export default class LockFile implements Disposable {
 
 

package/src/server/storage/TempFileService.ts

@@ -16,7 +16,6 @@ import FileContent from "../model/entities/FileContent.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import GZip from "./compression/gz.js";
 import DiskCacheService from "../services/cache/DiskCacheService.js";
-import { globalEnv } from "../../common/globalEnv.js";
 import { platform } from "os";
 import { secureFetch } from "../services/root-certs/RootCertificates.js";
 import { tempDiskCache } from "./tempDiskCache.js";

package/src/server/storage/azure/AzureStorage.ts

@@ -1,4 +1,4 @@
-import { Readable, Stream } from "stream";
+import { Readable } from "stream";
 import BaseStorage from "../BaseStorage.js";
 import * as BS from "@azure/storage-blob";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";

package/src/server/storage/compression/gz.ts

@@ -1,8 +1,6 @@
 
-import { Stream, Writable } from "node:stream";
+import { Stream } from "node:stream";
 import * as zlib from "node:zlib";
-import { createWriteStream } from "node:fs";
-import { pipeline } from "node:stream/promises";
 
 export default class GZip {
 

package/src/server/storage/db/DbStorage.ts

@@ -1,7 +1,6 @@
-import { Readable, Stream } from "stream";
+import { Readable } from "stream";
 import BaseStorage from "../BaseStorage.js";
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
-import { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
@@ -11,8 +10,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import Logger from "@entity-access/entity-access/dist/common/Logger.js";
 
-const max = 16*1024*1024;
-
 let seeded = false;
 
 export default class DbStorage extends BaseStorage {

package/src/server/storage/s3/S3Storage.ts

@@ -1,7 +1,7 @@
-import { Readable, Stream } from "stream";
+import { Readable } from "stream";
 import BaseStorage from "../BaseStorage.js";
 
-import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, ListBucketsCommand, ListObjectsV2Command } from "@aws-sdk/client-s3";
+import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, ListObjectsV2Command } from "@aws-sdk/client-s3";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 
@@ -56,7 +56,7 @@ export default class S3Storage extends BaseStorage {
 
         const Body = file.openReadStream();
 
-        const r = await this.client.send(new PutObjectCommand({
+        await this.client.send(new PutObjectCommand({
             Bucket,
             Key,
             ChecksumSHA256,

package/src/server/storage/volume/VolumeStorage.ts

@@ -1,4 +1,3 @@
-import { Stream } from "stream";
 import BaseStorage from "../BaseStorage.js";
 import path from "path";
 import { unlink, writeFile } from "fs/promises";

package/src/server/storage/volume/av/AVService.ts

@@ -1,9 +1,7 @@
 /* eslint-disable no-console */
 import type NodeClamClass from "clamscan";
 import FileInfectedError from "../../FileInfectedError.js";
-import { existsSync } from "node:fs";
 import sleep from "../../../../common/sleep.js";
-import SocketClient from "../../../../protocols/socket/client/SocketClient.js";
 import LockFile from "../../LockFile.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { globalEnv } from "../../../../common/globalEnv.js";
@@ -78,7 +76,7 @@ export default class AVService {
         }
 
         // lets try file lock...
-        using fl = await LockFile.lock("av-lock");
+        using _fl = await LockFile.lock("av-lock");
 
         const results = await s.scanStream(file.openReadStream());
         if (results.isInfected) {

package/src/server/workflows/channel/moderation/UpdatePendingModerationCountWorkflow.ts

@@ -19,7 +19,7 @@ export default class UpdatePendingModerationCountWorkflow extends Workflow<{ mai
     async update(
         @Inject db?: SocialMailContext
     ) {
-        const { mailboxID, emailID, diff} = this.input;
+        const { mailboxID} = this.input;
         let q = db.mailboxes.asQuery();
         if (mailboxID) {
             q = q.where(this.input, (p) => (x) => x.mailboxID === p.mailboxID);

package/src/server/workflows/clean-up/CleanupDeletedFilesWorkflow.ts

@@ -4,7 +4,6 @@ import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import FileContent from "../../model/entities/FileContent.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class CleanupDeletedFilesWorkflow extends Workflow {
 

package/src/server/workflows/email/UpdateUnreadCounts.ts

@@ -1,7 +1,5 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { Email } from "../../model/entities/Email.js";
 import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 

package/src/server/workflows/files/DeleteFileHistoryWorkflow.ts

@@ -4,7 +4,7 @@ import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { AppWorkflowContext } from "../AppWorkflowContext.js";
-import { randomBytes, randomUUID } from "node:crypto";
+import { randomBytes } from "node:crypto";
 
 export default class DeleteFileHistoryWorkflow extends Workflow<{ appFileID }> {
 

package/src/server/workflows/files/DeleteFileWorkflow.ts

@@ -1,7 +1,6 @@
 import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
-import AppFile from "../../model/entities/AppFile.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
@@ -17,7 +16,7 @@ export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
         let start = 0;
         for(;;) {
 
-            start = await this.deleteFiles(start, false);
+            start = await this.deleteFiles(start);
             if (!BigInt(start)) {
                 break;
             }
@@ -51,29 +50,16 @@ export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
     @UniqueActivity
     async deleteFiles(
         start,
-        isFolder,
         @Inject db?: SocialMailContext) {
         const { root } = this;
         for (let index = 0; index < 100; index++) {
 
             db.changeSet.clear();
 
-            const q = db.appFiles
-            .where({ start, root, isFolder }, (p) => (x) =>
-                Sql.text.like(x.path, p.root)
-                && x.isFolder === p.isFolder
-                && x.appFileID > p.start)
-            .orderBy(void 0, (p) => (x) => x.appFileID)
-            .limit(20);
-
-            if (isFolder) {
-                continue;
-            }
-
             const files = await db.appFiles
-                .where({ start, root, isFolder }, (p) => (x) =>
+                .where({ start, root }, (p) => (x) =>
                     Sql.text.like(x.path, p.root)
-                    && x.isFolder === p.isFolder
+                    && x.isFolder === false
                     && x.appFileID > p.start)
                 .orderBy(void 0, (p) => (x) => x.appFileID)
                 .limit(20)

package/src/server/workflows/incoming/UpdateDomainFavicon.ts

@@ -30,7 +30,7 @@ export default class UpdateDomainFavicon extends Workflow<{ domainID: number, re
         }
 
         db.verifyFilters = false;
-        const [domain, referrer] = await db.domains
+        const [domain, _referrer] = await db.domains
             .where(this.input, (p) =>
                 (x) => x.domainID === p.domainID
                     || x.domainID === p.referrerDomainID)