Merge pull request #378 from BeaudanBrown/typing-friend-request

Also don't send typing messages for people we aren't friends with

js/models/conversations.js

@@ -208,8 +208,8 @@
     },
 
     bumpTyping() {
-      // We don't send typing messages if the setting is disabled
-      if (!storage.get('typing-indicators-setting')) {
+      // We don't send typing messages if the setting is disabled or we aren't friends
+      if (!this.isFriend() || !storage.get('typing-indicators-setting')) {
         return;
       }