From 381e91b822ed093eb958eea8e4554bc4e3a5505e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 27 Nov 2016 12:08:23 +0100
Subject: [PATCH] Made channel_prefix honor the emit keyword. Also corrected
 docstrings of message_transform to correctly note a Msg object is needed
 instead of a string.

---
 evennia/comms/comms.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/evennia/comms/comms.py b/evennia/comms/comms.py
index 1f1edd0ec8..b8f53d47af 100644
--- a/evennia/comms/comms.py
+++ b/evennia/comms/comms.py
@@ -201,13 +201,13 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
         from evennia.comms.channelhandler import CHANNELHANDLER
         CHANNELHANDLER.update()
 
-    def message_transform(self, msg, emit=False, prefix=True,
+    def message_transform(self, msgobj, emit=False, prefix=True,
                           sender_strings=None, external=False):
         """
         Generates the formatted string sent to listeners on a channel.
 
         Args:
-            msg (str): Message to send.
+            msgobj (Msg): Message object to send.
             emit (bool, optional): In emit mode the message is not associated
                 with a specific sender name.
             prefix (bool, optional): Prefix `msg` with a text given by `self.channel_prefix`.
@@ -216,13 +216,13 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
 
         """
         if sender_strings or external:
-            body = self.format_external(msg, sender_strings, emit=emit)
+            body = self.format_external(msgobj, sender_strings, emit=emit)
         else:
-            body = self.format_message(msg, emit=emit)
+            body = self.format_message(msgobj, emit=emit)
         if prefix:
-            body = "%s%s" % (self.channel_prefix(msg, emit=emit), body)
-        msg.message = body
-        return msg
+            body = "%s%s" % (self.channel_prefix(msgobj, emit=emit), body)
+        msgobj.message = body
+        return msgobj
 
     def distribute_message(self, msgobj, online=False):
         """
@@ -334,13 +334,13 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
         Args:
             msg (str, optional): Prefix text
             emit (bool, optional): Switches to emit mode, which usually
-                means to ignore any sender information. Not used by default.
+                means to not prefix the channel's info.
 
         Returns:
             prefix (str): The created channel prefix.
 
         """
-        return '[%s] ' % self.key
+        return '' if emit else '[%s] ' % self.key
 
     def format_senders(self, senders=None):
         """