me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #690 from ThibG/glitch-soc/merge-upstream

Browse source 
Merge upstream changes
This commit is contained in:
ThibG 2018-08-29 14:23:45 +02:00 committed by GitHub
commit 2b5dd39fbb
9 changed files with 121 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.buildpacks
View file

@ -1,3 +1,4 @@
https://github.com/heroku/heroku-buildpack-apt
https://github.com/Scalingo/ffmpeg-buildpack
https://github.com/Scalingo/nodejs-buildpack
https://github.com/Scalingo/ruby-buildpack

0
app/javascript/mastodon/.gitkeep
View file

9
app/javascript/mastodon/components/scrollable_list.js
View file

@ -26,6 +26,7 @@ export default class ScrollableList extends PureComponent {
hasMore: PropTypes.bool,
prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool,
alwaysShowScrollbar: PropTypes.bool,
emptyMessage: PropTypes.node,
children: PropTypes.node,
};
@ -141,7 +142,7 @@ export default class ScrollableList extends PureComponent {
}
render () {
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, alwaysShowScrollbar, emptyMessage, onLoadMore } = this.props;
const { fullscreen } = this.state;
const childrenCount = React.Children.count(children);
@ -172,11 +173,13 @@ export default class ScrollableList extends PureComponent {
</div>
);
} else {
const scrollable = alwaysShowScrollbar;
scrollableArea = (
<div style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
<div className={classNames({ scrollable, fullscreen })} ref={this.setRef} style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
{alwaysPrepend && prepend}
<div className='empty-column-indicator' ref={this.setRef}>
<div className='empty-column-indicator'>
{emptyMessage}
</div>
</div>

5
app/javascript/mastodon/features/followers/index.js
View file

@ -66,13 +66,14 @@ export default class Followers extends ImmutablePureComponent {
<Column>
<ColumnBackButton />
<HeaderContainer accountId={this.props.params.accountId} hideTabs />
<ScrollableList
scrollKey='followers'
hasMore={hasMore}
onLoadMore={this.handleLoadMore}
shouldUpdateScroll={shouldUpdateScroll}
prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
alwaysPrepend
alwaysShowScrollbar
emptyMessage={emptyMessage}
>
{accountIds.map(id =>

5
app/javascript/mastodon/features/following/index.js
View file

@ -66,13 +66,14 @@ export default class Following extends ImmutablePureComponent {
<Column>
<ColumnBackButton />
<HeaderContainer accountId={this.props.params.accountId} hideTabs />
<ScrollableList
scrollKey='following'
hasMore={hasMore}
onLoadMore={this.handleLoadMore}
shouldUpdateScroll={shouldUpdateScroll}
prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
alwaysPrepend
alwaysShowScrollbar
emptyMessage={emptyMessage}
>
{accountIds.map(id =>

12
app/javascript/mastodon/locales/zh-TW.json
View file

@ -1,7 +1,7 @@
{
"account.badges.bot": "機器人",
"account.block": "封鎖 @{name}",
"account.block_domain": "隱藏來自 {domain} 的一切貼文",
"account.block_domain": "隱藏來自 {domain} 的一切嘟文",
"account.blocked": "已被封鎖的",
"account.direct": "發送私訊給 @{name}",
"account.disclaimer_full": "下列資料不一定完整。",
@ -67,10 +67,10 @@
"compose_form.direct_message_warning": "這條嘟文僅對有被提及的使用者才能看到。",
"compose_form.direct_message_warning_learn_more": "了解更多",
"compose_form.hashtag_warning": "此則推文將不會在任何主題標籤中看見，只有公開的推文可以用主題標籤來搜尋。",
"compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你，看到發給關注者的貼文。",
"compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你，看到發給關注者的嘟文。",
"compose_form.lock_disclaimer.lock": "上鎖",
"compose_form.placeholder": "在想些什麼？",
"compose_form.publish": "貼掉",
"compose_form.publish": "嘟掉",
"compose_form.publish_loud": "{publish}！",
"compose_form.sensitive.marked": "此媒體已被標註為敏感的",
"compose_form.sensitive.unmarked": "此媒體未被標註為敏感的",
@ -92,7 +92,7 @@
"confirmations.redraft.message": "你確定要刪除這條嘟文並重新編輯它嗎? 所有相關的回覆、轉嘟與最愛都會被刪除。",
"confirmations.unfollow.confirm": "取消關注",
"confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎？",
"embed.instructions": "要內嵌此貼文，請將以下代碼貼進你的網站。",
"embed.instructions": "要內嵌此嘟文，請將以下代碼貼進你的網站。",
"embed.preview": "看上去會變成這樣：",
"emoji_button.activity": "活動",
"emoji_button.custom": "自訂",
@ -118,7 +118,7 @@
"empty_column.hashtag": "這個主題標籤下什麼都沒有。",
"empty_column.home": "你還沒關注任何人。造訪{public}或利用搜尋功能找到其他用者。",
"empty_column.home.public_timeline": "公開時間軸",
"empty_column.list": "此份清單尚未有東西。當此清單的成員貼出了新的狀態時，它們就會出現在這裡。",
"empty_column.list": "此份清單尚未有東西。當此清單的成員嘟出了新的狀態時，它們就會出現在這裡。",
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any users yet.",
"empty_column.notifications": "還沒有任何通知。和別的使用者互動來開始對話。",
@ -246,7 +246,7 @@
"privacy.direct.short": "私訊",
"privacy.private.long": "只有關注你的使用者能看到",
"privacy.private.short": "僅關注者",
"privacy.public.long": "貼到公開時間軸",
"privacy.public.long": "嘟到公開時間軸",
"privacy.public.short": "公開",
"privacy.unlisted.long": "公開，但不會顯示在公開時間軸",
"privacy.unlisted.short": "不公開",

2
app/javascript/styles/mastodon/components.scss
View file

@ -5367,7 +5367,7 @@ noscript {
dt,
dd {
box-sizing: border-box;
padding: 14px 20px;
padding: 14px 5px;
text-align: center;
max-height: 48px;
overflow: hidden;

5
scalingo.json
View file

@ -91,6 +91,11 @@
"description": "Internal scalingo configuration",
"required": true,
"value": "https://github.com/Scalingo/multi-buildpack.git"
},
"WITH_FFPROBE": {
"description": "Internal scalingo configuration to install ffprobe",
"required": true,
"value": "true"
}
},
"scripts": {

192
spec/lib/formatter_spec.rb
View file

@ -5,26 +5,26 @@ RSpec.describe Formatter do
let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') }
shared_examples 'encode and link URLs' do
context 'matches a stand-alone medium URL' do
context 'given a stand-alone medium URL' do
let(:text) { 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"'
end
end
context 'matches a stand-alone google URL' do
context 'given a stand-alone google URL' do
let(:text) { 'http://google.com' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="http://google.com"'
end
end
context 'matches a stand-alone IDN URL' do
context 'given a stand-alone IDN URL' do
let(:text) { 'https://nic.みんな/' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://nic.みんな/"'
end
@ -33,138 +33,138 @@ RSpec.describe Formatter do
end
end
context 'matches a URL without trailing period' do
context 'given a URL with a trailing period' do
let(:text) { 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ' }
it 'has valid URL' do
it 'matches the full URL but not the period' do
is_expected.to include 'href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"'
end
end
context 'matches a URL without closing paranthesis' do
context 'given a URL enclosed with parentheses' do
let(:text) { '(http://google.com/)' }
it 'has valid URL' do
it 'matches the full URL but not the parentheses' do
is_expected.to include 'href="http://google.com/"'
end
end
context 'matches a URL without exclamation point' do
context 'given a URL with a trailing exclamation point' do
let(:text) { 'http://www.google.com!' }
it 'has valid URL' do
it 'matches the full URL but not the exclamation point' do
is_expected.to include 'href="http://www.google.com"'
end
end
context 'matches a URL without single quote' do
context 'given a URL with a trailing single quote' do
let(:text) { "http://www.google.com'" }
it 'has valid URL' do
it 'matches the full URL but not the single quote' do
is_expected.to include 'href="http://www.google.com"'
end
end
context 'matches a URL without angle brackets' do
context 'given a URL with a trailing angle bracket' do
let(:text) { 'http://www.google.com>' }
it 'has valid URL' do
it 'matches the full URL but not the angle bracket' do
is_expected.to include 'href="http://www.google.com"'
end
end
context 'matches a URL with a query string' do
context 'given a URL with a query string' do
let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&amp;q=autolink"'
end
end
context 'matches a URL with parenthesis in it' do
context 'given a URL with parentheses in it' do
let(:text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
end
end
context 'matches a URL with Japanese path string' do
context 'given a URL with Japanese path string' do
let(:text) { 'https://ja.wikipedia.org/wiki/日本' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://ja.wikipedia.org/wiki/日本"'
end
end
context 'matches a URL with Korean path string' do
context 'given a URL with Korean path string' do
let(:text) { 'https://ko.wikipedia.org/wiki/대한민국' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://ko.wikipedia.org/wiki/대한민국"'
end
end
context 'matches a URL with Simplified Chinese path string' do
context 'given a URL with Simplified Chinese path string' do
let(:text) { 'https://baike.baidu.com/item/中华人民共和国' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://baike.baidu.com/item/中华人民共和国"'
end
end
context 'matches a URL with Traditional Chinese path string' do
context 'given a URL with Traditional Chinese path string' do
let(:text) { 'https://zh.wikipedia.org/wiki/臺灣' }
it 'has valid URL' do
it 'matches the full URL' do
is_expected.to include 'href="https://zh.wikipedia.org/wiki/臺灣"'
end
end
context 'contains unsafe URL (XSS attack, visible part)' do
context 'given a URL containing unsafe code (XSS attack, visible part)' do
let(:text) { %q{http://example.com/b<del>b</del>} }
it 'has escaped HTML' do
it 'escapes the HTML in the URL' do
is_expected.to include '&lt;del&gt;b&lt;/del&gt;'
end
end
context 'contains unsafe URL (XSS attack, invisible part)' do
context 'given a URL containing unsafe code (XSS attack, invisible part)' do
let(:text) { %q{http://example.com/blahblahblahblah/a<script>alert("Hello")</script>} }
it 'has escaped HTML' do
it 'escapes the HTML in the URL' do
is_expected.to include '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;'
end
end
context 'contains HTML (script tag)' do
context 'given text containing HTML code (script tag)' do
let(:text) { '<script>alert("Hello")</script>' }
it 'has escaped HTML' do
it 'escapes the HTML' do
is_expected.to include '<p>&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;</p>'
end
end
context 'contains HTML (XSS attack)' do
context 'given text containing HTML (XSS attack)' do
let(:text) { %q{<img src="javascript:alert('XSS');">} }
it 'has escaped HTML' do
it 'escapes the HTML' do
is_expected.to include '<p>&lt;img src=&quot;javascript:alert(&apos;XSS&apos;);&quot;&gt;</p>'
end
end
context 'contains invalid URL' do
context 'given an invalid URL' do
let(:text) { 'http://www\.google\.com' }
it 'has raw URL' do
it 'outputs the raw URL' do
is_expected.to eq '<p>http://www\.google\.com</p>'
end
end
context 'contains a hashtag' do
context 'given text containing a hashtag' do
let(:text) { '#hashtag' }
it 'has a link' do
it 'creates a hashtag link' do
is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
end
end
@ -173,8 +173,8 @@ RSpec.describe Formatter do
describe '#format' do
subject { Formatter.instance.format(status) }
context 'with local status' do
context 'with reblog' do
context 'given a post with local status' do
context 'given a reblogged post' do
let(:reblog) { Fabricate(:status, account: local_account, text: 'Hello world', uri: nil) }
let(:status) { Fabricate(:status, reblog: reblog) }
@ -183,15 +183,15 @@ RSpec.describe Formatter do
end
end
context 'contains plain text' do
context 'given a post containing plain text' do
let(:status) { Fabricate(:status, text: 'text', uri: nil) }
it 'paragraphizes' do
it 'paragraphizes the text' do
is_expected.to eq '<p>text</p>'
end
end
context 'contains line feeds' do
context 'given a post containing line feeds' do
let(:status) { Fabricate(:status, text: "line\nfeed", uri: nil) }
it 'removes line feeds' do
@ -199,18 +199,18 @@ RSpec.describe Formatter do
end
end
context 'contains linkable mentions' do
context 'given a post containing linkable mentions' do
let(:status) { Fabricate(:status, mentions: [ Fabricate(:mention, account: local_account) ], text: '@alice') }
it 'links' do
it 'creates a mention link' do
is_expected.to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
end
end
context 'contains unlinkable mentions' do
context 'given a post containing unlinkable mentions' do
let(:status) { Fabricate(:status, text: '@alice', uri: nil) }
it 'does not link' do
it 'does not create a mention link' do
is_expected.to include '@alice'
end
end
@ -224,29 +224,29 @@ RSpec.describe Formatter do
include_examples 'encode and link URLs'
end
context 'with custom_emojify option' do
context 'given a post with custom_emojify option' do
let!(:emoji) { Fabricate(:custom_emoji) }
let(:status) { Fabricate(:status, account: local_account, text: text) }
subject { Formatter.instance.format(status, custom_emojify: true) }
context 'with emoji at the start' do
context 'given a post with an emoji shortcode at the start' do
let(:text) { ':coolcat: Beep boop' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with emoji in the middle' do
context 'given a post with an emoji shortcode in the middle' do
let(:text) { 'Beep :coolcat: boop' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with concatenated emoji' do
context 'given a post with concatenated emoji shortcodes' do
let(:text) { ':coolcat::coolcat:' }
it 'does not touch the shortcodes' do
@ -254,46 +254,46 @@ RSpec.describe Formatter do
end
end
context 'with emoji at the end' do
context 'given a post with an emoji shortcode at the end' do
let(:text) { 'Beep boop :coolcat:' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/boop <img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
end
end
context 'with remote status' do
context 'given a post with remote status' do
let(:status) { Fabricate(:status, account: remote_account, text: 'Beep boop') }
it 'reformats' do
it 'reformats the post' do
is_expected.to eq 'Beep boop'
end
context 'with custom_emojify option' do
context 'given a post with custom_emojify option' do
let!(:emoji) { Fabricate(:custom_emoji, domain: remote_account.domain) }
let(:status) { Fabricate(:status, account: remote_account, text: text) }
subject { Formatter.instance.format(status, custom_emojify: true) }
context 'with emoji at the start' do
context 'given a post with an emoji shortcode at the start' do
let(:text) { '<p>:coolcat: Beep boop<br />' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with emoji in the middle' do
context 'given a post with an emoji shortcode in the middle' do
let(:text) { '<p>Beep :coolcat: boop</p>' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with concatenated emoji' do
context 'given a post with concatenated emoji' do
let(:text) { '<p>:coolcat::coolcat:</p>' }
it 'does not touch the shortcodes' do
@ -301,10 +301,10 @@ RSpec.describe Formatter do
end
end
context 'with emoji at the end' do
context 'given a post with an emoji shortcode at the end' do
let(:text) { '<p>Beep boop<br />:coolcat:</p>' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/<br><img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
@ -315,26 +315,26 @@ RSpec.describe Formatter do
describe '#reformat' do
subject { Formatter.instance.reformat(text) }
context 'contains plain text' do
context 'given a post containing plain text' do
let(:text) { 'Beep boop' }
it 'contains plain text' do
it 'keeps the plain text' do
is_expected.to include 'Beep boop'
end
end
context 'contains scripts' do
context 'given a post containing script tags' do
let(:text) { '<script>alert("Hello")</script>' }
it 'strips scripts' do
it 'strips the scripts' do
is_expected.to_not include '<script>alert("Hello")</script>'
end
end
context 'contains malicious classes' do
context 'given a post containing malicious classes' do
let(:text) { '<span class="mention status__content__spoiler-link">Show more</span>' }
it 'strips malicious classes' do
it 'strips the malicious classes' do
is_expected.to_not include 'status__content__spoiler-link'
end
end
@ -343,15 +343,15 @@ RSpec.describe Formatter do
describe '#plaintext' do
subject { Formatter.instance.plaintext(status) }
context 'with local status' do
context 'given a post with local status' do
let(:status) { Fabricate(:status, text: '<p>a text by a nerd who uses an HTML tag in text</p>', uri: nil) }
it 'returns raw text' do
it 'returns the raw text' do
is_expected.to eq '<p>a text by a nerd who uses an HTML tag in text</p>'
end
end
context 'with remote status' do
context 'given a post with remote status' do
let(:status) { Fabricate(:status, account: remote_account, text: '<script>alert("Hello")</script>') }
it 'returns tag-stripped text' do
@ -363,60 +363,60 @@ RSpec.describe Formatter do
describe '#simplified_format' do
subject { Formatter.instance.simplified_format(account) }
context 'with local status' do
context 'given a post with local status' do
let(:account) { Fabricate(:account, domain: nil, note: text) }
context 'contains linkable mentions for local accounts' do
context 'given a post containing linkable mentions for local accounts' do
let(:text) { '@alice' }
before { local_account }
it 'links' do
it 'creates a mention link' do
is_expected.to eq '<p><span class="h-card"><a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span></p>'
end
end
context 'contains linkable mentions for remote accounts' do
context 'given a post containing linkable mentions for remote accounts' do
let(:text) { '@bob@remote.test' }
before { remote_account }
it 'links' do
it 'creates a mention link' do
is_expected.to eq '<p><span class="h-card"><a href="https://remote.test/" class="u-url mention">@<span>bob</span></a></span></p>'
end
end
context 'contains unlinkable mentions' do
context 'given a post containing unlinkable mentions' do
let(:text) { '@alice' }
it 'returns raw mention texts' do
it 'does not create a mention link' do
is_expected.to eq '<p>@alice</p>'
end
end
context 'with custom_emojify option' do
context 'given a post with custom_emojify option' do
let!(:emoji) { Fabricate(:custom_emoji) }
before { account.note = text }
subject { Formatter.instance.simplified_format(account, custom_emojify: true) }
context 'with emoji at the start' do
context 'given a post with an emoji shortcode at the start' do
let(:text) { ':coolcat: Beep boop' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with emoji in the middle' do
context 'given a post with an emoji shortcode in the middle' do
let(:text) { 'Beep :coolcat: boop' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
context 'with concatenated emoji' do
context 'given a post with concatenated emoji shortcodes' do
let(:text) { ':coolcat::coolcat:' }
it 'does not touch the shortcodes' do
@ -424,10 +424,10 @@ RSpec.describe Formatter do
end
end
context 'with emoji at the end' do
context 'given a post with an emoji shortcode at the end' do
let(:text) { 'Beep boop :coolcat:' }
it 'converts shortcode to image tag' do
it 'converts the shortcode to an image tag' do
is_expected.to match(/boop <img draggable="false" class="emojione" alt=":coolcat:"/)
end
end
@ -436,7 +436,7 @@ RSpec.describe Formatter do
include_examples 'encode and link URLs'
end
context 'with remote status' do
context 'given a post with remote status' do
let(:text) { '<script>alert("Hello")</script>' }
let(:account) { Fabricate(:account, domain: 'remote', note: text) }
@ -451,7 +451,7 @@ RSpec.describe Formatter do
subject { Formatter.instance.simplified_format(remote_account, custom_emojify: true) }
context 'with emoji at the start' do
context 'given a post with an emoji shortcode at the start' do
let(:text) { '<p>:coolcat: Beep boop<br />' }
it 'converts shortcode to image tag' do
@ -459,7 +459,7 @@ RSpec.describe Formatter do
end
end
context 'with emoji in the middle' do
context 'given a post with an emoji shortcode in the middle' do
let(:text) { '<p>Beep :coolcat: boop</p>' }
it 'converts shortcode to image tag' do
@ -467,7 +467,7 @@ RSpec.describe Formatter do
end
end
context 'with concatenated emoji' do
context 'given a post with concatenated emoji shortcodes' do
let(:text) { '<p>:coolcat::coolcat:</p>' }
it 'does not touch the shortcodes' do
@ -475,7 +475,7 @@ RSpec.describe Formatter do
end
end
context 'with emoji at the end' do
context 'given a post with an emoji shortcode at the end' do
let(:text) { '<p>Beep boop<br />:coolcat:</p>' }
it 'converts shortcode to image tag' do