Merge pull request #2583 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 01ce9df880
pull/2584/head
Claire 2024-01-25 19:50:12 +01:00 committed by GitHub
commit adde803656
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
64 changed files with 298 additions and 89 deletions

View File

@ -5,7 +5,7 @@
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"features": {
"ghcr.io/devcontainers/features/sshd:1": {}
"ghcr.io/devcontainers/features/sshd:1": {},
},
"runServices": ["app", "db", "redis"],
@ -15,16 +15,16 @@
"portsAttributes": {
"3000": {
"label": "web",
"onAutoForward": "notify"
"onAutoForward": "notify",
},
"4000": {
"label": "stream",
"onAutoForward": "silent"
}
"onAutoForward": "silent",
},
},
"otherPortsAttributes": {
"onAutoForward": "silent"
"onAutoForward": "silent",
},
"remoteEnv": {
@ -33,7 +33,7 @@
"STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev",
"DISABLE_FORGERY_REQUEST_PROTECTION": "true",
"ES_ENABLED": "",
"LIBRE_TRANSLATE_ENDPOINT": ""
"LIBRE_TRANSLATE_ENDPOINT": "",
},
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@ -43,7 +43,7 @@
"customizations": {
"vscode": {
"settings": {},
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
}
}
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
},
},
}

View File

@ -5,7 +5,7 @@
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"features": {
"ghcr.io/devcontainers/features/sshd:1": {}
"ghcr.io/devcontainers/features/sshd:1": {},
},
"forwardPorts": [3000, 4000],
@ -14,17 +14,17 @@
"3000": {
"label": "web",
"onAutoForward": "notify",
"requireLocalPort": true
"requireLocalPort": true,
},
"4000": {
"label": "stream",
"onAutoForward": "silent",
"requireLocalPort": true
}
"requireLocalPort": true,
},
},
"otherPortsAttributes": {
"onAutoForward": "silent"
"onAutoForward": "silent",
},
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@ -34,7 +34,7 @@
"customizations": {
"vscode": {
"settings": {},
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
}
}
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
},
},
}

View File

@ -86,12 +86,7 @@ Rails/WhereExists:
- 'app/models/status.rb'
- 'app/policies/status_policy.rb'
- 'app/serializers/rest/announcement_serializer.rb'
- 'app/services/activitypub/fetch_remote_status_service.rb'
- 'app/services/vote_service.rb'
- 'app/validators/reaction_validator.rb'
- 'app/validators/vote_validator.rb'
- 'app/workers/move_worker.rb'
- 'lib/tasks/tests.rake'
- 'spec/models/account_spec.rb'
- 'spec/services/activitypub/process_collection_service_spec.rb'
- 'spec/services/purge_domain_service_spec.rb'

View File

@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
end
def default_accounts
Account.includes(:active_relationships, :account_stat).references(:active_relationships)
Account.includes(:active_relationships, :account_stat, :user).references(:active_relationships)
end
def paginated_follows

View File

@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
end
def default_accounts
Account.includes(:passive_relationships, :account_stat).references(:passive_relationships)
Account.includes(:passive_relationships, :account_stat, :user).references(:passive_relationships)
end
def paginated_follows

View File

@ -17,7 +17,7 @@ class Api::V1::BlocksController < Api::BaseController
end
def paginated_blocks
@paginated_blocks ||= Block.eager_load(target_account: :account_stat)
@paginated_blocks ||= Block.eager_load(target_account: [:account_stat, :user])
.joins(:target_account)
.merge(Account.without_suspended)
.where(account: current_account)

View File

@ -27,7 +27,7 @@ class Api::V1::DirectoriesController < Api::BaseController
scope.merge!(local_account_scope) if local_accounts?
scope.merge!(account_exclusion_scope) if current_account
scope.merge!(account_domain_block_scope) if current_account && !local_accounts?
end
end.includes(:account_stat, user: :role)
end
def local_accounts?

View File

@ -25,7 +25,7 @@ class Api::V1::EndorsementsController < Api::BaseController
end
def endorsed_accounts
current_account.endorsed_accounts.includes(:account_stat).without_suspended
current_account.endorsed_accounts.includes(:account_stat, :user).without_suspended
end
def insert_pagination_headers

View File

@ -37,7 +37,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
end
def default_accounts
Account.without_suspended.includes(:follow_requests, :account_stat).references(:follow_requests)
Account.without_suspended.includes(:follow_requests, :account_stat, :user).references(:follow_requests)
end
def paginated_follow_requests

View File

@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController
def load_accounts
if unlimited?
@list.accounts.without_suspended.includes(:account_stat).all
@list.accounts.without_suspended.includes(:account_stat, :user).all
else
@list.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
@list.accounts.without_suspended.includes(:account_stat, :user).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
end
end

