Merge pull request #360 from progval/account

Add missing 'account' property on 'ctcp response' and 'tagmsg'
kiwiirc · Jun 9, 2023 · a609363 · a609363
2 parents 8098298 + 15144f4
commit a609363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/docs/events.md b/docs/events.md
@@ -355,7 +355,8 @@ sent from the server or a user.
     group: '@',
     message: 'A message to all channel ops',
     tags: [],
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -371,7 +372,8 @@ Also triggers a **message** event with .type = 'action'
     target: '#channel',
     message: 'slaps someuser around a bit with a large trout',
     tags: [],
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -387,7 +389,8 @@ Also triggers a **message** event with .type = 'privmsg'
     target: '#channel',
     message: 'Hello everybody',
     tags: [],
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -402,7 +405,8 @@ Also triggers a **message** event with .type = 'privmsg'
     tags: {
         example: 'hello'
     },
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -414,7 +418,8 @@ Also triggers a **message** event with .type = 'privmsg'
     hostname: 'manchester.isp.net',
     target: 'someuser',
     message: 'VERSION kiwiirc',
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -431,7 +436,8 @@ The `VERSION` CTCP is handled internally and will not trigger this event, unless
     target: 'someuser',
     type: 'VERSION',
     message: 'VERSION and remaining text',
-    time: 000000000
+    time: 000000000,
+    account: 'account_name'
 }
 ~~~
 
@@ -443,7 +449,8 @@ The `VERSION` CTCP is handled internally and will not trigger this event, unless
     nick: 'prawnsalad',
     ident: 'prawn',
     hostname: 'manchester.isp.net',
-    message: 'This is a server-wide message'
+    message: 'This is a server-wide message',
+    account: 'account_name'
 }
 ~~~
 

diff --git a/src/commands/handlers/messaging.js b/src/commands/handlers/messaging.js
@@ -23,6 +23,7 @@ const handlers = {
                 type: (message.substring(1, message.length - 1).split(' ') || [null])[0],
                 message: message.substring(1, message.length - 1),
                 time: time,
+                account: command.getTag('account'),
                 tags: command.tags
             });
         } else {
@@ -125,6 +126,7 @@ const handlers = {
             target: target,
             tags: command.tags,
             time: time,
+            account: command.getTag('account'),
             batch: command.batch
         });
     },