From 80d9a640715129560b66c037d8af5e1ca05e27b3 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Thu, 5 Mar 2009 10:42:25 +0100
Subject: [PATCH] _error_necessary_nick_local for /kill

---
 CHANGESTODO                   |  6 +++---
 world/default/de/plain.textdb | 15 +++++++++------
 world/default/en/plain.textdb |  3 +++
 world/net/usercmd.i           | 17 ++++++++++++++---
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index 20abf3b..030cd4c 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -6,10 +6,10 @@ Essentially: whenever you fix something, move that line to the end of file.
 ________________________________________________________________________
 == NEXT RELEASE ========================================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
-? what happens if i /alias an autoalias?
-- and commands like /kill do not see the autoaliases...
-
 ? support tls multiplexing on all suitable ports
+
+- pointless to keep gentoo files in this git, if they can't be updated
+  separately
 ________________________________________________________________________
 == currently being inspected ===========================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
diff --git a/world/default/de/plain.textdb b/world/default/de/plain.textdb
index 00ebead..cc5515d 100644
--- a/world/default/de/plain.textdb
+++ b/world/default/de/plain.textdb
@@ -1,6 +1,9 @@
 <PSYC:TEXTDB> ## vim:syntax=mail
 ## Check utf-8: Praise Atatürk!
 
+_error_necessary_nick_local
+|Dieser Befehl akzeptiert nur lokale Spitznamen.
+
 _failure_unavailable_alias
 |Kein Name für [_uniform_new]: [_nick_old] gehört bereits [_uniform_old].
 
@@ -1720,10 +1723,10 @@ _warning_usage_auto
 |Syntax: /[_nick] <beschreibung>
 
 _warning_usage_tell
-|Syntax: /tell <nickname> <nachricht>
+|Syntax: /tell <Spitzname> <Nachricht>
 
 _warning_usage_notify
-|Syntax: /notify <nickname> [ i(mmediate),d(elayed),D(elayedMore) ]
+|Syntax: /notify <Spitzname> [ i(mmediate),d(elayed),D(elayedMore) ]
 
 _warning_usage_acquaintance
 |Syntax: /ignore oder /display <person>
@@ -1754,10 +1757,10 @@ _warning_usage_unalias
 |Syntax: /unalias <Aliasname>
 
 _warning_usage_kill
-|Syntax: /kill <Person> [<Nachricht>]
+|Syntax: /kill <Spitzname> [<Nachricht>]
 
 _warning_usage_warn
-|Syntax: /warn <Person> [<Nachricht>]
+|Syntax: /warn <Spitzname> [<Nachricht>]
 
 _echo_kill
 |[_entity] gekillt.
@@ -1769,10 +1772,10 @@ _warning_usage_invite
 |Syntax: /invite <Person>
 
 _warning_usage_query
-|Syntax: /talk <nickname> und /talk zum Beenden des Zwiegesprächs.
+|Syntax: /talk <Spitzname> und /talk zum Beenden des Zwiegesprächs.
 
 _warning_usage_friend
-|Syntax: /friend <nickname> oder /unfriend <nickname>
+|Syntax: /friend <Spitzname> oder /unfriend <Spitzname>
 
 _warning_usage_authenticate
 |Syntax: /auth(enticate) <Spitzname|psycUNI>
diff --git a/world/default/en/plain.textdb b/world/default/en/plain.textdb
index 7ec5fba..8bfc102 100644
--- a/world/default/en/plain.textdb
+++ b/world/default/en/plain.textdb
@@ -1,6 +1,9 @@
 <PSYC:TEXTDB> ## vim:syntax=mail
 ## Check utf-8: Praise Atatürk!
 
+_error_necessary_nick_local
+|This command only accepts local nicknames.
+
 _failure_unavailable_alias
 |No alias for [_uniform_new]: [_nick_old] already belongs to [_uniform_old].
 
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index 616ee64..b3a7bd4 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -1367,12 +1367,23 @@ cmd(a, args, dest, command) {
 		if (boss(ME)) switch(a) {
 		case "warn":
 		case "kill":
-			if (sizeof(args) > 1) ob = find_person(args[1]);
-			else {
+			unless (sizeof(args) > 1) {
 				w("_warning_usage_"+a,
 				  "Usage: /"+a+" <nick> [<message>]");
 				return 1;
 			}
+#if 0 //def ALIASES
+			// makes no sense for this command to support aliases
+			t3 = aliases[t3 = lower_case(args[1])] || t3;
+#else
+			t3 = args[1];
+#endif
+			// learn to accept local uniforms, too?
+			if (is_formal(t3)) {
+				w("_error_necessary_nick_local");
+				return 1;
+			}
+		       	ob = find_person(t3);
 			if (ob) {
 				t = sizeof(args) > 2 ? ARGS(2) : 0;
 				// log first, after kill ob will be 0
@@ -1382,7 +1393,7 @@ cmd(a, args, dest, command) {
 					"_entity": ob ]));
 				ob -> sanction(a, t);
 			} else w("_error_unknown_name_user", 0, ([
-				 "_nick_target": args[1] ]));
+				 "_nick_target": t3 ]));
 			return 1;
 		case "config":
 			if (sizeof(args) < 3) return