@social-mail/social-mail-web-server 1.7.415 → 1.7.417

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.415",
+  "version": "1.7.417",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.408",
-    "@entity-access/server-pages": "^1.1.425",
+    "@entity-access/server-pages": "^1.1.426",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

package/src/common/Hashtags.ts

@@ -1,6 +1,6 @@
 import { tokenizeRegex } from "../protocols/core/tokenizer.js";
 
-const tags = /((?<=\s)|^)(#\p{L}[\p{L}\d\-_\/]{3,200})/gmiu;
+const tags = /((?<=\s)|^)(#\p{L}[\p{L}\d\-_\/]{2,200})/gmiu;
 
 export default class Hashtags {
 

package/src/protocols/core/RegExpExtra.ts

@@ -15,7 +15,7 @@ export const RegExpExtra = {
     replaceLinks(input: string, blog = "") {
         return RegExpExtra.replaceAll(
             input,
-            /(([^@\s,;]{5,80}@)|([📅📆📆]:\s{0,5}\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,5}Z)|(#\p{L}[\p{L}\d\-_\/]{3,200}))/gui,
+            /(([^@\s,;]{5,80}@)|([📅📆📆]:\s{0,5}\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,5}Z)|(#\p{L}[\p{L}\d\-_\/]{2,200}))/gui,
             ({ text, match }) => {
                 if (text) {
                     return text;
@@ -47,7 +47,7 @@ export const RegExpExtra = {
     replaceTimeAndEmail(input: string, blog = "") {
         return RegExpExtra.replaceAll(
             input,
-            /(([^@\s,;]{5,80}@)|([📅📆📆]:\s{0,5}\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,5}Z)|(#\p{L}[\p{L}\d\-_\/]{3,200}))/gui,
+            /(([^@\s,;]{5,80}@)|([📅📆📆]:\s{0,5}\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,5}Z)|(#\p{L}[\p{L}\d\-_\/]{2,200}))/gui,
             ({ text, match }) => {
                 if (text) {
                     return text;

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

@@ -10,6 +10,8 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import TagService from "../../services/tags/TagService.js";
+import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
+import SendLibraryContentWorkflow from "../../workflows/channel/library/SendLibraryContentWorkflow.js";
 
 export default class MailboxContactEvents extends AuthenticatedEvents<MailboxContact> {
 
@@ -209,4 +211,22 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
         }
 
     }
+
+    async afterInsert(entity: MailboxContact, entry: ChangeEntry<MailboxContact>) {
+        if (entity.status !== "unsubscribed") {
+            const db = ServiceProvider.resolve(this, SocialMailContext);
+            // if channel is library...
+            const channel = await db.mailboxes.where(entity, (p) => (x) => x.mailboxID === p.mailboxID && x.isLibrary === true)
+                .include((x) => x.emailAddress)
+                .first();
+            if (channel) {
+                const context = ServiceProvider.resolve(this, WorkflowContext);
+                await SendLibraryContentWorkflow.broadcast(context, {
+                    channelID: channel.mailboxID,
+                    recipientID: entity.emailAddressID,
+                    from: channel.emailAddress.emailAddress
+                });
+            }
+        }
+    }
 }

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

@@ -61,9 +61,9 @@ export default class MailboxEmailEvents extends AuthenticatedEvents<ChannelEmail
 
     @ExternalQuery
     async libraryEmails(channelID) {
-        // get current host
-        const q = await this.channelEmails(channelID);
-        return q.where(void 0, (p) => (x) => x.mailbox.isLibrary === true);
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        const q = db.channelEmails.where(void 0, (p) => (x) => x.mailbox.isLibrary === true);
+        return q.limit(25);
     }
 
     beforeInsert(entity: ChannelEmail, entry: ChangeEntry<ChannelEmail>) {

package/src/server/workflows/channel/library/SendLibraryContentWorkflow.ts

@@ -38,6 +38,16 @@ export default class SendLibraryContentWorkflow extends Workflow<ISendLibraryCon
 
         const { channelID, recipientID } = this.input;
 
+        // verify if unsubscribed...
+        const unsubscribed = await db.mailboxContacts.where(this.input, (p) => (x) => x.mailboxID === p.channelID
+                && x.emailAddressID === p.channelID
+                && x.status === "unsubscribed"
+            ).some();
+
+        if (unsubscribed) {
+            return 0;
+        }
+
         const list = await db.channelEmails.where({ channelID, start, recipientID }, (p) => (x) => x.mailboxID === p.channelID
             && x.emailID > p.start
             && x.datePublished !== null