code.ivysaur.me/nmdc-ircfrontend
1
0
Fork 0
Code Issues 9 Pull Requests Releases 7 Wiki Activity

use full info when relaying PRIVMSG, fixes display in andchat

Browse Source 
--HG--
branch : nmdc-ircfrontend
This commit is contained in:
. 2016-05-07 18:38:25 +12:00
parent 849bb925cb
commit 36ad701b3b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO.txt
View File

@ -5,11 +5,9 @@ PRE-RELEASE
- hexchat: missing nick list - hexchat: missing nick list
--- works if we reply NAMES to WHO queries, but that throws andchat --- works if we reply NAMES to WHO queries, but that throws andchat
- Atomic: fix crash on connection (even with autojoin disabled) - yaaic/atomic: doesn't recognise the room join (even with autojoin disabled)
- yaaic: doesn't recognise the room join (even with autojoin disabled) - andchat: system message styling
- andchat: user nicks not appearing in < angle brackets >
- part all nicks upon upstream server disconnection - part all nicks upon upstream server disconnection

7
server.go
View File

@ -159,6 +159,7 @@ func (s *Server) upstreamWorker() {
switch hubEvent.EventType { switch hubEvent.EventType {
case libnmdc.EVENT_USER_JOINED: case libnmdc.EVENT_USER_JOINED:
s.reply(rplJoin, hubEvent.Nick, BLESSED_CHANNEL) s.reply(rplJoin, hubEvent.Nick, BLESSED_CHANNEL)
// If we want to JOIN with the full power of the supplied nick!user@host, then we'll need to actually remember the active client's USER parameters
case libnmdc.EVENT_USER_PART: case libnmdc.EVENT_USER_PART:
s.reply(rplPart, hubEvent.Nick, BLESSED_CHANNEL, "Disconnected") s.reply(rplPart, hubEvent.Nick, BLESSED_CHANNEL, "Disconnected")
@ -173,13 +174,15 @@ func (s *Server) upstreamWorker() {
s.sendChannelTopic(hubEvent.Nick) s.sendChannelTopic(hubEvent.Nick)
case libnmdc.EVENT_PRIVATE: case libnmdc.EVENT_PRIVATE:
s.reply(rplMsg, hubEvent.Nick, s.upstreamLauncher.Self.Nick, hubEvent.Message) //s.reply(rplMsg, hubEvent.Nick, s.upstreamLauncher.Self.Nick, hubEvent.Message)
s.reply(rplMsg, hubEvent.Nick+"!"+hubEvent.Nick+"@"+hubEvent.Nick, s.upstreamLauncher.Self.Nick, hubEvent.Message)
case libnmdc.EVENT_PUBLIC: case libnmdc.EVENT_PUBLIC:
if hubEvent.Nick == s.upstreamLauncher.Self.Nick && hubEvent.Message == s.lastMessage { if hubEvent.Nick == s.upstreamLauncher.Self.Nick && hubEvent.Message == s.lastMessage {
s.lastMessage = "" // irc doesn't echo our own pubchat s.lastMessage = "" // irc doesn't echo our own pubchat
} else { } else {
s.reply(rplMsg, hubEvent.Nick, BLESSED_CHANNEL, hubEvent.Message) // s.reply(rplMsg, hubEvent.Nick, BLESSED_CHANNEL, hubEvent.Message)
s.reply(rplMsg, hubEvent.Nick+"!"+hubEvent.Nick+"@"+hubEvent.Nick, BLESSED_CHANNEL, hubEvent.Message)
} }
case libnmdc.EVENT_SYSTEM_MESSAGE_FROM_CONN, libnmdc.EVENT_SYSTEM_MESSAGE_FROM_HUB: case libnmdc.EVENT_SYSTEM_MESSAGE_FROM_CONN, libnmdc.EVENT_SYSTEM_MESSAGE_FROM_HUB: