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

CommandParser now uses conversations instead of channels

Browse Source
This commit is contained in:
Sebastian Kaspari 2010-03-10 20:58:37 +01:00
parent d30360b606
commit 47ee4d1d6e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/yaaic/command/CommandParser.java
View File

@ -36,7 +36,7 @@ import org.yaaic.command.handler.TopicHandler;
import org.yaaic.command.handler.VoiceHandler; import org.yaaic.command.handler.VoiceHandler;
import org.yaaic.irc.IRCService; import org.yaaic.irc.IRCService;
import org.yaaic.model.Broadcast; import org.yaaic.model.Broadcast;
import org.yaaic.model.Channel; import org.yaaic.model.Conversation;
import org.yaaic.model.Message; import org.yaaic.model.Message;
import org.yaaic.model.Server; import org.yaaic.model.Server;
@ -105,7 +105,7 @@ public class CommandParser
* *
* @param line * @param line
*/ */
public void parse(String line, Server server, Channel channel, IRCService service) public void parse(String line, Server server, Conversation conversation, IRCService service)
{ {
line = line.trim().substring(1); // cut the slash line = line.trim().substring(1); // cut the slash
String[] params = line.split(" "); String[] params = line.split(" ");
@ -114,33 +114,33 @@ public class CommandParser
if (isCommand(type)) { if (isCommand(type)) {
BaseHandler command = commands.get(type); BaseHandler command = commands.get(type);
try { try {
command.execute(params, server, channel, service); command.execute(params, server, conversation, service);
} catch(CommandException e) { } catch(CommandException e) {
// Wrong number of params // Wrong number of params
if (channel != null) { if (conversation != null) {
Message errorMessage = new Message(type + ": " + e.getMessage()); Message errorMessage = new Message(type + ": " + e.getMessage());
errorMessage.setColor(Message.COLOR_RED); errorMessage.setColor(Message.COLOR_RED);
channel.addMessage(errorMessage); conversation.addMessage(errorMessage);
Message usageMessage = new Message("Syntax: " + command.getUsage()); Message usageMessage = new Message("Syntax: " + command.getUsage());
channel.addMessage(usageMessage); conversation.addMessage(usageMessage);
Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE); Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE);
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
intent.putExtra(Broadcast.EXTRA_CHANNEL, channel.getName()); intent.putExtra(Broadcast.EXTRA_CHANNEL, conversation.getName());
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
} else { } else {
// Unknown command // Unknown command
if (channel != null) { if (conversation != null) {
Message message = new Message("Unknown command: " + type); Message message = new Message("Unknown command: " + type);
message.setColor(Message.COLOR_RED); message.setColor(Message.COLOR_RED);
channel.addMessage(message); conversation.addMessage(message);
Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE); Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE);
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
intent.putExtra(Broadcast.EXTRA_CHANNEL, channel.getName()); intent.putExtra(Broadcast.EXTRA_CHANNEL, conversation.getName());
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }