/g, '\n\n'); + + const quote_emojiMap = makeEmojiMap(normalStatus.quote); + + const quote_account_emojiMap = makeEmojiMap(status.quote.account); + const displayName = normalStatus.quote.account.display_name.length === 0 ? normalStatus.quote.account.username : normalStatus.quote.account.display_name; + normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap); + normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent; + let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement; + Array.from(docElem.querySelectorAll('p,br'), line => { + let parentNode = line.parentNode; + if (line.nextSibling) { + parentNode.insertBefore(document.createTextNode(' '), line.nextSibling); + } + }); + let _contentHtml = docElem.textContent; + normalStatus.quote.contentHtml = '
'+emojify(_contentHtml.substr(0, 150), quote_emojiMap) + (_contentHtml.substr(150) ? '...' : '')+'
{ this.nl2br(intl.formatMessage(messages.markdown, { domain: document.title }))} + + (半角)は半角スペースを入力する必要がある場所です。(半角)だけの列は半角スペースのみが入力された列が必要であるを指します。 + 〜〜〜〜〜〜見出し〜〜〜〜〜〜 + #(半角)見出しテキスト + #は1〜6個重ねることができます。 + 〜〜〜〜コードブロック〜〜〜〜 + `コード` + 〜〜〜〜〜〜引用〜〜〜〜〜〜 + >引用文 + (半角) + ここから先は引用が切れます + 引用は複数回重ねることが可能です。 + 〜〜〜〜〜〜リスト〜〜〜〜〜〜 + (半角) + +(半角)内容1 + +(半角)内容2 + (半角) + 内容の数に制限はありません。 + 投稿トップにリストを持ってくる場合に限り1行目の(半角)は必要ありません。 + +(半角)を1.(半角)に置き換えることで数字付きリストになります。 + 〜〜〜〜〜上付き文字〜〜〜〜〜 + _上付き文字_ + 〜〜〜〜〜下付き文字〜〜〜〜〜 + __下付き文字__ + 〜〜〜〜〜小さい文字〜〜〜〜〜 + ___小さい文字___ + 〜〜〜〜〜取り消し線〜〜〜〜〜 + ~~取り消したい文字列~~ + 〜〜〜〜〜〜横罫線〜〜〜〜〜〜 + ___ + 〜〜〜〜〜〜リンク〜〜〜〜〜〜 + [リンク文章](https://・・・) + 〜〜〜〜〜〜画像〜〜〜〜〜〜 +  + リンク、画像ともにURLにはhttps://から始まる物のみご利用可能です。 +
(.+)<\/p>$/, '\1') + html = Sanitize.clean(html).delete("\n").truncate(150) + html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify] + html.html_safe + end + + def reformat(html) + sanitize(html, Sanitize::Config::MASTODON_STRICT) + rescue ArgumentError + '' + end + + def plaintext(status) + return status.text if status.local? + + text = status.text.gsub(/(||<\/p>)+/) { |match| "#{match}\n" } + strip_tags(text) + end + + def simplified_format(account, **options) + return '' if account.note.blank? + + html = account.local? ? linkify(account.note) : reformat(account.note) + html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify] + html.html_safe # rubocop:disable Rails/OutputSafety + end + + def sanitize(html, config) + Sanitize.fragment(html, config) + end + + def format_spoiler(status, **options) + html = encode(status.spoiler_text) + html = encode_custom_emojis(html, status.emojis, options[:autoplay]) + html.html_safe # rubocop:disable Rails/OutputSafety + end + + def format_poll_option(status, option, **options) + html = encode(option.title) + html = encode_custom_emojis(html, status.emojis, options[:autoplay]) + html.html_safe # rubocop:disable Rails/OutputSafety + end + + def format_display_name(account, **options) + html = encode(account.display_name.presence || account.username) + html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify] + html.html_safe # rubocop:disable Rails/OutputSafety + end + + def format_field(account, str, **options) + html = account.local? ? encode_and_link_urls(str, me: true, with_domain: true) : reformat(str) + html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify] + html.html_safe # rubocop:disable Rails/OutputSafety + end + + def linkify(text) + html = encode_and_link_urls(text) + html = simple_format(html, {}, sanitize: false) + html = html.delete("\n") + + html.html_safe # rubocop:disable Rails/OutputSafety + end + + private + + def html_entities + @html_entities ||= HTMLEntities.new + end + + def encode(html) + html_entities.encode(html) + end + + def encode_and_link_urls(html, accounts = nil, options = {}) + entities = utf8_friendly_extractor(html, extract_url_without_protocol: false) + + mdExtractor = MDExtractor.new(html) + entities.concat(mdExtractor.extractEntities) + + if accounts.is_a?(Hash) + options = accounts + accounts = nil + end + + rewrite(html.dup, entities) do |entity| + if entity[:markdown] + html[entity[:indices][0]...entity[:indices][1]] + elsif entity[:url] + link_to_url(entity, options) + elsif entity[:hashtag] + link_to_hashtag(entity) + elsif entity[:screen_name] + link_to_mention(entity, accounts, options) + end + end + end + + def count_tag_nesting(tag) + if tag[1] == '/' then -1 + elsif tag[-2] == '/' then 0 + else 1 + end + end + + # rubocop:disable Metrics/BlockNesting + def encode_custom_emojis(html, emojis, animate = false) + return html if emojis.empty? + + emoji_map = emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] } + + i = -1 + tag_open_index = nil + inside_shortname = false + shortname_start_index = -1 + invisible_depth = 0 + + while i + 1 < html.size + i += 1 + + if invisible_depth.zero? && inside_shortname && html[i] == ':' + shortcode = html[shortname_start_index + 1..i - 1] + emoji = emoji_map[shortcode] + + if emoji + original_url, static_url = emoji + replacement = begin + if animate + image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:") + else + image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url }) + end + end + before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : '' + html = before_html + replacement + html[i + 1..-1] + i += replacement.size - (shortcode.size + 2) - 1 + else + i -= 1 + end + + inside_shortname = false + elsif tag_open_index && html[i] == '>' + tag = html[tag_open_index..i] + tag_open_index = nil + if invisible_depth.positive? + invisible_depth += count_tag_nesting(tag) + elsif tag == '' + invisible_depth = 1 + end + elsif html[i] == '<' + tag_open_index = i + inside_shortname = false + elsif !tag_open_index && html[i] == ':' + inside_shortname = true + shortname_start_index = i + end + end + + html + end + # rubocop:enable Metrics/BlockNesting + + def quotify(html, status) + url = ActivityPub::TagManager.instance.url_for(status.quote) + link = encode_and_link_urls(url) + html.sub(/(<[^>]+>)\z/, "QT: #{link}\\1") + end + + def rewrite(text, entities) + text = text.to_s + + # Sort by start index + entities = entities.sort_by do |entity| + indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices] + indices.first + end + + result = [] + + last_index = entities.reduce(0) do |index, entity| + indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices] + result << encode(text[index...indices.first]) + result << yield(entity) + indices.last + end + + result << encode(text[last_index..-1]) + + result.flatten.join + end + + def utf8_friendly_extractor(text, options = {}) + # Note: I couldn't obtain list_slug with @user/list-name format + # for mention so this requires additional check + special = Extractor.extract_urls_with_indices(text, options) + standard = Extractor.extract_entities_with_indices(text, options) + extra = Extractor.extract_extra_uris_with_indices(text, options) + + Extractor.remove_overlapping_entities(special + standard + extra) + end + + def link_to_url(entity, options = {}) + url = Addressable::URI.parse(entity[:url]) + html_attrs = { target: '_blank', rel: 'nofollow noopener noreferrer' } + + html_attrs[:rel] = "me #{html_attrs[:rel]}" if options[:me] + + Twitter::TwitterText::Autolink.send(:link_to_text, entity, link_html(entity[:url]), url, html_attrs) + rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError + encode(entity[:url]) + end + + def link_to_mention(entity, linkable_accounts, options = {}) + acct = entity[:screen_name] + + return link_to_account(acct, options) unless linkable_accounts + + same_username_hits = 0 + account = nil + username, domain = acct.split('@') + domain = nil if TagManager.instance.local_domain?(domain) + + linkable_accounts.each do |item| + same_username = item.username.casecmp(username).zero? + same_domain = item.domain.nil? ? domain.nil? : item.domain.casecmp(domain)&.zero? + + if same_username && !same_domain + same_username_hits += 1 + elsif same_username && same_domain + account = item + end + end + + account ? mention_html(account, with_domain: same_username_hits.positive? || options[:with_domain]) : "@#{encode(acct)}" + end + + def link_to_account(acct, options = {}) + username, domain = acct.split('@') + + domain = nil if TagManager.instance.local_domain?(domain) + account = EntityCache.instance.mention(username, domain) + + account ? mention_html(account, with_domain: options[:with_domain]) : "@#{encode(acct)}" + end + + def link_to_hashtag(entity) + hashtag_html(entity[:hashtag]) + end + + def link_html(url) + url = Addressable::URI.parse(url).to_s + prefix = url.match(/\A(https?:\/\/(www\.)?|xmpp:)/).to_s + text = url[prefix.length, 30] + suffix = url[prefix.length + 30..-1] + cutoff = url[prefix.length..-1].length > 30 + + "#{encode(prefix)}#{encode(text)}#{encode(suffix)}" + end + + def hashtag_html(tag) + "##{encode(tag)}" + end + + def mention_html(account, with_domain: false) + "@#{encode(with_domain ? account.pretty_acct : account.username)}" + end +end diff --git a/app/lib/formatter_markdown.rb b/app/lib/formatter_markdown.rb new file mode 100644 index 000000000..edfee6b25 --- /dev/null +++ b/app/lib/formatter_markdown.rb @@ -0,0 +1,367 @@ +require 'uri' +require 'redcarpet' +require 'redcarpet/render_strip' + +class FormatterMarkdown + def initialize(html) + @html = html.dup + end + + def formatted + mdRenderer = CustomMDRenderer.new( + strikethrough: true, + hard_wrap: true, + autolink: false, + superscript:false, + fenced_link: true, + fenced_image: true, + no_intra_emphasis: true, + no_links: true, + no_styles: true, + no_images: true, + filter_html: true, + escape_html: true, + safe_links_only: true, + with_toc_data: true, + xhtml: false, + prettify: true, + link_attributes: true + ) + + md = Redcarpet::Markdown.new( + mdRenderer, + strikethrough: true, + hard_wrap: true, + superscript:false, + autolink: false, + space_after_headers: true, + no_intra_emphasis: true, + no_links: true, + no_styles: true, + no_images: true, + filter_html: true, + escape_html: true, + safe_links_only: true, + with_toc_data: true, + xhtml: false, + prettify: true, + link_attributes: true + ) + s = @html + s.gsub!(/\n[\n]+/) {"\n \n"}# 改行周りの問題を修正 + s.gsub!(/`[ ]+`/) {"｀ ｀"}# code内が半角スペースのみだとHTMLが壊れるのでそれの回避 + + renderedMD = md.render(s) + + result = renderedMD + result.gsub!(/(<\w+)([^>]*>)/) { "#{$1} data-md='true' #{$2}" }# ToDo data-md="true" を認識して他鯖の人にmarkdownの使用を伝える機能の実装 + result.gsub!(/(https?:\/\/[^<>"\[\] ]+)/){"#{$1} "}#URLの後ろにスペースをねじ込む奴 mastodonのURL認識がゆるいのをmarkdownで対処 + + result + + end + + class CustomMDRenderer < Redcarpet::Render::HTML + + #基本的な実装の流れ + #URLの削除(mastodonの機能上URLとして認識されると十中八九HTMLが壊れるので) + #markdownコンテンツ内でのmarkdownコンテンツの禁止(意図しないHTMLタグの生成によってHTMLの不正出力を防ぐ目的) + #最後にHTMLに出力される際にHTML的にヤバイ子たちのエスケープ + + def paragraph(text) + %(#{text.strip}) + end + + def linebreak() + %() + end + + def block_quote(quote) + urlRemoved = "#{remove_url(quote)}" + escapedContents = "#{blockquote_markdown_escape(urlRemoved)}" + %(#{escapedContents.strip}) + end + + def header(text, header_level) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}\n) + end + + def block_code(code, language) + %(#{code.strip}) + end + + def codespan(code) + urlRemoved = "#{remove_url(code)}" + escapedCode = "#{escape_bbcode(urlRemoved)}" + encoded = "#{encode(escapedCode)}" + %(#{code_contents(encoded)}) + end + + def list(contents, list_type) + if list_type == :unordered + %(#{contents.strip}) + elsif list_type == :ordered + %(#{contents.strip}) + else + %(<#{list_type} class='md-contents'>#{contents.strip}) + end + end + + def list_item(text, list_type) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def emphasis(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def double_emphasis(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def triple_emphasis(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def strikethrough(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def superscript(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def underline(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + def highlight(text) + urlRemoved = "#{remove_url(text)}" + mdContentsRemoved = "#{markdown_escape(urlRemoved)}" + %(#{encode(mdContentsRemoved)}) + end + + #オートリンクはmastodonとの相性が悪いので基本的には使わない + + def autolink(link, link_type) + %(リンク) + end + + #https以外の物がURLとして記入された時にTextをHTML的に考えて安全に表示するように変更 + + def image(link, title, alt_text) + + if alt_text =~ /[<>"\[\] ]+/ + alt_text = "設定なし" + end + + imgcheck = "#{link}" + if imgcheck !~ /\Ahttps:\/\/[^<>"\[\] ]+\z/ + %(#{encode(alt_text)}) + else + %(画像が添付されています。) + end + end + + def link(link, title, content) + + if content =~ /([<>"\[\] ]+|https?:\/\/|#|@)/ + content = "リンク" + elsif content !~ /.+/ + content = "リンク" + end + + linkcheck = "#{link}" + if linkcheck !~ /\Ahttps:\/\/[^<>"\[\] ]+\z/ + %(#{encode(content)}) + else + %(#{encode(content)}) + end + end + + #ここから下はいろいろエスケープするための奴 + + #HTML的に考えてよろしくない子たちをエスケープする奴 + def encode(html) + HTMLEntities.new.encode(html) + end + + #markdownコンテンツないでURLが生成されるのを防ぐためのエスケープする奴 + def remove_url(string) + url = string.gsub(/https?:\/\//){ "URL:" } + reply = url.gsub(/@/){ "＠" } + hashTag = reply.gsub(/#/){ "＃" } + end + + #前々から要望があったcode内でBBCodeを無効化するための奴 + def escape_bbcode(string) + string.gsub(/\[/){ "[" } + end + + #markdownの中でmarkdownを展開させないためのエスケープする奴 + + #blockquote以外は下のが使える + def markdown_escape(string) + string.gsub(/<[^>]+>/) { "" } + end + + #blockquoteコンテンツ内でblockquoteタグだけを許可するためのエスケープ + def blockquote_markdown_escape(string) + string.gsub(/<([\/]?a[^>]*|[\/]?img[^>]*|[\/]?code[^>]*|[\/]?h[1-6][^>]*|[\/]?sup[^>]*|[\/]?sub[^>]*|[\/]?small[^>]*|[\/]?ul[^>]*|[\/]?ol[^>]*|[\/]?li[^>]*|[\/]?hr[^>]*|[\/]?s[^>]*|[\/]?u[^>]*|[\/]?mark[^>]*)>/) { "" } + end + + #code内の一部を色分けするための変更 + def code_contents(string) + simple = string.gsub(/(true|error|false|failed|def|puts|end|fn|let|mut|use|String|println!)/ , + "true" => "#{:true}", + "error" => "#{:error}", + "false" => "#{:false}", + "failed" => "#{:failed}", + "def" => "#{:def}", + "puts" => "#{:puts}", + "end" => "#{:end}", + "fn" => "#{:fn}", + "let" => "#{:let}", + "mut" => "#{:mut}", + "use" => "#{:use}", + "String" => "#{:String}", + "println!" => "#{:println!}", + ) + simple.gsub(/("[a-zA-Z0-9_ ,]+")/){ "#{$1}" } +# "" => "#{:}", + end + + #テストで書きなぐった奴 + def html_escape(string) + string.gsub(/['&\"<>\/]/, { + '&' => '&', + '<' => '<', + '>' => '>', + '"' => '"', + "'" => ''', + "/" => '/', + }) + end + + end + +end + +#URLとかいう人類には早すぎたやばい子たちを大人しくするために必要な機構 + +class MDLinkDecoder + def initialize(html) + @html = html.dup + end + + def decode + imageDecoded = @html.gsub(/]*)>/) { "" } + + imageDecoded.gsub(/]*)>/) { "" } + end +end + +#エスケープを回避するHTMLタグの設定とかその他 + +class MDExtractor + def initialize(html) + @html = html.dup + end + + def extractEntities + [ + extractByHTMLTagName("h1"), + extractByHTMLTagName("h2"), + extractByHTMLTagName("h3"), + extractByHTMLTagName("h4"), + extractByHTMLTagName("h5"), + extractByHTMLTagName("h6"), + extractByHTMLTagName("em"), + extractByHTMLTagName("sup"), + extractByHTMLTagName("sub"), + extractByHTMLTagName("small"), + extractByHTMLTagName("u"), + extractByHTMLTagName("strong"), + extractByHTMLTagName("ul", false, false, "li"), + extractByHTMLTagName("ol", false, false, "li"), + extractByHTMLTagName("code"), + extractByHTMLTagName("blockquote", false), + extractByHTMLTagName("hr", false, true), + extractByHTMLTagName("br", false, true), + extractByHTMLTagName("a"), + extractByHTMLTagName("img", false, true), + extractByHTMLTagName("s"), + extractByHTMLTagName("span") + ].flatten.compact + end + + def extractByHTMLTagName(tagName, isNoNest = true, isSingle = false, itemTagName = nil) + entities = [] + + @html.to_s.scan(htmlTagPatternByCond(tagName, isNoNest, isSingle, itemTagName)) do + match = $~ + + beginPos = match.char_begin(0) + endPos = match.char_end(0) + #puts "MDExtractor extracted with:\n" + @html + "\nbeginPos: " + beginPos.to_s + ", endPos: " + endPos.to_s + ", length: " + @html.length.to_s + + entity = { + :markdown => true, + :indices => [beginPos, endPos] + } + + entities.push(entity) + end + + entities + end + + def htmlTagPatternByCond(tagName, isNoNest, isSingle, itemTagName) + if isSingle + htmlTagPatternSingle(tagName) + elsif isNoNest + htmlTagPatternNoNest(tagName) + elsif itemTagName && itemTagName.length > 0 + htmlTagPatternOuterMostWithItem(tagName, itemTagName) + else + htmlTagPatternOuterMost(tagName) + end + end + + def htmlTagPattern(tagName) + Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<]|<#{tagName} data-md=[^>]*>|<\\/#{tagName}>)*(?:<\\/#{tagName}>)*") + end + + def htmlTagPatternNoNest(tagName) + Regexp.compile("<#{tagName} data-md=[^>]*>(?:.|\n)*?<\\/#{tagName}>") + end + + def htmlTagPatternSingle(tagName) + Regexp.compile("<#{tagName} data-md=[^>]*>") + end + + # https://stackoverflow.com/questions/546433/regular-expression-to-match-outer-brackets + def htmlTagPatternOuterMost(tagName) + Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<>]|(\\g<0>))*<\/#{tagName}>") + end + + def htmlTagPatternOuterMostWithItem(tagName, itemTagName) + Regexp.compile("<#{tagName} data-md=[^>]*>(?:[^<>]|<#{itemTagName} data-md=[^>]*>|<\\/#{itemTagName}>|(\\g<0>))*<\/#{tagName}>") + end +end diff --git a/app/lib/quote_formatter.rb b/app/lib/quote_formatter.rb new file mode 100644 index 000000000..69c5b7456 --- /dev/null +++ b/app/lib/quote_formatter.rb @@ -0,0 +1,19 @@ +class QuoteFormatter + include ActionView::Helpers::TextHelper + include ERB::Util + include RoutingHelper + + def initialize(html, quote, options = {}) + @html = html + @quote = quote + @options = options + end + + def to_s + return html if status.quote? && !options[:escape_quotify] + + url = ActivityPub::TagManager.instance.url_for(status.quote) + link = encode_and_link_urls(url) + html.sub(/(<[^>]+>)\z/, "QT: #{link}\\1") + end +end diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index de054e403..b56ad81ef 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -38,6 +38,8 @@ class UserSettingsDecorator user.settings['use_pending_items'] = use_pending_items_preference if change?('setting_use_pending_items') user.settings['trends'] = trends_preference if change?('setting_trends') user.settings['crop_images'] = crop_images_preference if change?('setting_crop_images') + user.settings['place_tab_bar_at_bottom'] = place_tab_bar_at_bottom_preference if change?('setting_place_tab_bar_at_bottom') + user.settings['show_tab_bar_label'] = show_tab_bar_label_preference if change?('setting_show_tab_bar_label') end def merged_notification_emails @@ -132,6 +134,14 @@ class UserSettingsDecorator boolean_cast_setting 'setting_crop_images' end + def place_tab_bar_at_bottom_preference + boolean_cast_setting 'setting_place_tab_bar_at_bottom' + end + + def show_tab_bar_label_preference + boolean_cast_setting 'setting_show_tab_bar_label' + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end diff --git a/app/models/status.rb b/app/models/status.rb index bf5a49b7f..16d24a5e7 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -23,6 +23,7 @@ # in_reply_to_account_id :bigint(8) # poll_id :bigint(8) # deleted_at :datetime +# quote_id :bigint(8) # edited_at :datetime # trendable :boolean # ordered_media_attachment_ids :bigint(8) is an Array @@ -59,6 +60,7 @@ class Status < ApplicationRecord belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true + belongs_to :quote, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quoted, optional: true has_many :favourites, inverse_of: :status, dependent: :destroy has_many :bookmarks, inverse_of: :status, dependent: :destroy @@ -68,6 +70,7 @@ class Status < ApplicationRecord has_many :mentions, dependent: :destroy, inverse_of: :status has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status has_many :media_attachments, dependent: :nullify + has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify has_and_belongs_to_many :tags has_and_belongs_to_many :preview_cards @@ -82,6 +85,7 @@ class Status < ApplicationRecord validates_with DisallowedHashtagsValidator validates :reblog, uniqueness: { scope: :account }, if: :reblog? validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog? + validates :quote_visibility, inclusion: { in: %w(public unlisted) }, if: :quote? accepts_nested_attributes_for :poll @@ -171,6 +175,14 @@ class Status < ApplicationRecord !reblog_of_id.nil? end + def quote? + !quote_id.nil? && quote + end + + def quote_visibility + quote&.visibility + end + def within_realtime_window? created_at >= REAL_TIME_WINDOW.ago end @@ -235,7 +247,7 @@ class Status < ApplicationRecord fields = [spoiler_text, text] fields += preloadable_poll.options unless preloadable_poll.nil? - @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : []) end def ordered_media_attachments diff --git a/app/models/user.rb b/app/models/user.rb index e25c0ddb0..262528a10 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -130,6 +130,8 @@ class User < ApplicationRecord :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, :disable_swiping, + :place_tab_bar_at_bottom,:show_tab_bar_label, + to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code, :sign_in_token_attempt diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index 27e058199..6b98211b7 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -11,6 +11,9 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer :atom_uri, :in_reply_to_atom_uri, :conversation + attribute :quote_url, if: -> { object.quote? } + attribute :misskey_quote, key: :_misskey_quote, if: -> { object.quote? } + attribute :misskey_content, key: :_misskey_content, if: -> { object.quote? } attribute :content attribute :content_map, if: :language? attribute :updated, if: :edited? @@ -138,6 +141,16 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer end end + def quote_url + ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote? + end + + alias misskey_quote quote_url + + def misskey_content + object.text if object.quote? + end + def local? object.account.local? end diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index b3b913946..f66e52b83 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -41,6 +41,8 @@ class InitialStateSerializer < ActiveModel::Serializer store[:is_staff] = object.current_account.user.staff? store[:trends] = Setting.trends && object.current_account.user.setting_trends store[:crop_images] = object.current_account.user.setting_crop_images + store[:place_tab_bar_at_bottom] = object.current_account.user.setting_place_tab_bar_at_bottom + store[:show_tab_bar_label] = object.current_account.user.setting_show_tab_bar_label else store[:auto_play_gif] = Setting.auto_play_gif store[:display_media] = Setting.display_media diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 0dc44b623..30269593c 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -6,7 +6,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer attributes :uri, :title, :short_description, :description, :email, :version, :urls, :stats, :thumbnail, :languages, :registrations, :approval_required, :invites_enabled, - :configuration + :configuration, + :feature_quote has_one :contact_account, serializer: REST::AccountSerializer @@ -96,6 +97,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer Setting.min_invite_role == 'user' end + def feature_quote + true + end + private def instance_presenter diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 32c4e405e..18a3b1cfe 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -17,6 +17,8 @@ class REST::StatusSerializer < ActiveModel::Serializer attribute :content, unless: :source_requested? attribute :text, if: :source_requested? + attribute :quote_id, if: -> { object.quote? } + belongs_to :reblog, serializer: REST::StatusSerializer belongs_to :application, if: :show_application? belongs_to :account, serializer: REST::AccountSerializer @@ -41,6 +43,10 @@ class REST::StatusSerializer < ActiveModel::Serializer object.in_reply_to_account_id&.to_s end + def quote_id + object.quote_id.to_s + end + def current_user? !current_user.nil? end @@ -169,3 +175,23 @@ class REST::StatusSerializer < ActiveModel::Serializer end end end + +class REST::NestedQuoteSerializer < REST::StatusSerializer + attribute :quote do + nil + end + attribute :quote_muted, if: :current_user? + + def quote_muted + if instance_options && instance_options[:account_relationships] + instance_options[:account_relationships].muting[object.account_id] ? true : false || instance_options[:account_relationships].blocking[object.account_id] || instance_options[:account_relationships].blocked_by[object.account_id] || instance_options[:account_relationships].domain_blocking[object.account_id] || false + else + current_user.account.muting?(object.account) || object.account.blocking?(current_user.account) || current_user.account.blocking?(object.account) || current_user.account.domain_blocking?(object.account.domain) + end + end + +end + +class REST::StatusSerializer < ActiveModel::Serializer + belongs_to :quote, serializer: REST::NestedQuoteSerializer +end diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index c132930a9..9c30a7e29 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -27,11 +27,13 @@ class PostStatusService < BaseService @options = options @text = @options[:text] || '' @in_reply_to = @options[:thread] + @quote_id = @options[:quote_id] return idempotency_duplicate if idempotency_given? && idempotency_duplicate? validate_media! preprocess_attributes! + preprocess_quote! if scheduled? schedule_status! @@ -48,6 +50,19 @@ class PostStatusService < BaseService private + def status_from_uri(uri) + ActivityPub::TagManager.instance.uri_to_resource(uri, Status) + end + + def quote_from_url(url) + return nil if url.nil? + + quote = ResolveURLService.new.call(url) + status_from_uri(quote.uri) if quote + rescue + nil + end + def preprocess_attributes! @sensitive = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present? @text = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present? @@ -55,10 +70,21 @@ class PostStatusService < BaseService @visibility = :unlisted if @visibility&.to_sym == :public && @account.silenced? @scheduled_at = @options[:scheduled_at]&.to_datetime @scheduled_at = nil if scheduled_in_the_past? + if @quote_id.nil? && md = @text.match(/QT:\s*\[\s*(https:\/\/.+?)\s*\]/) + @quote_id = quote_from_url(md[1])&.id + @text.sub!(/QT:\s*\[.*?\]/, '') + end rescue ArgumentError raise ActiveRecord::RecordInvalid end + def preprocess_quote! + if @quote_id.present? + quote = Status.find(@quote_id) + @quote_id = quote.reblog_of_id.to_s if quote.reblog? + end + end + def process_status! # The following transaction block is needed to wrap the UPDATEs to # the media attachments when the status is created @@ -169,6 +195,7 @@ class PostStatusService < BaseService language: valid_locale_cascade(@options[:language], @account.user&.preferred_posting_language, I18n.default_locale), application: @options[:application], rate_limit: @options[:with_rate_limit], + quote_id: @quote_id, }.compact end diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index e107912b7..6bb5beb86 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class StatusLengthValidator < ActiveModel::Validator - MAX_CHARS = 500 + MAX_CHARS = 2048 URL_PLACEHOLDER_CHARS = 23 URL_PLACEHOLDER = 'x' * 23 diff --git a/app/views/admin/tags/_tag.html.haml b/app/views/admin/tags/_tag.html.haml new file mode 100644 index 000000000..ac0c72816 --- /dev/null +++ b/app/views/admin/tags/_tag.html.haml @@ -0,0 +1,19 @@ +.batch-table__row + - if batch_available + %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox + = f.check_box :tag_ids, { multiple: true, include_hidden: false }, tag.id + + .directory__tag + = link_to admin_tag_path(tag.id) do + %h4 + = fa_icon 'hashtag' + = tag.name + + %small + = t('admin.tags.unique_uses_today', count: tag.history.first[:accounts]) + + - if tag.trending? + = fa_icon 'fire fw' + = t('admin.tags.trending_right_now') + + .trends__item__current= friendly_number_to_human tag.history.first[:uses] diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f5a963e00..d1b27fa72 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,7 +2,7 @@ %html{ lang: I18n.locale } %head %meta{ charset: 'utf-8' }/ - %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/ + %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, viewport-fit=cover' }/ - if cdn_host? %link{ rel: 'dns-prefetch', href: cdn_host }/ diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index 852a0c69b..c8d9ff352 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -4,7 +4,7 @@ %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/ %meta{ charset: 'utf-8' }/ %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ') - %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ + %meta{ content: 'width=device-width,initial-scale=1,viewport-fit=cover', name: 'viewport' }/ = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous' = javascript_pack_tag 'common', crossorigin: 'anonymous' diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 44f4af2eb..852fa3d43 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -28,6 +28,17 @@ .fields-group = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true + %h4= t 'preferences.fedibird_features' + + .fields-group + = f.input :setting_place_tab_bar_at_bottom, as: :boolean, wrapper: :with_label + + .fields-group + = f.input :setting_show_tab_bar_label, as: :boolean, wrapper: :with_label + + -# .fields-group + -# = f.input :setting_show_target, as: :boolean, wrapper: :with_label + %h4= t 'preferences.public_timelines' .fields-group diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml index 1d0e5a38c..85ed2af17 100644 --- a/app/views/statuses/_detailed_status.html.haml +++ b/app/views/statuses/_detailed_status.html.haml @@ -26,6 +26,9 @@ - if status.preloadable_poll = render_poll_component(status) + - if status.quote? + = render partial: "quote_status", locals: {status: status.quote} + - if !status.ordered_media_attachments.empty? - if status.ordered_media_attachments.first.video? = render_video_component(status, width: 670, height: 380, detailed: true) diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml new file mode 100644 index 000000000..fa0b7b1b1 --- /dev/null +++ b/app/views/statuses/_quote_status.html.haml @@ -0,0 +1,35 @@ +.status.quote-status{ dataurl: ActivityPub::TagManager.instance.url_for(status) } + = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do + .status__avatar + %div + = image_tag status.account.avatar_static_url, width: 18, height: 18, alt: '', class: 'u-photo account__avatar' + %span.display-name + %bdi + %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true) + + %span.display-name__account + = acct(status.account) + = fa_icon('lock') if status.account.locked? + + .status__content.emojify< + - if status.spoiler_text? + %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< + %span.p-summary> #{Formatter.instance.format_spoiler(status)} + %button.status__content__spoiler-link= t('statuses.show_more') + .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}" } + = Formatter.instance.format_in_quote(status, custom_emojify: true) + + - if !status.media_attachments.empty? + - if status.media_attachments.first.video? + - video = status.media_attachments.first + = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), frameRate: video.file.meta.dig('original', 'frame_rate'), blurhash: video.blurhash, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description, media: [ActiveModelSerializers::SerializableResource.new(video, serializer: REST::MediaAttachmentSerializer)].as_json, quote: true do + = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments } + - elsif status.media_attachments.first.audio? + - audio = status.media_attachments.first + = react_component :audio, src: audio.file.url(:original), height: 60, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do + = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments } + - else + = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }, quote: true do + = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments } + - elsif status.preview_card + = react_component :card, maxDescription: 10, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json, quote: true diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 13b6613ce..bb082b99f 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -38,6 +38,9 @@ - if status.preloadable_poll = render_poll_component(status) + - if status.quote? + = render partial: "statuses/quote_status", locals: {status: status.quote} + - if !status.ordered_media_attachments.empty? - if status.ordered_media_attachments.first.video? = render_video_component(status, width: 610, height: 343) diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml index 24aa076ee..a407226e2 100644 --- a/config/locales/devise.hu.yml +++ b/config/locales/devise.hu.yml @@ -6,7 +6,7 @@ hu: send_instructions: Néhány percen belül kapni fogsz egy levelet az e-mail cím megerősítésére vonatkozó utasításokkal. Kérjük, ellenőrizd a spam mappádat, ha nem látod az e-mailt a beérkezett e-mailek közt. send_paranoid_instructions: Ha az e-mail címed már szerepel az adatbázisunkban, néhány percen belül kapsz egy levelet az e-mail cím megerősítésére vonatkozó utasításokkal. Kérjük, ellenőrizd a spam mappád, ha nem látod az e-mailt. failure: - already_authenticated: Már bejelentkeztél. + already_authenticated: Már be van jelentkezve. inactive: A fiókod még nincs aktiválva. invalid: Helytelen %{authentication_keys} vagy jelszó. last_attempt: Már csak egy próbálkozásod maradt, mielőtt a fiókodat zároljuk. @@ -47,7 +47,7 @@ hu: subject: 'Mastodon: Jelszó visszaállítási lépések' title: Jelszó visszaállítása two_factor_disabled: - explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges. + explanation: A fiókod kétfaktoros hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges. subject: Kétlépcsős azonosítás kikapcsolva title: Kétlépcsős hitelesítés kikapcsolva two_factor_enabled: diff --git a/config/locales/en.yml b/config/locales/en.yml index 829cd61d0..dc6339a0a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1600,6 +1600,19 @@ en: contrast: Mastodon (High contrast) default: Mastodon (Dark) mastodon-light: Mastodon (Light) + mastodon-auto: Mastodon (Auto) + # additional theme + material-black: Material (Black) + material-dark: Material (Dark) + material-light: Material (Light) + material-auto: Material (Auto) + mastodon-material-dark: Mastodon Material (Dark) + mastodon-material-light: Mastodon Material (Light) + mastodon-material-auto: Mastodon Material (Auto) + plus: Plus + y-zu-dark: Y-zu (Dark) + y-zu-light: Y-zu (Light) + y-zu-auto: Y-zu (Auto) time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 84559e499..2f2a24d7f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1466,6 +1466,19 @@ ja: contrast: Mastodon (ハイコントラスト) default: Mastodon (ダーク) mastodon-light: Mastodon (ライト) + mastodon-auto: Mastodon (自動) + # 追加テーマ + material-black: Material (黒) + material-dark: Material (ダーク) + material-light: Material (ライト) + material-auto: Material (自動) + mastodon-material-dark: Mastodon Material (ダーク) + mastodon-material-light: Mastodon Material (ライト) + mastodon-material-auto: Mastodon Material (自動) + plus: Plus + y-zu-dark: Y-zu (ダーク) + y-zu-light: Y-zu (ライト) + y-zu-auto: Y-zu (自動) time: formats: default: "%Y年%m月%d日 %H:%M" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index b19b7891f..c0c06535b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -55,7 +55,16 @@ en: setting_display_media_show_all: Always show media setting_hide_network: Who you follow and who follows you will be hidden on your profile setting_noindex: Affects your public profile and post pages + setting_place_tab_bar_at_bottom: When using a touch device, you can operate tabs within the reach of your fingers. setting_show_application: The application you use to post will be displayed in the detailed view of your posts + setting_show_bookmark_button: When turned off, the bookmark call will be in Mastodon's standard position (in the menu on the action bar) + setting_show_follow_button_on_timeline: You can easily check the follow status and build a follow list quickly + setting_show_navigation_panel: Show the navigation panel at the right end of the advanced UI + setting_show_quote_button: Selects whether to display the button on the action bar. It does not enable/disable the citation function. + setting_show_subscribe_button_on_timeline: You can easily check the status of your subscriptions and quickly build a subscription list + setting_show_tab_bar_label: When adding a list etc. to the tab bar, it is recommended to display the label because it is not possible to distinguish by the icon alone + setting_show_followed_by: "The color of the follow button changes according to the follow status (gray: no follow relationship, yellow: followed, blue: following, green: mutual follow)" + setting_show_target: Enable the function to switch between posting target and follow / subscribe target setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed username: Your username will be unique on %{domain} @@ -166,8 +175,10 @@ en: setting_expand_spoilers: Always expand posts marked with content warnings setting_hide_network: Hide your social graph setting_noindex: Opt-out of search engine indexing + setting_place_tab_bar_at_bottom: Place the tab bar at the bottom setting_reduce_motion: Reduce motion in animations - setting_show_application: Disclose application used to send posts + setting_show_application: Disclose application used to send toots + setting_show_tab_bar_label: Show labels in the tab bar setting_system_font_ui: Use system's default font setting_theme: Site theme setting_trends: Show today's trends diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index eac5c351c..c5066fef9 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -54,7 +54,16 @@ ja: setting_display_media_show_all: メディアを常に表示する setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします setting_noindex: 公開プロフィールおよび各投稿ページに影響します + setting_place_tab_bar_at_bottom: タッチデバイス使用時に、タブの操作を指の届く範囲で行えます setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります + setting_show_bookmark_button: オフにした場合、ブックマークの呼び出しはMastodon標準の位置となります（アクションバーのメニューの中） + setting_show_follow_button_on_timeline: フォロー状態を確認し易くなり、素早くフォローリストを構築できます + setting_show_navigation_panel: 上級者向け UI の右端にナビゲーションパネルを表示します + setting_show_quote_button: アクションバーへボタンを表示するかどうかの設定です。引用機能の有効・無効を切り替えるものではありません + setting_show_subscribe_button_on_timeline: 購読状態を確認し易くなり、素早く購読リストを構築できます + setting_show_tab_bar_label: リスト等をタブバーに追加する場合、アイコンだけでは区別がつかないので、ラベルを表示することをおすすめします + setting_show_followed_by: フォロー状態に応じてフォローボタンの色が変わります（灰色：フォロー関係なし、黄色：フォローされている、青色：フォローしている、緑色：相互フォロー） + setting_show_target: 投稿対象と、フォロー・購読の対象を切り替える機能を有効にします setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします username: あなたのユーザー名は %{domain} の中で重複していない必要があります @@ -164,6 +173,7 @@ ja: setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する setting_hide_network: 繋がりを隠す setting_noindex: 検索エンジンによるインデックスを拒否する + setting_place_tab_bar_at_bottom: タブバーを下に配置する setting_reduce_motion: アニメーションの動きを減らす setting_show_application: 送信したアプリを開示する setting_system_font_ui: システムのデフォルトフォントを使う diff --git a/config/settings.yml b/config/settings.yml index 06dd2b3f3..81b9cef26 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -29,7 +29,7 @@ defaults: &defaults show_application: true system_font_ui: false noindex: false - theme: 'default' + theme: 'mastodon-auto' aggregate_reblogs: true advanced_layout: false use_blurhash: true @@ -37,6 +37,8 @@ defaults: &defaults trends: true trendable_by_default: false crop_images: true + place_tab_bar_at_bottom: false + show_tab_bar_label: false notification_emails: follow: false reblog: false diff --git a/config/themes.yml b/config/themes.yml index 9c21c9459..cea5258c2 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,3 +1,17 @@ default: styles/application.scss contrast: styles/contrast.scss mastodon-light: styles/mastodon-light.scss +mastodon-auto: styles/mastodon-auto.scss + +# 追加テーマ +material-black: styles/material-black.scss +material-dark: styles/material-dark.scss +material-light: styles/material-light.scss +material-auto: styles/material-auto.scss +mastodon-material-dark: styles/mastodon-material-dark.scss +mastodon-material-light: styles/mastodon-material-light.scss +mastodon-material-auto: styles/mastodon-material-auto.scss +plus: styles/plus.scss +y-zu-dark: styles/y-zu-dark.scss +y-zu-light: styles/y-zu-light.scss +y-zu-auto: styles/y-zu-auto.scss diff --git a/db/migrate/20180419235016_add_quote_id_to_statuses.rb b/db/migrate/20180419235016_add_quote_id_to_statuses.rb new file mode 100644 index 000000000..d7550b248 --- /dev/null +++ b/db/migrate/20180419235016_add_quote_id_to_statuses.rb @@ -0,0 +1,5 @@ +class AddQuoteIdToStatuses < ActiveRecord::Migration[5.1] + def change + add_column :statuses, :quote_id, :bigint, null: true, default: nil + end +end diff --git a/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb new file mode 100644 index 000000000..45293db98 --- /dev/null +++ b/db/migrate/20200301102028_add_index_to_statuses_quote_id.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddIndexToStatusesQuoteId < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def change + add_index :statuses, :quote_id, algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index c92f2d1c5..87ce37c8e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -892,6 +892,7 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do t.bigint "in_reply_to_account_id" t.bigint "poll_id" t.datetime "deleted_at" + t.bigint "quote_id" t.datetime "edited_at" t.boolean "trendable" t.bigint "ordered_media_attachment_ids", array: true @@ -901,6 +902,7 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))" t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id", where: "(in_reply_to_account_id IS NOT NULL)" t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", where: "(in_reply_to_id IS NOT NULL)" + t.index ["quote_id"], name: "index_statuses_on_quote_id" t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id" t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)" end diff --git a/docker-compose.yml b/docker-compose.yml index 5c2c0c5df..a9f03c978 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: web: build: . - image: tootsuite/mastodon + image: tootsuite/mastodon:v3.4.6 restart: always env_file: .env.production command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" @@ -65,7 +65,7 @@ services: streaming: build: . - image: tootsuite/mastodon + image: tootsuite/mastodon:v3.4.6 restart: always env_file: .env.production command: node ./streaming @@ -83,7 +83,7 @@ services: sidekiq: build: . - image: tootsuite/mastodon + image: tootsuite/mastodon:v3.4.6 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb index a2e1d9d01..de6b132ee 100644 --- a/lib/sanitize_ext/sanitize_config.rb +++ b/lib/sanitize_ext/sanitize_config.rb @@ -31,6 +31,7 @@ class Sanitize next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes next true if /^(mention|hashtag)$/.match?(e) # semantic classes next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes + next true if /^quote-inline$/.match?(e) # quote inline classes end node['class'] = class_list.join(' ') diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 7a99a1964..1aa62f0c3 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index b12aa55a3..b584148ce 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/avatars/original/missing.png b/public/avatars/original/missing.png index 34c8e45e6..fb27b84df 100644 Binary files a/public/avatars/original/missing.png and b/public/avatars/original/missing.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 79000c9cc..c18e3bbde 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb index 04f036447..24ce26217 100644 --- a/spec/controllers/activitypub/outboxes_controller_spec.rb +++ b/spec/controllers/activitypub/outboxes_controller_spec.rb @@ -59,6 +59,10 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do expect(response.headers['Vary']).to be_nil end + it 'does not have a Vary header' do + expect(response.headers['Vary']).to be_nil + end + context 'when account is permanently suspended' do before do account.suspend! @@ -104,6 +108,10 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do expect(response.headers['Vary']).to include 'Signature' end + it 'returns Vary header with Signature' do + expect(response.headers['Vary']).to include 'Signature' + end + context 'when account is permanently suspended' do before do account.suspend! diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb index 89b265e9a..8db534e76 100644 --- a/spec/services/process_mentions_service_spec.rb +++ b/spec/services/process_mentions_service_spec.rb @@ -45,6 +45,24 @@ RSpec.describe ProcessMentionsService, type: :service do expect(remote_user.mentions.where(status: status).count).to eq 1 end end + + context 'with an IDN TLD' do + let(:remote_user) { Fabricate(:account, username: 'foo', protocol: :activitypub, domain: 'xn--y9a3aq.xn--y9a3aq', inbox_url: 'http://example.com/inbox') } + let(:status) { Fabricate(:status, account: account, text: "Hello @foo@հայ.հայ") } + + before do + stub_request(:post, remote_user.inbox_url) + subject.call(status) + end + + it 'creates a mention' do + expect(remote_user.mentions.where(status: status).count).to eq 1 + end + + it 'sends activity to the inbox' do + expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once + end + end end context 'Temporarily-unreachable ActivityPub user' do diff --git a/yarn.lock b/yarn.lock index f59fcc41b..96590f538 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1076,6 +1076,14 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@babel/types@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" + integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== + dependencies: + "@babel/helper-validator-identifier" "^7.14.0" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
#{escapedContents.strip}
#{code_contents(encoded)}