From 34a01639a3c8407861590a76942e4f03af080346 Mon Sep 17 00:00:00 2001 From: zzak Date: Tue, 3 Jan 2023 13:07:28 +0900 Subject: [PATCH 1/2] wip --- app/helpers/users_helper.rb | 8 ++++++++ app/models/user.rb | 7 +++++++ app/views/profiles/edit.html.erb | 19 ++++++++++++++++++ app/views/profiles/show.html.erb | 12 +++++++++++ config/locales/de.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/fr.yml | 1 + config/locales/ja.yml | 1 + config/locales/nl.yml | 1 + config/locales/pt-BR.yml | 1 + config/locales/zh-CN.yml | 1 + config/locales/zh-TW.yml | 1 + ...0103103445_add_mastodon_handle_to_users.rb | 5 +++++ public/images/mastodon_icon.png | Bin 0 -> 7473 bytes test/integration/profile_test.rb | 15 ++++++++++++++ 16 files changed, 75 insertions(+) create mode 100644 db/migrate/20230103103445_add_mastodon_handle_to_users.rb create mode 100644 public/images/mastodon_icon.png diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index dd3ff761154..6f5247d0f4e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -6,4 +6,12 @@ def twitter_username(user) def twitter_url(user) "https://twitter.com/#{user.twitter_username}" end + + def mastodon_handle(user) + "@#{user.mastodon_handle}" if user.mastodon_handle.present? + end + + def mastodon_url(user) + "@#{user.mastodon_handle}" + end end diff --git a/app/models/user.rb b/app/models/user.rb index 7f9e006cd28..bef2c9d4d62 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,6 +14,7 @@ class User < ApplicationRecord password website twitter_username + mastodon_handle ].freeze before_save :_generate_confirmation_token_no_reset_unconfirmed_email, if: :will_save_change_to_unconfirmed_email? @@ -51,7 +52,13 @@ class User < ApplicationRecord message: "can only contain letters, numbers, and underscores" }, allow_nil: true + # https://rubular.com/r/Zjjh8UbLfAFBCm + validates :mastodon_handle, format: { + with: /\A[a-zA-Z0-9_]+@[a-zA-Z0-9_\.]+\z/ + }, allow_nil: true + validates :twitter_username, length: { within: 0..20 }, allow_nil: true + validates :mastodon_handle, length: { within: 0..20 }, allow_nil: true validates :password, length: { within: 10..200 }, unpwn: true, diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb index 2fe3e74716c..89ecbb7be0d 100644 --- a/app/views/profiles/edit.html.erb +++ b/app/views/profiles/edit.html.erb @@ -16,6 +16,25 @@ <%= form.text_field :handle, :class => 'form__input' %> +
+ <%= form.label :mastodon_handle, class: 'form__label form__label__icon-container' do %> + <%= + image_tag("/images/mastodon_icon.png", alt: 'Mastodon icon', class: 'form__label__icon') + %> + + Mastodon handle + <% end %> + +

+ <%= t('.optional_mastodon_handle') %> +

+ +
+ @ + <%= form.text_field(:mastodon_handle, class: 'form__input') %> +
+
+
<%= form.label :twitter_username, class: 'form__label form__label__icon-container' do %> <%= diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb index 4b059afe4ad..ed2fed92fed 100644 --- a/app/views/profiles/show.html.erb +++ b/app/views/profiles/show.html.erb @@ -73,6 +73,18 @@

