Browse Source

Bot nameplates (#7391)

* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
custom
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
42cd363542
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/controllers/api/v1/accounts/credentials_controller.rb
  2. 2
      app/controllers/settings/profiles_controller.rb
  3. 4
      app/javascript/mastodon/features/account/components/header.js
  4. 6
      app/javascript/styles/mastodon/components.scss
  5. 4
      app/javascript/styles/mastodon/forms.scss
  6. 11
      app/models/account.rb
  7. 2
      app/serializers/activitypub/actor_serializer.rb
  8. 2
      app/serializers/rest/account_serializer.rb
  9. 1
      app/services/activitypub/process_account_service.rb
  10. 6
      app/views/accounts/_header.html.haml
  11. 3
      app/views/settings/profiles/show.html.haml
  12. 1
      config/locales/en.yml
  13. 2
      config/locales/simple_form.en.yml
  14. 5
      db/migrate/20180506221944_add_actor_type_to_accounts.rb
  15. 3
      db/schema.rb

2
app/controllers/api/v1/accounts/credentials_controller.rb

@ -21,7 +21,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
private
def account_params
params.permit(:display_name, :note, :avatar, :header, :locked, fields_attributes: [:name, :value])
params.permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
end
def user_settings_params

2
app/controllers/settings/profiles_controller.rb

@ -27,7 +27,7 @@ class Settings::ProfilesController < ApplicationController
private
def account_params
params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, fields_attributes: [:name, :value])
params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
end
def set_account

4
app/javascript/mastodon/features/account/components/header.js

@ -131,6 +131,7 @@ export default class Header extends ImmutablePureComponent {
const content = { __html: account.get('note_emojified') };
const displayNameHtml = { __html: account.get('display_name_html') };
const fields = account.get('fields');
const badge = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null;
return (
<div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}>
@ -139,6 +140,9 @@ export default class Header extends ImmutablePureComponent {
<span className='account__header__display-name' dangerouslySetInnerHTML={displayNameHtml} />
<span className='account__header__username'>@{account.get('acct')} {lockedIcon}</span>
{badge}
<div className='account__header__content' dangerouslySetInnerHTML={content} />
{fields.size > 0 && (

6
app/javascript/styles/mastodon/components.scss

@ -5159,6 +5159,12 @@ noscript {
}
}
.account__header .roles {
margin-top: 20px;
margin-bottom: 20px;
padding: 0 15px;
}
.account__header .account__header__fields {
font-size: 14px;
line-height: 20px;

4
app/javascript/styles/mastodon/forms.scss

@ -87,6 +87,10 @@ code {
align-items: flex-start;
}
&.file .label_input {
flex-wrap: nowrap;
}
&.select .label_input {
align-items: initial;
}

11
app/models/account.rb

@ -45,6 +45,7 @@
# moved_to_account_id :bigint(8)
# featured_collection_url :string
# fields :jsonb
# actor_type :string
#
class Account < ApplicationRecord
@ -149,6 +150,16 @@ class Account < ApplicationRecord
moved_to_account_id.present?
end
def bot?
%w(Application Service).include? actor_type
end
alias bot bot?
def bot=(val)
self.actor_type = ActiveModel::Type::Boolean.new.cast(val) ? 'Service' : 'Person'
end
def acct
local? ? username : "#{username}@#{domain}"
end

2
app/serializers/activitypub/actor_serializer.rb

@ -37,7 +37,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
end
def type
'Person'
object.bot? ? 'Service' : 'Person'
end
def following

2
app/serializers/rest/account_serializer.rb

@ -3,7 +3,7 @@
class REST::AccountSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :id, :username, :acct, :display_name, :locked, :created_at,
attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at,
:note, :url, :avatar, :avatar_static, :header, :header_static,
:followers_count, :following_count, :statuses_count

1
app/services/activitypub/process_account_service.rb

@ -71,6 +71,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.note = @json['summary'] || ''
@account.locked = @json['manuallyApprovesFollowers'] || false
@account.fields = property_values || {}
@account.actor_type = @json['type']
end
def set_fetchable_attributes!

6
app/views/accounts/_header.html.haml

@ -10,7 +10,11 @@
%span>< @#{account.local_username_and_domain}
= fa_icon('lock') if account.locked?
- if Setting.show_staff_badge
- if account.bot?
.roles
.account-role.bot
= t 'accounts.roles.bot'
- elsif Setting.show_staff_badge
- if account.user_admin?
.roles
.account-role.admin

3
app/views/settings/profiles/show.html.haml

@ -19,6 +19,9 @@
.fields-group
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
.fields-group
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
.fields-group
.input.with_block_label
%label= t('simple_form.labels.defaults.fields')

1
config/locales/en.yml

@ -49,6 +49,7 @@ en:
reserved_username: The username is reserved
roles:
admin: Admin
bot: Bot
moderator: Mod
unfollow: Unfollow
admin:

2
config/locales/simple_form.en.yml

@ -4,6 +4,7 @@ en:
hints:
defaults:
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
bot: Warns people that the account does not represent a person
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
display_name:
one: <span class="name-counter">1</span> character left
@ -29,6 +30,7 @@ en:
value: Content
defaults:
avatar: Avatar
bot: This is a bot account
confirm_new_password: Confirm new password
confirm_password: Confirm password
current_password: Current password

5
db/migrate/20180506221944_add_actor_type_to_accounts.rb

@ -0,0 +1,5 @@
class AddActorTypeToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :actor_type, :string
end
end

3
db/schema.rb

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2018_04_16_210259) do
ActiveRecord::Schema.define(version: 2018_05_06_221944) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -75,6 +75,7 @@ ActiveRecord::Schema.define(version: 2018_04_16_210259) do
t.bigint "moved_to_account_id"
t.string "featured_collection_url"
t.jsonb "fields"
t.string "actor_type"
t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower"
t.index ["uri"], name: "index_accounts_on_uri"

Loading…
Cancel
Save