moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-22 08:52:18 -05:00
Code Issues Releases Wiki Activity

On own nick change: Display message in server info window (Your are now known as ...). Fixes #51.

Browse Source
This commit is contained in:
Sebastian Kaspari 2011-04-15 20:30:41 +02:00
parent c6dbe8cc18
commit 50a6047edd
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/res/values/strings.xml
View File

@ -124,6 +124,7 @@
<string name="message_join">%1$s joins</string> <string name="message_join">%1$s joins</string>
<string name="message_kick">%1$s kicks %2$s</string> <string name="message_kick">%1$s kicks %2$s</string>
<string name="message_rename">%1$s is now known as %2$s</string> <string name="message_rename">%1$s is now known as %2$s</string>
<string name="message_self_rename">You are now known as %1$s</string>
<string name="message_op">%1$s ops %2$s</string> <string name="message_op">%1$s ops %2$s</string>
<string name="message_part">%1$s parts</string> <string name="message_part">%1$s parts</string>
<string name="message_quit">%1$s quits (%2$s)</string> <string name="message_quit">%1$s quits (%2$s)</string>

23
application/src/org/jibble/pircbot/PircBot.java
View File

@ -877,14 +877,27 @@ public abstract class PircBot implements ReplyConstants {
String errorStr = token; String errorStr = token;
String response = line.substring(line.indexOf(errorStr, senderInfo.length()) + 4, line.length()); String response = line.substring(line.indexOf(errorStr, senderInfo.length()) + 4, line.length());
this.processServerResponse(code, response);
if (code == 433 && !_registered) { if (code == 433 && !_registered) {
if (_autoNickChange) { if (_autoNickChange) {
String oldNick = _nick;
List<String> aliases = getAliases(); List<String> aliases = getAliases();
_autoNickTries++; _autoNickTries++;
_nick = ((_autoNickTries - 1) <= aliases.size()) ?
aliases.get(_autoNickTries - 2) : if (_autoNickTries - 1 <= aliases.size()) {
getName() + (_autoNickTries - aliases.size()); // Try next alias
this.sendRawLineViaQueue("NICK " + _nick); _nick = aliases.get(_autoNickTries - 2);
} else {
// Append a number to the nickname
_nick = getName() + (_autoNickTries - aliases.size());
}
// Notify ourself about the change
this.onNickChange(oldNick, getLogin(), "", _nick);
this.sendRawLineViaQueue("NICK " + _nick);
} }
else { else {
_socket.close(); _socket.close();
@ -893,8 +906,6 @@ public abstract class PircBot implements ReplyConstants {
} }
} }
this.processServerResponse(code, response);
// Return from the method.
return; return;
} }
else { else {

13
application/src/org/yaaic/irc/IRCConnection.java
View File

@ -455,6 +455,19 @@ public class IRCConnection extends PircBot
{ {
if (getNick().equalsIgnoreCase(newNick)) { if (getNick().equalsIgnoreCase(newNick)) {
this.updateNickMatchPattern(); this.updateNickMatchPattern();
// Send message about own change to server info window
Message message = new Message(service.getString(R.string.message_self_rename, newNick));
message.setColor(Message.COLOR_GREEN);
server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
Intent intent = Broadcast.createConversationIntent(
Broadcast.CONVERSATION_MESSAGE,
server.getId(),
ServerInfo.DEFAULT_NAME
);
service.sendBroadcast(intent);
} }
Vector<String> channels = getChannelsByNickname(newNick); Vector<String> channels = getChannelsByNickname(newNick);