aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-18 12:42:09 +0000
committerrinpatch <rinpatch@sdf.org>2019-10-18 12:42:09 +0000
commit30a59ae97d79b2e3aa528a16f934e03d9ac80d72 (patch)
tree111924886f98da15734aa3d72f08f5a283ac0a8e /lib/pleroma/object.ex
parent724f611b0edf3d7fd819ee748df2f6b00d211fa2 (diff)
parentb085cd26602cca8fdb1343a2b72adb4e9575ab67 (diff)
downloadpleroma-30a59ae97d79b2e3aa528a16f934e03d9ac80d72.tar.gz
Merge branch 'backport/develop-safe-jsonb' into 'develop'
Backport safe_jsonb_set fixes to develop See merge request pleroma/pleroma!1858
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r--lib/pleroma/object.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index cdfbacb0e..d9b41d710 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -181,7 +181,7 @@ defmodule Pleroma.Object do
data:
fragment(
"""
- jsonb_set(?, '{repliesCount}',
+ safe_jsonb_set(?, '{repliesCount}',
(coalesce((?->>'repliesCount')::int, 0) + 1)::varchar::jsonb, true)
""",
o.data,
@@ -204,7 +204,7 @@ defmodule Pleroma.Object do
data:
fragment(
"""
- jsonb_set(?, '{repliesCount}',
+ safe_jsonb_set(?, '{repliesCount}',
(greatest(0, (?->>'repliesCount')::int - 1))::varchar::jsonb, true)
""",
o.data,