View File

@ -17,7 +17,7 @@ class Api::V1::MutesController < Api::BaseController
end
def paginated_mutes
@paginated_mutes ||= Mute.eager_load(:target_account)
@paginated_mutes ||= Mute.eager_load(target_account: [:account_stat, :user])
.joins(:target_account)
.merge(Account.without_suspended)
.where(account: current_account)

View File

@ -21,7 +21,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
def default_accounts
Account
.without_suspended
.includes(:favourites, :account_stat)
.includes(:favourites, :account_stat, :user)
.references(:favourites)
.where(favourites: { status_id: @status.id })
end

View File

@ -19,7 +19,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
end
def default_accounts
Account.without_suspended.includes(:statuses, :account_stat).references(:statuses)
Account.without_suspended.includes(:statuses, :account_stat, :user).references(:statuses)
end
def paginated_statuses

View File

@ -35,7 +35,7 @@ class Api::V2::FiltersController < Api::BaseController
private
def set_filters
@filters = current_account.custom_filters.includes(:keywords)
@filters = current_account.custom_filters.includes(:keywords, :statuses)
end
def set_filter

View File

@ -1,3 +1,4 @@
import { createSelector } from '@reduxjs/toolkit';
import { connect } from 'react-redux';
import {
@ -12,10 +13,15 @@ import {
import Search from '../components/search';
const getRecentSearches = createSelector(
state => state.getIn(['search', 'recent']),
recent => recent.reverse(),
);
const mapStateToProps = state => ({
value: state.getIn(['search', 'value']),
submitted: state.getIn(['search', 'submitted']),
recent: state.getIn(['search', 'recent']).reverse(),
recent: getRecentSearches(state),
});
const mapDispatchToProps = dispatch => ({

View File

@ -1,3 +1,4 @@
import { createSelector } from '@reduxjs/toolkit';
import { connect } from 'react-redux';
import {
@ -12,10 +13,15 @@ import {
import Search from '../components/search';
const getRecentSearches = createSelector(
state => state.getIn(['search', 'recent']),
recent => recent.reverse(),
);
const mapStateToProps = state => ({
value: state.getIn(['search', 'value']),
submitted: state.getIn(['search', 'submitted']),
recent: state.getIn(['search', 'recent']).reverse(),
recent: getRecentSearches(state),
});
const mapDispatchToProps = dispatch => ({

View File

@ -150,7 +150,7 @@
"compose_form.poll.duration": "Durada de l'enquesta",
"compose_form.poll.option_placeholder": "Opció {number}",
"compose_form.poll.remove_option": "Elimina aquesta opció",
"compose_form.poll.switch_to_multiple": "Canvia lenquesta per a permetre diverses opcions",
"compose_form.poll.switch_to_multiple": "Canvia lenquesta per a permetre múltiples opcions",
"compose_form.poll.switch_to_single": "Canvia lenquesta per a permetre una única opció",
"compose_form.publish": "Tut",
"compose_form.publish_form": "Nou tut",
@ -607,7 +607,7 @@
"search.quick_action.status_search": "Tuts coincidint amb {x}",
"search.search_or_paste": "Cerca o escriu l'URL",
"search_popout.full_text_search_disabled_message": "No disponible a {domain}.",
"search_popout.full_text_search_logged_out_message": "Només disponible en iniciar la sessió.",
"search_popout.full_text_search_logged_out_message": "Només disponible amb la sessió iniciada.",
"search_popout.language_code": "Codi de llengua ISO",
"search_popout.options": "Opcions de cerca",
"search_popout.quick_actions": "Accions ràpides",

View File

@ -32,6 +32,7 @@
"account.featured_tags.last_status_never": "Sem publicações",
"account.featured_tags.title": "Hashtags em destaque de {name}",
"account.follow": "Seguir",
"account.follow_back": "Seguir de volta",
"account.followers": "Seguidores",
"account.followers.empty": "Nada aqui.",
"account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@ -52,6 +53,7 @@
"account.mute_notifications_short": "Silenciar notificações",
"account.mute_short": "Silenciar",
"account.muted": "Silenciado",
"account.mutual": "Mútuo",
"account.no_bio": "Nenhuma descrição fornecida.",
"account.open_original_page": "Abrir a página original",
"account.posts": "Toots",

View File

@ -29,7 +29,7 @@ class AccountSuggestions
# a complicated query on this end.
account_ids = account_ids_with_sources[offset, limit]
accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat).index_by(&:id)
accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
account_ids.filter_map do |(account_id, source)|
next unless accounts_map.key?(account_id)

View File

@ -41,7 +41,7 @@ class Report < ApplicationRecord
scope :unresolved, -> { where(action_taken_at: nil) }
scope :resolved, -> { where.not(action_taken_at: nil) }
scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with([:account_stat, { user: [:invite_request, :invite, :ips] }])) }
# A report is considered local if the reporter is local
delegate :local?, to: :account

View File

@ -39,6 +39,8 @@ class Tag < ApplicationRecord
HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
RECENT_STATUS_LIMIT = 1000
validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
validates :display_name, format: { with: HASHTAG_NAME_RE }
validate :validate_name_change, if: -> { !new_record? && name_changed? }
@ -53,7 +55,7 @@ class Tag < ApplicationRecord
scope :not_trendable, -> { where(trendable: false) }
scope :recently_used, lambda { |account|
joins(:statuses)
.where(statuses: { id: account.statuses.select(:id).limit(1000) })
.where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
.group(:id).order(Arel.sql('count(*) desc'))
}
scope :matches_name, ->(term) { where(arel_table[:name].lower.matches(arel_table.lower("#{sanitize_sql_like(Tag.normalize(term))}%"), nil, true)) } # Search with case-sensitive to use B-tree index

View File

@ -44,7 +44,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
# If we fetched a status that already exists, then we need to treat the
# activity as an update rather than create
activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.exists?(uri: object_uri, account_id: actor.id)
with_redis do |redis|
discoveries = redis.incr("status_discovery_per_request:#{@request_id}")

View File

@ -19,7 +19,7 @@ class VoteService < BaseService
already_voted = true
with_redis_lock("vote:#{@poll.id}:#{@account.id}") do
already_voted = @poll.votes.where(account: @account).exists?
already_voted = @poll.votes.exists?(account: @account)
ApplicationRecord.transaction do
@choices.each do |choice|

View File

@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
end
def new_reaction?(reaction)
!reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
!reaction.announcement.announcement_reactions.exists?(name: reaction.name)
end
def limit_reached?(reaction)

View File

@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
if vote.persisted?
account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
else
account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
account_votes_on_same_poll(vote).exists?(choice: vote.choice)
end
end

View File

@ -1790,6 +1790,11 @@ bg:
extra: Вече е готово за теглене!
subject: Вашият архив е готов за изтегляне
title: Сваляне на архива
failed_2fa:
details: 'Ето подробности на опита за влизане:'
explanation: Някой се опита да влезе в акаунта ви, но предостави невалиден втори фактор за удостоверяване.
subject: Неуспешен втори фактор за удостоверяване
title: Провал на втория фактор за удостоверяване
suspicious_sign_in:
change_password: промяна на паролата ви
details: 'Ето подробности при вход:'

View File

@ -425,7 +425,7 @@ ca:
view: Veure el bloqueig del domini
email_domain_blocks:
add_new: Afegir nou
allow_registrations_with_approval: Registre permès amb validació
allow_registrations_with_approval: Permet els registres amb validació
attempts_over_week:
one: "%{count} intent en la darrera setmana"
other: "%{count} intents de registre en la darrera setmana"
@ -1046,6 +1046,7 @@ ca:
clicking_this_link: en clicar aquest enllaç
login_link: inici de sessió
proceed_to_login_html: Ara pots passar a %{login_link}.
redirect_to_app_html: Se us hauria d'haver redirigit a l'app <strong>%{app_name}</strong>. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
registration_complete: La teva inscripció a %{domain} ja és completa.
welcome_title: Hola, %{name}!
wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
@ -1109,6 +1110,7 @@ ca:
functional: El teu compte està completament operatiu.
pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
view_strikes: Veure accions del passat contra el teu compte
too_fast: Formulari enviat massa ràpid, torna a provar-ho.
use_security_key: Usa clau de seguretat
@ -1580,6 +1582,7 @@ ca:
over_total_limit: Has superat el límit de %{limit} tuts programats
too_soon: La data programada ha de ser futura
self_destruct:
lead_html: Lamentablement, <strong>%{domain}</strong> tanca de forma definitiva. Si hi teníeu un compte, no el podreu continuar utilitzant, però podeu demanar una còpia de les vostres dades.
title: Aquest servidor tancarà
sessions:
activity: Última activitat
@ -1784,9 +1787,15 @@ ca:
title: Apel·lació rebutjada
backup_ready:
explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
extra: Ja us ho podeu baixar
extra: Ja la podeu baixar
subject: L'arxiu està preparat per a descàrrega
title: Recollida de l'arxiu
failed_2fa:
details: 'Aquests són els detalls de l''intent d''accés:'
explanation: Algú ha intentat accedir al vostre compte però no ha proporcionat un factor de doble autenticació correcte.
further_actions_html: Si no heu estat vosaltres, us recomanem que %{action} immediatament perquè pot estar compromès.
subject: Ha fallat el factor de doble autenticació
title: Ha fallat l'autenticació de doble factor
suspicious_sign_in:
change_password: canvia la teva contrasenya
details: 'Aquest són els detalls de l''inici de sessió:'
@ -1840,7 +1849,7 @@ ca:
go_to_sso_account_settings: Ves a la configuració del compte del teu proveïdor d'identitat
invalid_otp_token: El codi de dos factors no és correcte
otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
rate_limited: Excessius intents d'autenticació, torneu-ho a provar més tard.
rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
signed_in_as: 'Sessió iniciada com a:'
verification:

View File

@ -1790,8 +1790,14 @@ de:
extra: Sie ist jetzt zum Herunterladen bereit!
subject: Dein persönliches Archiv kann heruntergeladen werden
title: Archiv-Download
failed_2fa:
details: 'Details zum Anmeldeversuch:'
explanation: Jemand hat versucht, sich bei deinem Konto anzumelden, aber die Zwei-Faktor-Authentisierung schlug fehl.
further_actions_html: Solltest du das nicht gewesen sein, empfehlen wir dir, sofort %{action}, da dein Konto möglicherweise kompromittiert ist.
subject: Zwei-Faktor-Authentisierung fehlgeschlagen
title: Zwei-Faktor-Authentisierung fehlgeschlagen
suspicious_sign_in:
change_password: dein Passwort ändern
change_password: dein Passwort zu ändern
details: 'Hier sind die Details zu den Anmeldeversuchen:'
explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.

View File

@ -49,19 +49,19 @@ ca:
subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
title: Contrasenya restablerta
two_factor_disabled:
explanation: Només es pot accedir amb compte de correu i contrasenya.
explanation: Ara es pot accedir amb només compte de correu i contrasenya.
subject: 'Mastodon: Autenticació de doble factor desactivada'
subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
title: A2F desactivada
two_factor_enabled:
explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
explanation: Per accedir cal un token generat per l'aplicació TOTP aparellada.
subject: 'Mastodon: Autenticació de doble factor activada'
subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
title: A2F activada
two_factor_recovery_codes_changed:
explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
subject: 'Mastodon: codis de recuperació de doble factor regenerats'
subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
subtitle: S'han invalidat els codis de recuperació anteriors i se n'han generat de nous.
title: Codis de recuperació A2F canviats
unlock_instructions:
subject: 'Mastodon: Instruccions per a desblocar'
@ -76,7 +76,7 @@ ca:
title: Una de les teves claus de seguretat ha estat esborrada
webauthn_disabled:
explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
extra: Ara es pot accedir amb només el token generat amb l'aplicació TOTP aparellada.
subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
title: Claus de seguretat desactivades
webauthn_enabled:

View File

@ -1790,6 +1790,12 @@ es-AR:
extra: "¡Ya está lista para descargar!"
subject: Tu archivo historial está listo para descargar
title: Descargar archivo historial
failed_2fa:
details: 'Estos son los detalles del intento de inicio de sesión:'
explanation: Alguien intentó iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación no válido.
further_actions_html: Si vos no fuiste, te recomendamos que %{action} inmediatamente, ya que la seguridad de tu cuenta podría estar comprometida.
subject: Fallo de autenticación del segundo factor
title: Fallo en la autenticación del segundo factor
suspicious_sign_in:
change_password: cambiés tu contraseña
details: 'Acá están los detalles del inicio de sesión:'

View File

@ -1790,6 +1790,8 @@ es-MX:
extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
failed_2fa:
details: 'Estos son los detalles del intento de inicio de sesión:'
suspicious_sign_in:
change_password: cambies tu contraseña
details: 'Aquí están los detalles del inicio de sesión:'

View File

@ -1790,6 +1790,8 @@ es:
extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
failed_2fa:
details: 'Estos son los detalles del intento de inicio de sesión:'
suspicious_sign_in:
change_password: cambies tu contraseña
details: 'Aquí están los detalles del inicio de sesión:'

View File

@ -1792,6 +1792,12 @@ et:
extra: See on nüüd allalaadimiseks valmis!
subject: Arhiiv on allalaadimiseks valmis
title: Arhiivi väljavõte
failed_2fa:
details: 'Sisenemise üksikasjad:'
explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale teisese autentimisfaktori.
further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla lekkinud.
subject: Kaheastmelise autentimise nurjumine
title: Kaheastmeline autentimine nurjus
suspicious_sign_in:
change_password: muuta oma salasõna
details: 'Sisenemise üksikasjad:'
@ -1848,6 +1854,7 @@ et:
go_to_sso_account_settings: Mine oma idenditeedipakkuja kontosätetesse
invalid_otp_token: Vale kaheastmeline võti
otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
signed_in_as: 'Sisse logitud kasutajana:'
verification:

View File

@ -1794,6 +1794,12 @@ eu:
extra: Deskargatzeko prest!
subject: Zure artxiboa deskargatzeko prest dago
title: Artxiboa jasotzea
failed_2fa:
details: 'Hemen dituzu saio-hasieraren saiakeraren xehetasunak:'
explanation: Norbait zure kontuan saioa hasten saiatu da, baina bigarren autentifikazioaren faktore baliogabea eman du.
further_actions_html: Ez bazara zu izan, "%{action}" ekintza berehala egitea gomendatzen dugu, kontua arriskarazi daiteke eta.
subject: Autentifikazioaren bigarren faktoreak huts egin du
title: Huts egin duen autentifikazioaren bigarren faktorea
suspicious_sign_in:
change_password: aldatu pasahitza
details: 'Hemen daude saio hasieraren xehetasunak:'

View File

@ -1790,6 +1790,12 @@ fi:
extra: Se on nyt valmis ladattavaksi!
subject: Arkisto on valmiina ladattavaksi
title: Arkiston tallennus
failed_2fa:
details: 'Tässä on tiedot kirjautumisyrityksestä:'
explanation: Joku on yrittänyt kirjautua tilillesi, mutta antanut virheellisen kaksivaiheisen todennuksen.
further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
subject: Kaksivaiheisen todennuksen virhe
title: Epäonnistunut kaksivaiheinen todennus
suspicious_sign_in:
change_password: vaihda salasanasi
details: 'Tässä on tiedot kirjautumisesta:'

View File

@ -1790,6 +1790,12 @@ fo:
extra: Tað er nú klárt at taka niður!
subject: Savnið hjá tær er tøkt at taka niður
title: Tak savn niður
failed_2fa:
details: 'Her eru smálutirnir í innritanarroyndini:'
explanation: Onkur hevur roynt at rita inn á tína kontu, men gav eitt ógildugt seinna samgildi.
further_actions_html: Um hetta ikki var tú, so skjóta vit upp, at tú %{action} beinan vegin, tí tað kann vera sett í vanda.
subject: Seinna samgildi miseydnaðist
title: Miseydnað seinna samgildi
suspicious_sign_in:
change_password: broyt loyniorðið hjá tær
details: 'Her eru smálutirnir í innritanini:'

View File

@ -1843,6 +1843,7 @@ fy:
go_to_sso_account_settings: Gean nei de accountynstellingen fan jo identiteitsprovider
invalid_otp_token: Unjildige twa-stapstagongskoade
otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
signed_in_as: 'Oanmeld as:'
verification:

View File

@ -1854,6 +1854,12 @@ he:
extra: הגיבוי מוכן להורדה!
subject: הארכיון שלך מוכן להורדה
title: הוצאת ארכיון
failed_2fa:
details: 'הנה פרטי נסיון ההתחברות:'
explanation: פולני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
further_actions_html: אם הנסיון לא היה שלך, אנו ממליצים על %{action} באופן מיידי כדי שהחשבון לא יפול קורבן.
subject: נכשל אימות בגורם שני
title: אימות בגורם שני נכשל
suspicious_sign_in:
change_password: שינוי הסיסמא שלך
details: 'הנה פרטי ההתחברות:'

View File

@ -1790,6 +1790,12 @@ hu:
extra: Már letöltésre kész!
subject: Az adataidról készült archív letöltésre kész
title: Archiválás
failed_2fa:
details: 'Itt vannak a bejelentkezési kísérlet részletei:'
explanation: Valaki megpróbált bejelentkezni a fiókodba, de a második hitelesítési lépése érvénytelen volt.
further_actions_html: Ha ez nem te voltál, azt javasoljuk, hogy azonnal %{action}, mivel lehetséges, hogy az rossz kezekbe került.
subject: Második körös hitelesítés sikertelen
title: Sikertelen a második körös hitelesítés
suspicious_sign_in:
change_password: módosítsd a jelszavad
details: 'Itt vannak a bejelentkezés részletei:'

View File

@ -1794,6 +1794,12 @@ is:
extra: Það er núna tilbúið til niðurhals!
subject: Safnskráin þín er tilbúin til niðurhals
title: Taka út í safnskrá
failed_2fa:
details: 'Hér eru nánari upplýsingar um innskráningartilraunina:'
explanation: Einhver reyndi að skrá sig inn á aðganginn þinn en gaf upp ógild gögn seinna þrepi auðkenningar.
further_actions_html: Ef þetta varst ekki þú, þá mælum við eindregið með því að þú %{action} samstundis, þar sem það gæti verið berskjaldað.
subject: Bilun í seinna þrepi auðkenningar
title: Seinna þrep auðkenningar brást
suspicious_sign_in:
change_password: breytir lykilorðinu þínu
details: 'Hér eru nánari upplýsingar um innskráninguna:'

View File

@ -1792,6 +1792,12 @@ it:
extra: Ora è pronto per il download!
subject: Il tuo archivio è pronto per essere scaricato
title: Esportazione archivio
failed_2fa:
details: 'Questi sono i dettagli del tentativo di accesso:'
explanation: Qualcuno ha tentato di accedere al tuo account ma ha fornito un secondo fattore di autenticazione non valido.
further_actions_html: Se non eri tu, ti consigliamo di %{action} immediatamente poiché potrebbe essere compromesso.
subject: Errore di autenticazione del secondo fattore
title: Autenticazione del secondo fattore non riuscita
suspicious_sign_in:
change_password: cambiare la tua password
details: 'Questi sono i dettagli del tentativo di accesso:'

View File

@ -1760,6 +1760,8 @@ ko:
extra: 다운로드 할 준비가 되었습니다!
subject: 아카이브를 다운로드할 수 있습니다
title: 아카이브 테이크아웃
failed_2fa:
details: '로그인 시도에 대한 상세 정보입니다:'
suspicious_sign_in:
change_password: 암호 변경
details: '로그인에 대한 상세 정보입니다:'

View File

@ -1757,6 +1757,8 @@ lad:
extra: Agora esta pronto para abashar!
subject: Tu dosya esta pronta para abashar
title: Abasha dosya
failed_2fa:
details: 'Aki estan los peratim de las provas de koneksyon kon tu kuento:'
suspicious_sign_in:
change_password: troka tu kod
details: 'Aki estan los peratim de la koneksyon kon tu kuento:'

View File

@ -559,6 +559,12 @@ lt:
extra: Jį jau galima atsisiųsti!
subject: Jūsų archyvas paruoštas parsisiuntimui
title: Archyvas išimtas
failed_2fa:
details: 'Štai išsami informacija apie bandymą prisijungti:'
explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą antrąjį tapatybės nustatymo veiksnį.
further_actions_html: Jei tai buvo ne tu, rekomenduojame nedelsiant imtis %{action}, nes jis gali būti pažeistas.
subject: Antrojo veiksnio tapatybės nustatymas nesėkmingai
title: Nepavyko atlikti antrojo veiksnio tapatybės nustatymo
warning:
subject:
disable: Jūsų paskyra %{acct} buvo užšaldyta
@ -584,6 +590,7 @@ lt:
go_to_sso_account_settings: Eik į savo tapatybės teikėjo paskyros nustatymus
invalid_otp_token: Netinkamas dviejų veiksnių kodas
otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
signed_in_as: 'Prisijungta kaip:'
verification:

View File

@ -1790,6 +1790,11 @@ nl:
extra: Het staat nu klaar om te worden gedownload!
subject: Jouw archief staat klaar om te worden gedownload
title: Archief ophalen
failed_2fa:
details: 'Hier zijn details van de aanmeldpoging:'
explanation: Iemand heeft geprobeerd om in te loggen op uw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
subject: Tweede factor authenticatiefout
title: Tweestapsverificatie mislukt
suspicious_sign_in:
change_password: je wachtwoord te wijzigen
details: 'Hier zijn de details van inlogpoging:'

View File

@ -1790,6 +1790,12 @@ nn:
extra: Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
failed_2fa:
details: 'Her er detaljane om innloggingsforsøket:'
explanation: Nokon har prøvd å logge inn på kontoen din, men brukte ein ugyldig andre-autentiseringsfaktor.
further_actions_html: Om dette ikkje var deg, rår me deg til å %{action} med éin gong, då det kan vere kompomittert.
subject: To-faktor-autentiseringsfeil
title: Mislukka to-faktor-autentisering
suspicious_sign_in:
change_password: endre passord
details: 'Her er påloggingsdetaljane:'

View File

@ -1790,6 +1790,12 @@
extra: Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
failed_2fa:
details: 'Her er detaljer om påloggingsforsøket:'
explanation: Noen har prøvd å logge på kontoen din, men ga en ugyldig andre-autentiseringsfaktor.
further_actions_html: Hvis dette ikke var deg, anbefaler vi at du %{action} umiddelbart fordi det kan ha blitt kompromittert.
subject: Andre-autentiseringsfaktorfeil
title: Mislykket andre-autentiseringsfaktor
suspicious_sign_in:
change_password: endre passord
details: 'Her er detaljer om påloggingen:'

View File

@ -1854,6 +1854,12 @@ pl:
extra: Gotowe do pobrania!
subject: Twoje archiwum jest gotowe do pobrania
title: Odbiór archiwum
failed_2fa:
details: 'Oto szczegóły próby logowania:'
explanation: Ktoś próbował zalogować się na twoje konto, ale nie przeszedł drugiego etapu autoryzacji.
further_actions_html: Jeśli to nie ty, polecamy natychmiastowo %{action}, bo może ono być narażone.
subject: Błąd drugiego etapu uwierzytelniania
title: Nieudane uwierzytelnienie w drugim etapie
suspicious_sign_in:
change_password: zmień hasło
details: 'Oto szczegóły logowania:'

View File

@ -1789,6 +1789,12 @@ pt-BR:
extra: Agora está pronto para baixar!
subject: Seu arquivo está pronto para ser baixado
title: Baixar arquivo
failed_2fa:
details: 'Aqui estão os detalhes da tentativa de acesso:'
explanation: Alguém tentou entrar em sua conta, mas forneceu um segundo fator de autenticação inválido.
further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois ela pode ser comprometida.
subject: Falha na autenticação do segundo fator
title: Falha na autenticação do segundo fator
suspicious_sign_in:
change_password: Altere sua senha
details: 'Aqui estão os detalhes do acesso:'
@ -1842,6 +1848,7 @@ pt-BR:
go_to_sso_account_settings: Vá para as configurações de conta do seu provedor de identidade
invalid_otp_token: Código de dois fatores inválido
otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
signed_in_as: 'Entrou como:'
verification:

View File

@ -1790,6 +1790,12 @@ pt-PT:
extra: Está pronta para transferir!
subject: O seu arquivo está pronto para descarregar
title: Arquivo de ficheiros
failed_2fa:
details: 'Aqui estão os detalhes da tentativa de entrada:'
explanation: Alguém tentou entrar em sua conta mas forneceu um segundo fator de autenticação inválido.
further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois pode ter sido comprometido.
subject: Falha na autenticação do segundo fator
title: Falha na autenticação do segundo fator
suspicious_sign_in:
change_password: alterar a sua palavra-passe
details: 'Eis os pormenores do início de sessão:'

View File

@ -1822,6 +1822,12 @@ sr-Latn:
extra: Sada je spremno za preuzimanje!
subject: Vaša arhiva je spremna za preuzimanje
title: Izvoz arhive
failed_2fa:
details: 'Evo detalja o pokušaju prijavljivanja:'
explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
further_actions_html: Ako to niste bili vi, preporučujemo vam da odmah %{action} jer može biti ugrožena.
subject: Neuspeh drugog faktora autentifikacije
title: Nije uspeo drugi faktor autentifikacije
suspicious_sign_in:
change_password: promenite svoju lozinku
details: 'Evo detalja o prijavi:'

View File

@ -1822,6 +1822,12 @@ sr:
extra: Сада је спремно за преузимање!
subject: Ваша архива је спремна за преузимање
title: Извоз архиве
failed_2fa:
details: 'Ево детаља о покушају пријављивања:'
explanation: Неко је покушао да се пријави на ваш налог али је дао неважећи други фактор аутентификације.
further_actions_html: Ако то нисте били ви, препоручујемо вам да одмах %{action} јер може бити угрожена.
subject: Неуспех другог фактора аутентификације
title: Није успео други фактор аутентификације
suspicious_sign_in:
change_password: промените своју лозинку
details: 'Ево детаља о пријави:'

View File

@ -1789,6 +1789,9 @@ sv:
extra: Nu redo för nedladdning!
subject: Ditt arkiv är klart för nedladdning
title: Arkivuttagning
failed_2fa:
further_actions_html: Om detta inte var du, rekommenderar vi att du %{action} omedelbart eftersom ditt konto kan ha äventyrats.
title: Misslyckad tvåfaktorsautentisering
suspicious_sign_in:
change_password: Ändra ditt lösenord
details: 'Här är inloggningsdetaljerna:'

View File

@ -1790,6 +1790,12 @@ tr:
extra: Şimdi indirebilirsiniz!
subject: Arşiviniz indirilmeye hazır
title: Arşiv paketlemesi
failed_2fa:
details: 'Oturum açma denemesinin ayrıntıları şöyledir:'
explanation: Birisi hesabınızda oturum açmaya çalıştı ancak hatalı bir iki aşamalı doğrulama kodu kullandı.
further_actions_html: Eğer bu kişi siz değilseniz, hemen %{action} yapmanızı öneriyoruz çünkü hesabınız ifşa olmuş olabilir.
subject: İki aşamalı doğrulama başarısızlığı
title: Başarısız iki aşamalı kimlik doğrulama
suspicious_sign_in:
change_password: parolanızı değiştirin
details: 'Oturum açma ayrıntıları şöyledir:'

View File

@ -1758,6 +1758,12 @@ zh-CN:
extra: 现在它可以下载了!
subject: 你的存档已经准备完毕
title: 存档导出
failed_2fa:
details: 以下是该次登录尝试的详情:
explanation: 有人试图登录到您的账户,但提供了无效的辅助认证因子。
further_actions_html: 如果这不是您所为,您的密码可能已经泄露,建议您立即 %{action} 。
subject: 辅助认证失败
title: 辅助认证失败
suspicious_sign_in:
change_password: 更改密码
details: 以下是该次登录的详细信息:

View File

@ -1758,6 +1758,12 @@ zh-HK:
extra: 現在可以下載了!
subject: 你的備份檔已可供下載
title: 檔案匯出
failed_2fa:
details: 以下是嘗試登入的細節:
explanation: 有人嘗試登入你的帳號,但沒有通過雙重認證。
further_actions_html: 如果這不是你,我們建議你立刻%{action},因為你的帳號或已遭到侵害。
subject: 雙重認證失敗
title: 雙重認證失敗
suspicious_sign_in:
change_password: 更改你的密碼
details: 以下是登入的細節:

View File

@ -1760,6 +1760,12 @@ zh-TW:
extra: 準備好下載了!
subject: 您的備份檔已可供下載
title: 檔案匯出
failed_2fa:
details: 以下是該登入嘗試之詳細資訊:
explanation: 有人嘗試登入您的帳號,但提供了無效的第二個驗證因子。
further_actions_html: 若這並非您所為,我們建議您立刻 %{action},因為其可能已被入侵。
subject: 第二因子驗證失敗
title: 第二因子身份驗證失敗
suspicious_sign_in:
change_password: 變更密碼
details: 以下是該登入之詳細資訊:

View File

@ -11,7 +11,7 @@
"noEmit": true,
"resolveJsonModule": true,
"strict": false,
"target": "ES2022"
"target": "ES2022",
},
"exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
"exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"],
}

View File

@ -275,7 +275,7 @@ module Mastodon::CLI
def deduplicate_users_process_email
ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a
users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
ref_user = users.shift
say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@ -289,7 +289,7 @@ module Mastodon::CLI
def deduplicate_users_process_confirmation_token
ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
users = User.where(id: row['ids'].split(',')).order(created_at: :desc).to_a.drop(1)
users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
users.each do |user|
@ -313,7 +313,7 @@ module Mastodon::CLI
def deduplicate_users_process_password_token
ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
users.each do |user|
@ -591,7 +591,7 @@ module Mastodon::CLI
end
def deduplicate_local_accounts!(scope)
accounts = scope.order(id: :desc).to_a
accounts = scope.order(id: :desc).includes(:account_stat, :user).to_a
say "Multiple local accounts were found for username '#{accounts.first.username}'.", :yellow
say 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.', :yellow

View File

@ -24,7 +24,7 @@ namespace :tests do
exit(1)
end
if Account.where(domain: Rails.configuration.x.local_domain).exists?
if Account.exists?(domain: Rails.configuration.x.local_domain)
puts 'Faux remote accounts not properly cleaned up'
exit(1)
end

View File

@ -100,6 +100,38 @@ RSpec.describe Tag do
end
end
describe '.recently_used' do
let(:account) { Fabricate(:account) }
let(:other_person_status) { Fabricate(:status) }
let(:out_of_range) { Fabricate(:status, account: account) }
let(:older_in_range) { Fabricate(:status, account: account) }
let(:newer_in_range) { Fabricate(:status, account: account) }
let(:unused_tag) { Fabricate(:tag) }
let(:used_tag_one) { Fabricate(:tag) }
let(:used_tag_two) { Fabricate(:tag) }
let(:used_tag_on_out_of_range) { Fabricate(:tag) }
before do
stub_const 'Tag::RECENT_STATUS_LIMIT', 2
other_person_status.tags << used_tag_one
out_of_range.tags << used_tag_on_out_of_range
older_in_range.tags << used_tag_one
older_in_range.tags << used_tag_two
newer_in_range.tags << used_tag_one
end
it 'returns tags used by account within last X statuses ordered most used first' do
results = described_class.recently_used(account)
expect(results)