diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 | 
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 | 
| commit | 9e0567ec5237fc7a2ba37f5291962f3c58fd21f8 (patch) | |
| tree | 6caabbf049051d3725662eb765013ee9b844f0cc /lib/mix | |
| parent | 484162c18774ff28842a517ae0afcaaf824e12bf (diff) | |
| parent | bd961a3badaf7aa7ffc97ab92a6b04367d1c514b (diff) | |
| download | pleroma-9e0567ec5237fc7a2ba37f5291962f3c58fd21f8.tar.gz pleroma-9e0567ec5237fc7a2ba37f5291962f3c58fd21f8.zip | |
Merge develop into feature/770-add-emoji-tags
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/tasks/pleroma/user.ex | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex index f6cca0d06..2487b4ab5 100644 --- a/lib/mix/tasks/pleroma/user.ex +++ b/lib/mix/tasks/pleroma/user.ex @@ -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 @@ defmodule Mix.Tasks.Pleroma.User 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 @@ defmodule Mix.Tasks.Pleroma.User 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}") | 
