moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-23 01:12:17 -05:00
Code Issues Releases Wiki Activity

Improve detection for nickname in messages. This will prevent notifications from poping up when a word contains the nickname.

Browse Source
This commit is contained in:
liato 2010-11-17 02:36:52 +01:00
parent 81f2c94b87
commit f5b5b99adb
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ package org.yaaic.irc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Vector; import java.util.Vector;
import java.util.regex.Pattern;
import android.content.Intent; import android.content.Intent;
@ -52,6 +53,7 @@ public class IRCConnection extends PircBot
private IRCService service; private IRCService service;
private Server server; private Server server;
private ArrayList<String> autojoinChannels; private ArrayList<String> autojoinChannels;
private Pattern mNickMatch;
/** /**
* Create a new connection * Create a new connection
@ -68,6 +70,7 @@ public class IRCConnection extends PircBot
this.setAutoNickChange(true); this.setAutoNickChange(true);
this.setFinger("http://www.youtube.com/watch?v=oHg5SJYRHA0"); this.setFinger("http://www.youtube.com/watch?v=oHg5SJYRHA0");
this.updateNickMatchPattern();
} }
/** /**
@ -78,6 +81,7 @@ public class IRCConnection extends PircBot
public void setNickname(String nickname) public void setNickname(String nickname)
{ {
this.setName(nickname); this.setName(nickname);
this.updateNickMatchPattern();
} }
/** /**
@ -156,6 +160,7 @@ public class IRCConnection extends PircBot
// execute commands // execute commands
CommandParser parser = CommandParser.getInstance(); CommandParser parser = CommandParser.getInstance();
this.updateNickMatchPattern();
for (String command : server.getConnectCommands()) { for (String command : server.getConnectCommands()) {
parser.parse(command, server, server.getConversation(ServerInfo.DEFAULT_NAME), service); parser.parse(command, server, server.getConversation(ServerInfo.DEFAULT_NAME), service);
} }
@ -192,7 +197,7 @@ public class IRCConnection extends PircBot
Message message = new Message(sender + " " + action); Message message = new Message(sender + " " + action);
message.setIcon(R.drawable.action); message.setIcon(R.drawable.action);
if (action.contains(getNick())) { if (isMentioned(action)) {
// highlight // highlight
message.setColor(Message.COLOR_RED); message.setColor(Message.COLOR_RED);
service.updateNotification(target + ": " + sender + " " + action, service.getSettings().isVibrateHighlightEnabled()); service.updateNotification(target + ": " + sender + " " + action, service.getSettings().isVibrateHighlightEnabled());
@ -387,7 +392,7 @@ public class IRCConnection extends PircBot
Message message = new Message(text, sender); Message message = new Message(text, sender);
if (text.contains(getNick())) { if (isMentioned(text)) {
// highlight // highlight
message.setColor(Message.COLOR_RED); message.setColor(Message.COLOR_RED);
service.updateNotification(target + ": <" + sender + "> " + text, service.getSettings().isVibrateHighlightEnabled()); service.updateNotification(target + ": <" + sender + "> " + text, service.getSettings().isVibrateHighlightEnabled());
@ -428,6 +433,9 @@ public class IRCConnection extends PircBot
@Override @Override
protected void onNickChange(String oldNick, String login, String hostname, String newNick) protected void onNickChange(String oldNick, String login, String hostname, String newNick)
{ {
if (getNick().equalsIgnoreCase(newNick)) {
this.updateNickMatchPattern();
}
Vector<String> channels = getChannelsByNickname(newNick); Vector<String> channels = getChannelsByNickname(newNick);
for (String target : channels) { for (String target : channels) {
@ -534,7 +542,7 @@ public class IRCConnection extends PircBot
Message message = new Message("<" + sender + "> " + text); Message message = new Message("<" + sender + "> " + text);
if (text.contains(getNick())) { if (isMentioned(text)) {
message.setColor(Message.COLOR_RED); message.setColor(Message.COLOR_RED);
service.updateNotification("<" + sender + "> " + text, service.getSettings().isVibrateHighlightEnabled()); service.updateNotification("<" + sender + "> " + text, service.getSettings().isVibrateHighlightEnabled());
@ -1114,4 +1122,21 @@ public class IRCConnection extends PircBot
} }
}.start(); }.start();
} }
/**
* Check whether the nickname has been mentioned.
*
* @param text The text to check for the nickname
* @return true if nickname was found, otherwise false
*/
public boolean isMentioned(String text) {
return mNickMatch.matcher(text).find();
}
/**
* Update the nick matching pattern, should be called when the nickname changes.
*/
private void updateNickMatchPattern() {
mNickMatch = Pattern.compile("(?:^|[\\s?:;,.])"+Pattern.quote(getNick())+"(?:[\\s?:;,.]|$)", Pattern.CASE_INSENSITIVE);
}
} }