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
1b3d9219
Commit
1b3d9219
authored
Apr 02, 2019
by
minibikini
Browse files
change `Repo.get(User, id)` => `User.get_by_id(id)`
parent
42125279
Changes
23
Hide whitespace changes
Inline
Side-by-side
lib/mix/tasks/pleroma/user.ex
View file @
1b3d9219
...
...
@@ -6,7 +6,6 @@ defmodule Mix.Tasks.Pleroma.User do
use
Mix
.
Task
import
Ecto
.
Changeset
alias
Mix
.
Tasks
.
Pleroma
.
Common
alias
Pleroma
.
Repo
alias
Pleroma
.
User
@shortdoc
"Manages Pleroma users"
...
...
@@ -23,7 +22,7 @@ defmodule Mix.Tasks.Pleroma.User do
- `--password PASSWORD` - the user's password
- `--moderator`/`--no-moderator` - whether the user is a moderator
- `--admin`/`--no-admin` - whether the user is an admin
- `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions
- `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions
## Generate an invite link.
...
...
@@ -202,7 +201,7 @@ def run(["unsubscribe", nickname]) do
{
:ok
,
friends
}
=
User
.
get_friends
(
user
)
Enum
.
each
(
friends
,
fn
friend
->
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
Mix
.
shell
()
.
info
(
"Unsubscribing
#{
friend
.
nickname
}
from
#{
user
.
nickname
}
"
)
User
.
unfollow
(
user
,
friend
)
...
...
@@ -210,7 +209,7 @@ def run(["unsubscribe", nickname]) do
:timer
.
sleep
(
500
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
if
Enum
.
empty?
(
user
.
following
)
do
Mix
.
shell
()
.
info
(
"Successfully unsubscribed all followers from
#{
user
.
nickname
}
"
)
...
...
lib/pleroma/PasswordResetToken.ex
View file @
1b3d9219
...
...
@@ -39,7 +39,7 @@ def used_changeset(struct) do
def
reset_password
(
token
,
data
)
do
with
%{
used:
false
}
=
token
<-
Repo
.
get_by
(
PasswordResetToken
,
%{
token:
token
}),
%
User
{}
=
user
<-
Repo
.
get
(
User
,
token
.
user_id
),
%
User
{}
=
user
<-
User
.
get_by_id
(
token
.
user_id
),
{
:ok
,
_user
}
<-
User
.
reset_password
(
user
,
data
),
{
:ok
,
token
}
<-
Repo
.
update
(
used_changeset
(
token
))
do
{
:ok
,
token
}
...
...
lib/pleroma/list.ex
View file @
1b3d9219
...
...
@@ -80,7 +80,7 @@ def get_lists_from_activity(%Activity{actor: ap_id}) do
# Get lists to which the account belongs.
def
get_lists_account_belongs
(%
User
{}
=
owner
,
account_id
)
do
user
=
Repo
.
get
(
User
,
account_id
)
user
=
User
.
get_by_id
(
account_id
)
query
=
from
(
...
...
lib/pleroma/user.ex
View file @
1b3d9219
...
...
@@ -1231,8 +1231,8 @@ def get_or_fetch(nickname), do: get_or_fetch_by_nickname(nickname)
# this is because we have synchronous follow APIs and need to simulate them
# with an async handshake
def
wait_and_refresh
(
_
,
%
User
{
local:
true
}
=
a
,
%
User
{
local:
true
}
=
b
)
do
with
%
User
{}
=
a
<-
Repo
.
get
(
User
,
a
.
id
),
%
User
{}
=
b
<-
Repo
.
get
(
User
,
b
.
id
)
do
with
%
User
{}
=
a
<-
User
.
get_by_id
(
a
.
id
),
%
User
{}
=
b
<-
User
.
get_by_id
(
b
.
id
)
do
{
:ok
,
a
,
b
}
else
_e
->
...
...
@@ -1242,8 +1242,8 @@ def wait_and_refresh(_, %User{local: true} = a, %User{local: true} = b) do
def
wait_and_refresh
(
timeout
,
%
User
{}
=
a
,
%
User
{}
=
b
)
do
with
:ok
<-
:timer
.
sleep
(
timeout
),
%
User
{}
=
a
<-
Repo
.
get
(
User
,
a
.
id
),
%
User
{}
=
b
<-
Repo
.
get
(
User
,
b
.
id
)
do
%
User
{}
=
a
<-
User
.
get_by_id
(
a
.
id
),
%
User
{}
=
b
<-
User
.
get_by_id
(
b
.
id
)
do
{
:ok
,
a
,
b
}
else
_e
->
...
...
lib/pleroma/web/channels/user_socket.ex
View file @
1b3d9219
...
...
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.UserSocket do
def
connect
(%{
"token"
=>
token
},
socket
)
do
with
true
<-
Pleroma
.
Config
.
get
([
:chat
,
:enabled
]),
{
:ok
,
user_id
}
<-
Phoenix
.
Token
.
verify
(
socket
,
"user socket"
,
token
,
max_age:
84_600
),
%
User
{}
=
user
<-
Pleroma
.
Repo
.
get
(
User
,
user_id
)
do
%
User
{}
=
user
<-
Pleroma
.
User
.
get_by_id
(
user_id
)
do
{
:ok
,
assign
(
socket
,
:user_name
,
user
.
nickname
)}
else
_e
->
:error
...
...
lib/pleroma/web/common_api/utils.ex
View file @
1b3d9219
...
...
@@ -275,7 +275,7 @@ defp shortname(name) do
end
def
confirm_current_password
(
user
,
password
)
do
with
%
User
{
local:
true
}
=
db_user
<-
Repo
.
get
(
User
,
user
.
id
),
with
%
User
{
local:
true
}
=
db_user
<-
User
.
get_by_id
(
user
.
id
),
true
<-
Pbkdf2
.
checkpw
(
password
,
db_user
.
password_hash
)
do
{
:ok
,
db_user
}
else
...
...
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file @
1b3d9219
...
...
@@ -285,7 +285,7 @@ def public_timeline(%{assigns: %{user: user}} = conn, params) do
end
def
user_statuses
(%{
assigns:
%{
user:
reading_user
}}
=
conn
,
params
)
do
with
%
User
{}
=
user
<-
Repo
.
get
(
User
,
params
[
"id"
])
do
with
%
User
{}
=
user
<-
User
.
get_by_id
(
params
[
"id"
])
do
activities
=
ActivityPub
.
fetch_user_activities
(
user
,
reading_user
,
params
)
conn
...
...
@@ -657,7 +657,7 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
end
def
followers
(%{
assigns:
%{
user:
for_user
}}
=
conn
,
%{
"id"
=>
id
}
=
params
)
do
with
%
User
{}
=
user
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
user
<-
User
.
get_by_id
(
id
),
followers
<-
MastodonAPI
.
get_followers
(
user
,
params
)
do
followers
=
cond
do
...
...
@@ -674,7 +674,7 @@ def followers(%{assigns: %{user: for_user}} = conn, %{"id" => id} = params) do
end
def
following
(%{
assigns:
%{
user:
for_user
}}
=
conn
,
%{
"id"
=>
id
}
=
params
)
do
with
%
User
{}
=
user
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
user
<-
User
.
get_by_id
(
id
),
followers
<-
MastodonAPI
.
get_friends
(
user
,
params
)
do
followers
=
cond
do
...
...
@@ -699,7 +699,7 @@ def follow_requests(%{assigns: %{user: followed}} = conn, _params) do
end
def
authorize_follow_request
(%{
assigns:
%{
user:
followed
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
follower
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
follower
<-
User
.
get_by_id
(
id
),
{
:ok
,
follower
}
<-
CommonAPI
.
accept_follow_request
(
follower
,
followed
)
do
conn
|>
put_view
(
AccountView
)
...
...
@@ -713,7 +713,7 @@ def authorize_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}
end
def
reject_follow_request
(%{
assigns:
%{
user:
followed
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
follower
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
follower
<-
User
.
get_by_id
(
id
),
{
:ok
,
follower
}
<-
CommonAPI
.
reject_follow_request
(
follower
,
followed
)
do
conn
|>
put_view
(
AccountView
)
...
...
@@ -727,7 +727,7 @@ def reject_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}) d
end
def
follow
(%{
assigns:
%{
user:
follower
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
followed
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
followed
<-
User
.
get_by_id
(
id
),
false
<-
User
.
following?
(
follower
,
followed
),
{
:ok
,
follower
,
followed
,
_
}
<-
CommonAPI
.
follow
(
follower
,
followed
)
do
conn
...
...
@@ -769,7 +769,7 @@ def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
end
def
unfollow
(%{
assigns:
%{
user:
follower
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
followed
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
followed
<-
User
.
get_by_id
(
id
),
{
:ok
,
follower
}
<-
CommonAPI
.
unfollow
(
follower
,
followed
)
do
conn
|>
put_view
(
AccountView
)
...
...
@@ -778,7 +778,7 @@ def unfollow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
end
def
mute
(%{
assigns:
%{
user:
muter
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
muted
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
muted
<-
User
.
get_by_id
(
id
),
{
:ok
,
muter
}
<-
User
.
mute
(
muter
,
muted
)
do
conn
|>
put_view
(
AccountView
)
...
...
@@ -792,7 +792,7 @@ def mute(%{assigns: %{user: muter}} = conn, %{"id" => id}) do
end
def
unmute
(%{
assigns:
%{
user:
muter
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
muted
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
muted
<-
User
.
get_by_id
(
id
),
{
:ok
,
muter
}
<-
User
.
unmute
(
muter
,
muted
)
do
conn
|>
put_view
(
AccountView
)
...
...
@@ -813,7 +813,7 @@ def mutes(%{assigns: %{user: user}} = conn, _) do
end
def
block
(%{
assigns:
%{
user:
blocker
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
blocked
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
blocked
<-
User
.
get_by_id
(
id
),
{
:ok
,
blocker
}
<-
User
.
block
(
blocker
,
blocked
),
{
:ok
,
_activity
}
<-
ActivityPub
.
block
(
blocker
,
blocked
)
do
conn
...
...
@@ -828,7 +828,7 @@ def block(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
end
def
unblock
(%{
assigns:
%{
user:
blocker
}}
=
conn
,
%{
"id"
=>
id
})
do
with
%
User
{}
=
blocked
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
blocked
<-
User
.
get_by_id
(
id
),
{
:ok
,
blocker
}
<-
User
.
unblock
(
blocker
,
blocked
),
{
:ok
,
_activity
}
<-
ActivityPub
.
unblock
(
blocker
,
blocked
)
do
conn
...
...
@@ -966,7 +966,7 @@ def favourites(%{assigns: %{user: user}} = conn, params) do
end
def
bookmarks
(%{
assigns:
%{
user:
user
}}
=
conn
,
_
)
do
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
activities
=
user
.
bookmarks
...
...
@@ -1023,7 +1023,7 @@ def add_to_list(%{assigns: %{user: user}} = conn, %{"id" => id, "account_ids" =>
accounts
|>
Enum
.
each
(
fn
account_id
->
with
%
Pleroma
.
List
{}
=
list
<-
Pleroma
.
List
.
get
(
id
,
user
),
%
User
{}
=
followed
<-
Repo
.
get
(
User
,
account_id
)
do
%
User
{}
=
followed
<-
User
.
get_by_id
(
account_id
)
do
Pleroma
.
List
.
follow
(
list
,
followed
)
end
end
)
...
...
@@ -1035,7 +1035,7 @@ def remove_from_list(%{assigns: %{user: user}} = conn, %{"id" => id, "account_id
accounts
|>
Enum
.
each
(
fn
account_id
->
with
%
Pleroma
.
List
{}
=
list
<-
Pleroma
.
List
.
get
(
id
,
user
),
%
User
{}
=
followed
<-
Repo
.
get
(
Pleroma
.
User
,
account_id
)
do
%
User
{}
=
followed
<-
Pleroma
.
User
.
get_by_id
(
account_id
)
do
Pleroma
.
List
.
unfollow
(
list
,
followed
)
end
end
)
...
...
@@ -1312,7 +1312,7 @@ def logout(conn, _) do
def
relationship_noop
(%{
assigns:
%{
user:
user
}}
=
conn
,
%{
"id"
=>
id
})
do
Logger
.
debug
(
"Unimplemented, returning unmodified relationship"
)
with
%
User
{}
=
target
<-
Repo
.
get
(
User
,
id
)
do
with
%
User
{}
=
target
<-
User
.
get_by_id
(
id
)
do
conn
|>
put_view
(
AccountView
)
|>
render
(
"relationship.json"
,
%{
user:
user
,
target:
target
})
...
...
lib/pleroma/web/mastodon_api/websocket_handler.ex
View file @
1b3d9219
...
...
@@ -90,7 +90,7 @@ defp allow_request(stream, nil) when stream in @anonymous_streams do
# Authenticated streams.
defp
allow_request
(
stream
,
{
"access_token"
,
access_token
})
when
stream
in
@streams
do
with
%
Token
{
user_id:
user_id
}
<-
Repo
.
get_by
(
Token
,
token:
access_token
),
user
=
%
User
{}
<-
Repo
.
get
(
User
,
user_id
)
do
user
=
%
User
{}
<-
User
.
get_by_id
(
user_id
)
do
{
:ok
,
user
}
else
_
->
{
:error
,
403
}
...
...
lib/pleroma/web/oauth/oauth_controller.ex
View file @
1b3d9219
...
...
@@ -108,7 +108,7 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
fixed_token
=
fix_padding
(
params
[
"code"
]),
%
Authorization
{}
=
auth
<-
Repo
.
get_by
(
Authorization
,
token:
fixed_token
,
app_id:
app
.
id
),
%
User
{}
=
user
<-
Repo
.
get
(
User
,
auth
.
user_id
),
%
User
{}
=
user
<-
User
.
get_by_id
(
auth
.
user_id
),
{
:ok
,
token
}
<-
Token
.
exchange_token
(
app
,
auth
),
{
:ok
,
inserted_at
}
<-
DateTime
.
from_naive
(
token
.
inserted_at
,
"Etc/UTC"
)
do
response
=
%{
...
...
lib/pleroma/web/oauth/token.ex
View file @
1b3d9219
...
...
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.OAuth.Token do
def
exchange_token
(
app
,
auth
)
do
with
{
:ok
,
auth
}
<-
Authorization
.
use_token
(
auth
),
true
<-
auth
.
app_id
==
app
.
id
do
create_token
(
app
,
Repo
.
get
(
User
,
auth
.
user_id
),
auth
.
scopes
)
create_token
(
app
,
User
.
get_by_id
(
auth
.
user_id
),
auth
.
scopes
)
end
end
...
...
lib/pleroma/web/streamer.ex
View file @
1b3d9219
...
...
@@ -8,7 +8,6 @@ defmodule Pleroma.Web.Streamer do
alias
Pleroma
.
Activity
alias
Pleroma
.
Notification
alias
Pleroma
.
Object
alias
Pleroma
.
Repo
alias
Pleroma
.
User
alias
Pleroma
.
Web
.
ActivityPub
.
ActivityPub
alias
Pleroma
.
Web
.
ActivityPub
.
Visibility
...
...
@@ -82,7 +81,7 @@ def handle_cast(%{action: :stream, topic: "list", item: item}, topics) do
_
->
Pleroma
.
List
.
get_lists_from_activity
(
item
)
|>
Enum
.
filter
(
fn
list
->
owner
=
Repo
.
get
(
User
,
list
.
user_id
)
owner
=
User
.
get_by_id
(
list
.
user_id
)
Visibility
.
visible_for_user?
(
item
,
owner
)
end
)
...
...
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file @
1b3d9219
...
...
@@ -21,7 +21,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
def
show_password_reset
(
conn
,
%{
"token"
=>
token
})
do
with
%{
used:
false
}
=
token
<-
Repo
.
get_by
(
PasswordResetToken
,
%{
token:
token
}),
%
User
{}
=
user
<-
Repo
.
get
(
User
,
token
.
user_id
)
do
%
User
{}
=
user
<-
User
.
get_by_id
(
token
.
user_id
)
do
render
(
conn
,
"password_reset.html"
,
%{
token:
token
,
user:
user
...
...
@@ -96,13 +96,13 @@ def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
def
do_remote_follow
(
conn
,
%{
"authorization"
=>
%{
"name"
=>
username
,
"password"
=>
password
,
"id"
=>
id
}
})
do
followee
=
Repo
.
get
(
User
,
id
)
followee
=
User
.
get_by_id
(
id
)
avatar
=
User
.
avatar_url
(
followee
)
name
=
followee
.
nickname
with
%
User
{}
=
user
<-
User
.
get_cached_by_nickname
(
username
),
true
<-
Pbkdf2
.
checkpw
(
password
,
user
.
password_hash
),
%
User
{}
=
_followed
<-
Repo
.
get
(
User
,
id
),
%
User
{}
=
_followed
<-
User
.
get_by_id
(
id
),
{
:ok
,
follower
}
<-
User
.
follow
(
user
,
followee
),
{
:ok
,
_activity
}
<-
ActivityPub
.
follow
(
follower
,
followee
)
do
conn
...
...
@@ -124,7 +124,7 @@ def do_remote_follow(conn, %{
end
def
do_remote_follow
(%{
assigns:
%{
user:
user
}}
=
conn
,
%{
"user"
=>
%{
"id"
=>
id
}})
do
with
%
User
{}
=
followee
<-
Repo
.
get
(
User
,
id
),
with
%
User
{}
=
followee
<-
User
.
get_by_id
(
id
),
{
:ok
,
follower
}
<-
User
.
follow
(
user
,
followee
),
{
:ok
,
_activity
}
<-
ActivityPub
.
follow
(
follower
,
followee
)
do
conn
...
...
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
1b3d9219
...
...
@@ -434,7 +434,7 @@ def password_reset(conn, params) do
end
def
confirm_email
(
conn
,
%{
"user_id"
=>
uid
,
"token"
=>
token
})
do
with
%
User
{}
=
user
<-
Repo
.
get
(
User
,
uid
),
with
%
User
{}
=
user
<-
User
.
get_by_id
(
uid
),
true
<-
user
.
local
,
true
<-
user
.
info
.
confirmation_pending
,
true
<-
user
.
info
.
confirmation_token
==
token
,
...
...
@@ -587,7 +587,7 @@ def friend_requests(conn, params) do
def
approve_friend_request
(
conn
,
%{
"user_id"
=>
uid
}
=
_params
)
do
with
followed
<-
conn
.
assigns
[
:user
],
%
User
{}
=
follower
<-
Repo
.
get
(
User
,
uid
),
%
User
{}
=
follower
<-
User
.
get_by_id
(
uid
),
{
:ok
,
follower
}
<-
CommonAPI
.
accept_follow_request
(
follower
,
followed
)
do
conn
|>
put_view
(
UserView
)
...
...
@@ -599,7 +599,7 @@ def approve_friend_request(conn, %{"user_id" => uid} = _params) do
def
deny_friend_request
(
conn
,
%{
"user_id"
=>
uid
}
=
_params
)
do
with
followed
<-
conn
.
assigns
[
:user
],
%
User
{}
=
follower
<-
Repo
.
get
(
User
,
uid
),
%
User
{}
=
follower
<-
User
.
get_by_id
(
uid
),
{
:ok
,
follower
}
<-
CommonAPI
.
reject_follow_request
(
follower
,
followed
)
do
conn
|>
put_view
(
UserView
)
...
...
test/user_test.exs
View file @
1b3d9219
...
...
@@ -122,7 +122,7 @@ test "follow takes a user and another user" do
{
:ok
,
user
}
=
User
.
follow
(
user
,
followed
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
followed
=
User
.
get_by_ap_id
(
followed
.
ap_id
)
assert
followed
.
info
.
follower_count
==
1
...
...
@@ -178,7 +178,7 @@ test "unfollow takes a user and another user" do
{
:ok
,
user
,
_activity
}
=
User
.
unfollow
(
user
,
followed
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
following
==
[]
end
...
...
@@ -188,7 +188,7 @@ test "unfollow doesn't unfollow yourself" do
{
:error
,
_
}
=
User
.
unfollow
(
user
,
user
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
following
==
[
user
.
ap_id
]
end
...
...
@@ -679,7 +679,7 @@ test "blocks tear down cyclical follow relationships" do
assert
User
.
following?
(
blocked
,
blocker
)
{
:ok
,
blocker
}
=
User
.
block
(
blocker
,
blocked
)
blocked
=
Repo
.
get
(
User
,
blocked
.
id
)
blocked
=
User
.
get_by_id
(
blocked
.
id
)
assert
User
.
blocks?
(
blocker
,
blocked
)
...
...
@@ -697,7 +697,7 @@ test "blocks tear down blocker->blocked follow relationships" do
refute
User
.
following?
(
blocked
,
blocker
)
{
:ok
,
blocker
}
=
User
.
block
(
blocker
,
blocked
)
blocked
=
Repo
.
get
(
User
,
blocked
.
id
)
blocked
=
User
.
get_by_id
(
blocked
.
id
)
assert
User
.
blocks?
(
blocker
,
blocked
)
...
...
@@ -715,7 +715,7 @@ test "blocks tear down blocked->blocker follow relationships" do
assert
User
.
following?
(
blocked
,
blocker
)
{
:ok
,
blocker
}
=
User
.
block
(
blocker
,
blocked
)
blocked
=
Repo
.
get
(
User
,
blocked
.
id
)
blocked
=
User
.
get_by_id
(
blocked
.
id
)
assert
User
.
blocks?
(
blocker
,
blocked
)
...
...
@@ -809,9 +809,9 @@ test ".delete deactivates a user, all follow relationships and all create activi
{
:ok
,
_
}
=
User
.
delete
(
user
)
followed
=
Repo
.
get
(
User
,
followed
.
id
)
follower
=
Repo
.
get
(
User
,
follower
.
id
)
user
=
Repo
.
get
(
User
,
user
.
id
)
followed
=
User
.
get_by_id
(
followed
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
info
.
deactivated
...
...
test/web/activity_pub/activity_pub_controller_test.exs
View file @
1b3d9219
...
...
@@ -8,7 +8,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
alias
Pleroma
.
Activity
alias
Pleroma
.
Instances
alias
Pleroma
.
Object
alias
Pleroma
.
Repo
alias
Pleroma
.
User
alias
Pleroma
.
Web
.
ActivityPub
.
ObjectView
alias
Pleroma
.
Web
.
ActivityPub
.
UserView
...
...
@@ -51,7 +50,7 @@ test "it returns a json representation of the user with accept application/json"
|>
put_req_header
(
"accept"
,
"application/json"
)
|>
get
(
"/users/
#{
user
.
nickname
}
"
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
})
end
...
...
@@ -66,7 +65,7 @@ test "it returns a json representation of the user with accept application/activ
|>
put_req_header
(
"accept"
,
"application/activity+json"
)
|>
get
(
"/users/
#{
user
.
nickname
}
"
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
})
end
...
...
@@ -84,7 +83,7 @@ test "it returns a json representation of the user with accept application/ld+js
)
|>
get
(
"/users/
#{
user
.
nickname
}
"
)
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
})
end
...
...
@@ -543,7 +542,7 @@ test "it works for more than 10 users", %{conn: conn} do
user
=
insert
(
:user
)
Enum
.
each
(
1
..
15
,
fn
_
->
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
other_user
=
insert
(
:user
)
User
.
follow
(
user
,
other_user
)
end
)
...
...
test/web/activity_pub/activity_pub_test.exs
View file @
1b3d9219
...
...
@@ -218,18 +218,18 @@ test "increases user note count only for public activities" do
user
=
insert
(
:user
)
{
:ok
,
_
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"1"
,
"visibility"
=>
"public"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"1"
,
"visibility"
=>
"public"
})
{
:ok
,
_
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"2"
,
"visibility"
=>
"unlisted"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"2"
,
"visibility"
=>
"unlisted"
})
{
:ok
,
_
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"2"
,
"visibility"
=>
"private"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"2"
,
"visibility"
=>
"private"
})
{
:ok
,
_
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"3"
,
"visibility"
=>
"direct"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"3"
,
"visibility"
=>
"direct"
})
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
info
.
note_count
==
2
end
...
...
@@ -758,23 +758,23 @@ test "decrements user note count only for public activities" do
user
=
insert
(
:user
,
info:
%{
note_count:
10
})
{
:ok
,
a1
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"public"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"public"
})
{
:ok
,
a2
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"unlisted"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"unlisted"
})
{
:ok
,
a3
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"private"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"private"
})
{
:ok
,
a4
}
=
CommonAPI
.
post
(
Repo
.
get
(
User
,
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"direct"
})
CommonAPI
.
post
(
User
.
get_by_id
(
user
.
id
),
%{
"status"
=>
"yeah"
,
"visibility"
=>
"direct"
})
{
:ok
,
_
}
=
a1
.
data
[
"object"
][
"id"
]
|>
Object
.
get_by_ap_id
()
|>
ActivityPub
.
delete
()
{
:ok
,
_
}
=
a2
.
data
[
"object"
][
"id"
]
|>
Object
.
get_by_ap_id
()
|>
ActivityPub
.
delete
()
{
:ok
,
_
}
=
a3
.
data
[
"object"
][
"id"
]
|>
Object
.
get_by_ap_id
()
|>
ActivityPub
.
delete
()
{
:ok
,
_
}
=
a4
.
data
[
"object"
][
"id"
]
|>
Object
.
get_by_ap_id
()
|>
ActivityPub
.
delete
()
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
info
.
note_count
==
10
end
...
...
test/web/activity_pub/transmogrifier_test.exs
View file @
1b3d9219
...
...
@@ -639,7 +639,7 @@ test "it works for incoming accepts which were pre-accepted" do
assert
activity
.
data
[
"object"
]
==
follow_activity
.
data
[
"id"
]
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
assert
User
.
following?
(
follower
,
followed
)
==
true
end
...
...
@@ -661,7 +661,7 @@ test "it works for incoming accepts which were orphaned" do
{
:ok
,
activity
}
=
Transmogrifier
.
handle_incoming
(
accept_data
)
assert
activity
.
data
[
"object"
]
==
follow_activity
.
data
[
"id"
]
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
assert
User
.
following?
(
follower
,
followed
)
==
true
end
...
...
@@ -681,7 +681,7 @@ test "it works for incoming accepts which are referenced by IRI only" do
{
:ok
,
activity
}
=
Transmogrifier
.
handle_incoming
(
accept_data
)
assert
activity
.
data
[
"object"
]
==
follow_activity
.
data
[
"id"
]
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
assert
User
.
following?
(
follower
,
followed
)
==
true
end
...
...
@@ -700,7 +700,7 @@ test "it fails for incoming accepts which cannot be correlated" do
:error
=
Transmogrifier
.
handle_incoming
(
accept_data
)
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
refute
User
.
following?
(
follower
,
followed
)
==
true
end
...
...
@@ -719,7 +719,7 @@ test "it fails for incoming rejects which cannot be correlated" do
:error
=
Transmogrifier
.
handle_incoming
(
accept_data
)
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
refute
User
.
following?
(
follower
,
followed
)
==
true
end
...
...
@@ -744,7 +744,7 @@ test "it works for incoming rejects which are orphaned" do
{
:ok
,
activity
}
=
Transmogrifier
.
handle_incoming
(
reject_data
)
refute
activity
.
local
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
assert
User
.
following?
(
follower
,
followed
)
==
false
end
...
...
@@ -766,7 +766,7 @@ test "it works for incoming rejects which are referenced by IRI only" do
{
:ok
,
%
Activity
{
data:
_
}}
=
Transmogrifier
.
handle_incoming
(
reject_data
)
follower
=
Repo
.
get
(
User
,
follower
.
id
)
follower
=
User
.
get_by_id
(
follower
.
id
)
assert
User
.
following?
(
follower
,
followed
)
==
false
end
...
...
@@ -1020,7 +1020,7 @@ test "it upgrades a user to activitypub" do
{
:ok
,
unrelated_activity
}
=
CommonAPI
.
post
(
user_two
,
%{
"status"
=>
"test"
})
assert
"http://localhost:4001/users/rye@niu.moe/followers"
in
activity
.
recipients
user
=
Repo
.
get
(
User
,
user
.
id
)
user
=
User
.
get_by_id
(
user
.
id
)
assert
user
.
info
.
note_count
==
1
{
:ok
,
user
}
=
Transmogrifier
.
upgrade_user_from_ap_id
(
"https://niu.moe/users/rye"
)
...
...
@@ -1031,7 +1031,7 @@ test "it upgrades a user to activitypub" do
# Wait for the background task