Squashed commit of the following:

commit c9327633a352e39e75166dc0fcf88ad13e5658a3
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 01:25:41 2023 +0900

    tset

commit 40925b9adddef9c0fd50557e322a9ecab79eea15
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 01:13:54 2023 +0900

    d

commit 63a76af1acfc1442dd270aa6280597cdd39a6c56
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 01:07:21 2023 +0900

    test

commit a6024a83d779efb6fa1be20cdfa31af5e679dec5
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 00:46:16 2023 +0900

    sdf

commit 2fa4c4d4a7933a729c32f666c5dba7359f6e5eb6
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 00:33:38 2023 +0900

    ㅅㄷㄴㅅ

commit 9bb8fe3e95263f32f65dc5d884ea8789a8d4b323
Author: whippyshou <whippyshou@gmail.com>
Date:   Fri Nov 3 00:08:12 2023 +0900

    test

commit 909b622f7eef6f91c6ed24b5b5e439d853ccbf04
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 23:56:44 2023 +0900

    tes

commit e0cd24b7a8f0b69fff17f0eda260a03220e5fd9f
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 23:46:21 2023 +0900

    test

commit 623977653a3033cc104b094e7e4176efa5e820a1
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 23:41:24 2023 +0900

    icon change

commit b5d0b03dc0fe30531ecf476c7c9f2fbe7c1024ce
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 23:31:46 2023 +0900

    public

commit 1e408b723a9610dd3395ea7b2006e9dfd7f1bfe5
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 23:00:19 2023 +0900

    test

commit 5d93d266b8df636586ac37186a036beb63208e6d
Author: whippyshou <whippyshou@gmail.com>
Date:   Thu Nov 2 22:52:57 2023 +0900

    test

app/helpers/application_helper.rb

@@ -121,11 +121,12 @@ module ApplicationHelper
     if status.public_visibility?
       fa_icon('globe', title: I18n.t('statuses.visibilities.public'))
     elsif status.unlisted_visibility?
-      fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
+      fa_icon('cloud', title: I18n.t('statuses.visibilities.unlisted'))
+      #fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
     elsif status.private_visibility? || status.limited_visibility?
       fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
     elsif status.direct_visibility?
-      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
+      fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
     end
   end
 

app/helpers/statuses_helper.rb

@@ -70,11 +70,11 @@ module StatusesHelper
     when 'public'
       fa_icon 'globe fw'
     when 'unlisted'
-      fa_icon 'unlock fw'
+      fa_icon 'cloud fw'
     when 'private'
       fa_icon 'lock fw'
     when 'direct'
-      fa_icon 'at fw'
+      fa_icon 'envelope fw'
     end
   end
 

app/javascript/mastodon/components/status.jsx

@@ -428,7 +428,7 @@ class Status extends ImmutablePureComponent {
     } else if (status.get('visibility') === 'direct') {
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='at' className='status__prepend-icon' fixedWidth /></div>
+          <div className='status__prepend-icon-wrapper'><Icon id='envelope' className='status__prepend-icon' fixedWidth /></div>
           <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
         </div>
       );
