Merge pull request #372 from BlueBubblesApp/v1.1.3

V1.1.3
BlueBubblesApp · Jun 11, 2022 · 1e610ed · 1e610ed
2 parents 1b32856 + d917d83
commit 1e610ed
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
     "private": true,
     "workspaces": [

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bluebubbles/server",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "main": "./dist/main.js",
     "license": "Apache-2.0",
     "author": {

diff --git a/packages/server/src/server/api/v1/interfaces/chatInterface.ts b/packages/server/src/server/api/v1/interfaces/chatInterface.ts
@@ -32,9 +32,7 @@ export class ChatInterface {
         const tmpChats = await Server().iMessageRepo.getChats({
             chatGuid: guid as string,
             withParticipants: true,
-            withArchived,
-            offset,
-            limit
+            withArchived
         });
 
         for (const chat of tmpChats) {

diff --git a/packages/server/src/server/api/v1/interfaces/contactInterface.ts b/packages/server/src/server/api/v1/interfaces/contactInterface.ts
@@ -71,7 +71,10 @@ export class ContactInterface {
         }: {
             extraProps?: string[]
         } = {}): any {
-        return records.map((e: NodeJS.Dict<any>) => {
+        return records.map((contact: NodeJS.Dict<any>) => {
+            // We have to make a copy so that when we "delete", we aren't deleting from the master copy.
+            const e = { ...contact };
+
             // Only include extra properties that are asked for.
             for (const prop of ContactInterface.apiExtraProperties) {
                 if (!extraProps.includes(prop) && Object.keys(e).includes(prop)) {

diff --git a/packages/server/src/server/index.ts b/packages/server/src/server/index.ts
@@ -1067,8 +1067,8 @@ class BlueBubblesServer extends EventEmitter {
         // Disconnect & reconnect to the iMessage DB
         if (this.iMessageRepo.db.isConnected) {
             this.log("Reconnecting to iMessage database...");
-            await this.iMessageRepo.db.close();
-            await this.iMessageRepo.db.connect();
+            await this.iMessageRepo.db.destroy();
+            await this.iMessageRepo.db.initialize();
         }
 
         await this.stopServices();

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bluebubbles/ui",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "homepage": "./",
   "license": "Apache-2.0",
   "scripts": {