From f675715317a9b6300ced78ae93f9e98037f542ee Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@isinglasstheater.org>
Date: Sat, 21 Jun 2014 17:29:10 -0700
Subject: [PATCH] Bugfixes for "me" ACL.

---
 lib/models.py         | 15 ++++++++++++---
 static/cosmopolite.js |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/models.py b/lib/models.py
index d7544fb..882e76b 100644
--- a/lib/models.py
+++ b/lib/models.py
@@ -256,7 +256,10 @@ class Subject(db.Model):
       raise e
     event = obj.ToEvent()
     for subscription in subscriptions:
-      subscription.SendMessage(event)
+      subscription.SendMessage(self.TranslateEvent(
+          event,
+          subscription.readable_only_by_me,
+          subscription.writable_only_by_me))
     return self.TranslateEvent(event, readable_only_by_me, writable_only_by_me)
 
   @db.transactional()
@@ -299,7 +302,10 @@ class Subject(db.Model):
       raise e
     event = obj.ToEvent()
     for subscription in subscriptions:
-      subscription.SendMessage(event)
+      subscription.SendMessage(self.TranslateEvent(
+          event,
+          subscription.readable_only_by_me,
+          subscription.writable_only_by_me))
     return self.TranslateEvent(event, readable_only_by_me, writable_only_by_me)
 
   @db.transactional()
@@ -391,7 +397,10 @@ class Subscription(db.Model):
         .filter('writable_only_by_me =', writable_only_by_me)
         .fetch(1))
     if not subscriptions:
-      cls(parent=subject, instance=instance).put()
+      cls(parent=subject,
+          instance=instance,
+          readable_only_by_me=readable_only_by_me,
+          writable_only_by_me=writable_only_by_me).put()
     return subject.GetEvents(messages, last_id, request)
 
   @classmethod
diff --git a/static/cosmopolite.js b/static/cosmopolite.js
index 80f2c0e..b0483cb 100644
--- a/static/cosmopolite.js
+++ b/static/cosmopolite.js
@@ -1199,8 +1199,9 @@ Cosmopolite.prototype.onMessage_ = function(e) {
     console.log(
         this.loggingPrefix_(),
         'message from unrecognized subject:', e);
-    console.log(this.subscriptions_);
-    console.log(subjectString);
+    console.log(
+        this.loggingPrefix_(),
+        'subscriptions:', this.subscriptions_);
     return;
   }
   /** @type {boolean} */