@@ -538,9 +538,9 @@ class Status extends ImmutablePureComponent {
 
     const visibilityIconInfo = {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
-      'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
+      'unlisted': { icon: 'cloud', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];

app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx

@@ -222,14 +222,14 @@ class PrivacyDropdown extends PureComponent {
     const { intl: { formatMessage } } = this.props;
 
     this.options = [
-      { icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
-      { icon: 'unlock', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
+      // { icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
+      { icon: 'cloud', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
       { icon: 'lock', value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
     ];
 
     if (!this.props.noDirect) {
       this.options.push(
-        { icon: 'at', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+        { icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
       );
     }
   }

app/javascript/mastodon/features/status/components/detailed_status.jsx

@@ -227,9 +227,9 @@ class DetailedStatus extends ImmutablePureComponent {
 
     const visibilityIconInfo = {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
-      'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
+      'unlisted': { icon: 'cloud', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
@@ -300,7 +300,7 @@ class DetailedStatus extends ImmutablePureComponent {
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
           {status.get('visibility') === 'direct' && (
             <div className='status__prepend'>
-              <div className='status__prepend-icon-wrapper'><Icon id='at' className='status__prepend-icon' fixedWidth /></div>
+              <div className='status__prepend-icon-wrapper'><Icon id='envelope' className='status__prepend-icon' fixedWidth /></div>
               <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
             </div>
           )}

app/javascript/mastodon/locales/ko.json

@@ -518,13 +518,13 @@
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
   "privacy.direct.long": "언급된 사용자만 볼 수 있음",
-  "privacy.direct.short": "멘션한 사람들만",
+  "privacy.direct.short": "다이렉트 메시지",
   "privacy.private.long": "팔로워에게만 공개",
   "privacy.private.short": "팔로워 전용",
   "privacy.public.long": "모두가 볼 수 있음",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
-  "privacy.unlisted.short": "미등재",
+  "privacy.unlisted.long": "서버 계정과 팔로워에게만 공개됨",
+  "privacy.unlisted.short": "로컬",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
   "refresh": "새로고침",

app/javascript/styles/mastodon-bird-ui-vanilla/layout-single-column.scss

@@ -2743,6 +2743,7 @@ body.embed .button.logo-button:hover,
   position: relative;
 }
 
+.layout-single-column .detailed-status__wrapper-direct::after,
 .layout-single-column .status__wrapper-direct::after,
 .layout-single-column .detailed-status-direct::after {
   border-left: 20px solid transparent;

app/javascript/styles/mastodon-bird-ui/layout-single-column.scss

@@ -2749,6 +2749,7 @@ body.embed .button.logo-button:hover,
   position: relative;
 }
 
+.layout-single-column .detailed-status__wrapper-direct::after,
 .layout-single-column .status__wrapper-direct::after,
 .layout-single-column .detailed-status-direct::after {
   border-left: 20px solid transparent;
@@ -2761,7 +2762,7 @@ body.embed .button.logo-button:hover,
   top: 0;
   width: 0;
 }
-
+.layout-single-column .detailed-status__wrapper-direct::after,
 .layout-single-column .notification .status__wrapper-direct::after {
   top: -40px;
 }

app/models/status.rb

@@ -315,7 +315,7 @@ class Status < ApplicationRecord
 
   class << self
     def selectable_visibilities
-      visibilities.keys - %w(direct limited)
+      visibilities.keys - %w(direct limited public)
     end
 
     def favourites_map(status_ids, account_id)

app/views/admin/settings/discovery/show.html.haml

@@ -10,17 +10,6 @@
 
   %p.lead= t('admin.settings.discovery.preamble')
 
-  %h4= t('admin.settings.discovery.trends')
-
-  .fields-group
-    = f.input :trends, as: :boolean, wrapper: :with_label
-
-  .fields-group
-    = f.input :trends_as_landing_page, as: :boolean, wrapper: :with_label
-
-  .fields-group
-    = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, recommended: :not_recommended
-
   %h4= t('admin.settings.discovery.public_timelines')
 
   .fields-group

app/views/settings/preferences/appearance/show.html.haml

@@ -20,7 +20,11 @@
       #{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: '_blank', rel: 'noopener')}
 
   = f.simple_fields_for :settings, current_user.settings do |ff|
+    %h4= t 'appearance.advanced_web_interface'
 
+    %p.hint= t 'appearance.advanced_web_interface_hint'
+
+    .fields-group
     %h4= t 'appearance.animations_and_accessibility'
 
     .fields-group
@@ -32,10 +36,6 @@
       = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping')
       = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
 
-    %h4= t 'appearance.discovery'
-
-    .fields-group
-      = ff.input :'web.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_trends')
 
     %h4= t 'appearance.confirmation_dialogs'
 

config/locales/ko.yml

@@ -1655,8 +1655,8 @@ ko:
       private_long: 팔로워에게만 공개됩니다
       public: 공개
       public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
-      unlisted: 미등재
-      unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
+      unlisted: 로컬
+      unlisted_long: 서버에 계정이 있는 사람들과 팔로워들이 볼 수 있습니다
   statuses_cleanup:
     enabled: 오래된 게시물 자동 삭제
     enabled_hint: 아래의 예외 목록에 해당하지 않는다면, 명시된 기한 이후 당신의 게시물을 자동으로 삭제합니다

spec/helpers/application_helper_spec.rb

@@ -269,7 +269,7 @@ describe ApplicationHelper do
 
     it 'returns an unlock icon for a unlisted visible status' do
       result = helper.visibility_icon Status.new(visibility: 'unlisted')
-      expect(result).to match(/unlock/)
+      expect(result).to match(/cloud/)
     end
 
     it 'returns a lock icon for a private visible status' do
@@ -279,7 +279,7 @@ describe ApplicationHelper do
 
     it 'returns an at icon for a direct visible status' do
       result = helper.visibility_icon Status.new(visibility: 'direct')
-      expect(result).to match(/at/)
+      expect(result).to match(/envelope/)
     end
   end
 

spec/helpers/statuses_helper_spec.rb

@@ -66,7 +66,7 @@ describe StatusesHelper do
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-unlock')
+        expect(result).to match('fa-cloud')
       end
     end
 
@@ -86,7 +86,7 @@ describe StatusesHelper do
       it 'returns the correct fa icon' do
         result = helper.fa_visibility_icon(status)
 
-        expect(result).to match('fa-at')
+        expect(result).to match('fa-envelope')
       end
     end
   end