Merge remote-tracking branch 'origin/phillip/chat-skill-merge' into d…

…elta

website/server/libs/spells.js

@@ -241,6 +241,18 @@ async function castSpell (req, res, { isV3 = false }) {
     });
 
     if (party && !spell.silent) {
+      const lastMessages = await Chat.find({ groupId: group._id })
+        .limit(1)
+        .sort('-timestamp')
+        .exec();
+      if (lastMessages.size == 1) {
+        const lastMessage = lastMessages[0];
+        if (lastMessage.info.spell == spellId && lastMessage.info.user == user.profile.name) {
+          lastMessage.info.times += 1;
+          await lastMessage.save();
+          return;
+        }
+      }
       if (targetType === 'user') {
         const newChatMessage = party.sendChat({
           message: `\`${common.i18n.t('chatCastSpellUser', { username: user.profile.name, spell: spell.text(), target: partyMembers.profile.name }, 'en')}\``,
@@ -250,6 +262,7 @@ async function castSpell (req, res, { isV3 = false }) {
             class: klass,
             spell: spellId,
             target: partyMembers.profile.name,
+            times: 1
           },
         });
         await newChatMessage.save();
@@ -261,6 +274,7 @@ async function castSpell (req, res, { isV3 = false }) {
             user: user.profile.name,
             class: klass,
             spell: spellId,
+            times: 1
           },
         });
         await newChatMessage.save();