Merge branch 'deps-bump' into 'develop'
Bump dependencies See merge request pleroma/pleroma!4044
This commit is contained in:
commit
251c455b91
38 changed files with 192 additions and 192 deletions
|
|
@ -2407,9 +2407,9 @@ defmodule Pleroma.User do
|
|||
|
||||
defp put_password_hash(changeset), do: changeset
|
||||
|
||||
def is_internal_user?(%User{nickname: nil}), do: true
|
||||
def is_internal_user?(%User{local: true, nickname: "internal." <> _}), do: true
|
||||
def is_internal_user?(_), do: false
|
||||
def internal?(%User{nickname: nil}), do: true
|
||||
def internal?(%User{local: true, nickname: "internal." <> _}), do: true
|
||||
def internal?(_), do: false
|
||||
|
||||
# A hack because user delete activities have a fake id for whatever reason
|
||||
# TODO: Get rid of this
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue