Fix for sometimes not using trust level

Stephen Paul Weber created 1 month ago

Change summary

sgx_jmp.rb | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)

Detailed changes

sgx_jmp.rb

@@ -402,16 +402,20 @@ def find_from_and_to_customer(from, to)
 end
 
 def usage_guard(m, to, customer, trust_level, usage)
-	return if trust_level.send_message?(to, usage[:today]) && usage[:body] < 5
+	over_limit = OverLimit.new(customer, usage)
+
+	unless trust_level.send_message?(to, usage[:today])
+		log.warn "OverLimit", m
+		raise over_limit
+	end
+
+	return if usage[:body] < 5
 
 	log.warn "OverLimit", m
 
-	if usage[:body] >= 5 && (m.body.to_s.length < 30 || usage[:body] < 10)
-		OverLimit.new(customer, usage).notify_admin
-		return
-	end
+	return over_limit.notify_admin if m.body.to_s.length < 30 || usage[:body] < 10
 
-	raise OverLimit.new(customer, usage)
+	raise over_limit
 end
 
 message do |m|