diff options
| author | dor <dor1_b@walla.com> | 2014-03-14 23:27:33 +0200 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir@cohens.org.il> | 2014-03-16 03:06:05 +0200 |
| commit | 6e7c77e22283459834aea09b870418decc266450 (patch) | |
| tree | db72eea44e495f8168f22e922ce13e1db8d061db | |
| parent | ae8ee6e3e1f934de65bb3b7b4f142968fdc24788 (diff) | |
Server: print proper nicks on privmsg.
* print user can now provide ditalese of diffrent client.
* print also space before the message.
| -rw-r--r-- | src/Server/Client.java | 2 | ||||
| -rw-r--r-- | src/Server/CommandsTable.java | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/Server/Client.java b/src/Server/Client.java index f7e6eae..f7d015b 100644 --- a/src/Server/Client.java +++ b/src/Server/Client.java @@ -36,7 +36,7 @@ public class Client /** returning the host name */ public String getHostname() { - return "me"; + return "myhost"; } /** returning the user name */ public String getUsername() diff --git a/src/Server/CommandsTable.java b/src/Server/CommandsTable.java index 4ae3651..d1d093c 100644 --- a/src/Server/CommandsTable.java +++ b/src/Server/CommandsTable.java @@ -47,10 +47,17 @@ abstract class Command } } + public void printUser(Client client, String str) { + printUser (client ,client, str); + } + + + public void printUser(Client client,Client sender, String str) + { try { - client.println(":" + client.getNick() + "!" + client.getUsername() + "@" + client.getHostname() + str); + client.println(":" + sender .getNick() + "!" + client.getUsername() + "@" + client.getHostname() + " " + str); } catch (IOException e) { System.err.println("Failed to print to client socket: <" + str + "> (" + e + ")"); } @@ -85,7 +92,7 @@ class CommandPrivmsg extends Command continue; } ports += con.toString(); - this.println(con.getClient(), "PRIVMSG " + starr[0] + " :" + line); + this.printUser(con.getClient(), client, "PRIVMSG " + starr[0] + " :" + line); } System.err.println("printed message to ports: " + ports); } @@ -113,7 +120,7 @@ class CommandJoin extends Command { // FIXME : parse args to channel names and save client state // but right now everybody is on a single channel - this.printUser(client, " JOIN " + ":" + args); + this.printUser(client, "JOIN " + ":" + args); this.println(client, "332 " + client.getNick() + " " + args + " :Welcome to the single channel"); //this.println(client, "333 " + client.getNick()) + args + "someone!somewhere"; } |