From 0f0e7cedf317fde3efdec608045b396dcd39ba3b Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 14 Mar 2020 21:09:25 -0500 Subject: [PATCH] dmails: fixup exceptions when verifying dmail keys. Fix show action throwing exceptions when viewing a dmail without a dmail key. --- app/logical/danbooru/message_verifier.rb | 4 ++++ app/models/dmail.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/logical/danbooru/message_verifier.rb b/app/logical/danbooru/message_verifier.rb index cea28c978..aac80fa0a 100644 --- a/app/logical/danbooru/message_verifier.rb +++ b/app/logical/danbooru/message_verifier.rb @@ -15,5 +15,9 @@ module Danbooru def verify(*args, **options) verifier.verify(*args, purpose: purpose, **options) end + + def verified(*args, **options) + verifier.verified(*args, purpose: purpose, **options) + end end end diff --git a/app/models/dmail.rb b/app/models/dmail.rb index 513c79966..bd76a8466 100644 --- a/app/models/dmail.rb +++ b/app/models/dmail.rb @@ -121,7 +121,7 @@ class Dmail < ApplicationRecord end def valid_key?(key) - id == verifier.verify(key) + id == verifier.verified(key) end def visible_to?(user, key)