fix: friendship ranking

Author: feildmaster

changelog.md

@@ -1,5 +1,9 @@
 # UnderScript Changelog
 
+## Version 0.53.1 (2023-07-02)
+1. Fixed changelog
+1. Fixed friendship ranking not loading sometimes
+
 ## Version 0.53.0 (2023-05-23)
 ### New Features
 1. Added craft/disenchant protection to prevent double clicking

src/base/friendship/collect.js

@@ -53,7 +53,7 @@ function getLabel(type = '') {
   }
 }
 
-eventManager.on('Friendship:loaded', () => {
+eventManager.on(':loaded:Friendship', () => {
   button.prop('disabled', setting.value() || !canCollect());
 });
 

src/base/friendship/ranking.js

@@ -132,7 +132,7 @@ function displayRank(card, rank) {
 // TODO: This needs to be hooked into leaderboard
 // eventManager.on('updateFriendship', (data) => updateCache({ ...data, save: true }));
 
-eventManager.on('Friendship:load', () => {
+eventManager.on(':loaded:Friendship', () => {
   style.add(
     `.rank {
       position: relative;
@@ -188,30 +188,27 @@ eventManager.on('Friendship:load', () => {
     loaded = true;
   });
 
-  eventManager.on(':loaded', () => {
-    globalSet('appendCardFriendship', function func(card, ...args) {
-      const ret = this.super(card, ...args);
-      if (setting.value() !== disabled) {
-        const id = card.idCard || card.fixedId || card.id;
-        pending.push(pendingUpdate(id, card.xp)
-          .then(({ rank, cached }) => {
-            displayRank(id, rank);
-            return cached;
-          }));
-      }
-      return ret;
-    });
+  eventManager.on('Friendship:page', () => {
+    if (!pending.length) return;
+    Promise.all(pending.splice(0))
+      .then((vals = []) => {
+        const notAllCached = vals.some((val) => !val);
+        if (notAllCached) {
+          saveCache();
+        }
+      });
   });
 
-  eventManager.on('Friendship:page', () => {
-    if (pending.length) {
-      Promise.all(pending.splice(0))
-        .then((vals = []) => {
-          const notAllCached = vals.some((val) => !val);
-          if (notAllCached) {
-            saveCache();
-          }
-        });
+  globalSet('appendCardFriendship', function func(card, ...args) {
+    const ret = this.super(card, ...args);
+    if (setting.value() !== disabled) {
+      const id = card.idCard || card.fixedId || card.id;
+      pending.push(pendingUpdate(id, card.xp)
+        .then(({ rank, cached }) => {
+          displayRank(id, rank);
+          return cached;
+        }));
     }
+    return ret;
   });
 });

src/hooks/friendship.js

@@ -2,7 +2,7 @@ import eventManager from '../utils/eventManager.js';
 import { global } from '../utils/global.js';
 
 eventManager.on(':loaded:Friendship', () => {
-  eventManager.emit('Friendship:load');
+  eventManager.singleton.emit('Friendship:load');
   $(document).ajaxComplete((event, xhr, settings) => {
     if (settings.url !== 'FriendshipConfig') return;
     if (settings.type === 'GET') {