IcyNetwork/teemant-old
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed? something?

Browse Source
This commit is contained in:
Evert Prants 2016-09-25 16:22:20 +03:00
parent 2d22402cb0
commit bcc0b86ed9
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/main.css
View File

@ -180,7 +180,7 @@ body {
bottom: 46px; bottom: 46px;
} }
.ircclient #chat .ircwrapper .chatarea .smsc-nicklistbtn { .ircclient #chat .ircwrapper .chatarea .smsc-nicklistbtn {
background-image: url("image/users.svg"); background-image: url("../image/users.svg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
width: 46px; width: 46px;
@ -313,7 +313,7 @@ body {
box-shadow: inset 4px 4px 8px #d8d8d8; box-shadow: inset 4px 4px 8px #d8d8d8;
} }
.ircclient #chat .ircwrapper .input .sendbutton { .ircclient #chat .ircwrapper .input .sendbutton {
background-image: url("image/send.svg"); background-image: url("../image/send.svg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
width: 32px; width: 32px;

18
public/js/main.js
View File

@ -156,6 +156,8 @@ irc.whoisMessage = function(whoisData, buffer) {
break; break;
case "loggedIn": case "loggedIn":
case "registered": case "registered":
case "connectingFrom":
case "usingModes":
case "title": case "title":
messages.push(whoisData[key]); messages.push(whoisData[key]);
break; break;
@ -602,9 +604,11 @@ class Buffer {
appendMessage(meta) { appendMessage(meta) {
let mesgConstr = composer.message[irc.chatType](meta.time, meta.sender, meta.message, meta.type); let mesgConstr = composer.message[irc.chatType](meta.time, meta.sender, meta.message, meta.type);
if((meta.type == "privmsg" || meta.type == "notice" || meta.type == "action") && if(irc.serverData[this.server]) {
meta.message.indexOf(irc.serverData[this.server].my_nick) != -1) if((meta.type == "privmsg" || meta.type == "notice" || meta.type == "action") &&
addClass(mesgConstr, "mentioned"); meta.message.indexOf(irc.serverData[this.server].my_nick) != -1)
addClass(mesgConstr, "mentioned");
}
clientdom.letterbox.appendChild(mesgConstr); clientdom.letterbox.appendChild(mesgConstr);
@ -631,9 +635,11 @@ class Buffer {
this.appendMessage(mesg); this.appendMessage(mesg);
} else { } else {
this.unreadCount += 1; this.unreadCount += 1;
if((type == "privmsg" || type == "notice" || type == "action") && if(irc.serverData[this.server]) {
message.indexOf(irc.serverData[this.server].my_nick) != -1) if((type == "privmsg" || type == "notice" || type == "action") &&
console.log("TODO: notify user of mentioned"); message.indexOf(irc.serverData[this.server].my_nick) != -1)
console.log("TODO: notify user of mentioned");
}
} }
this.tab.setUnreadCount(this.unreadCount); this.tab.setUnreadCount(this.unreadCount);

4
public/main.styl
View File

@ -161,7 +161,7 @@ body
width: 100%; width: 100%;
bottom: 46px; bottom: 46px;
.smsc-nicklistbtn .smsc-nicklistbtn
background-image: url(image/users.svg); background-image: url(../image/users.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
width: 46px; width: 46px;
@ -277,7 +277,7 @@ body
border-left: 0 border-left: 0
box-shadow: inset 4px 4px 8px #d8d8d8 box-shadow: inset 4px 4px 8px #d8d8d8
.sendbutton .sendbutton
background-image: url(image/send.svg); background-image: url(../image/send.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
width: 32px; width: 32px;

14
server/irc.js
View File

@ -269,6 +269,18 @@ class IRCConnectionHandler {
}; };
this.whoisManage(line.arguments[1], list); this.whoisManage(line.arguments[1], list);
break; break;
case "378":
list = {
connectingFrom: line.trailing,
};
this.whoisManage(line.arguments[1], list);
break;
case "379":
list = {
usingModes: line.trailing,
};
this.whoisManage(line.arguments[1], list);
break;
case "312": case "312":
list = { list = {
server: line.arguments[2], server: line.arguments[2],
@ -431,7 +443,7 @@ class IRCConnection extends EventEmitter {
this.socket.write('PASS {0}\r\n'.format(this.config.password)); this.socket.write('PASS {0}\r\n'.format(this.config.password));
let serverpass = webirc.get_password(this.config.address); let serverpass = webirc.get_password(this.config.address);
if(serverpass) if(serverpass)
this.socket.write('WEBIRC {0} cgiirc {1} {2}\r\n'.format(serverpass, this.userInfo.hostname, this.userInfo.ipaddr)); this.socket.write('WEBIRC {0} cgiirc {1} {2}\r\n'.format(serverpass, this.userInfo.hostname, this.userInfo.ipaddr));