zephyr_mirror: Forward messages sent to the empty instance more clearly.

(imported from commit 1fb5e4f8ce9941b3ca89688821d325d7ae49aee5)
This commit is contained in:
Tim Abbott 2012-11-08 13:57:21 -05:00
parent 8d27bcbad7
commit c3c3045e3d

View file

@ -266,7 +266,7 @@ def process_notice(notice, log):
if notice.instance != "": if notice.instance != "":
zeph['subject'] = notice.instance zeph['subject'] = notice.instance
else: else:
zeph["subject"] = "personal" zeph["subject"] = "(no instance)"
# Add instances in for instanced personals # Add instances in for instanced personals
if zeph['type'] == "personal" and notice.instance.lower() != "personal": if zeph['type'] == "personal" and notice.instance.lower() != "personal":
@ -367,6 +367,10 @@ def forward_to_zephyr(message):
if message['type'] == "stream": if message['type'] == "stream":
zephyr_class = message["display_recipient"] zephyr_class = message["display_recipient"]
instance = message["subject"] instance = message["subject"]
if instance == "(no instance)":
# Forward messages sent to "(no instance)" back to the
# empty instance for bidirectional mirroring
instance = ""
if (instance == "instance %s" % (zephyr_class,) or if (instance == "instance %s" % (zephyr_class,) or
instance == "test instance %s" % (zephyr_class,)): instance == "test instance %s" % (zephyr_class,)):
# Forward messages to e.g. -c -i white-magic back from the # Forward messages to e.g. -c -i white-magic back from the