Move code to use originalMessage instead message

pull/818/head
Rodrigo Nascimento 10 years ago
parent e9fbad715d
commit 007390a4f4
  1. 7
      server/methods/deleteMessage.coffee

@ -3,13 +3,14 @@ Meteor.methods
if not Meteor.userId() if not Meteor.userId()
throw new Meteor.Error('invalid-user', "[methods] deleteMessage -> Invalid user") throw new Meteor.Error('invalid-user', "[methods] deleteMessage -> Invalid user")
hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'delete-message', message.rid)
deleteAllowed = RocketChat.settings.get 'Message_AllowDeleting'
originalMessage = ChatMessage.findOne message._id, {fields: {u: 1, rid: 1}} originalMessage = ChatMessage.findOne message._id, {fields: {u: 1, rid: 1}}
if not originalMessage? if not originalMessage?
throw new Meteor.Error 'message-deleting-not-allowed', "[methods] deleteMessage -> Message with id [#{message._id} dos not exists]" throw new Meteor.Error 'message-deleting-not-allowed', "[methods] deleteMessage -> Message with id [#{message._id} dos not exists]"
hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'delete-message', originalMessage.rid)
deleteAllowed = RocketChat.settings.get 'Message_AllowDeleting'
deleteOwn = originalMessage?.u?._id is Meteor.userId() deleteOwn = originalMessage?.u?._id is Meteor.userId()
unless hasPermission or (deleteAllowed and deleteOwn) unless hasPermission or (deleteAllowed and deleteOwn)

Loading…
Cancel
Save