projects
/
KiwiIRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
299a4c3
)
channel:join + channel:leave plugin events
author
Darren
<darren@darrenwhitlen.com>
Fri, 28 Nov 2014 18:33:11 +0000
(18:33 +0000)
committer
Darren
<darren@darrenwhitlen.com>
Fri, 28 Nov 2014 18:33:11 +0000
(18:33 +0000)
client/src/models/network.js
patch
|
blob
|
blame
|
history
diff --git
a/client/src/models/network.js
b/client/src/models/network.js
index edd23a4b68773db49abecfd0f93fbd3b836d1e28..f4f46f21537ad5c51daa4d1d63b5902e415afdf0 100644
(file)
--- a/
client/src/models/network.js
+++ b/
client/src/models/network.js
@@
-344,7
+344,11
@@
hostname: event.hostname,
user_prefixes: this.get('user_prefixes')
});
hostname: event.hostname,
user_prefixes: this.get('user_prefixes')
});
- members.add(user, {kiwi: event});
+
+ _kiwi.global.events.emit('channel:join', {channel: event.channel, user: user})
+ .then(function() {
+ members.add(user, {kiwi: event});
+ });
}
}
@@
-372,7
+376,10
@@
user = members.getByNick(event.nick);
if (!user) return;
user = members.getByNick(event.nick);
if (!user) return;
- members.remove(user, {kiwi: part_options});
+ _kiwi.global.events.emit('channel:leave', {channel: event.channel, user: user, type: 'part', message: part_options.message})
+ .then(function() {
+ members.remove(user, {kiwi: part_options});
+ });
}
}
@@
-398,7
+405,10
@@
if (panel.isChannel()) {
member = panel.get('members').getByNick(event.nick);
if (member) {
if (panel.isChannel()) {
member = panel.get('members').getByNick(event.nick);
if (member) {
- panel.get('members').remove(member, {kiwi: quit_options});
+ _kiwi.global.events.emit('channel:leave', {channel: panel.get('name'), user: member, type: 'quit', message: part_options.message})
+ .then(function() {
+ panel.get('members').remove(member, {kiwi: quit_options});
+ });
}
}
});
}
}
});
@@
-427,11
+437,14
@@
if (!user) return;
if (!user) return;
- members.remove(user, {kiwi: part_options});
+ _kiwi.global.events.emit('channel:leave', {channel: event.channel, user: user, type: 'kick', message: part_options.message})
+ .then(function() {
+ members.remove(user, {kiwi: part_options});
- if (part_options.current_user_kicked) {
- members.reset([]);
- }
+ if (part_options.current_user_kicked) {
+ members.reset([]);
+ }
+ });
}
}