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
63dbd875
Commit
63dbd875
authored
Jan 08, 2019
by
minibikini
Browse files
rename `post` to `status`
parent
f24087f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user/info.ex
View file @
63dbd875
...
...
@@ -202,14 +202,14 @@ def admin_api_update(info, params) do
def
add_pinnned_activity
(
info
,
%
Pleroma
.
Activity
{
id:
id
})
do
if
id
not
in
info
.
pinned_activities
do
max_pinned_
po
sts
=
Pleroma
.
Config
.
get
([
:instance
,
:max_pinned_
po
sts
],
0
)
max_pinned_st
atuse
s
=
Pleroma
.
Config
.
get
([
:instance
,
:max_pinned_st
atuse
s
],
0
)
params
=
%{
pinned_activities:
info
.
pinned_activities
++
[
id
]}
info
|>
cast
(
params
,
[
:pinned_activities
])
|>
validate_length
(
:pinned_activities
,
max:
max_pinned_
po
sts
,
message:
"You have already pinned the maximum number of
toot
s"
max:
max_pinned_st
atuse
s
,
message:
"You have already pinned the maximum number of
statuse
s"
)
else
change
(
info
)
...
...
test/web/activity_pub/activity_pub_test.exs
View file @
63dbd875
...
...
@@ -601,8 +601,8 @@ test "it can fetch peertube videos" do
assert
object
end
test
"returned pinned
po
sts"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
3
)
test
"returned pinned st
atuse
s"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
3
)
user
=
insert
(
:user
)
{
:ok
,
activity_one
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
test/web/common_api/common_api_test.exs
View file @
63dbd875
...
...
@@ -97,9 +97,9 @@ test "favoriting a status twice returns an error" do
end
end
describe
"pinned
po
sts"
do
test
"pin
po
st"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
describe
"pinned st
atuse
s"
do
test
"pin st
atus
"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
@@ -107,8 +107,8 @@ test "pin post" do
assert
{
:ok
,
^
activity
}
=
CommonAPI
.
pin
(
activity
.
id
,
user
)
end
test
"max pinned
po
sts"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
test
"max pinned st
atuse
s"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity_one
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
@@ -122,8 +122,8 @@ test "max pinned posts" do
CommonAPI
.
pin
(
activity_two
.
id
,
user
)
end
test
"unpin
po
st"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
test
"unpin st
atus
"
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
test/web/mastodon_api/mastodon_api_controller_test.exs
View file @
63dbd875
...
...
@@ -1472,9 +1472,9 @@ test "put settings", %{conn: conn} do
assert
user
.
info
.
settings
==
%{
"programming"
=>
"socks"
}
end
describe
"pinned
po
sts"
do
test
"returns pinned
po
sts"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
describe
"pinned st
atuse
s"
do
test
"returns pinned st
atuse
s"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
@@ -1492,8 +1492,8 @@ test "returns pinned posts", %{conn: conn} do
assert
[%{
"id"
=>
^
id_str
}]
=
result
end
test
"pin
po
st"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
test
"pin st
atus
"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
@@ -1514,8 +1514,8 @@ test "pin post", %{conn: conn} do
|>
Jason
.
decode!
()
end
test
"unpin
po
st"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
test
"unpin st
atus
"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"HI!!!"
})
...
...
@@ -1539,8 +1539,8 @@ test "unpin post", %{conn: conn} do
|>
Jason
.
decode!
()
end
test
"max pinned
po
sts"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_
po
sts
],
1
)
test
"max pinned st
atuse
s"
,
%{
conn:
conn
}
do
Pleroma
.
Config
.
put
([
:instance
,
:max_pinned_st
atuse
s
],
1
)
user
=
insert
(
:user
)
...
...
@@ -1558,7 +1558,7 @@ test "max pinned posts", %{conn: conn} do
user
=
User
.
get_by_ap_id
(
user
.
ap_id
)
assert
%{
"error"
=>
"You have already pinned the maximum number of
toot
s"
}
=
assert
%{
"error"
=>
"You have already pinned the maximum number of
statuse
s"
}
=
conn
|>
assign
(
:user
,
user
)
|>
post
(
"/api/v1/statuses/
#{
activity_two
.
id
}
/pin"
)
...
...
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