feat: Now you can play on any platform, and it'll show you the last p…

…layed character at all times
itssimple · Jun 4, 2022 · be26f77 · be26f77
1 parent ffd319c
commit be26f77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/scripts/background.js b/src/scripts/background.js
@@ -443,11 +443,12 @@ async function initializeDatabase() {
       window.historyChecker = setInterval(async function () {
         if (destinyApiClient.profile) {
           let lastPlayed = await destinyApiClient.getLastPlayedCharacter();
-
-          await destinyApiClient.loadCharacterHistory(
-            lastPlayed.characterInfo.membershipId,
-            lastPlayed.characterInfo.characterId
-          );
+          try {
+            await destinyApiClient.loadCharacterHistory(
+              lastPlayed.characterInfo.membershipId,
+              lastPlayed.characterInfo.characterId
+            );
+          } catch (e) {}
         }
       }, 300 * 1000);
 

diff --git a/src/scripts/destiny2/apiClient.tsx b/src/scripts/destiny2/apiClient.tsx
@@ -561,12 +561,11 @@ export class DestinyApiClient {
       }
 
       if (
-        _profile == null &&
         self.linkedProfiles !== null &&
         self.linkedProfiles.profiles !== null &&
         self.linkedProfiles.profiles.length > 0
       ) {
-        var primaryMembership = self.linkedProfiles.profiles[0];
+        var primaryMembership = self.linkedProfiles.profiles.sort((a, b) => a.dateLastPlayed > b.dateLastPlayed)[0];
 
         _profile = await self.getUserProfile(primaryMembership.membershipId, primaryMembership.membershipType);
       }
@@ -956,7 +955,7 @@ export class DestinyApiClient {
           } catch (e) {
             log("CHARACTER-HISTORY", "Failed to load character history", e, history);
             self.refreshToken();
-            reject(history.Result.content);
+            reject(history);
           }
 
           page++;