Skip to content

Commit 2530c8b

Browse files
committed
https://github.com/bonfire-networks/bonfire-app/issues/979
1 parent 54c18f5 commit 2530c8b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

lib/quotes.ex

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ defmodule Bonfire.Social.Quotes do
2929
{"Delete", "QuoteAuthorization"}
3030
]
3131

32-
def quote_verb_id, do: Bonfire.Boundaries.Verbs.get_id(:annotate)
32+
def quote_verb, do: :quote
33+
def quote_verb_id, do: Bonfire.Boundaries.Verbs.get_id(quote_verb())
3334

3435
@doc """
3536
Checks if a quote request has been made.
@@ -46,11 +47,11 @@ defmodule Bonfire.Social.Quotes do
4647
4748
## Examples
4849
49-
iex> Bonfire.Social.Quotes.requested?(user, quote_post, quoted_object)
50+
iex> Bonfire.Social.Quotes.requested?(quote_post, quoted_object)
5051
true
5152
"""
52-
def requested?(subject, quote_post, quoted_object),
53-
do: Requests.requested?(quote_post, :annotate, quoted_object)
53+
def requested?(quote_post, quoted_object),
54+
do: Requests.requested?(quote_post, quote_verb(), quoted_object)
5455

5556
@doc """
5657
Requests permission to quote a post, checking boundaries and creating requests as needed.
@@ -85,7 +86,7 @@ defmodule Bonfire.Social.Quotes do
8586
{:auto_approve, quoted_object}
8687

8788
# Check if user can annotate the post (auto-approve)
88-
Bonfire.Boundaries.can?(user, :annotate, quoted_object) ->
89+
Bonfire.Boundaries.can?(user, quote_verb(), quoted_object) ->
8990
debug(user_id, "User has permission to annotate")
9091
{:auto_approve, quoted_object}
9192

@@ -124,7 +125,7 @@ defmodule Bonfire.Social.Quotes do
124125

125126
# Store as a Request in our database and federate as QuoteRequest
126127
# subject: quote_post (can lookup creator from here)
127-
# table_id: :annotate (annotation verb)
128+
# table_id: :quote verb
128129
# object: quoted_object (the post being quoted)
129130
Requests.request(
130131
quote_post,
@@ -249,7 +250,7 @@ defmodule Bonfire.Social.Quotes do
249250
"""
250251
def reject(request, opts) do
251252
Requests.requested(request)
252-
|> flood("request to reject")
253+
|> debug("request to reject")
253254
~> reject(..., e(..., :edge, :subject, nil), e(..., :edge, :object, nil), opts)
254255
end
255256

@@ -444,7 +445,7 @@ defmodule Bonfire.Social.Quotes do
444445
def verify_quote_authorization(quote_post, quoted_object \\ nil, authorization \\ nil) do
445446
quoted_object =
446447
(quoted_object || get_first_quoted_object(quote_post))
447-
|> flood("quoted_object for verification")
448+
|> debug("quoted_object for verification")
448449

449450
case authorization || fetch_fresh_quote_authorization(quote_post, quoted_object) do
450451
{:ok, authorization} ->

0 commit comments

Comments
 (0)