/g, '\n\n'); + normalStatus.unescaped_content = new DOMParser().parseFromString(linebreakComplemented, 'text/html').documentElement.textContent; + return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus))); }; diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index d1c4d2bb2b..8bd35819a9 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -1203,6 +1203,10 @@ a.status__content__spoiler-link { &:focus { outline: 0; } + + @media screen and (max-width: 600px) { + font-size: 16px; + } } .spoiler-input__input { @@ -1267,6 +1271,10 @@ a.status__content__spoiler-link { color: $color5; border-bottom-color: $color4; } + + @media screen and (max-width: 600px) { + font-size: 16px; + } } @import 'boost'; @@ -1906,6 +1914,10 @@ button.icon-button.active i.fa-retweet { &:focus { background: lighten($color1, 4%); } + + @media screen and (max-width: 600px) { + font-size: 16px; + } } .search__icon { diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index a8b56c0859..5d146d9469 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -15,16 +15,26 @@ module Admin if @domain_block.save DomainBlockWorker.perform_async(@domain_block.id) - redirect_to admin_domain_blocks_path, notice: 'Domain block is now being processed' + redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_block.created_msg') else render action: :new end end + def show + @domain_block = DomainBlock.find(params[:id]) + end + + def destroy + @domain_block = DomainBlock.find(params[:id]) + UnblockDomainService.new.call(@domain_block, resource_params[:retroactive]) + redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_block.destroyed_msg') + end + private def resource_params - params.require(:domain_block).permit(:domain, :severity) + params.require(:domain_block).permit(:domain, :severity, :reject_media, :retroactive) end end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c320177dd..e8d7de2188 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,7 +8,9 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" include Localized - helper_method :current_account, :single_user_mode? + + helper_method :current_account + helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 3548ccd692..89c81f766a 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -3,6 +3,8 @@ class DomainBlock < ApplicationRecord enum severity: [:silence, :suspend] + attr_accessor :retroactive + validates :domain, presence: true, uniqueness: true def self.blocked?(domain) diff --git a/app/models/import.rb b/app/models/import.rb index 3013bc50eb..85f6ca4bdf 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -1,13 +1,15 @@ # frozen_string_literal: true class Import < ApplicationRecord + FILE_TYPES = ['text/plain', 'text/csv'].freeze + self.inheritance_column = false + belongs_to :account, required: true + enum type: [:following, :blocking, :muting] - belongs_to :account - - FILE_TYPES = ['text/plain', 'text/csv'].freeze + validates :type, presence: true has_attached_file :data, url: '/system/:hash.:extension', hash_secret: ENV['PAPERCLIP_SECRET'] validates_attachment_content_type :data, content_type: FILE_TYPES diff --git a/app/models/status.rb b/app/models/status.rb index 22d93947a9..5393acfcc2 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -110,6 +110,10 @@ class Status < ApplicationRecord results end + def non_sensitive_with_media? + !sensitive? && media_attachments.any? + end + class << self def as_home_timeline(account) where(account: [account] + account.following) diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb index 6c131bd341..97d2ebcd76 100644 --- a/app/services/block_domain_service.rb +++ b/app/services/block_domain_service.rb @@ -3,12 +3,34 @@ class BlockDomainService < BaseService def call(domain_block) if domain_block.silence? - Account.where(domain: domain_block.domain).update_all(silenced: true) + silence_accounts!(domain_block.domain) + clear_media!(domain_block.domain) if domain_block.reject_media? else - Account.where(domain: domain_block.domain).find_each do |account| - account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed? - SuspendAccountService.new.call(account) - end + suspend_accounts!(domain_block.domain) + end + end + + private + + def silence_accounts!(domain) + Account.where(domain: domain).update_all(silenced: true) + end + + def clear_media!(domain) + Account.where(domain: domain).find_each do |account| + account.avatar.destroy + account.header.destroy + end + + MediaAttachment.where(account: Account.where(domain: domain)).find_each do |attachment| + attachment.file.destroy + end + end + + def suspend_accounts!(domain) + Account.where(domain: domain).where(suspended: false).find_each do |account| + account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed? + SuspendAccountService.new.call(account) end end end diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index dce712b403..14bc064d5d 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -16,7 +16,7 @@ class FollowRemoteAccountService < BaseService return Account.find_local(username) if TagManager.instance.local_domain?(domain) account = Account.find_remote(username, domain) - return account unless account&.last_webfingered_at.nil? || 1.day.from_now(account.last_webfingered_at) < Time.now.utc + return account unless account_needs_webfinger_update?(account) Rails.logger.debug "Looking up webfinger for #{uri}" @@ -62,6 +62,10 @@ class FollowRemoteAccountService < BaseService private + def account_needs_webfinger_update?(account) + account&.last_webfingered_at.nil? || account.last_webfingered_at <= 1.day.ago + end + def get_feed(url) response = http_client.get(Addressable::URI.parse(url)) [response.to_s, Nokogiri::XML(response)] diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 321f53f22e..fa0633b275 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -179,12 +179,12 @@ class ProcessFeedService < BaseService end def hashtags_from_xml(parent, xml) - tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select { |t| !t.blank? } + tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?) ProcessHashtagsService.new.call(parent, tags) end def media_from_xml(parent, xml) - return if DomainBlock.find_by(domain: parent.account.domain)&.reject_media? + do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link| next unless link['href'] @@ -192,7 +192,11 @@ class ProcessFeedService < BaseService media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href']) parsed_url = URI.parse(link['href']) - next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? + next if !%w[http https].include?(parsed_url.scheme) || parsed_url.host.empty? + + media.save + + next if do_not_download begin media.file_remote_url = link['href'] diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 42ff4dcb78..66517470e6 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -13,6 +13,7 @@ class SuspendAccountService < BaseService def purge_content @account.statuses.reorder(nil).find_each do |status| + # This federates out deletes to previous followers RemoveStatusService.new.call(status) end @@ -29,9 +30,7 @@ class SuspendAccountService < BaseService @account.display_name = '' @account.note = '' @account.avatar.destroy - @account.avatar.clear @account.header.destroy - @account.header.clear @account.save! end diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb new file mode 100644 index 0000000000..9794e439d1 --- /dev/null +++ b/app/services/unblock_domain_service.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class UnblockDomainService < BaseService + def call(domain_block, retroactive) + if retroactive + if domain_block.silence? + Account.where(domain: domain_block.domain).update_all(silenced: false) + else + Account.where(domain: domain_block.domain).update_all(suspended: false) + end + end + + domain_block.destroy + end +end diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index 244c9b5290..9b39f4945a 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -6,6 +6,7 @@ class UnfollowService < BaseService # @param [Account] target_account Which to unfollow def call(source_account, target_account) follow = source_account.unfollow!(target_account) + return unless follow NotificationWorker.perform_async(build_xml(follow), source_account.id, target_account.id) unless target_account.local? UnmergeWorker.perform_async(target_account.id, source_account.id) end diff --git a/app/views/about/terms.no.html.haml b/app/views/about/terms.no.html.haml index 5506cd863d..32ec57ed19 100644 --- a/app/views/about/terms.no.html.haml +++ b/app/views/about/terms.no.html.haml @@ -71,6 +71,6 @@ %p Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017. %p - Dokumentet er en adoptert og endret versjon fra + Dokumentet er en adoptert og endret versjon fra = succeed '.' do = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse' diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index beee96cd8d..6538885a01 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,34 +1,34 @@ -.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" } - - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account) +.card.h-card.p-author{ style: "background-image: url(#{account.header.url( :original)})" } + - if user_signed_in? && current_account.id != account.id && !current_account.requested?(account) .controls - - if current_account.following?(@account) - = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button' + - if current_account.following?(account) + = link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button' - else - = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button' + = link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button' - elsif !user_signed_in? .controls .remote-follow - = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button' - .avatar= image_tag @account.avatar.url(:original), class: 'u-photo' + = link_to t('accounts.remote_follow'), account_remote_follow_path(account), class: 'button' + .avatar= image_tag account.avatar.url(:original), class: 'u-photo' %h1.name - %span.p-name.emojify= display_name(@account) + %span.p-name.emojify= display_name(account) %small - %span= "@#{@account.username}" - = fa_icon('lock') if @account.locked? + %span= "@#{account.username}" + = fa_icon('lock') if account.locked? .details .bio - .account__header__content.p-note.emojify= Formatter.instance.simplified_format(@account) + .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account) .details-counters - .counter{ class: active_nav_class(short_account_url(@account)) } - = link_to short_account_url(@account), class: 'u-url u-uid' do + .counter{ class: active_nav_class(short_account_url(account)) } + = link_to short_account_url(account), class: 'u-url u-uid' do %span.counter-label= t('accounts.posts') - %span.counter-number= number_with_delimiter @account.statuses_count - .counter{ class: active_nav_class(following_account_url(@account)) } - = link_to following_account_url(@account) do + %span.counter-number= number_with_delimiter account.statuses_count + .counter{ class: active_nav_class(following_account_url(account)) } + = link_to following_account_url(account) do %span.counter-label= t('accounts.following') - %span.counter-number= number_with_delimiter @account.following_count - .counter{ class: active_nav_class(followers_account_url(@account)) } - = link_to followers_account_url(@account) do + %span.counter-number= number_with_delimiter account.following_count + .counter{ class: active_nav_class(followers_account_url(account)) } + = link_to followers_account_url(account) do %span.counter-label= t('accounts.followers') - %span.counter-number= number_with_delimiter @account.followers_count + %span.counter-number= number_with_delimiter account.followers_count diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml index fa5071f383..4b53aef0cc 100644 --- a/app/views/accounts/followers.html.haml +++ b/app/views/accounts/followers.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('accounts.people_who_follow', name: display_name(@account)) -= render partial: 'header' += render 'header', account: @account .accounts-grid - if @followers.empty? diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml index 987dcba1fa..4711997d9d 100644 --- a/app/views/accounts/following.html.haml +++ b/app/views/accounts/following.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('accounts.people_followed_by', name: display_name(@account)) -= render partial: 'header' += render 'header', account: @account .accounts-grid - if @following.empty? diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index fd7ff9653d..9a70fd16fe 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -20,7 +20,7 @@ .h-feed %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ - = render partial: 'header' + = render 'header', account: @account - if @statuses.empty? .accounts-grid diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml index 6f4ba9b579..da9a07bbc0 100644 --- a/app/views/admin/domain_blocks/index.html.haml +++ b/app/views/admin/domain_blocks/index.html.haml @@ -6,12 +6,19 @@ %tr %th= t('admin.domain_block.domain') %th= t('admin.domain_block.severity') + %th= t('admin.domain_block.reject_media') + %th %tbody - @blocks.each do |block| %tr %td %samp= block.domain - %td= block.severity + %td= t("admin.domain_block.severities.#{block.severity}") + %td + - if block.reject_media? || block.suspend? + %i.fa.fa-check + %td + = table_link_to 'undo', t('admin.domain_block.undo'), admin_domain_block_path(block) = paginate @blocks = link_to t('admin.domain_block.add_new'), new_admin_domain_block_path, class: 'button' diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml index 53aab21ff4..603faeb554 100644 --- a/app/views/admin/domain_blocks/new.html.haml +++ b/app/views/admin/domain_blocks/new.html.haml @@ -10,5 +10,8 @@ = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("admin.domain_block.new.severity.#{type}") } %p.hint= t('admin.domain_block.new.severity.desc_html') + + = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_block.reject_media'), hint: I18n.t('admin.domain_block.reject_media_hint') + .actions = f.button :button, t('admin.domain_block.new.create'), type: :submit diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml new file mode 100644 index 0000000000..bf9011c528 --- /dev/null +++ b/app/views/admin/domain_blocks/show.html.haml @@ -0,0 +1,9 @@ +- content_for :page_title do + = t('admin.domain_block.show.title', domain: @domain_block.domain) + += simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f| + + = f.input :retroactive, as: :boolean, wrapper: :with_label, label: I18n.t("admin.domain_block.show.retroactive.#{@domain_block.severity}"), hint: I18n.t('admin.domain_block.show.affected_accounts', count: Account.where(domain: @domain_block.domain).count) + + .actions + = f.button :button, t('admin.domain_block.show.undo'), type: :submit diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl index 2f56c6d07d..80d80ea05a 100644 --- a/app/views/api/v1/statuses/_media.rabl +++ b/app/views/api/v1/statuses/_media.rabl @@ -1,5 +1,5 @@ attributes :id, :remote_url, :type -node(:url) { |media| full_asset_url(media.file.url(:original)) } -node(:preview_url) { |media| full_asset_url(media.file.url(:small)) } +node(:url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:original)) } +node(:preview_url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:small)) } node(:text_url) { |media| media.local? ? medium_url(media) : nil } diff --git a/app/views/settings/two_factor_auths/_recovery_codes.html.haml b/app/views/settings/two_factor_auths/_recovery_codes.html.haml index 719a1e01ba..054588b97d 100644 --- a/app/views/settings/two_factor_auths/_recovery_codes.html.haml +++ b/app/views/settings/two_factor_auths/_recovery_codes.html.haml @@ -1,6 +1,6 @@ %p.hint= t('two_factor_auth.recovery_instructions') %ol.recovery-codes - - @codes.each do |code| + - recovery_codes.each do |code| %li %samp= code diff --git a/app/views/settings/two_factor_auths/create.html.haml b/app/views/settings/two_factor_auths/create.html.haml index 8710b6e020..138a930fd6 100644 --- a/app/views/settings/two_factor_auths/create.html.haml +++ b/app/views/settings/two_factor_auths/create.html.haml @@ -1,4 +1,4 @@ - content_for :page_title do = t('settings.two_factor_auth') -= render 'recovery_codes' += render partial: 'recovery_codes', object: @codes diff --git a/app/views/settings/two_factor_auths/recovery_codes.html.haml b/app/views/settings/two_factor_auths/recovery_codes.html.haml index 8710b6e020..138a930fd6 100644 --- a/app/views/settings/two_factor_auths/recovery_codes.html.haml +++ b/app/views/settings/two_factor_auths/recovery_codes.html.haml @@ -1,4 +1,4 @@ - content_for :page_title do = t('settings.two_factor_auth') -= render 'recovery_codes' += render partial: 'recovery_codes', object: @codes diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml new file mode 100644 index 0000000000..5762aca041 --- /dev/null +++ b/app/views/stream_entries/_og_description.html.haml @@ -0,0 +1,4 @@ +- if activity.is_a?(Status) && activity.spoiler_text? + %meta{ property: 'og:description', content: activity.spoiler_text }/ +- else + %meta{ property: 'og:description', content: activity.content }/ diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml new file mode 100644 index 0000000000..f725209d82 --- /dev/null +++ b/app/views/stream_entries/_og_image.html.haml @@ -0,0 +1,6 @@ +- if activity.is_a?(Status) && activity.non_sensitive_with_media? + %meta{ property: 'og:image', content: full_asset_url(activity.media_attachments.first.file.url(:small)) }/ +- else + %meta{ property: 'og:image', content: full_asset_url(account.avatar.url(:original)) }/ + %meta{ property: 'og:image:width', content: '120' }/ + %meta{ property: 'og:image:height', content: '120' }/ diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index eb8387ccb6..dea5e9d408 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -6,17 +6,8 @@ %meta{ property: 'og:type', content: 'article' }/ %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ - - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.spoiler_text.blank? - %meta{ property: 'og:description', content: @stream_entry.activity.spoiler_text }/ - - else - %meta{ property: 'og:description', content: @stream_entry.activity.content }/ - - - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0 - %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/ - - else - %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ - %meta{ property: 'og:image:width', content: '120' }/ - %meta{ property: 'og:image:height', content: '120' }/ + = render 'stream_entries/og_description', activity: @stream_entry.activity + = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account %meta{ property: 'twitter:card', content: 'summary' }/ diff --git a/bin/rspec b/bin/rspec new file mode 100755 index 0000000000..d738b23c0b --- /dev/null +++ b/bin/rspec @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true +# +# This file was generated by Bundler. +# +# The application 'rspec' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("rspec-core", "rspec") diff --git a/config/deploy.rb b/config/deploy.rb index 9bcf907be1..b1cade49d4 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,4 +1,7 @@ -lock '3.7.2' +# frozen_string_literal: true + +lock '3.8.0' + set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git') set :branch, ENV.fetch('BRANCH', 'master') diff --git a/config/locales/en.yml b/config/locales/en.yml index 474de39853..325df50450 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -81,6 +81,8 @@ en: web: Web domain_block: add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone domain: Domain new: create: Create block @@ -90,8 +92,22 @@ en: silence: Silence suspend: Suspend title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions + severities: + silence: Silence + suspend: Suspend severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} title: Domain Blocks + undo: Undo pubsubhubbub: callback_url: Callback URL confirmed: Confirmed diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 3c7b342e2a..5483e63b5e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -71,6 +71,7 @@ ja: profile_url: プロフィールURL public: パブリック push_subscription_expires: PuSH購読期限切れ + reset_password: パスワード再設定 salmon_url: Salmon URL silence: サイレンス statuses: トゥート数 @@ -81,6 +82,8 @@ ja: web: Web domain_block: add_new: 新規追加 + created_msg: ドメインブロック処理を完了しました + destroyed_msg: ドメインブロックを外しました domain: ドメイン new: create: ブロックを作成 @@ -90,8 +93,21 @@ ja: silence: サイレンス suspend: 停止 title: 新規ドメインブロック + reject_media: メディアファイルを拒否 + reject_media_hint: ローカルに保村されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です。 + severities: + silence: サイレンス + suspend: 停止 severity: 深刻度 + show: + affected_accounts: "データベース中の%{count}個のアカウントに影響します" + retroactive: + silence: このドメインからの存在するすべてのアカウントのサイレンスを戻す + suspend: このドメインからの存在するすべてのアカウントの停止を戻す + title: "%{domain}のドメインブロックを戻す" + undo: 元に戻す title: ドメインブロック + undo: 元に戻す pubsubhubbub: callback_url: コールバックURL confirmed: 確認済み @@ -106,7 +122,7 @@ ja: delete: 削除 id: ID mark_as_resolved: 解決済みとしてマーク - report: 'レポート#%{id}' + report: レポート#%{id} reported_account: 報告対象アカウント reported_by: 報告者 resolved: 解決済み @@ -290,8 +306,13 @@ ja: disable: 無効 enable: 有効 enabled_success: 二段階認証が有効になりました + generate_recovery_codes: 復元コードを生成 instructions_html: "Google Authenticatorか、もしくはほかのTOTPアプリでこのQRコードをスキャンしてください。これ以降、ログインするときはそのアプリで生成されるコードが必要になります。" + lost_recovery_codes: リカバリコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリコードは無効になります。 manual_instructions: 'QRコードがスキャンできず、手動での登録を希望の場合はこのシークレットコードを利用してください。:' + recovery_codes: リカバリーコード + recovery_codes_regenerated: リカバリーコードが再生成されました。 + recovery_instructions: 携帯電話を紛失した場合、以下の内どれかのリカバリコードを使用してアカウントへアクセスすることができます。 リカバリコードは印刷して安全に保管してください。 setup: 初期設定 warning: 現在認証アプリを設定できない場合、無効に設定して、有効にしないでください。 wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。 diff --git a/config/locales/pt.yml b/config/locales/pt.yml index f2c7458f7f..703c8467fb 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -2,28 +2,97 @@ pt: about: about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. + about_this: Sobre essa instância get_started: Como começar + apps: Aplicações + business_email: 'Email comercial:' + closed_registrations: Registros estão fechadas para essa instância. + contact: Contato + description_headline: O que é %{domain}? + domain_count_after: outras instâncias + domain_count_before: Conectado a + features: + api: Aberto para API de aplicações e serviços + blocks: Bloqueos e ferramentas para mudar + characters: 500 caracteres por post + chronology: Timeline são cronologicas + ethics: 'Design ético: sem propaganda, sem tracking' + gifv: GIFV e vídeos curtos + privacy: Granular, privacidade setada por post + public: Timelines públicas + features_headline: O que torna Mastodon diferente + get_started: Comece aqui + links: Links source_code: Source code + other_instances: Outras instâncias terms: Termos + user_count_after: usuários + user_count_before: Lugar de accounts: follow: Seguir followers: Seguidores - following: Following + following: Seguindo nothing_here: Não há nada aqui! people_followed_by: Pessoas seguidas por %{name} people_who_follow: Pessoas que seguem %{name} posts: Posts + remote_follow: Acesso remoto unfollow: Unfollow + admin: + accounts: + are_you_sure: Você tem certeza? + display_name: Nome mostrado + domain: Domain + edit: Editar + email: E-mail + feed_url: URL do Feed + followers: Seguidores + follows: Seguindo + location: + all: Todos + local: Local + remote: Remoto + title: Local + media_attachments: Mídia anexadas + moderation: + all: Todos + silenced: Silenciado + suspended: Supenso + title: Moderação + most_recent_activity: Atividade mais recente + most_recent_ip: IP mais recente + not_subscribed: Não inscrito + order: + alphabetic: Alfabética + most_recent: Mais recente + title: Ordem + perform_full_suspension: Fazer suspensão completa + profile_url: URL do perfil + public: Público + push_subscription_expires: PuSH subscription expires + salmon_url: Salmon URL + silence: Silêncio + statuses: Status + title: Contas + undo_silenced: Desfazer silenciar + undo_suspension: Desfazer supensão + username: Usuário + web: Web + domain_block: + add_new: Adicionar nova + created_msg: Bloqueio do domínio está sendo processado + destroyed_msg: Bloqueio de domínio está sendo desfeito + domain: Domínio application_mailer: signature: notificações Mastodon de %{instance} auth: - change_password: Mudar password + change_password: Mudar senha didnt_get_confirmation: Não recebeu instruções de confirmação? - forgot_password: Esqueceu a password? + forgot_password: Esqueceu a senha? login: Entrar register: Registar resend_confirmation: Reenviar instruções de confirmação - reset_password: Reset password + reset_password: Resetar senha set_new_password: Editar password generic: changes_saved_msg: Mudanças guardadas! diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 103001b7ef..b9257ec35f 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -10,11 +10,13 @@ ja: note: プロフィールは160文字まで設定することができます。 imports: data: 他の Mastodon サーバーからエクスポートしたCSVファイルを選択して下さい + sessions: + otp: 携帯電話に表示された2段階認証コードを入力するか、生成したリカバリーコードを使用してください。 labels: defaults: avatar: アイコン confirm_new_password: 新しいパスワード（確認用） - confirm_password: 新しいパスワード + confirm_password: パスワード（確認用） current_password: 現在のパスワード data: データ display_name: 表示名 @@ -22,12 +24,13 @@ ja: header: ヘッダー locale: 言語 locked: 非公開アカウントにする - new_password: パスワード + new_password: 新しいパスワード note: プロフィール otp_attempt: 二段階認証コード password: パスワード setting_boost_modal: ブーストする前に確認ダイアログを表示する setting_default_privacy: 投稿の公開範囲 + severity: 重大性 type: インポートする項目 username: ユーザー名 interactions: diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index 07099c1f0d..e8b5e2d7f0 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -4,17 +4,17 @@ pt: labels: defaults: avatar: Avatar - confirm_new_password: Confirme nova password - confirm_password: Confirme a password - current_password: Password atual + confirm_new_password: Confirme nova senha + confirm_password: Confirme a senha + current_password: Senha atual display_name: Nome email: Endereço de email header: Header locale: Linguagem - new_password: Nova password + new_password: Nova senha note: Biografia - password: Password - username: Username + password: Senha + username: Usuário interactions: must_be_follower: Bloquear notificações de não-seguidores must_be_following: Bloquear notificações de pessoas que você diff --git a/config/routes.rb b/config/routes.rb index 31909a4f4d..fd186c3206 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,7 +78,7 @@ Rails.application.routes.draw do namespace :admin do resources :pubsubhubbub, only: [:index] - resources :domain_blocks, only: [:index, :new, :create] + resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] resources :settings, only: [:index, :update] resources :reports, only: [:index, :show, :update] do diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 54980634d3..b477302740 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -1,6 +1,16 @@ # frozen_string_literal: true namespace :mastodon do + desc 'Execute daily tasks' + task :daily do + Rake::Task['mastodon:feeds:clear'].invoke + Rake::Task['mastodon:media:clear'].invoke + Rake::Task['mastodon:users:clear'].invoke + + Rake::Task['mastodon:push:refresh'].invoke + end + + desc 'Turn a user into an admin, identified by the USERNAME environment variable' task make_admin: :environment do include RoutingHelper @@ -13,12 +23,13 @@ namespace :mastodon do desc 'Manually confirms a user with associated user email address stored in USER_EMAIL environment variable.' task confirm_email: :environment do email = ENV.fetch('USER_EMAIL') - user = User.where(email: email).first + user = User.find_by(email: email) + if user user.update(confirmed_at: Time.now.utc) - puts "User #{email} confirmed." + puts "#{email} confirmed" else - abort "User #{email} not found." + abort "#{email} not found" end end @@ -32,6 +43,13 @@ namespace :mastodon do task remove_silenced: :environment do MediaAttachment.where(account: Account.silenced).find_each(&:destroy) end + + desc 'Remove cached remote media attachments that are older than a week' + task remove_remote: :environment do + MediaAttachment.where.not(remote_url: '').where('created_at < ?', 1.week.ago).find_each do |media| + media.file.destroy + end + end end namespace :push do @@ -60,7 +78,7 @@ namespace :mastodon do end end - desc 'Clears all timelines so that they would be regenerated on next hit' + desc 'Clears all timelines' task clear_all: :environment do Redis.current.keys('feed:*').each { |key| Redis.current.del(key) } end @@ -126,8 +144,13 @@ namespace :mastodon do Rails.logger.debug 'Generating static avatars/headers for GIF ones...' Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account| - account.avatar.reprocess! - account.header.reprocess! + begin + account.avatar.reprocess! + account.header.reprocess! + rescue StandardError => e + Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}" + next + end end Rails.logger.debug 'Done!' diff --git a/package.json b/package.json index 6f448238bd..0ced631a9c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "mastodon", + "license" : "AGPL-3.0", "scripts": { "start": "babel-node ./streaming/index.js --presets es2015,stage-2", "storybook": "start-storybook -p 9001 -c storybook", diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb index 5526d6780e..acc0c39f5b 100644 --- a/spec/views/stream_entries/show.html.haml_spec.rb +++ b/spec/views/stream_entries/show.html.haml_spec.rb @@ -61,5 +61,4 @@ describe 'stream_entries/show.html.haml' do expect(mf2.entry.in_reply_to.format.author.format.name.to_s).to eq alice.display_name expect(mf2.entry.in_reply_to.format.author.format.url.to_s).not_to be_empty end - end