 # @private
 # @mixin
 # @nodoc
-RoomHelpers =
+RoomPermissions =
 
   # @private
   isAdmin : (userName, cb) ->
     @roomState.ownerGet withEH cb, (owner) =>
+      if owner == userName
+        return cb null, true
       @roomState.hasInList 'adminlist', userName, withEH cb, (hasName) ->
-        if owner == userName or hasName
+        if hasName
           return cb null, true
         cb null, false
 


# @private
# @nodoc
class DirectMessaging

  extend @, DirectMessagingHelpers

  # @private
  constructor : (@server, @username) ->

# @private
# @mixin
# @nodoc
#
# Implements permissions checks.
# Required existence of username, directMessagingState and
# errorBuilder in extented classes.
DirectMessagingPermissions =

  # @private
  checkUser : (author, cb) ->
