Skip to content

Commit 275280f

Browse files
author
topboy
committed
add all irc-framework event props to buf messages
1 parent e2ee3f8 commit 275280f

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

‎src/libs/IrcClient.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ function clientMiddleware(state, network) {
266266

267267
let serverBuffer = network.serverBuffer();
268268
state.addMessage(serverBuffer, {
269+
...event,
269270
time: eventTime,
270271
server_time: serverTime,
271272
nick: '',
@@ -345,6 +346,7 @@ function clientMiddleware(state, network) {
345346
// Only add this message if it does not match the previous message
346347
// Typing status messages can cause a spam of this error type
347348
state.addMessageNoRepeat(buffer, {
349+
...event,
348350
time: eventTime,
349351
server_time: serverTime,
350352
nick: '*',
@@ -369,6 +371,7 @@ function clientMiddleware(state, network) {
369371
}
370372

371373
state.addMessage(buffer, {
374+
...event,
372375
time: eventTime,
373376
server_time: serverTime,
374377
nick: '',
@@ -471,6 +474,7 @@ function clientMiddleware(state, network) {
471474
});
472475

473476
let message = {
477+
...event,
474478
time: eventTime,
475479
server_time: serverTime,
476480
nick: event.nick,
@@ -527,6 +531,7 @@ function clientMiddleware(state, network) {
527531
});
528532

529533
state.addMessage(buffer, {
534+
...event,
530535
time: eventTime,
531536
server_time: serverTime,
532537
nick: event.nick,
@@ -588,6 +593,7 @@ function clientMiddleware(state, network) {
588593
let typeExtra = (event.nick === client.user.nick) ? 'join_self' : 'join';
589594

590595
state.addMessage(buffer, {
596+
...event,
591597
time: eventTime,
592598
server_time: serverTime,
593599
nick: event.nick,
@@ -639,6 +645,7 @@ function clientMiddleware(state, network) {
639645
let typeExtra = (isUserInvolved) ? 'kick_self' : 'kick';
640646

641647
state.addMessage(buffer, {
648+
...event,
642649
time: eventTime,
643650
server_time: serverTime,
644651
nick: event.nick,
@@ -686,6 +693,7 @@ function clientMiddleware(state, network) {
686693
let typeExtra = (event.nick === client.user.nick) ? 'part_self' : 'part';
687694

688695
state.addMessage(buffer, {
696+
...event,
689697
time: eventTime,
690698
server_time: serverTime,
691699
nick: event.nick,
@@ -728,6 +736,7 @@ function clientMiddleware(state, network) {
728736
let typeExtra = (event.nick === client.user.nick) ? 'quit_self' : 'quit';
729737

730738
state.addMessage(buffer, {
739+
...event,
731740
time: eventTime,
732741
server_time: serverTime,
733742
nick: event.nick,
@@ -765,6 +774,7 @@ function clientMiddleware(state, network) {
765774
}
766775

767776
state.addMessage(buffer, {
777+
...event,
768778
nick: '',
769779
time: eventTime,
770780
server_time: serverTime,
@@ -813,6 +823,7 @@ function clientMiddleware(state, network) {
813823
if (buffer && event.nick === client.user.nick) {
814824
network.away = 'away';
815825
state.addMessage(buffer, {
826+
...event,
816827
time: eventTime,
817828
server_time: serverTime,
818829
nick: '*',
@@ -831,6 +842,7 @@ function clientMiddleware(state, network) {
831842
if (buffer && event.nick === client.user.nick) {
832843
network.away = '';
833844
state.addMessage(buffer, {
845+
...event,
834846
time: eventTime,
835847
server_time: serverTime,
836848
nick: '*',
@@ -905,6 +917,7 @@ function clientMiddleware(state, network) {
905917
text: event.motd,
906918
});
907919
state.addMessage(buffer, {
920+
...event,
908921
time: eventTime,
909922
server_time: serverTime,
910923
nick: '',
@@ -931,6 +944,7 @@ function clientMiddleware(state, network) {
931944
);
932945

933946
let message = {
947+
...event,
934948
time: eventTime,
935949
server_time: serverTime,
936950
nick: '',
@@ -981,6 +995,7 @@ function clientMiddleware(state, network) {
981995
}
982996

983997
state.addMessage(buffer, {
998+
...event,
984999
time: eventTime,
9851000
server_time: serverTime,
9861001
nick: '',
@@ -1076,6 +1091,7 @@ function clientMiddleware(state, network) {
10761091

10771092
if (buffer.flags.requested_modes) {
10781093
state.addMessage(buffer, {
1094+
...event,
10791095
time: eventTime,
10801096
server_time: serverTime,
10811097
nick: '*',
@@ -1095,6 +1111,7 @@ function clientMiddleware(state, network) {
10951111
(new Date(event.created_at * 1000)).toLocaleString();
10961112

10971113
state.addMessage(buffer, {
1114+
...event,
10981115
time: eventTime,
10991116
server_time: serverTime,
11001117
nick: '*',
@@ -1268,6 +1285,7 @@ function clientMiddleware(state, network) {
12681285
'';
12691286

12701287
state.addMessage(buffer, {
1288+
...event,
12711289
time: eventTime,
12721290
server_time: serverTime,
12731291
nick: '',
@@ -1343,6 +1361,7 @@ function clientMiddleware(state, network) {
13431361
text,
13441362
});
13451363
state.addMessage(serverBuffer, {
1364+
...event,
13461365
time: eventTime,
13471366
server_time: serverTime,
13481367
nick: '',
@@ -1377,6 +1396,7 @@ function clientMiddleware(state, network) {
13771396
}
13781397

13791398
state.addMessage(targetBuffer, {
1399+
...event,
13801400
time: eventTime,
13811401
server_time: serverTime,
13821402
nick: '',
@@ -1413,6 +1433,7 @@ function clientMiddleware(state, network) {
14131433
}
14141434

14151435
state.addMessage(targetBuffer, {
1436+
...event,
14161437
time: eventTime,
14171438
server_time: serverTime,
14181439
nick: '',
@@ -1451,6 +1472,7 @@ function clientMiddleware(state, network) {
14511472

14521473
if (messageBody) {
14531474
state.addMessage(buffer, {
1475+
...event,
14541476
time: eventTime,
14551477
server_time: serverTime,
14561478
nick: '',
@@ -1472,6 +1494,7 @@ function clientMiddleware(state, network) {
14721494
if (command === 'help') {
14731495
let buffer = state.getOrAddBufferByName(networkid, '*help');
14741496
state.addMessage(buffer, {
1497+
...event,
14751498
time: eventTime,
14761499
server_time: serverTime,
14771500
nick: '',
@@ -1493,6 +1516,7 @@ function clientMiddleware(state, network) {
14931516
});
14941517

14951518
state.addMessage(buffer, {
1519+
...event,
14961520
time: eventTime,
14971521
server_time: serverTime,
14981522
nick: '',
@@ -1514,6 +1538,7 @@ function clientMiddleware(state, network) {
15141538
});
15151539
let buffer = state.getActiveBuffer();
15161540
state.addMessage(buffer, {
1541+
...event,
15171542
time: eventTime,
15181543
server_time: serverTime,
15191544
nick: '',
@@ -1546,6 +1571,7 @@ function clientMiddleware(state, network) {
15461571

15471572
buffers.forEach((buffer) => {
15481573
state.addMessage(buffer, {
1574+
...event,
15491575
time: Date.now(),
15501576
nick: '',
15511577
message: messageBody,
@@ -1578,6 +1604,7 @@ function clientMiddleware(state, network) {
15781604
// Only add messages if the client is not going to disconnect on failure
15791605
buffers.forEach((buffer) => {
15801606
state.addMessage(buffer, {
1607+
...event,
15811608
time: Date.now(),
15821609
nick: '',
15831610
message: failMessage,
@@ -1630,6 +1657,7 @@ function clientMiddleware(state, network) {
16301657
});
16311658

16321659
let message = {
1660+
...event,
16331661
time: eventTime,
16341662
server_time: serverTime,
16351663
nick: '',

0 commit comments

Comments
 (0)