aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-05-23 09:03:11 +0000
committerlambda <pleromagit@rogerbraun.net>2018-05-23 09:03:11 +0000
commit06c97f211fc4a8c9c9c7e77143c3398ade817ab4 (patch)
tree4ce968502f30a8b4365fe78776cf5ca3cbe1b23a /lib/pleroma/object.ex
parentf0e8194a7129b6885ad74a694157e10e29f20807 (diff)
parente55c6f311b8f459402134351230a5ff9700a8ff0 (diff)
downloadpleroma-06c97f211fc4a8c9c9c7e77143c3398ade817ab4.tar.gz
Merge branch 'feature/deps-migration' into 'develop'
Migrate to comeonin 4 and Cachex 3 See merge request pleroma/pleroma!162
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r--lib/pleroma/object.ex20
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