fix: More translation fixes

feildmaster · feildmaster · commit 6c05eb015b97 · 2019-06-01T06:40:02.000-05:00
diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,9 @@
 ## Version 0.26.3
 1. Fix quest notification
 1. Fix home page translations
+1. Fix legend user notification
+1. Fix legendary card draw notification
+1. Fix winstreak notification
 
 ## Version 0.26.2
 1. Fix battle log (again)
diff --git a/src/base/chat/legend.js b/src/base/chat/legend.js
@@ -16,22 +16,23 @@ wrap(() => {
     category: 'Legendary User',
   });
 
-  eventManager.on('preChat:getMessageAuto', function legend({message: text}) {
-    const index = text.indexOf(' has just reached ');
-    if (this.canceled || !~index) return;
+  const events = ['chat-new-legend'];
+  eventManager.on('preChat:getMessageAuto', function legend(data) {
+    const message = JSON.parse(JSON.parse(data.message).args);
+    if (this.canceled || !events.includes(message[0])) return;
     const handling = setting.value();
     const friendsOnly = friends.value();
     if (handling === 'Chat' && !friendsOnly) return; // All default
     const hidden = handling === 'Hidden';
     this.canceled = hidden || handling === 'Toast';
     if (hidden) return;
-    const user = text.substring(0, index);
+    const user = message[1];
     if (friendsOnly && !fn.isFriend(user)) {
       this.canceled = true;
       return;
     }
     fn.toast({
-      text,
+      text: translateFromServerJson(data.message),
       css: {
         color: 'yellow',
         footer: {color: 'white'},
diff --git a/src/base/chat/legendary.js b/src/base/chat/legendary.js
@@ -22,30 +22,32 @@ wrap(() => {
     return null;
   }
 
+  const events = ['chat-legendary-notification', 'chat-legendary-shiny-notification'];
   eventManager.on('preChat:getMessageAuto', function drawAnnouncement(data) {
+    const message = JSON.parse(JSON.parse(data.message).args);
+    if (this.canceled || !events.includes(message[0])) return;
     const setting = settings.value('underscript.announcement.draws');
-    const index = data.message.indexOf(' has just obtained ');
-    if (this.canceled || setting === 'chat' || !~index) return;
+    if (setting === 'chat') return;
     const both = setting === 'both';
     this.canceled = !both;
     if (both || setting === 'toast') {
-      const owner = data.message.substring(0, index);
-      const card = data.message.substring(index + 19, data.message.length - 2);
+      const owner = message[1];
+      const card = message[2];
 
       const last = getToast(owner);
       if (last) {
-        const text = `${owner} has just obtained ${last.cards.join(', ')} and ${card} !`;
-        last.setText(text);
-        last.time = Date.now(); // This toast is still relevant!
         last.cards.push(card);
+        message[2] = last.cards.join(', ');
+        last.setText(translateFromServerJson(JSON.stringify({args: JSON.stringify(message)})));
+        last.time = Date.now(); // This toast is still relevant!
         return;
       }
       if (toasts[toastIndex]) { // Close any old toast
         toasts[toastIndex].close();
       }
-      
+
       const toast = fn.toast({
-        text: data.message,
+        text: translateFromServerJson(data.message),
         css: {
           color: 'yellow',
           footer: {color: 'white'},
diff --git a/src/base/chat/winstreak.js b/src/base/chat/winstreak.js
@@ -38,15 +38,16 @@ wrap(() => {
     //return parseInt(amt, 10) >= settings.value('underscript.winstreak.count');
     return true;
   }
-  eventManager.on('preChat:getMessageAuto', function winstreaks({message: text}) {
-    if (this.canceled || !~text.indexOf('game winning streak !')) return;
+  const events = ['chat-user-ws', 'chat-user-ws-stop'];
+  eventManager.on('preChat:getMessageAuto', function winstreaks(data) {
+    const message = JSON.parse(JSON.parse(data.message).args);
+    if (this.canceled || !events.includes(message[0])) return;
     const handling = settings.value('underscript.winstreak');
     if (handling === 'Chat' && !friendsOnly()) return; // All default
     this.canceled = handling !== 'Chat' && handling !== 'Both';
     if (handling === 'Hidden') return;
-    const results = text.match(regex);
-    const username = results[1] || results[4];
-    const streak = results[2] || results[5];
+    const username = message[message.length - 2];
+    const streak = message[message.length - 1];
     if (!checkFriend(username) || !checkCount(streak)) {
       this.canceled = true;
       return;
