@social-mail/social-mail-web-server 1.4.680 → 1.4.682

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.680",
+  "version": "1.4.682",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

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

@@ -65,32 +65,4 @@ export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
         }
     }
 
-    async afterInsert(entity: StoreItem, entry: ChangeEntry<StoreItem>) {
-        // update tags...
-        // if (!entry.isUpdated("tags")) {
-        //     return;
-        // }
-        // const ts = ServiceProvider.resolve(this, TagService);
-        // const db = ServiceProvider.resolve(this, SocialMailContext);
-        // await db.storeItemTags.asQuery()
-        //     .delete(entity, (p) => (x) => x.storeItemID === p.storeItemID);
-        // const tags = entity.tags?.trim();
-        // if (!tags){
-        //     return;
-        // }
-        // const { storeItemID } = entity;
-        // for(const tag of tags.split(/\,/g)) {
-        //     const trimmedTag = tag.trim();
-        //     const ids = await ts.getTagID(trimmedTag);
-        //     for (const tagID of ids) {
-        //         await db.storeItemTags.saveDirect({
-        //             mode: "insert",
-        //             changes: {
-        //                 tagID,
-        //                 storeItemID
-        //             }
-        //         });
-        //     }
-        // }
-    }
 }

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

@@ -187,13 +187,14 @@ export default class UserEvents extends AuthenticatedEvents<User> {
             if (entity.status === "blocked") {
                 const now = new Date();
                 const { userID } = entity;
-                const sessions = await this.db.loginSessions.where({ userID, now }, (p) => (x) => x.userID
+
+                await this.db.loginSessions.where({ userID, now}, (p) => (x) => x.userID === p.userID
                     && x.invalid === false
-                    && x.expiry > p.now)
-                    .select(void 0, () => (x) => ({ sessionID: x.sessionID })).toArray();
-                for (const keys of sessions) {
-                    await this.db.loginSessions.saveDirect({ mode: "update", keys, changes: { invalid: true } });
-                }
+                    && x.expiry > Sql.cast.asDateTime(p.now)
+                ).update(void 0, (p) => (x) => ({
+                    invalid: true
+                }));
+
             }
         }
     }

package/src/server/services/files/SnapshotService.ts

@@ -189,7 +189,7 @@ export default class SnapshotService {
             if (iterator.isFolder) {
                 await this.copyChildren(db, iterator, child, path, copyMedia, siteRoot + "/" + child.name);
             } else {
-                this.snapshotSize = iterator.fileSize;
+                this.snapshotSize += iterator.fileSize;
             }
         }
     }

package/src/server/storage/BaseStorage.ts

@@ -87,16 +87,12 @@ export default abstract class BaseStorage {
                 // before checking for hash collision
 
                 fc.cloudPath = cloudPath;
-                await db.fileContents.saveDirect({
-                    mode: "update",
-                    keys: {
-                        fileContentID: fc.fileContentID
-                    },
-                    changes: {
-                        cloudPath,
-                        compression
-                    }
-                }, 2);
+                fc.compression = compression;
+                await db.fileContents.where(fc, (p) => (x) => x.fileContentID === p.fileContentID)
+                    .update(fc, (p) => (x) => ({
+                        cloudPath: p.cloudPath,
+                        compression: p.compression
+                    }));
             }
             return fc;
         } finally {