<% end %> + <% if @user.mastodon_handle.present? %> + <%= + image_tag( + "/images/mastodon_icon.png", + alt: "Mastodon icon", + class: "profile__header__icon" + ) + %> + + <%= mastodon_handle(user) %> + <% end %> + <% if @user.twitter_username.present? %> <%= image_tag( diff --git a/config/locales/de.yml b/config/locales/de.yml index cc525913b7a..83f9bf00e92 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -418,6 +418,7 @@ de: email_awaiting_confirmation: enter_password: hide_email: Verberge E-Mails in öffentlichem Profil + optional_mastodon_handle: optional_twitter_username: title: Bearbeite Profil delete: diff --git a/config/locales/en.yml b/config/locales/en.yml index 20a77dabcbb..27f95127af4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -406,6 +406,7 @@ en: email_awaiting_confirmation: Please confirm your new email address %{unconfirmed_email} enter_password: Please enter your account's password hide_email: Hide email in public profile + optional_mastodon_handle: Optional Mastodon handle. Will be displayed publicly optional_twitter_username: Optional Twitter username. Will be displayed publicly title: Edit profile delete: diff --git a/config/locales/es.yml b/config/locales/es.yml index 401950dc61d..0d8b5c35bc3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -441,6 +441,7 @@ es: %{unconfirmed_email} enter_password: Por favor introduce tu contraseña hide_email: Ocultar correo electrónico en perfil público + optional_mastodon_handle: optional_twitter_username: Usuario de Twitter opcional. Será mostrado en tu perfil público title: Editar perfil diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 8c8dfa284e9..0c7a1c18c80 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -444,6 +444,7 @@ fr: %{unconfirmed_email} enter_password: Veuillez entrer le mot de passe de votre compte hide_email: Ne pas afficher l'email dans le profil public + optional_mastodon_handle: optional_twitter_username: Nom d'utilisateur Twitter optionnel. Sera affiché publiquement title: Modification de profil diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4e6db7db468..c1a0d413574 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -403,6 +403,7 @@ ja: email_awaiting_confirmation: あなたの新しいメールアドレス%{unconfirmed_email}を確認してください。 enter_password: パスワードを入力してください。 hide_email: メールアドレスを公開しない + optional_mastodon_handle: Mastodonのユーザー名(任意,公開) optional_twitter_username: Twitterのユーザー名(任意,公開) title: プロフィールを編集する delete: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 619eeeff352..c365f8bf013 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -422,6 +422,7 @@ nl: email_awaiting_confirmation: enter_password: hide_email: + optional_mastodon_handle: optional_twitter_username: title: Wijzig profiel delete: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index a1340ffd706..15f522fbe8c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -433,6 +433,7 @@ pt-BR: email_awaiting_confirmation: enter_password: hide_email: Não mostrar meu email + optional_mastodon_handle: optional_twitter_username: title: Editar Perfil delete: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index c8603fd4699..5da99b0d31c 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -404,6 +404,7 @@ zh-CN: email_awaiting_confirmation: 请验证你的新邮箱地址 %{unconfirmed_email} enter_password: 输入密码 hide_email: 在公开的个人资料里面隐藏我的 Email + optional_mastodon_handle: optional_twitter_username: Twitter 账号（可选） title: 修改个人资料 delete: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 43b261a2d30..28cc266341a 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -405,6 +405,7 @@ zh-TW: email_awaiting_confirmation: 請驗證你的新 Email %{unconfirmed_email} enter_password: 輸入密碼 hide_email: 在公開的個人頁面中隱藏 email + optional_mastodon_handle: optional_twitter_username: Twitter 帳號（可選） title: 編輯個人檔案 delete: diff --git a/db/migrate/20230103103445_add_mastodon_handle_to_users.rb b/db/migrate/20230103103445_add_mastodon_handle_to_users.rb new file mode 100644 index 00000000000..747bc0973c2 --- /dev/null +++ b/db/migrate/20230103103445_add_mastodon_handle_to_users.rb @@ -0,0 +1,5 @@ +class AddMastodonHandleToUsers < ActiveRecord::Migration[7.0] + def change + add_column :users, :mastodon_handle, :string + end +end diff --git a/public/images/mastodon_icon.png b/public/images/mastodon_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f686138c93300afde1dbac9495808f08ebfe3c99 GIT binary patch literal 7473 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

$ck4451~y;%7FAF&KyFMp;94Vg~UZN#9Uab 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 Date: Tue, 3 Jan 2023 15:14:55 +0900 Subject: [PATCH 2/2] forget test --- test/unit/user_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 9b3041e7fcf..f562745f8d2 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -128,6 +128,16 @@ class UserTest < ActiveSupport::TestCase end end + context "mastodon_handle" do + should validate_length_of(:mastodon_handle) + should allow_value("user123_32@mastodon").for(:mastodon_handle) + should_not allow_value("@user").for(:mastodon_handle) + should_not allow_value("user 1").for(:mastodon_handle) + should_not allow_value("user-1").for(:mastodon_handle) + should allow_value("01234567890123456789@01234567890123456789").for(:mastodon_handle) + should_not allow_value("012345678901234567890").for(:mastodon_handle) + end + context "twitter_username" do should validate_length_of(:twitter_username) should allow_value("user123_32").for(:twitter_username)