Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
twitter api: add no_rich_text option to userview for account prefs See merge request pleroma/pleroma!355
This commit is contained in:
commit
7e12ef0ab0
@ -64,7 +64,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
|
||||
"background_image" => image_url(user.info["background"]) |> MediaProxy.url(),
|
||||
"is_local" => user.local,
|
||||
"locked" => !!user.info["locked"],
|
||||
"default_scope" => user.info["default_scope"] || "public"
|
||||
"default_scope" => user.info["default_scope"] || "public",
|
||||
"no_rich_text" => user.info["no_rich_text"] || false
|
||||
}
|
||||
|
||||
if assigns[:token] do
|
||||
|
@ -87,7 +87,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
"background_image" => nil,
|
||||
"is_local" => true,
|
||||
"locked" => false,
|
||||
"default_scope" => "public"
|
||||
"default_scope" => "public",
|
||||
"no_rich_text" => false
|
||||
}
|
||||
|
||||
assert represented == UserView.render("show.json", %{user: user})
|
||||
@ -126,7 +127,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
"background_image" => nil,
|
||||
"is_local" => true,
|
||||
"locked" => false,
|
||||
"default_scope" => "public"
|
||||
"default_scope" => "public",
|
||||
"no_rich_text" => false
|
||||
}
|
||||
|
||||
assert represented == UserView.render("show.json", %{user: user, for: follower})
|
||||
@ -166,7 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
"background_image" => nil,
|
||||
"is_local" => true,
|
||||
"locked" => false,
|
||||
"default_scope" => "public"
|
||||
"default_scope" => "public",
|
||||
"no_rich_text" => false
|
||||
}
|
||||
|
||||
assert represented == UserView.render("show.json", %{user: follower, for: user})
|
||||
@ -213,7 +216,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
"background_image" => nil,
|
||||
"is_local" => true,
|
||||
"locked" => false,
|
||||
"default_scope" => "public"
|
||||
"default_scope" => "public",
|
||||
"no_rich_text" => false
|
||||
}
|
||||
|
||||
blocker = Repo.get(User, blocker.id)
|
||||
|
Loading…
Reference in New Issue
Block a user