diff options
author | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
commit | 4b3ec5351466f8615b32e62cc4e6215f8a80b105 (patch) | |
tree | e46842eac5d8255858a113f71bdf42bfd75e4436 /lib/pleroma/object.ex | |
parent | 4fd9df100f61dfe4731934eca86500472d866f60 (diff) | |
parent | 6138b297836f459e4fe5d21dfed30ddd9397b6d4 (diff) | |
download | pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.tar.gz |
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r-- | lib/pleroma/object.ex | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 558e151b0..ff2af4a6f 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -33,19 +33,15 @@ defmodule Pleroma.Object do else key = "object:#{ap_id}" - Cachex.get!( - :user_cache, - key, - fallback: fn _ -> - object = get_by_ap_id(ap_id) - - if object do - {:commit, object} - else - {:ignore, object} - end + Cachex.fetch!(:user_cache, key, fn _ -> + object = get_by_ap_id(ap_id) + + if object do + {:commit, object} + else + {:ignore, object} end - ) + end) end end |