From b41968da3674eae702a4765a3dbed47ac99a91b8 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 2 Mar 2023 22:10:12 +0900
Subject: [PATCH 1/5] Fix status meaningless space

---
 app/javascript/mastodon/components/status.jsx                 | 4 +++-
 .../mastodon/features/status/components/detailed_status.jsx   | 4 +++-
 app/javascript/styles/mastodon/components.scss                | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 3d920bdb79..de1e9390c9 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -512,7 +512,9 @@ class Status extends ImmutablePureComponent {
     let emojiReactionsBar = null;
     if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) {
       const emojiReactions = status.get('emoji_reactions');
-      emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      if (emojiReactions.size > 0) {
+        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      }
     }
 
     return (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index dae935ceb5..e864ced944 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -194,7 +194,9 @@ class DetailedStatus extends ImmutablePureComponent {
     let emojiReactionsBar = null;
     if (status.get('emoji_reactions')) {
       const emojiReactions = status.get('emoji_reactions');
-      emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      if (emojiReactions.size > 0) {
+        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      }
     }
 
     if (status.get('application')) {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4364b8ebd6..538044340c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1269,7 +1269,7 @@ body > [data-popper-placement] {
   margin: 8px 0 2px 4px;
 
   .emoji-reactions-bar__button {
-    background: lighten($ui-base-color, 16%);
+    background: lighten($ui-base-color, 12%);
     border: 0;
     cursor: pointer;
     display: flex;

From bc64450455d742fcea18db79bc61cfa3fbe5516b Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 2 Mar 2023 22:48:37 +0900
Subject: [PATCH 2/5] Fix notification failed bug

---
 .../mastodon/features/notifications/components/filter_bar.jsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
index f56ca6a69c..9fb06c1ddc 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
@@ -6,6 +6,7 @@ import Icon from 'mastodon/components/icon';
 const tooltips = defineMessages({
   mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
   favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' },
+  emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Emoji reactions' },
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
@@ -79,7 +80,7 @@ class FilterBar extends React.PureComponent {
           onClick={this.onClick('emoji_reaction')}
           title={intl.formatMessage(tooltips.emojiReactions)}
         >
-          <Icon id='star' fixedWidth />
+          <Icon id='smile-o' fixedWidth />
         </button>
         <button
           className={selectedFilter === 'reblog' ? 'active' : ''}

From 44ef5a61731d780365993e08161a3f1200c484d9 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Sat, 4 Mar 2023 15:25:24 +0900
Subject: [PATCH 3/5] Add markdown support

---
 app/javascript/styles/application.scss        |  1 +
 app/javascript/styles/mastodon/rich_text.scss | 97 +++++++++++++++++++
 app/lib/text_formatter.rb                     | 50 +++++++++-
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/styles/mastodon/rich_text.scss

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 81a040108e..1b2969c234 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -23,3 +23,4 @@
 @import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
+@import 'mastodon/rich_text';
diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss
new file mode 100644
index 0000000000..a8258ee8cb
--- /dev/null
+++ b/app/javascript/styles/mastodon/rich_text.scss
@@ -0,0 +1,97 @@
+.account__header__bio,
+.status__content__text,
+.e-content,
+.reply-indicator__content {
+  pre,
+  blockquote {
+    margin-bottom: 20px;
+    white-space: pre-wrap;
+    unicode-bidi: plaintext;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  code, pre {
+    border: 1px solid $ui-primary-color;
+    font-family: monospace;
+  }
+
+  code {
+    margin: 0 4px;
+  }
+
+  pre {
+    padding: 4px 8px;
+
+    span.ellipsis::after {
+      content: "";
+    }
+
+    span.invisible {
+      display: inline;
+      font-size: inherit;
+      line-height: inherit;
+      width: inherit;
+      height: inherit;
+      position: static;
+    }
+  }
+
+  blockquote {
+    padding-left: 10px;
+    border-left: 3px solid $darker-text-color;
+    color: $darker-text-color;
+    white-space: normal;
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  & > ul,
+  & > ol {
+    margin-bottom: 20px;
+  }
+
+  b,
+  strong {
+    font-weight: 700;
+  }
+
+  em,
+  i {
+    font-style: italic;
+  }
+
+  ul,
+  ol {
+    margin-left: 2em;
+
+    p {
+      margin: 0;
+    }
+  }
+
+  ul {
+    list-style-type: disc;
+  }
+
+  ol {
+    list-style-type: decimal;
+  }
+
+  mark {
+    background-color: $ui-highlight-color;
+    color: $ui-secondary-color;
+    padding: 0 2px;
+  }
+}
+
+.reply-indicator__content {
+  blockquote {
+    border-left-color: $inverted-text-color;
+    color: $inverted-text-color;
+  }
+}
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 48e2fc2338..8513b1f4ca 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -43,7 +43,9 @@ class TextFormatter
       end
     end
 
-    html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+    html = markdownify(html)
+
+    # html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
@@ -155,4 +157,50 @@ class TextFormatter
   def preloaded_accounts?
     preloaded_accounts.present?
   end
+
+  def markdownify(html)
+    # not need filter_html because escape is already done
+    @htmlobj ||= MyMarkdownHTML.new(
+        filter_html: false,
+        hard_wrap: false,
+        no_styles: true
+      )
+    @markdown ||= Redcarpet::Markdown.new(@htmlobj,
+        autolink: false,
+        tables: false,
+        underline: true,
+        disable_indented_code_blocks: false,
+        fenced_code_blocks: true,
+        highlight: false
+      )
+    @markdown.render(html)
+  end
+
+  class MyMarkdownHTML < Redcarpet::Render::HTML
+    def link(link, title, content)
+      nil
+    end
+
+    def linebreak
+      nil
+    end
+
+    def block_code(code, language)
+      "<pre>#{code}</pre>"
+    end
+
+    def codespan(code)
+      "<code>#{escape_tags(code)}</code>"
+    end
+
+    def header(text, header_level)
+      "<p>#{text}</p>"
+    end
+
+    private
+
+    def escape_tags(code)
+      code.gsub(/</, '&lt;').gsub(/>/, '&gt;')
+    end
+  end
 end

From 245309d679ec379ab3ac1c693bab1bc8a1f4cc5c Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Sat, 4 Mar 2023 15:58:53 +0900
Subject: [PATCH 4/5] Fix status text single-line via markdown

---
 app/lib/text_formatter.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 8513b1f4ca..9417396333 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -46,6 +46,8 @@ class TextFormatter
     html = markdownify(html)
 
     # html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+    html = html.delete("\n")
+    p html
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
@@ -162,7 +164,7 @@ class TextFormatter
     # not need filter_html because escape is already done
     @htmlobj ||= MyMarkdownHTML.new(
         filter_html: false,
-        hard_wrap: false,
+        hard_wrap: true,
         no_styles: true
       )
     @markdown ||= Redcarpet::Markdown.new(@htmlobj,
@@ -181,16 +183,12 @@ class TextFormatter
       nil
     end
 
-    def linebreak
-      nil
-    end
-
     def block_code(code, language)
-      "<pre>#{code}</pre>"
+      "<pre>#{process_program_code(code)}</pre>"
     end
 
     def codespan(code)
-      "<code>#{escape_tags(code)}</code>"
+      "<code>#{process_program_code(code)}</code>"
     end
 
     def header(text, header_level)
@@ -199,8 +197,8 @@ class TextFormatter
 
     private
 
-    def escape_tags(code)
-      code.gsub(/</, '&lt;').gsub(/>/, '&gt;')
+    def process_program_code(code)
+      code.gsub(/\n/, '<br>')
     end
   end
 end

From 5f477d21d104b4b7b9f74197988ecc0db650903d Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Sat, 4 Mar 2023 16:19:08 +0900
Subject: [PATCH 5/5] Fix blockquote

---
 app/lib/text_formatter.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 9417396333..607583ab2f 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -43,7 +43,9 @@ class TextFormatter
       end
     end
 
-    html = markdownify(html)
+    # line first letter for blockquote
+    p 'DEBUG  ' + html.gsub(/^gt;/, '>')
+    html = markdownify(html.gsub(/^&gt;/, '>'))
 
     # html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
     html = html.delete("\n")
@@ -164,8 +166,7 @@ class TextFormatter
     # not need filter_html because escape is already done
     @htmlobj ||= MyMarkdownHTML.new(
         filter_html: false,
-        hard_wrap: true,
-        no_styles: true
+        hard_wrap: true
       )
     @markdown ||= Redcarpet::Markdown.new(@htmlobj,
         autolink: false,