luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 15:34:55 +00:00
Code Issues Projects Releases Wiki Activity

replies to local-only toots default to local-only, and fix some regex bugs

Browse source
This commit is contained in:
Surinna Curtis 2017-07-06 22:30:21 -05:00
parent d87d70e89a
commit 3464bb30f8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/reducers/compose.js
View file

@ -180,7 +180,9 @@ export default function compose(state = initialState, action) {
map.set('in_reply_to', action.status.get('id')); map.set('in_reply_to', action.status.get('id'));
map.set('text', statusToTextMentions(state, action.status)); map.set('text', statusToTextMentions(state, action.status));
map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy'))); map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
map.set('advanced_options', state.get('default_advanced_options')); map.set('advanced_options', new Immutable.Map({
do_not_federate: /👁\ufe0f?<\/p>$/.test(action.status.get('content')),
}));
map.set('focusDate', new Date()); map.set('focusDate', new Date());
map.set('preselectDate', new Date()); map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid()); map.set('idempotencyKey', uuid());

2
app/services/post_status_service.rb
View file

@ -38,7 +38,7 @@ class PostStatusService < BaseService
DistributionWorker.perform_async(status.id) DistributionWorker.perform_async(status.id)
# match both with and without U+FE0F (the emoji variation selector) # match both with and without U+FE0F (the emoji variation selector)
unless /[👁👁️]$/.match?(status.content) unless /👁\ufe0f?\z/.match?(status.content)
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id) Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
end end