Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
23960309
Verified
Commit
23960309
authored
Mar 05, 2019
by
Haelwenn
Browse files
[Credo] Change quoted string with 3+ quotes to sigils
parent
c42d34b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
23960309
...
...
@@ -504,7 +504,7 @@ defp restrict_tag_reject(query, %{"tag_reject" => tag_reject})
when
is_list
(
tag_reject
)
and
tag_reject
!=
[]
do
from
(
activity
in
query
,
where:
fragment
(
"
(not (? #> '{
\
"
object
\
"
,
\
"
tag
\
"
}')
\\
?| ?)
"
,
activity
.
data
,
^
tag_reject
)
where:
fragment
(
~s(\
(
not
\
(
? #> '{"object","tag"}'
\
)
\\
?|
?
\)
),
activity
.
data
,
^
tag_reject
)
)
end
...
...
@@ -514,7 +514,7 @@ defp restrict_tag_all(query, %{"tag_all" => tag_all})
when
is_list
(
tag_all
)
and
tag_all
!=
[]
do
from
(
activity
in
query
,
where:
fragment
(
"
(? #> '{
\
"
object
\
"
,
\
"
tag
\
"
}')
\\
?& ?
"
,
activity
.
data
,
^
tag_all
)
where:
fragment
(
~s(\
(
? #> '{"object","tag"}'
\
)
\\
?&
?
)
,
activity
.
data
,
^
tag_all
)
)
end
...
...
@@ -523,14 +523,14 @@ defp restrict_tag_all(query, _), do: query
defp
restrict_tag
(
query
,
%{
"tag"
=>
tag
})
when
is_list
(
tag
)
do
from
(
activity
in
query
,
where:
fragment
(
"
(? #> '{
\
"
object
\
"
,
\
"
tag
\
"
}')
\\
?| ?
"
,
activity
.
data
,
^
tag
)
where:
fragment
(
~s(\
(
? #> '{"object","tag"}'
\
)
\\
?|
?
)
,
activity
.
data
,
^
tag
)
)
end
defp
restrict_tag
(
query
,
%{
"tag"
=>
tag
})
when
is_binary
(
tag
)
do
from
(
activity
in
query
,
where:
fragment
(
"
? <@ (? #> '{
\
"
object
\
"
,
\
"
tag
\
"
}')
"
,
^
tag
,
activity
.
data
)
where:
fragment
(
~s(
? <@
(
? #> '{"object","tag"}'
\)
),
^
tag
,
activity
.
data
)
)
end
...
...
@@ -603,7 +603,7 @@ defp restrict_type(query, _), do: query
defp
restrict_favorited_by
(
query
,
%{
"favorited_by"
=>
ap_id
})
do
from
(
activity
in
query
,
where:
fragment
(
"
? <@ (? #> '{
\
"
object
\
"
,
\
"
likes
\
"
}')
"
,
^
ap_id
,
activity
.
data
)
where:
fragment
(
~s(
? <@
(
? #> '{"object","likes"}'
\)
),
^
ap_id
,
activity
.
data
)
)
end
...
...
@@ -612,7 +612,7 @@ defp restrict_favorited_by(query, _), do: query
defp
restrict_media
(
query
,
%{
"only_media"
=>
val
})
when
val
==
"true"
or
val
==
"1"
do
from
(
activity
in
query
,
where:
fragment
(
"
not (? #> '{
\
"
object
\
"
,
\
"
attachment
\
"
}' = ?)
"
,
activity
.
data
,
^
[])
where:
fragment
(
~s(
not
(
? #> '{"object","attachment"}' = ?
\)
),
activity
.
data
,
^
[])
)
end
...
...
test/web/mastodon_api/mastodon_api_controller_test.exs
View file @
23960309
...
...
@@ -1632,9 +1632,10 @@ test "updates the user's bio", %{conn: conn} do
assert
user
=
json_response
(
conn
,
200
)
assert
user
[
"note"
]
==
"I drink <a class=
\"
hashtag
\"
data-tag=
\"
cofe
\"
href=
\"
http://localhost:4001/tag/cofe
\"
>#cofe</a> with <span class=
\"
h-card
\"
><a data-user=
\"
#{
user2
.
id
}
\"
class=
\"
u-url mention
\"
href=
\"
#{
user2
.
ap_id
}
\"
>@<span>
#{
user2
.
nickname
}
</span></a></span>"
~s(I drink <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe">#cofe</a> with <span class="h-card"><a data-user=")
<>
user2
.
id
<>
~s(" class="u-url mention" href=")
<>
user2
.
ap_id
<>
~s(">@<span>)
<>
user2
.
nickname
<>
~s(</span></a></span>)
end
test
"updates the user's locking status"
,
%{
conn:
conn
}
do
...
...
test/web/twitter_api/representers/activity_representer_test.exs
View file @
23960309
...
...
@@ -101,10 +101,14 @@ test "an activity" do
recipients:
to
}
corndog_emojo
=
~s(<img height="32px" width="32px" alt="2hu" title="2hu" src="corndog.png" />)
expected_html
=
"<p>2hu <img height=
\"
32px
\"
width=
\"
32px
\"
alt=
\"
2hu
\"
title=
\"
2hu
\"
src=
\"
corndog.png
\"
/></p>alert('YAY')Some <img height=
\"
32px
\"
width=
\"
32px
\"
alt=
\"
2hu
\"
title=
\"
2hu
\"
src=
\"
corndog.png
\"
/> content mentioning <a href=
\"
#{
mentioned_user
.
ap_id
}
\"
>@shp</a>"
~s(<p>2hu )
<>
corndog_emojo
<>
~s(</p>alert\
(
'YAY'\)
Some
)
<>
corndog_emojo
<>
~s( content mentioning <a href=")
<>
mentioned_user
.
ap_id
<>
~s(">@shp</a>)
expected_status
=
%{
"id"
=>
activity
.
id
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment