Skip to content

Commit

Permalink
Merge pull request #486 from BlueBubblesApp/development
Browse files Browse the repository at this point in the history
v1.5.3
  • Loading branch information
zlshames authored Feb 17, 2023
2 parents dc8d088 + 75b6f6f commit 075d5fd
Show file tree
Hide file tree
Showing 48 changed files with 962 additions and 187 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This is the back-end server for the BlueBubbles App. It allows you to forward yo
3. Install the server dependencies
- `yarn`
4. Run the dev server (this will start both the renderer and server)
- `yarn run start-dev`
- `yarn start`

## Structure / Directory Map

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bluebubbles-server",
"version": "1.5.2",
"version": "1.5.3",
"description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
"private": true,
"workspaces": [
Expand Down
Binary file modified packages/server/appResources/macos/daemons/cloudflared
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/server/appResources/macos/daemons/cloudflared.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98f78f5ce6b7c5d51e7351e8280b78d6
09aeb674587258c1e2cd4e00ab5f0b66
2 changes: 1 addition & 1 deletion packages/server/appResources/private-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The `macosXbundle.md5` files within this directory contain a single string that

`find -s /path/to/private/api/folder/BlueBubblesHelper.bundle -type f -exec md5 {} \; | md5`

**GitHub Release Reference**: https://github.com/BlueBubblesApp/BlueBubbles-Server-Helper/releases/tag/0.0.9
**GitHub Release Reference**: https://github.com/BlueBubblesApp/BlueBubbles-Server-Helper/releases/tag/0.0.11

You can also check the current versions of these bundles by opening the `version.txt` file.
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.9</string>
<string>0.0.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>11</string>
<string>13</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// Generated by class-dump 3.5 (64 bit) (Debug version compiled Jun 9 2015 22:53:21).
//
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2014 by Steve Nygard.
//

#import "IMAccount.h"

@interface IMAccount (AliasAdditions)
- (id)loginName;
- (id)phoneNumberAlias;
- (id)allAliases;
- (long long)numberOfActiveAliases;
- (BOOL)isAliasActivated:(id)arg1;
- (double)timeIntervalSinceEmailWasSentForAlias:(id)arg1;
- (void)removeCreationMarker:(id)arg1;
- (void)setCreationMarker:(id)arg1;
@end

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//
// Generated by class-dump 3.5 (64 bit) (Debug version compiled Jun 9 2015 22:53:21).
//
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2014 by Steve Nygard.
//


@class NSDictionary, NSString, SOAccountAliasController;

@interface SOAccountAlias : NSObject <NSCopying>
{
BOOL _active;
BOOL _initialized;
int _verificationState;
NSString *_name;
long long _type;
NSDictionary *_failureInfo;
SOAccountAliasController *_controller;
}

@property(nonatomic) __weak SOAccountAliasController *controller; // @synthesize controller=_controller;
@property(nonatomic) BOOL initialized; // @synthesize initialized=_initialized;
@property(copy, nonatomic) NSDictionary *failureInfo; // @synthesize failureInfo=_failureInfo;
@property(nonatomic) BOOL active; // @synthesize active=_active;
@property(nonatomic) int verificationState; // @synthesize verificationState=_verificationState;
@property(readonly, nonatomic) long long type; // @synthesize type=_type;
@property(readonly, nonatomic) NSString *name; // @synthesize name=_name;

- (long long)validationErrorReason;
- (id)localizedValidationFalure;
- (void)deactivate;
- (void)activate;
- (id)description;
- (id)copyWithZone:(struct _NSZone *)arg1;
- (BOOL)isEqual:(id)arg1;
- (id)initWithName:(id)arg1 type:(long long)arg2 controller:(id)arg3;
- (id)initWithName:(id)arg1 type:(long long)arg2;

@end

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
//
// Generated by class-dump 3.5 (64 bit) (Debug version compiled Jun 9 2015 22:53:21).
//
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2014 by Steve Nygard.
//

#import <objc/NSObject.h>
#import "IMAccount-AliasAdditions.h"
@class IMAccount, NSMutableArray, NSMutableDictionary, NSMutableOrderedSet;

@interface SOAccountAliasController : NSObject
{
IMAccount *_account;
NSMutableOrderedSet *_aliasSet;
NSMutableArray *_aliasTimers;
NSMutableDictionary *_aliasLookup;
}

+ (id)stringForAliasValidationFailure:(long long)arg1 aliasName:(id)arg2;
@property(retain) NSMutableDictionary *aliasLookup; // @synthesize aliasLookup=_aliasLookup;
@property(retain) NSMutableArray *aliasTimers; // @synthesize aliasTimers=_aliasTimers;
@property(retain) NSMutableOrderedSet *aliasSet; // @synthesize aliasSet=_aliasSet;
@property(readonly) __weak IMAccount *account; // @synthesize account=_account;
- (void)_validationTimerEnded:(id)arg1;
- (void)_removeTimerForAliasName:(id)arg1;
- (void)_addAliasTimer:(id)arg1 length:(double)arg2;
- (void)confirmNewAlias:(id)arg1;
- (void)_clearTimers;
- (void)configureAliasState:(id)arg1;
- (void)_removeAliasesFromSet:(id)arg1;
- (void)_removeAliasFromSet:(id)arg1;
- (void)_addAliasesToSet:(id)arg1;
- (void)_addAliasToSet:(id)arg1;
- (void)_initializeAliases;
- (void)_stopListeningToNotifications;
- (void)_listenToNotifications;
- (void)_vettedAliasesChanged:(id)arg1;
- (void)_aliasValidationChanged:(id)arg1;
- (void)_aliasesChanged:(id)arg1;
- (void)deleteAlias:(id)arg1;
- (void)deactivateAliases:(id)arg1;
- (void)addAliases:(id)arg1;
- (void)addAliasesWithNames:(id)arg1;
- (BOOL)addAliasWithName:(id)arg1;
- (void)removeAliases:(id)arg1;
- (void)removeAliasesWithNames:(id)arg1;
- (void)removeAliasWithName:(id)arg1;
- (void)setAccount:(id)arg1;
- (id)aliasForName:(id)arg1;
- (long long)activeAliasCount;
- (id)activeAliases;
- (long long)vettedAliasCount;
- (id)vettedAliases;
- (id)aliases;
- (long long)validationErrorReasonForAlias:(id)arg1;
- (void)dealloc;
- (id)initWithAccount:(id)arg1;

@end

Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
//
// Generated by class-dump 3.5 (64 bit) (Debug version compiled May 21 2020 17:01:39).
//
// Copyright (C) 1997-2019 Steve Nygard.
//





@class IMAccount, IMServiceImpl, NSTimer, SOAccountAliasController;

@interface SOAccountRegistrationController : NSObject
{
BOOL _isSigningOut;
BOOL _isSignedIn;
long long _registrationState;
long long _enabledState;
IMAccount *_account;
SOAccountAliasController *_aliasController;
IMServiceImpl *_serviceType;
NSTimer *_authenticationTimer;
}

+ (id)stringForAccountRegistrationFailure:(long long)arg1;
+ (id)errorWithCode:(long long)arg1;
+ (id)registrationControllerForAccount:(id)arg1;
+ (id)faceTimeRegistrationController;
+ (id)registrationController;
+ (void)resetSharedInstance;
@property(retain) NSTimer *authenticationTimer; // @synthesize authenticationTimer=_authenticationTimer;
@property(nonatomic) BOOL isSignedIn; // @synthesize isSignedIn=_isSignedIn;
@property(nonatomic) BOOL isSigningOut; // @synthesize isSigningOut=_isSigningOut;
@property(retain, nonatomic) IMServiceImpl *serviceType; // @synthesize serviceType=_serviceType;
@property(retain, nonatomic) SOAccountAliasController *aliasController; // @synthesize aliasController=_aliasController;
@property(retain, nonatomic) IMAccount *account; // @synthesize account=_account;
@property(nonatomic) long long enabledState; // @synthesize enabledState=_enabledState;
@property(nonatomic) long long registrationState; // @synthesize registrationState=_registrationState;
- (BOOL)cloudKitEventNotificationManagerAccountHasiMessageEnabled:(id)arg1;
- (void)_clearAliasController;
- (void)_setupAliasController;
- (void)_authenticationTimerTimedOut:(id)arg1;
- (void)_clearAuthenticationTimeout;
- (void)accountLoggedOut:(id)arg1;
- (void)activationStatusChanged:(id)arg1;
- (void)registrationStatusChanged:(id)arg1;
- (void)_accountAliasActivationStateChanged:(id)arg1;
- (void)_SOAccountAliasVerificationStateChanged:(id)arg1;
- (void)_accountAliasCountChanged:(id)arg1;
- (BOOL)accountOnlineAndRegistered;
- (BOOL)accountIsSignedIn;
- (id)loginName;
- (id)localizedRegistrationErrorMessage;
- (BOOL)readReceiptsEnabled;
- (void)enableReadReceipts:(BOOL)arg1;
- (void)confirmNewAlias:(id)arg1;
- (BOOL)addAndConfirmNewAlias:(id)arg1;
- (void)enableAccount:(BOOL)arg1;
- (BOOL)deleteAccount;
- (void)signOutAndUpdateDaemon:(BOOL)arg1;
- (void)signOut;
- (void)_registerAccountIfNecessary;
- (void)registerAccount;
- (void)authenticateWithUsername:(id)arg1 password:(id)arg2 authID:(id)arg3 authToken:(id)arg4;
- (void)authenticateWithUsername:(id)arg1 authID:(id)arg2 authToken:(id)arg3;
- (void)authenticateWithUsername:(id)arg1 password:(id)arg2;
- (void)updateStateForAccountStatusAndPostNotification:(BOOL)arg1;
- (void)setEnabledState:(long long)arg1 andPostNotification:(BOOL)arg2;
- (void)setRegistrationState:(long long)arg1 andPostNotification:(BOOL)arg2;
- (void)dealloc;

@end

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,22 @@
<data>
GOS5kxzLZzPuPU7AMvjis6Oltjk=
</data>
<key>Resources/SocialAppsCore/IMAccount-AliasAdditions.h</key>
<data>
k3hVO7/+cKZSupuS+4makuvqQ3o=
</data>
<key>Resources/SocialAppsCore/SOAccountAlias.h</key>
<data>
hsOAN73xrV8SAvF4lLs3OVEtSyc=
</data>
<key>Resources/SocialAppsCore/SOAccountAliasController.h</key>
<data>
72KEKFyBqsA7Kd2a3HObxvQzhPo=
</data>
<key>Resources/SocialAppsCore/SOAccountRegistrationController.h</key>
<data>
SLtcWTI/+Ghzd1OC6oRMTFSt7OE=
</data>
</dict>
<key>files2</key>
<dict>
Expand All @@ -18,6 +34,34 @@
OiPCSXEfNginSgTFrUsF7VuW3q3fk6E2Ih7+t73hGVY=
</data>
</dict>
<key>Resources/SocialAppsCore/IMAccount-AliasAdditions.h</key>
<dict>
<key>hash2</key>
<data>
egihpTZAMD/MEW4PSvmHINNYRzHJCKUmGYsWEFAiFcQ=
</data>
</dict>
<key>Resources/SocialAppsCore/SOAccountAlias.h</key>
<dict>
<key>hash2</key>
<data>
WSKWp1BVcMxEmCriwLZKZ5/VVZA7guKISbvt6Uph148=
</data>
</dict>
<key>Resources/SocialAppsCore/SOAccountAliasController.h</key>
<dict>
<key>hash2</key>
<data>
iADBnpDPFuRVFA9fr2+8AgtsA74Ws25vWftS+LowmDk=
</data>
</dict>
<key>Resources/SocialAppsCore/SOAccountRegistrationController.h</key>
<dict>
<key>hash2</key>
<data>
aS+oUmRnPXxh/QDBEJ5qpBEq7qTwwl08SxpahZbRJn0=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion packages/server/appResources/private-api/macos10bundle.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
175343768ea164dc7ff92d37b4cd8cfc
40fdae0ec7bfbf605f1df380b65002c3
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.9</string>
<string>0.0.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>11</string>
<string>13</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/server/appResources/private-api/macos11bundle.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
393f7cf77c6a53cc9ef4a2782503a5b8
592098c9bb73d8556df04fa32aba6f50
2 changes: 1 addition & 1 deletion packages/server/appResources/private-api/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.9
0.0.11
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bluebubbles/server",
"version": "1.5.2",
"version": "1.5.3",
"main": "./dist/main.js",
"license": "Apache-2.0",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/server/api/v1/apple/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import { tapbackUIMap } from "./mappings";
*/
export class ActionHandler {
static sendMessageHandler = async (chatGuid: string, message: string, attachment: string) => {
let messageScript;
let messageScript: string;

let theAttachment = attachment;
if (theAttachment !== null && theAttachment.endsWith(".mp3")) {
Expand Down
Loading

0 comments on commit 075d5fd

Please sign in to comment.