tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Merge upstream changes
This commit is contained in:
ThibG 2019-05-19 22:07:42 +02:00 committed by GitHub
commit 0998e3ade8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/containers/compose_form_container.js
View File

@ -20,7 +20,7 @@ const mapStateToProps = state => ({
focusDate: state.getIn(['compose', 'focusDate']), focusDate: state.getIn(['compose', 'focusDate']),
caretPosition: state.getIn(['compose', 'caretPosition']), caretPosition: state.getIn(['compose', 'caretPosition']),
preselectDate: state.getIn(['compose', 'preselectDate']), preselectDate: state.getIn(['compose', 'preselectDate']),
is_submitting: state.getIn(['compose', 'is_submitting']), isSubmitting: state.getIn(['compose', 'is_submitting']),
isChangingUpload: state.getIn(['compose', 'is_changing_upload']), isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
isUploading: state.getIn(['compose', 'is_uploading']), isUploading: state.getIn(['compose', 'is_uploading']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']), showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),

6
app/models/user.rb
View File

@ -114,6 +114,10 @@ class User < ApplicationRecord
end end
def invited? def invited?
invite_id.present?
end
def valid_invitation?
invite_id.present? && invite.valid_for_use? invite_id.present? && invite.valid_for_use?
end end
@ -274,7 +278,7 @@ class User < ApplicationRecord
private private
def set_approved def set_approved
self.approved = open_registrations? || invited? || external? self.approved = open_registrations? || valid_invitation? || external?
end end
def open_registrations? def open_registrations?

2
app/validators/blacklisted_email_validator.rb
View File

@ -2,7 +2,7 @@
class BlacklistedEmailValidator < ActiveModel::Validator class BlacklistedEmailValidator < ActiveModel::Validator
def validate(user) def validate(user)
return if user.invited? return if user.valid_invitation?
@email = user.email @email = user.email

8
config/locales/sk.yml
View File

@ -294,12 +294,12 @@ sk:
suspend: vylúčený suspend: vylúčený
show: show:
affected_accounts: affected_accounts:
few: "%{count} účty v databáze ovplyvnených" few: Je ovplyvnených %{count} účtov v databázi
one: Jeden účet v databáze bol ovplyvnený one: Jeden účet v databázi bol ovplyvnený
other: "%{count} účtov v databáze bolo ovplyvnených" other: "%{count} účty v databáze boli ovplyvnené"
retroactive: retroactive:
silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény
suspend: Zruš suspendáciu všetkých momentálne odročených účtov z tejto domény suspend: Zruš suspendáciu všetkých momentálne ovplyvnených účtov z tejto domény
title: Zruš blokovanie domény %{domain} title: Zruš blokovanie domény %{domain}
undo: Vráť späť undo: Vráť späť
undo: Odvolaj blokovanie domény undo: Odvolaj blokovanie domény

2
spec/validators/blacklisted_email_validator_spec.rb
View File

@ -8,7 +8,7 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
let(:errors) { double(add: nil) } let(:errors) { double(add: nil) }
before do before do
allow(user).to receive(:invited?) { false } allow(user).to receive(:valid_invitation?) { false }
allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email } allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
described_class.new.validate(user) described_class.new.validate(user)
end end