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

package/src/common/reader/CSVReader.ts

@@ -1,4 +1,3 @@
-import LineStream, { StringLineStream } from "@social-mail/shared/dist/mime-parser/stream/LineStream.js";
 
 export default class CSVReader {
 

package/src/isolated/IsolatedProcess.ts

@@ -1,6 +1,5 @@
 import { fileURLToPath } from "url";
 import { spawnPromise } from "../common/spawnPromise.js";
-import FileInfo from "./FileInfo.js";
 import IImageConverter from "./image-converter/IImageConverter.js";
 import IExtract from "./extract/IExtract.js";
 

package/src/isolated/extract/index.ts

@@ -29,7 +29,7 @@ export class ExtractWorker {
 };
 
 
-const [execPath, self, p] = process.argv;
+const [_execPath, _self, p] = process.argv;
 
 
 ExtractWorker.text(JSON.parse(p))

package/src/isolated/image-converter/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import sharp from "sharp";
 import { parse } from "path";
 import IImageConverter from "./IImageConverter.js";
@@ -67,7 +68,7 @@ async function transform({
     await r.toFile(output.path);
 }
 
-const [execPath, self, p] = process.argv;
+const [_execPath, _self, p] = process.argv;
 
 transform(JSON.parse(p))
     .catch(console.error);

package/src/protocols/core/LineReader.ts

@@ -1,4 +1,4 @@
-import fs, { read } from "node:fs";
+import fs from "node:fs";
 import readline from "node:readline/promises";
 import { tokenize } from "./tokenizer.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";

package/src/protocols/core/Queue.ts

@@ -1,7 +1,5 @@
 import EventSet from "@entity-access/entity-access/dist/common/EventSet.js";
 
-const next = Symbol("queuedNext");
-
 export default class Queue<T> {
 
     public readonly eventItemAdded: EventSet<T> = new EventSet(this);

package/src/protocols/core/ReactionExtractor.ts

@@ -1,4 +1,3 @@
-import { Base36 } from "../../common/Base36.js";
 import EmailCommands from "./EmailCommands.js";
 
 const cmd = new RegExp("^(?<engagement>\\p{Emoji}|" + EmailCommands.commands.join("|") +  ")-k(?<emailID>[^-]{1,50})-(?<inReplyTo>.+)", "u");

package/src/protocols/core/RegExpExtra.ts

@@ -1,4 +1,4 @@
-import { tokenizeRegex, tokenizeRegexAll } from "./tokenizer.js";
+import { tokenizeRegexAll } from "./tokenizer.js";
 
 export type regExpTokens = { text: string, match: RegExpMatchArray };
 

package/src/protocols/smtp/ESmtpClient.ts

@@ -1,10 +1,8 @@
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import SmtpError from "../../server/smtp/services/SmtpError.js";
 import LineReader from "../core/LineReader.js";
-import FileLineReader from "../core/LineReader.js";
 import SocketClient from "../socket/client/SocketClient.js";
 import os from "node:os";
-import DnsService from "../../server/smtp/dns/DnsService.js";
 import { SmtpStatusCodes } from "../../server/smtp/client/SmtpStatusCodes.js";
 
 export interface ISmtpAuth {
@@ -84,6 +82,10 @@ export default class ESmtpClient {
         return this.client.eventClosed;
     }
 
+    public get isSecure() {
+        return this.sslSupported;
+    }
+
     private sslSupported: boolean;
 
     private constructor(private client: SocketClient, private logger: (data) => void) {

package/src/protocols/socket/client/SocketClient.ts

@@ -1,8 +1,6 @@
 import net from "net";
-import Queue from "../../core/Queue.js";
 import EventSet from "@entity-access/entity-access/dist/common/EventSet.js";
 import tls, { TLSSocket } from "tls";
-import { AsyncDisposableScope } from "@entity-access/entity-access/dist/common/usingAsync.js";
 import { BufferStream } from "../../../common/BufferStream.js";
 
 export default class SocketClient {

package/src/reports/model/ReportDbContext.ts

@@ -1,6 +1,6 @@
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import Visitor from "./entities/Visitor.js";
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
 import ReportDbContextEvents from "./ReportDbContextEvents.js";
 import Visit from "./entities/Visit.js";
 import ReportSite from "./entities/ReportSite.js";

package/src/reports/model/events/VisitActivityEvents.ts

@@ -1,6 +1,5 @@
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
-import Visit from "../entities/Visit.js";
 import VisitActivity from "../entities/VisitActivity.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 

package/src/reports/services/ReportingCache.ts

@@ -1,5 +1,5 @@
-import Inject, { RegisterScoped, RegisterSingleton, ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
-import { cacheFor, ICacheContainer, ObjectCache } from "../../common/cacheFor.js";
+import Inject, { RegisterScoped, RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { ObjectCache } from "../../common/cacheFor.js";
 import ReportDbContext from "../model/ReportDbContext.js";
 import WebSiteContentService from "../../server/services/files/WebSiteContentService.js";
 import BaseDiskCache from "../../common/BaseDiskCache.js";

package/src/reports/workflows/visit-added/TrackActivityWorkflow.ts

@@ -1,8 +1,6 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
 import ReportDbContext from "../../model/ReportDbContext.js";
-import myUaParser from "my-ua-parser";
-import GeoIPService from "../../../server/services/geo-ip/GeoIPService.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { durationType } from "../../model/entities/VisitSegment.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
@@ -44,7 +42,7 @@ export default class TrackActivityWorkflow extends Workflow<ITrackActivityInfo>
 
 
 
-        let q = db.reportSites.where({ startTime, endTime, siteID }, (p) =>
+        const q = db.reportSites.where({ startTime, endTime, siteID }, (p) =>
             (x) => x.siteID === p.siteID );
 
         let counts = null as { visitors, newVisitors };

package/src/reports/wwwroot/routes/social-mail/reports/api/track/[event]/get.tsx

@@ -1,6 +1,5 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { Query } from "@entity-access/server-pages/dist/core/Query.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import ReportDbContext from "../../../../../../../model/ReportDbContext.js";
@@ -8,7 +7,6 @@ import ReportingCache from "../../../../../../../services/ReportingCache.js";
 import AddActivityWorkflow, { IActivityInfo } from "../../../../../../../workflows/activities/AddActivityWorkflow.js";
 import ReportWorkflowContext from "../../../../../../../workflows/ReportWorkflowContext.js";
 import VisitorAddedWorkflow from "../../../../../../../workflows/visitor-added/VisitorAddedWorkflow.js";
-import Visitor from "../../../../../../../model/entities/Visitor.js";
 import { AppStringHelper } from "../../../../../../../../common/AppStringHelper.js";
 
 const maxAge = 30*24*60*60;
@@ -62,14 +60,14 @@ export default class extends Page<IActivityInfo> {
 
         let visitID = this.request.cookies["vvid"] as any;
         if (visitID) {
-            const oldVisit = await this.db.visits.statements.select({}, { visitID, visitorID });
+            const oldVisit = await db.visits.statements.select({}, { visitID, visitorID });
             if (oldVisit) {
                 const windowStart = time.addHours(-8);
 
                 if (DateTime.from(oldVisit.dateCreated).msSinceEpoch < windowStart.msSinceEpoch) {
                     visitID = null;
                 } else {
-                    await this.db.visits.statements.update({ dateUpdated: time }, { visitID });
+                    await db.visits.statements.update({ dateUpdated: time }, { visitID });
                 }
             } else {
                 visitID = null;
@@ -78,7 +76,7 @@ export default class extends Page<IActivityInfo> {
 
         if (!visitID) {
 
-            const visit = await this.db.visits.statements.insert({
+            const visit = await db.visits.statements.insert({
                 visitorID
             });
 

package/src/server/model/entities/AppPassword.ts

@@ -1,5 +1,5 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import { User } from "./User.js";
 import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";

package/src/server/model/entities/Configuration.ts

@@ -1,8 +1,5 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 
 @Table("Configuration")
 export default class Configuration<T = any> {

package/src/server/model/entities/Email.ts

@@ -1,5 +1,4 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import type Mailbox from "./Mailbox.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import EmailAddress from "./EmailAddress.js";
@@ -13,7 +12,7 @@ import MailboxContactEmail from "./MailboxContactEmail.js";
 import type ChannelEmail from "./ChannelEmail.js";
 import { User } from "./User.js";
 import type SubscriberActivity from "./SubscriberActivity.js";
-import { IgnoreJsonProperty, JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import { IgnoreJsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import type EmailEngagement from "./EmailEngagement.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { apiPath } from "../../../common/globalEnv.js";

package/src/server/model/entities/FileContent.ts

@@ -3,7 +3,7 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import type AppFile from "./AppFile.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import type { AppFileVersion } from "./AppFile.js";
-import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import type AppTempFile from "./AppTempFile.js";

package/src/server/model/entities/HostedDomain.ts

@@ -1,6 +1,5 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import type Mailbox from "./Mailbox.js";
 import type DomainUser from "./DomainUser.js";
 import DomainKey from "./DomainKey.js";
 import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";

package/src/server/model/entities/IncomingSmsSource.ts

@@ -3,8 +3,6 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
-import type UserAuthFactor from "./UserAuthFactor.js";
-import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 
 @Table("IncomingSmsSource")
 export default class IncomingSmsSource {

package/src/server/model/entities/MailboxContact.ts

@@ -6,7 +6,6 @@ import EmailAddress from "./EmailAddress.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { Email } from "./Email.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
-import { EnumColumn } from "../../../common/columns.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import type MailboxContactTag from "./MailboxContactTag.js";

package/src/server/model/entities/MailboxContactEmail.ts

@@ -7,8 +7,6 @@ import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
-import { ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
-import { apiPath } from "../../../common/globalEnv.js";
 import MailboxContact from "./MailboxContact.js";
 import MultiForeignKeys from "@entity-access/entity-access/dist/decorators/ForeignKey.js";
 

package/src/server/model/entities/NameToken.ts

@@ -1,4 +1,3 @@
-import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";

package/src/server/model/entities/StoreAccount.ts

@@ -1,7 +1,7 @@
 import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
-import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { StoreJournalEntry } from "./StoreJournalEntry.js";
 import { StoreItem } from "./StoreItem.js";

package/src/server/model/entities/StorePaymentAttempt.ts

@@ -3,7 +3,6 @@ import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { StoreJournal } from "./StoreJournal.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { StoreAccount } from "./StoreAccount.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import StorePaymentGateway from "./StorePaymentGateway.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";

package/src/server/model/entities/StorePaymentGateway.ts

@@ -1,5 +1,5 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { StoreAccount } from "./StoreAccount.js";
 import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";

package/src/server/model/entities/ThreadParticipant.ts

@@ -3,8 +3,6 @@ import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { Email } from "./Email.js";
 import EmailAddress from "./EmailAddress.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 /**
  * This class is a separate entity instead of using EmailRecipient,

package/src/server/model/entities/UserAuthFactor.ts

@@ -3,9 +3,7 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import { User } from "./User.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { IgnoreJsonProperty, JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
-import IncomingSmsSource from "./IncomingSmsSource.js";
-import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
+import { IgnoreJsonProperty, JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import VerificationToken from "./VerificationToken.js";

package/src/server/model/entities/UserRole.ts

@@ -1,5 +1,4 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import ForeignKey from "@entity-access/entity-access/dist/decorators/ForeignKey.js";
 import { AppRole } from "./AppRole.js";
 import { User } from "./User.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";

package/src/server/model/events/AppRoleEvents.ts

@@ -1,9 +1,4 @@
-import EntityEvents from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import { AppRole } from "../entities/AppRole.js";
-import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import Inject from "@entity-access/entity-access/dist/di/di.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import BaseEvents from "./BaseEvents.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 
 export default class AppRoleEvents extends AuthenticatedEvents<AppRole> {

package/src/server/model/events/ContactEvents.ts

@@ -2,7 +2,7 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import Contact, { ContactAddress, ContactDomain, ContactEmail, ContactItem, ContactPhone } from "../entities/Contact.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 

package/src/server/model/events/DomainEvents.ts

@@ -1,6 +1,5 @@
-import EntityEvents, { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import Domain from "../entities/Domain.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";

package/src/server/model/events/DomainKeyEvents.ts

@@ -5,7 +5,6 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import CryptoService from "../../services/CryptoService.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import SocialMailContext from "../SocialMailContext.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 
@@ -14,9 +13,6 @@ export default class DomainKeyEvents extends AuthenticatedEvents<DomainKey> {
     @Inject
     private cryptoService: CryptoService;
 
-    @Inject
-    private db: SocialMailContext;
-
     filter(query: IEntityQuery<DomainKey>): IEntityQuery<DomainKey> {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

package/src/server/model/events/EmailEvents.ts

@@ -12,12 +12,10 @@ import SocialMailContext from "../SocialMailContext.js";
 import { randomUUID } from "crypto";
 // import UpdateEmailReferences from "../../workflows/incoming/UpdateEmailReferences.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import { expandPlaceholders } from "../../services/TemplateExpander.js";
 import { Base36 } from "../../../common/Base36.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import ScopeVars from "../../../common/ScopeVars.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
@@ -29,7 +27,6 @@ import CachedEmailService from "../../smtp/services/CachedEmailService.js";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import UpdatePendingModerationCountWorkflow from "../../workflows/channel/moderation/UpdatePendingModerationCountWorkflow.js";
 import EmailReferenceService from "../../smtp/services/EmailReferenceService.js";
-import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
 
 export default class EmailEvents extends AuthenticatedEvents<Email> {
 
@@ -408,7 +405,7 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
 
     private async updateScheduleAndReferences(entity: Email, entry: ChangeEntry<Email>) {
 
-        const { emailID, silent, dateReceived, htmlBody, tempID, parentID, threadID } = entity;
+        const { emailID, htmlBody, tempID } = entity;
 
         let updateEmail = false;
 
@@ -421,10 +418,10 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         }
 
 
-        let timeRead = void 0;
-        if (silent) {
-            timeRead = dateReceived;
-        }
+        // let timeRead = void 0;
+        // if (silent) {
+        //     timeRead = dateReceived;
+        // }
 
         // if (entity.status !== "draft") {
         //     const taskGroup = ScopeVars.fromScope(this).taskGroup ?? "default";

package/src/server/model/events/EmailRecipientEvents.ts

@@ -2,20 +2,15 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import EmailRecipient from "../entities/EmailRecipient.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
-import SocialMailContext from "../SocialMailContext.js";
-import ChannelService from "../../smtp/services/ChannelService.js";
 
 export default class EmailRecipientEvents extends AuthenticatedEvents<EmailRecipient> {
 
     @Inject
     private emailAddressService: EmailAddressService;
 
-    @Inject
-    private db: SocialMailContext;
-
     filter(query: IEntityQuery<EmailRecipient>): IEntityQuery<EmailRecipient> {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

package/src/server/model/events/FileContentEvents.ts

@@ -1,4 +1,3 @@
-import EntityEvents from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import FileContent from "../entities/FileContent.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";

package/src/server/model/events/MailboxEmailEvents.ts

@@ -13,7 +13,6 @@ import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSe
 import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
 import CachedEmailService from "../../smtp/services/CachedEmailService.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
-import { RegExpExtra } from "../../../protocols/core/RegExpExtra.js";
 import Content from "@entity-access/server-pages/dist/Content.js";
 
 export default class MailboxEmailEvents extends AuthenticatedEvents<ChannelEmail> {

package/src/server/model/events/MailboxEvents.ts

@@ -140,8 +140,6 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
 
         let q = this.db.domains.where({ domainID }, (p) => (x) => x.domainID === p.domainID);
 
-        let addUser = false;
-
         // check if user has access to the domain...
         const { userID } = this.sessionUser;
         if (!this.sessionUser.isAdmin) {
@@ -150,9 +148,9 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
                 // get the prefix...
                 const du = await this.db.hostedDomainUsers.where({ domainID, userID}, (p) => (x) => x.userID === p.userID
                     && x.domainID === p.domainID).firstOrFail();
-                if (du.allowCreateMailbox) {
-                    addUser = true;
-                }
+                // if (du.allowCreateMailbox) {
+                //     addUser = true;
+                // }
                 if (du.prefix) {
                     entity.username = du.prefix + entity.username;
                 }

package/src/server/model/events/MailboxSyncTargetEvents.ts

@@ -4,7 +4,6 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SyncMailboxWorkflow from "../../workflows/sync/SyncMailboxWorkflow.js";
-import SocialMailContext from "../SocialMailContext.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 
@@ -69,8 +68,6 @@ export default class MailboxSyncTargetEvents extends AuthenticatedEvents<Mailbox
             return;
         }
 
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-
         await SyncMailboxWorkflow.startSyncing(this.context, entity.syncTargetID);
     }
 }

package/src/server/model/events/StoreAccountEvents.ts

@@ -4,7 +4,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { StoreAccount } from "../entities/StoreAccount.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import EncryptionService from "../../services/encryption/EncryptionService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import SocialMailContext from "../SocialMailContext.js";
 import { randomUUID } from "crypto";

package/src/server/model/events/StoreConfigEvents.ts

@@ -3,10 +3,7 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { StoreConfig } from "../entities/StoreConfig.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../SocialMailContext.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 

package/src/server/model/events/StoreCouponEvents.ts

@@ -2,11 +2,6 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../SocialMailContext.js";
-import EncryptionService from "../../services/encryption/EncryptionService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import StoreCoupon from "../entities/StoreCoupon.js";
 

package/src/server/model/events/StoreItemEvents.ts

@@ -11,11 +11,8 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import StoreTagCountService from "../../services/store/StoreTagCountService.js";
 import StoreFileService from "../../services/StoreFileService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
-const till = new DateTime(DateTime.today.year + 2, 1, 1);
-
 export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
 
     @Inject

package/src/server/model/events/StoreItemFolderEvents.ts

@@ -4,7 +4,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { StoreItemFolder } from "../entities/StoreItemFolder.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import TagService from "../../services/tags/TagService.js";
 import SocialMailContext from "../SocialMailContext.js";
 import { randomUUID } from "crypto";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";

package/src/server/model/events/StoreItemPriceEvents.ts

@@ -1,6 +1,5 @@
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";

package/src/server/model/events/StoreItemTagEvents.ts

@@ -4,7 +4,6 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { StoreItemTag } from "../entities/StoreItemTag.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import TagService from "../../services/tags/TagService.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";