Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
b3553f992d
11 changed files with 85 additions and 26 deletions
4
Gemfile
4
Gemfile
|
@ -115,7 +115,7 @@ group :test do
|
|||
gem 'rspec-sidekiq', '~> 3.0'
|
||||
gem 'simplecov', '~> 0.16', require: false
|
||||
gem 'webmock', '~> 3.4'
|
||||
gem 'parallel_tests', '~> 2.26'
|
||||
gem 'parallel_tests', '~> 2.27'
|
||||
end
|
||||
|
||||
group :development do
|
||||
|
@ -123,7 +123,7 @@ group :development do
|
|||
gem 'annotate', '~> 2.7'
|
||||
gem 'better_errors', '~> 2.5'
|
||||
gem 'binding_of_caller', '~> 0.7'
|
||||
gem 'bullet', '~> 5.8'
|
||||
gem 'bullet', '~> 5.9'
|
||||
gem 'letter_opener', '~> 1.4'
|
||||
gem 'letter_opener_web', '~> 1.3'
|
||||
gem 'memory_profiler'
|
||||
|
|
12
Gemfile.lock
12
Gemfile.lock
|
@ -103,7 +103,7 @@ GEM
|
|||
brakeman (4.3.1)
|
||||
browser (2.5.3)
|
||||
builder (3.2.3)
|
||||
bullet (5.8.1)
|
||||
bullet (5.9.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
bundler-audit (0.6.0)
|
||||
|
@ -361,7 +361,7 @@ GEM
|
|||
concurrent-ruby (~> 1.0.0)
|
||||
sidekiq (>= 3.5.0)
|
||||
statsd-ruby (~> 1.2.0)
|
||||
oj (3.7.0)
|
||||
oj (3.7.1)
|
||||
omniauth (1.8.1)
|
||||
hashie (>= 3.4.6, < 3.6.0)
|
||||
rack (>= 1.6.2, < 3)
|
||||
|
@ -388,7 +388,7 @@ GEM
|
|||
av (~> 0.9.0)
|
||||
paperclip (>= 2.5.2)
|
||||
parallel (1.12.1)
|
||||
parallel_tests (2.26.2)
|
||||
parallel_tests (2.27.0)
|
||||
parallel
|
||||
parser (2.5.3.0)
|
||||
ast (~> 2.4.0)
|
||||
|
@ -596,7 +596,7 @@ GEM
|
|||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
terrapin (0.6.0)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
thor (0.20.0)
|
||||
thor (0.20.3)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
timers (4.2.0)
|
||||
|
@ -660,7 +660,7 @@ DEPENDENCIES
|
|||
bootsnap (~> 1.3)
|
||||
brakeman (~> 4.3)
|
||||
browser
|
||||
bullet (~> 5.8)
|
||||
bullet (~> 5.9)
|
||||
bundler-audit (~> 0.6)
|
||||
capistrano (~> 3.11)
|
||||
capistrano-rails (~> 1.4)
|
||||
|
@ -718,7 +718,7 @@ DEPENDENCIES
|
|||
ox (~> 2.10)
|
||||
paperclip (~> 6.0)
|
||||
paperclip-av-transcoder (~> 0.6)
|
||||
parallel_tests (~> 2.26)
|
||||
parallel_tests (~> 2.27)
|
||||
pg (~> 1.1)
|
||||
pghero (~> 2.2)
|
||||
pkg-config (~> 1.3)
|
||||
|
|
|
@ -136,7 +136,7 @@ export default class ScrollableList extends PureComponent {
|
|||
React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
|
||||
this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
|
||||
|
||||
if ((someItemInserted && this.node.scrollTop > 0) || this.mouseMovedRecently) {
|
||||
if (someItemInserted && (this.node.scrollTop > 0 || this.mouseMovedRecently)) {
|
||||
return this.node.scrollHeight - this.node.scrollTop;
|
||||
} else {
|
||||
return null;
|
||||
|
|
|
@ -73,7 +73,7 @@ export default class Card extends React.PureComponent {
|
|||
};
|
||||
|
||||
componentWillReceiveProps (nextProps) {
|
||||
if (this.props.card !== nextProps.card) {
|
||||
if (!Immutable.is(this.props.card, nextProps.card)) {
|
||||
this.setState({ embedded: false });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -349,6 +349,10 @@
|
|||
{
|
||||
"defaultMessage": "{name} boosted",
|
||||
"id": "status.reblogged_by"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show thread",
|
||||
"id": "status.show_thread"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/components/status.json"
|
||||
|
@ -471,6 +475,15 @@
|
|||
],
|
||||
"path": "app/javascript/mastodon/features/account_timeline/containers/header_container.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "No toots here!",
|
||||
"id": "empty_column.account_timeline"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/account_timeline/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
|
@ -578,6 +591,7 @@
|
|||
"id": "account.unendorse"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Add or Remove from lists",
|
||||
"id": "account.add_or_remove_from_list"
|
||||
},
|
||||
{
|
||||
|
@ -1277,6 +1291,39 @@
|
|||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Any of these",
|
||||
"id": "hashtag.column_settings.tag_mode.any"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "All of these",
|
||||
"id": "hashtag.column_settings.tag_mode.all"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "None of these",
|
||||
"id": "hashtag.column_settings.tag_mode.none"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Include additional tags in this column",
|
||||
"id": "hashtag.column_settings.tag_toggle"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/hashtag_timeline/components/column_settings.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "or {additional}",
|
||||
"id": "hashtag.column_header.tag_mode.any"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "and {additional}",
|
||||
"id": "hashtag.column_header.tag_mode.all"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "without {additional}",
|
||||
"id": "hashtag.column_header.tag_mode.none"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "There is nothing in this hashtag yet.",
|
||||
"id": "empty_column.hashtag"
|
||||
|
|
|
@ -116,6 +116,7 @@
|
|||
"emoji_button.search_results": "Search results",
|
||||
"emoji_button.symbols": "Symbols",
|
||||
"emoji_button.travel": "Travel & Places",
|
||||
"empty_column.account_timeline": "No toots here!",
|
||||
"empty_column.blocks": "You haven't blocked any users yet.",
|
||||
"empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
|
||||
"empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
|
||||
|
@ -141,13 +142,13 @@
|
|||
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
|
||||
"getting_started.security": "Security",
|
||||
"getting_started.terms": "Terms of service",
|
||||
"hashtag.column_settings.tag_toggle": "Include additional tags for this column",
|
||||
"hashtag.column_settings.tag_mode.any": "Any of these",
|
||||
"hashtag.column_settings.tag_mode.all": "All of these",
|
||||
"hashtag.column_settings.tag_mode.none": "None of these",
|
||||
"hashtag.column_header.tag_mode.any": "{tag} or {additional}",
|
||||
"hashtag.column_header.tag_mode.all": "{tag} and {additional}",
|
||||
"hashtag.column_header.tag_mode.any": "{tag} or {additional}",
|
||||
"hashtag.column_header.tag_mode.none": "{tag} without {additional}",
|
||||
"hashtag.column_settings.tag_mode.all": "All of these",
|
||||
"hashtag.column_settings.tag_mode.any": "Any of these",
|
||||
"hashtag.column_settings.tag_mode.none": "None of these",
|
||||
"hashtag.column_settings.tag_toggle": "Include additional tags for this column",
|
||||
"home.column_settings.basic": "Basic",
|
||||
"home.column_settings.show_reblogs": "Show boosts",
|
||||
"home.column_settings.show_replies": "Show replies",
|
||||
|
@ -325,6 +326,7 @@
|
|||
"status.show_less_all": "Show less for all",
|
||||
"status.show_more": "Show more",
|
||||
"status.show_more_all": "Show more for all",
|
||||
"status.show_thread": "Show thread",
|
||||
"status.unmute_conversation": "Unmute conversation",
|
||||
"status.unpin": "Unpin from profile",
|
||||
"suggestions.dismiss": "Dismiss suggestion",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"account.add_or_remove_from_list": "Add or Remove from lists",
|
||||
"account.add_or_remove_from_list": "リストに追加または外す",
|
||||
"account.badges.bot": "Bot",
|
||||
"account.block": "@{name}さんをブロック",
|
||||
"account.block_domain": "{domain}全体を非表示",
|
||||
|
@ -116,6 +116,7 @@
|
|||
"emoji_button.search_results": "検索結果",
|
||||
"emoji_button.symbols": "記号",
|
||||
"emoji_button.travel": "旅行と場所",
|
||||
"empty_column.account_timeline": "トゥートがありません!",
|
||||
"empty_column.blocks": "まだ誰もブロックしていません。",
|
||||
"empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう!",
|
||||
"empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
|
||||
|
@ -141,6 +142,13 @@
|
|||
"getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub({github})から開発に参加したり、問題を報告したりできます。",
|
||||
"getting_started.security": "セキュリティ",
|
||||
"getting_started.terms": "プライバシーポリシー",
|
||||
"hashtag.column_header.tag_mode.all": " と {additional}",
|
||||
"hashtag.column_header.tag_mode.any": " か {additional}",
|
||||
"hashtag.column_header.tag_mode.none": " ({additional} を除く)",
|
||||
"hashtag.column_settings.tag_mode.all": "すべてを含む",
|
||||
"hashtag.column_settings.tag_mode.any": "いずれかを含む",
|
||||
"hashtag.column_settings.tag_mode.none": "これらを除く",
|
||||
"hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
|
||||
"home.column_settings.basic": "基本設定",
|
||||
"home.column_settings.show_reblogs": "ブースト表示",
|
||||
"home.column_settings.show_replies": "返信表示",
|
||||
|
@ -318,10 +326,11 @@
|
|||
"status.show_less_all": "全て隠す",
|
||||
"status.show_more": "もっと見る",
|
||||
"status.show_more_all": "全て見る",
|
||||
"status.show_thread": "続きを読む",
|
||||
"status.unmute_conversation": "会話のミュートを解除",
|
||||
"status.unpin": "プロフィールの固定表示を解除",
|
||||
"suggestions.dismiss": "Dismiss suggestion",
|
||||
"suggestions.header": "You might be interested in…",
|
||||
"suggestions.dismiss": "隠す",
|
||||
"suggestions.header": "興味あるかもしれません…",
|
||||
"tabs_bar.federated_timeline": "連合",
|
||||
"tabs_bar.home": "ホーム",
|
||||
"tabs_bar.local_timeline": "ローカル",
|
||||
|
|
|
@ -38,11 +38,11 @@ export default function statuses(state = initialState, action) {
|
|||
case FAVOURITE_REQUEST:
|
||||
return state.setIn([action.status.get('id'), 'favourited'], true);
|
||||
case FAVOURITE_FAIL:
|
||||
return state.setIn([action.status.get('id'), 'favourited'], false);
|
||||
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
|
||||
case REBLOG_REQUEST:
|
||||
return state.setIn([action.status.get('id'), 'reblogged'], true);
|
||||
case REBLOG_FAIL:
|
||||
return state.setIn([action.status.get('id'), 'reblogged'], false);
|
||||
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
|
||||
case STATUS_MUTE_SUCCESS:
|
||||
return state.setIn([action.id, 'muted'], true);
|
||||
case STATUS_UNMUTE_SUCCESS:
|
||||
|
|
|
@ -177,7 +177,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
updated = tag['updated']
|
||||
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
|
||||
|
||||
return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && emoji.updated_at >= updated)
|
||||
return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
|
||||
|
||||
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
|
||||
emoji.image_remote_url = image_url
|
||||
|
|
|
@ -232,7 +232,7 @@ class ActivityPub::ProcessAccountService < BaseService
|
|||
updated = tag['updated']
|
||||
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
|
||||
|
||||
return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && emoji.updated_at >= updated)
|
||||
return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
|
||||
|
||||
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
|
||||
emoji.image_remote_url = image_url
|
||||
|
|
|
@ -136,14 +136,15 @@ class FetchLinkCardService < BaseService
|
|||
detector = CharlockHolmes::EncodingDetector.new
|
||||
detector.strip_tags = true
|
||||
|
||||
guess = detector.detect(@html, @html_charset)
|
||||
page = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil))
|
||||
guess = detector.detect(@html, @html_charset)
|
||||
page = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil))
|
||||
player_url = meta_property(page, 'twitter:player')
|
||||
|
||||
if meta_property(page, 'twitter:player')
|
||||
if player_url && !bad_url?(Addressable::URI.parse(player_url))
|
||||
@card.type = :video
|
||||
@card.width = meta_property(page, 'twitter:player:width') || 0
|
||||
@card.height = meta_property(page, 'twitter:player:height') || 0
|
||||
@card.html = content_tag(:iframe, nil, src: meta_property(page, 'twitter:player'),
|
||||
@card.html = content_tag(:iframe, nil, src: player_url,
|
||||
width: @card.width,
|
||||
height: @card.height,
|
||||
allowtransparency: 'true',
|
||||
|
|
Loading…
Reference in a new issue