- 
-
-
-
-
- {actionDescription}
{actionPrompt}
+
+
rel="me" que impede a personificação em sites com conteúdo gerado pelo utilizador. Pode até utilizar uma etiqueta link no cabeçalho da página ao invés de a, mas o HTML deve ser acessível sem executar JavaScript.
+ extra_instructions_html: Dica: a hiperligação no seu site pode ser invisível. A parte importante é rel="me" que impede a falsificação de identidade em sítios na web com conteúdos gerados pelos utilizadores. Pode até utilizar uma etiqueta link no cabeçalho da página ao invés de a, mas o HTML deve ser acessível sem executar JavaScript.
here_is_how: Veja como
- hint_html: "Verificar a sua identidade no Mastodon é para todos. Baseado em normas públicas da web, agora e para sempre gratuitas. Tudo o que precisa é de um site pessoal pelo qual as pessoas o reconheçam. Quando coloca no seu perfil uma ligação para esse site, vamos verificar que o site tem uma ligação de volta para o seu perfil e mostrar um indicador visual."
+ hint_html: "Verificar a sua identidade no Mastodon é para todos. Baseado em normas públicas da web, agora e para sempre gratuitas. Tudo o que precisa é de um site pessoal pelo qual as pessoas o reconheçam. Quando coloca no seu perfil uma hiperligação para esse site, vamos verificar que o site tem uma hiperligação de volta para o seu perfil e mostrar um indicador visual."
instructions_html: Copie e cole o código abaixo no HTML do seu site. Em seguida, adicione o endereço do seu site num dos campos extras no seu perfil, na aba "Editar perfil" e guarde as alterações.
verification: Verificação
verified_links: As suas ligações verificadas
+ website_verification: Verificação do sítio web
webauthn_credentials:
add: Adicionar nova chave de segurança
create:
@@ -1921,5 +2044,5 @@ pt-PT:
nickname_hint: Introduza a alcunha da sua nova chave de segurança
not_enabled: Ainda não ativou o WebAuthn
not_supported: Este navegador não funciona com chaves de segurança
- otp_required: Para usar chaves de segurança, por favor ative primeiro a autenticação em duas etapas.
+ otp_required: Para utilizar chaves de segurança, ative primeiro a autenticação de dois fatores.
registered_on: Registado em %{date}
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 486d87f003..ff35e13fa8 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -220,6 +220,7 @@ ru:
enable_user: Разморозка пользователей
memorialize_account: Присвоение пользователям статуса «мемориала»
promote_user: Повышение пользователей
+ publish_terms_of_service: Опубликование пользовательского соглашения
reject_appeal: Отклонение обжалований
reject_user: Отклонение регистраций
remove_avatar_user: Удаление аватаров
@@ -284,6 +285,7 @@ ru:
enable_user_html: "%{name} разморозил(а) пользователя %{target}"
memorialize_account_html: "%{name} перевел(а) учётную запись пользователя %{target} в статус памятника"
promote_user_html: "%{name} повысил(а) пользователя %{target}"
+ publish_terms_of_service_html: "%{name} опубликовал(а) обновление пользовательского соглашения"
reject_appeal_html: "%{name} отклонил(а) обжалование действий модерации от %{target}"
reject_user_html: "%{name} отклонил(а) регистрацию %{target}"
remove_avatar_user_html: "%{name} убрал(а) аватарку пользователя %{target}"
@@ -953,6 +955,35 @@ ru:
search: Поиск
title: Хэштеги
updated_msg: Настройки хэштега обновлены
+ terms_of_service:
+ back: Назад к пользовательскому соглашению
+ changelog: Что изменилось
+ create: Использовать свой текст
+ current: Действующее
+ draft: Черновик
+ generate: Использовать шаблон
+ generates:
+ action: Генерировать
+ chance_to_review_html: "Сгенерированное пользовательское соглашение не будет опубликовано автоматически. У вас будет возможность просмотреть результат. Введите все необходимые сведения, чтобы продолжить."
+ title: Создание пользовательского соглашения
+ history: История
+ live: Действует
+ no_history: Нет зафиксированных изменений пользовательского соглашения.
+ notified_on_html: 'Дата уведомления пользователей: %{date}'
+ notify_users: Уведомить пользователей
+ preview:
+ explanation_html: 'Сообщение будет отравлено %{display_count} пользователям, которые зарегистрировались до %{date}. В теле письма будет указан следующий текст:'
+ send_preview: Отправить предпросмотр на %{email}
+ send_to_all:
+ few: Отправить %{display_count} сообщения
+ many: Отправить %{display_count} сообщений
+ one: Отправить %{display_count} сообщение
+ other: Отправить %{display_count} сообщений
+ title: Предпросмотр уведомления об изменении пользовательского соглашения
+ publish: Опубликовать
+ published_on_html: 'Дата публикации: %{date}'
+ save_draft: Сохранить черновик
+ title: Пользовательское соглашение
title: Администрирование
trends:
allow: Разрешить
@@ -1192,6 +1223,7 @@ ru:
set_new_password: Задать новый пароль
setup:
email_below_hint_html: Проверьте папку "Спам" или запросите другую. Вы можете исправить свой адрес электронной почты, если он неправильный.
+ email_settings_hint_html: Чтобы начать пользоваться Mastodon, пройдите по ссылке, которую мы отправили на %{email}. А мы пока подождём тут.
link_not_received: Не получили ссылку?
new_confirmation_instructions_sent: Через несколько минут вы получите новое письмо со ссылкой для подтверждения!
title: Проверьте свой почтовый ящик
@@ -1200,6 +1232,7 @@ ru:
title: Войти в %{domain}
sign_up:
manual_review: Регистрация на %{domain} проходит через ручную проверку нашими модераторами. Чтобы помочь нам обработать вашу регистрацию, напишите немного о себе и о том, почему вы хотите получить аккаунт на %{domain}.
+ preamble: С учётной записью на этом сервере Mastodon вы сможете подписываться на всех других людей в федиверсе вне зависимости от того, где находятся их учётные записи.
title: Зарегистрируйтесь в %{domain}.
status:
account_status: Статус учётной записи
@@ -1211,6 +1244,7 @@ ru:
view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
use_security_key: Использовать ключ безопасности
+ user_agreement_html: Мной прочитаны и принятыпользовательское соглашение и политика конфиденциальности
author_attribution:
example_title: Образец текста
hint_html: Публикуете ли вы свои статьи где-либо ещё кроме Mastodon? Если да, то ваше авторство может быть упомянуто, когда ими делятся в Mastodon.
@@ -1920,6 +1954,8 @@ ru:
too_late: Слишком поздно обжаловать это замечание
tags:
does_not_match_previous_name: не совпадает с предыдущим именем
+ terms_of_service:
+ title: Пользовательское соглашение
themes:
contrast: Mastodon (высококонтрастная)
default: Mastodon (тёмная)
@@ -1980,6 +2016,15 @@ ru:
further_actions_html: Если это были не вы, рекомендуем вам немедленно %{action} и включить двухфакторную авторизацию, чтобы обезопасить свою учётную запись.
subject: В вашу учётную запись был выполнен вход с нового IP-адреса
title: Выполнен вход
+ terms_of_service_changed:
+ agreement: Продолжая использовать %{domain}, вы соглашаетесь с этими условиями. Если вы не согласны с новыми условиями, вы в любой момент можете удалить вашу учётную запись на %{domain}.
+ changelog: 'Вот что обновление условий будет значит для вас в общих чертах:'
+ description: 'Вы получили это сообщение, потому что мы внесли некоторые изменения в пользовательское соглашение %{domain}. Рекомендуем вам ознакомиться с обновлёнными условиями по ссылке:'
+ description_html: Вы получили это сообщение, потому что мы внесли некоторые изменения в пользовательское соглашение %{domain}. Рекомендуем вам ознакомиться с обновлёнными условиями.
+ sign_off: Ваш %{domain}
+ subject: Обновления наших условий использования
+ subtitle: На %{domain} изменилось пользовательское соглашение
+ title: Важное обновление
warning:
appeal: Обжаловать
appeal_description: Если вы считаете, что это ошибка, вы можете обратиться к поддержке %{instance}.
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 1dfac9d043..7b56cbac46 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -134,6 +134,7 @@ es-AR:
changelog: Se puede estructurar con sintaxis Markdown.
text: Se puede estructurar con sintaxis Markdown.
terms_of_service_generator:
+ admin_email: Los avisos legales incluyen devoluciones, órdenes judiciales, solicitudes de retiro y solicitudes de cumplimiento de la ley.
arbitration_address: Puede ser la misma que la dirección física anterior, o "N/A" si utiliza correo electrónico
arbitration_website: Puede ser un formulario web, o “N/A” si utiliza correo electrónico
dmca_address: Para operadores estadounidenses, utilice la dirección registrada en el DMCA Designated Agent Directory. Un listado P.O. Box está disponible bajo petición directa, use la DMCA Designated Agent Post Office Box Waiver Request para enviar un correo electrónico a la Oficina de Derechos de Autor y describir que usted es un moderador de contenido basado en el hogar que teme venganza o represalia por sus acciones y que necesita usar un P.O. Box para eliminar su dirección postal de la vista pública.
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 269fdb7091..77cd04cfd0 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -134,6 +134,7 @@ es:
changelog: Se puede estructurar con sintaxis Markdown.
text: Se puede estructurar con sintaxis Markdown.
terms_of_service_generator:
+ admin_email: Los avisos legales incluyen devoluciones, órdenes judiciales, solicitudes de retiro y solicitudes de cumplimiento de la ley.
arbitration_address: Puede ser la misma que la dirección física anterior, o "N/A" si utiliza correo electrónico
arbitration_website: Puede ser un formulario web, o “N/A” si utiliza correo electrónico
dmca_address: Para operadores estadounidenses, utilice la dirección registrada en el DMCA Designated Agent Directory. Un listado P.O. Box está disponible bajo petición directa, use la DMCA Designated Agent Post Office Box Waiver Request para enviar un correo electrónico a la Oficina de Derechos de Autor y describir que usted es un moderador de contenido basado en el hogar que teme venganza o represalia por sus acciones y que necesita usar un P.O. Box para eliminar su dirección postal de la vista pública.
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 749efcb5b4..02b2942b5d 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -130,6 +130,17 @@ ga:
show_application: Beidh tú in ann a fheiceáil i gcónaí cén aip a d’fhoilsigh do phostáil beag beann ar.
tag:
name: Ní féidir leat ach cásáil na litreacha a athrú, mar shampla, chun é a dhéanamh níos inléite
+ terms_of_service:
+ changelog: Is féidir é a struchtúrú le comhréir Markdown.
+ text: Is féidir é a struchtúrú le comhréir Markdown.
+ terms_of_service_generator:
+ admin_email: Áirítear le fógraí dlí frithfhógraí, orduithe cúirte, iarratais éirí anuas, agus iarratais forghníomhaithe dlí.
+ arbitration_address: D’fhéadfadh sé a bheith mar an gcéanna leis an seoladh fisiceach thuas, nó “N/B” má tá ríomhphost in úsáid agat
+ arbitration_website: D’fhéadfadh gur foirm ghréasáin í, nó “N/A” má tá ríomhphost in úsáid agat
+ dmca_address: Maidir le hoibreoirí SAM, bain úsáid as an seoladh atá cláraithe in Eolaire Gníomhairí Ainmnithe DMCA. A P.O. Tá liostú boscaí ar fáil ach é a iarraidh go díreach, bain úsáid as Iarratas Tarscaoilte Bosca Gníomhaire Ainmnithe DMCA chun ríomhphost a chur chuig an Oifig Cóipchirt agus déan cur síos gur modhnóir ábhar baile thú a bhfuil eagla ort díoltas nó aisíocaíocht a fháil mar gheall ar do ghníomhartha agus a dteastaíonn uait úsáid a bhaint as P.O. Bosca chun do sheoladh baile a bhaint den radharc poiblí.
+ dmca_email: Is féidir gurb é an ríomhphost céanna é a úsáidtear le haghaidh “Seoladh ríomhphoist le haghaidh fógraí dlí” thuas
+ domain: Aitheantas uathúil na seirbhíse ar líne atá á cur ar fáil agat.
+ jurisdiction: Liostaigh an tír ina bhfuil cónaí ar an té a íocann na billí. Más cuideachta nó aonán eile é, liostaigh an tír ina bhfuil sé corpraithe, agus an chathair, an réigiún, an chríoch nó an stát mar is cuí.
user:
chosen_languages: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach postálacha i dteangacha roghnaithe in amlínte poiblí
role: Rialaíonn an ról na ceadanna atá ag an úsáideoir.
@@ -319,6 +330,17 @@ ga:
name: Haischlib
trendable: Lig don haischlib seo a bheith le feiceáil faoi threochtaí
usable: Lig do phostálacha an hashchlib seo a úsáid go háitiúil
+ terms_of_service:
+ changelog: Cad atá athraithe?
+ text: Téarmaí Seirbhíse
+ terms_of_service_generator:
+ admin_email: Seoladh ríomhphoist le haghaidh fógraí dlí
+ arbitration_address: Seoladh fisiciúil le haghaidh fógraí eadrána
+ arbitration_website: An láithreán gréasáin chun fógraí eadrána a chur isteach
+ dmca_address: Seoladh fisiciúil le haghaidh fógraí DMCA/cóipchirt
+ dmca_email: Seoladh ríomhphoist le haghaidh fógraí DMCA/cóipchirt
+ domain: Fearann
+ jurisdiction: Dlínse dhlíthiúil
user:
role: Ról
time_zone: Crios ama
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 113f55a2ba..585e84f490 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -60,6 +60,7 @@ ia:
setting_display_media_default: Celar le medios marcate como sensibile
setting_display_media_hide_all: Sempre celar le medios
setting_display_media_show_all: Sempre monstrar le medios
+ setting_system_scrollbars_ui: Se applica solmente al navigatores de scriptorio basate sur Safari e Chrome
setting_use_blurhash: Le imagines degradate se basa sur le colores del visuales celate, ma illos offusca tote le detalios
setting_use_pending_items: Requirer un clic pro monstrar nove messages in vice de rolar automaticamente le fluxo
username: Tu pote usar litteras, numeros e tractos de sublineamento
@@ -129,6 +130,17 @@ ia:
show_application: In omne caso, tu potera sempre vider qual app ha publicate tu message.
tag:
name: Tu pote solmente cambiar le litteras inter majusculas e minusculas, per exemplo, pro render lo plus legibile
+ terms_of_service:
+ changelog: Pote esser structurate con le syntaxe Markdown.
+ text: Pote esser structurate con le syntaxe Markdown.
+ terms_of_service_generator:
+ admin_email: Le avisos juridic include le contra-avisos, ordinantias judiciari, demandas de retiro e demandas de application del lege.
+ arbitration_address: Pote esser le mesme que le adresse physic supra, o “N/A” si se usa e-mail
+ arbitration_website: Pote esser un formulario web, o “N/A” si se usa e-mail
+ dmca_address: Pro operatores in le SUA, usa le adresse registrate in le Directorio de Agentes Designate pro le DMCA (DMCA Designated Agent Directory). Un adresse de cassa postal es disponibile per requesta directe; usa le Requesta de Exemption de Cassa Postal pro Agentes Designate del DMCA (DMCA Designated Agent Post Office Box Waiver Request) pro inviar un message electronic al Officio del Derecto de Autor (Copyright Office) e describer que tu es un moderator de contento que travalia de casa e qui time vengiantias o represalias pro tu actiones, necessitante le uso un cassa postal pro remover tu adresse personal del vista public.
+ dmca_email: Pote esser le mesme adresse de e-mail usate pro “Adresse de e-mail pro avisos juridic” supra
+ domain: Identification unic del servicio in linea que tu forni.
+ jurisdiction: Vermeldt het land waar de persoon woont die de rekeningen betaalt. Als het een bedrijf of een andere entiteit is, vermeldt het land waar het is opgenomen en de stad, regio, grondgebied of staat, voor zover van toepassing.
user:
chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
role: Le rolo controla qual permissos le usator ha.
@@ -223,6 +235,7 @@ ia:
setting_hide_network: Cela tu rete social
setting_reduce_motion: Reducer movimento in animationes
setting_system_font_ui: Usar typo de litteras predefinite del systema
+ setting_system_scrollbars_ui: Usar le barra de rolamento predefinite del systema
setting_theme: Thema de sito
setting_trends: Monstrar le tendentias de hodie
setting_unfollow_modal: Monstrar dialogo de confirmation ante cessar de sequer alcuno
@@ -317,6 +330,17 @@ ia:
name: Hashtag
trendable: Permitter a iste hashtag de sub tendentias
usable: Permitter al messages usar iste hashtag localmente
+ terms_of_service:
+ changelog: Que ha cambiate?
+ text: Conditiones de servicio
+ terms_of_service_generator:
+ admin_email: Adresse de e-mail pro avisos juridic
+ arbitration_address: Adresse physic pro avisos de arbitration
+ arbitration_website: Sito web pro submitter avisos de arbitration
+ dmca_address: Adresse physic pro avisos DCMA/de derectos de autor
+ dmca_email: Adresse de e-mail pro avisos DCMA/de derectos de autor
+ domain: Dominio
+ jurisdiction: Jurisdiction
user:
role: Rolo
time_zone: Fuso horari
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 2f113087e9..1348fa4e9f 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -130,6 +130,17 @@ is:
show_application: Þú munt alltaf geta séð hvaða forrit birti færsluna þína.
tag:
name: Þú getur aðeins breytt stafstöði mill há-/lágstafa, til gæmis til að gera þetta læsilegra
+ terms_of_service:
+ changelog: Er hægt að sníða með Markdown-málskipan.
+ text: Er hægt að sníða með Markdown-málskipan.
+ terms_of_service_generator:
+ admin_email: Löglegar tilkynningar ná yfir andsvör, dómsúrskurði, lokunarbeiðnir og beiðnir frá lögregluembættum.
+ arbitration_address: Má vera það sama og raunverulegt heimilisfang eða “N/A” ef tölvupóstur er notaður
+ arbitration_website: Má vera innfyllingarform á vefsíðu eða “N/A” ef tölvupóstur er notaður
+ dmca_address: Fyrir rekstraraðila í BNA ætti að nota heimilisfang sem skráð er í DMCA Designated Agent Directory. Hægt er að verða sér úti um A P.O. pósthólfsskráningu með beinni beiðni; notaðu DMCA Designated Agent Post Office Box Waiver Request til að senda tölvupóst á Copyright Office og lýstu því yfir að þú sért heimavinnandi efnismiðlari (home-based content moderator) sem átt á hættu refsingar eða hefndir vegna þess sem þú miðlar og þurfir því á slíku pósthólfi að halda svo þitt eigið heimilisfang sé ekki gert opinbert.
+ dmca_email: Má vera sama tölvupóstfang og það sem notað er í “Tölvupóstfang vegna löglegra tilkynninga” hér að ofan
+ domain: Einstakt auðkenni á netþjónustunni sem þú býður.
+ jurisdiction: Settu inn landið þar sem sá býr sem borgar reikningana. Ef það er fyrirtæki eða samtök, skaltu hafa það landið þar sem lögheimili þess er, auk borgar, héraðs, svæðis eða fylkis eins og við á.
user:
chosen_languages: Þegar merkt er við þetta, birtast einungis færslur á völdum tungumálum á opinberum tímalínum
role: Hlutverk stýrir hvaða heimildir notandinn hefur.
@@ -323,8 +334,11 @@ is:
changelog: Hvað breyttist?
text: Þjónustuskilmálar
terms_of_service_generator:
- admin_email: Tölvupóstfang vegna löglegra fyrirvara
- dmca_email: Tölvupóstfang tylfynninga vegna DMCA/höfundarétt
+ admin_email: Tölvupóstfang vegna löglegra tilkynninga
+ arbitration_address: Raunverulegt heimilisfang fyrir tilkynningar um úrskurði
+ arbitration_website: Vefsvæði til að senda inn tilkynningar um úrskurði
+ dmca_address: Raunverulegt heimilisfang fyrir kröfur vegna DMCA/höfundarréttar
+ dmca_email: Tölvupóstfang tilkynninga vegna DMCA/höfundaréttar
domain: Lén
jurisdiction: Lögsagnarumdæmi
user:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index e5ffd4b38e..515c01256b 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -84,6 +84,7 @@ ja:
setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
setting_stay_privacy: この設定を有効にする場合、ブーストの公開範囲を手動で設定されることもご検討ください
setting_stop_emoji_reaction_streaming: 通信容量の節約に役立ちます
+ setting_system_scrollbars_ui: Safari/Chromeベースのデスクトップブラウザーでのみ有効です
setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
username: アルファベット大文字と小文字、数字、アンダーバー「_」が使えます
@@ -164,6 +165,17 @@ ja:
show_application: 自分で自分の投稿の送信元アプリを確認することは、ここのチェック状態にかかわらず可能です。
tag:
name: 視認性向上などのためにアルファベット大文字小文字の変更のみ行うことができます
+ terms_of_service:
+ changelog: Markdown 記法を利用できます。
+ text: Markdown 記法を利用できます。
+ terms_of_service_generator:
+ admin_email: 法的通知とは、異議申し立て通知、裁判所命令、削除要請、法執行機関による要請などをいいます。
+ arbitration_address: 上記住所と同じでもかまいません。電子メールを使用する場合は「N/A」とすることができます。
+ arbitration_website: ウェブフォームでもかまいません。電子メールを使用する場合は「N/A」とすることができます。
+ dmca_address: 米国の運営者の場合は、DMCA Designated Agent Directory（DMCA指定代理人ディレクトリ）に登録のある住所を使用してください。申請を行えば記載を私書箱とすることも可能で、その場合はDMCA Designated Agent Post Office Box Waiver Request（DMCA指定代理人の郵便私書箱による免除申請）によって著作権局にメールを送信し、あなたが個人のコンテンツ管理者であって、行った措置に対して報復を受けるおそれがあり、住所を非公開とするために私書箱を使用する必要がある旨を伝えてください。
+ dmca_email: 上記「法的通知を受け取るメールアドレス」と同じものでもかまいません。
+ domain: あなたの提供するこのオンラインサービスの識別名です。
+ jurisdiction: 運営責任者が居住する国を記載します。企業や他の団体である場合は、その組織の所在国に加えて、市・区・州などの地域を記載します。
user:
chosen_languages: 選択すると、選択した言語の投稿のみが公開タイムラインに表示されるようになります
role: そのロールは、ユーザーが持つ権限を制御します。
@@ -324,6 +336,7 @@ ja:
setting_stay_privacy: 投稿時に公開範囲を保存する
setting_stop_emoji_reaction_streaming: 絵文字リアクションのストリーミングを停止する
setting_system_font_ui: システムのデフォルトフォントを使う
+ setting_system_scrollbars_ui: システムのデフォルトのスクロールバーを使う
setting_theme: サイトテーマ
setting_translatable_private: 非公開投稿の翻訳を許可する
setting_trends: 本日のトレンドタグを表示する
@@ -460,6 +473,17 @@ ja:
name: ハッシュタグ
trendable: トレンドへの表示を許可する
usable: このサーバーのユーザーがタグをつけて投稿することを許可する
+ terms_of_service:
+ changelog: 変更箇所
+ text: サービス利用規約
+ terms_of_service_generator:
+ admin_email: 法的通知を受け取るメールアドレス
+ arbitration_address: 仲裁通知の送付先住所
+ arbitration_website: 仲裁通知の送信用ウェブサイト
+ dmca_address: DMCA/著作権通知の送付先住所
+ dmca_email: DMCA/著作権通知の送付先メールアドレス
+ domain: ドメイン
+ jurisdiction: 裁判管轄
user:
role: ロール
time_zone: タイムゾーン
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index d272ebef0d..d5aa5855ec 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -131,16 +131,16 @@ nl:
tag:
name: Je kunt elk woord met een hoofdletter beginnen, om zo bijvoorbeeld de tekst leesbaarder te maken
terms_of_service:
- changelog: Kan worden gestructureerd met Markdown-syntaxis.
- text: Kan worden gestructureerd met Markdown-syntaxis.
+ changelog: Kan worden opgemaakt met Markdown.
+ text: Kan worden opgemaakt met Markdown.
terms_of_service_generator:
- admin_email: Juridische mededelingen zijn o.a. tegenaantekeningen, rechterlijke bevelen, verwijderingsverzoeken en verzoeken om wetshandhaving.
- arbitration_address: Kan hetzelfde zijn als bovenstaande straatadres of "N/A" bij gebruik van e-mail
+ admin_email: Juridische mededelingen zijn o. a. counter-notices, gerechterlijke bevelen, takedown-requests en handhavingsverzoeken.
+ arbitration_address: Kan hetzelfde zijn als bovenstaand vestigingsadres of "N/A" bij gebruik van e-mail
arbitration_website: Kan een webformulier zijn, of "N/A" als e-mail wordt gebruikt
- dmca_address: 'Gebruik voor beheerders in de VS: het adres dat is geregistreerd in de DMCA Designated Agent Directory. Op verzoek is er een postbuslijst beschikbaar. Gebruik het DMCA Designated Agent Post Office Box Waiver Request om het Copyright Office te e-mailen en te beschrijven dat u een thuisgebaseerde inhoudsmoderator bent die wraak of vergelding vreest voor uw daden en een postbus moet gebruiken om uw huisadres uit het publieke domein te houden.'
- dmca_email: Kan dezelfde e-mail worden gebruikt voor "E-mailadres voor juridische berichten" hierboven
- domain: Een unieke identificatie van de online dienst die wordt verleend.
- jurisdiction: Vermeldt het land waar de persoon woont die de rekeningen betaalt. Als het een bedrijf of een andere entiteit is, vermeldt het land waar het is opgenomen en de stad, regio, grondgebied of staat, voor zover van toepassing.
+ dmca_address: 'Gebruik voor beheerders in de VS: het adres dat is geregistreerd in de DMCA Designated Agent Directory. Op verzoek is er een postbuslijst beschikbaar. Gebruik het DMCA Designated Agent Post Office Box Waiver Request om het Copyright Office te e-mailen en te beschrijven dat je een vanaf huis opererende inhoudsmoderator bent, die wraak of vergelding vreest voor je moderator-acties en daarom een postbus moet gebruiken om jouw huisadres uit het publieke domein te houden.'
+ dmca_email: Kan hetzelfde e-mailadres zijn dat gebruikt wordt voor "E-mailadres voor juridische berichten" hierboven
+ domain: Een unieke identificatie van de online dienst die je levert.
+ jurisdiction: Vermeld het land waar de persoon woont die de rekeningen betaalt. Is het een bedrijf of iets dergelijks, vermeld dan het land waar het ingeschreven staat en de stad, de regio, het grondgebied of de staat, voor zover van toepassing.
user:
chosen_languages: Alleen berichten in de aangevinkte talen worden op de openbare tijdlijnen getoond
role: De rol bepaalt welke rechten de gebruiker heeft.
@@ -156,7 +156,7 @@ nl:
url: Waar gebeurtenissen naartoe worden verzonden
labels:
account:
- attribution_domains_as_text: Websites doe jou credit mogen geven
+ attribution_domains_as_text: Websites die jou credit mogen geven
discoverable: Jouw account en berichten laten uitlichten door Mastodon
fields:
name: Label
@@ -335,12 +335,12 @@ nl:
text: Gebruiksvoorwaarden
terms_of_service_generator:
admin_email: E-mailadres voor juridische meldingen
- arbitration_address: Straatadres voor arbitragemeldingen
- arbitration_website: Website voor het indienen van arbitragemeldingen
- dmca_address: Straatadres voor DMCA/auteursrecht-mededelingen
+ arbitration_address: Vestigingsadres voor arbitrage-mededelingen
+ arbitration_website: Website voor het indienen van arbitrage-mededelingen
+ dmca_address: Vestigingsadres voor DMCA/auteursrecht-mededelingen
dmca_email: E-mailadres voor DMCA/auteursrecht-mededelingen
domain: Domein
- jurisdiction: Rechtsgebied
+ jurisdiction: Jurisdictie
user:
role: Rol
time_zone: Tijdzone
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 917b85a0bb..417d69d88e 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -130,6 +130,8 @@ pt-BR:
show_application: Você sempre conseguirá ver qual aplicativo realizou sua publicação independentemente disso.
tag:
name: Você pode mudar a capitalização das letras, por exemplo, para torná-la mais legível
+ terms_of_service_generator:
+ dmca_email: Pode ser o mesmo e-mail utilizado para "Endereço de e-mail para avisos legais" acima
user:
chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
role: A função controla quais permissões o usuário tem.
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index a172ed2752..59ebceb718 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -3,18 +3,20 @@ pt-PT:
simple_form:
hints:
account:
+ attribution_domains_as_text: Um por linha. Protege contra falsas atribuições.
discoverable: As suas publicações e perfil públicos podem ser destacados ou recomendados em várias áreas do Mastodon e o seu perfil pode ser sugerido a outros utilizadores.
display_name: O seu nome completo ou o seu nome divertido.
fields: A sua página inicial, os seus pronomes, idade e tudo o que quiser.
indexable: As suas mensagens públicas podem aparecer nos resultados da pesquisa no Mastodon. Independentemente disso, as pessoas que interagiram com as suas publicações podem ser capazes de as pesquisar.
- note: 'Pode @mencionar outras pessoas ou #hashtags.'
+ note: 'Pode @mencionar outras pessoas e usar #etiquetas.'
show_collections: As pessoas podem navegar pelas listas das pessoas que segue e dos seus seguidores. Independentemente disso, as pessoas que segue verão que você as segue.
+ unlocked: As pessoas poderão segui-lo sem pedir aprovação. Desmarque se pretender rever os pedidos de seguimento e escolha se pretende aceitar ou rejeitar novos seguidores.
account_alias:
acct: Especifique o utilizador@domínio da conta de onde você deseja migrar
account_migration:
acct: Especifique o utilizador@domínio da conta para onde você deseja migrar
account_warning_preset:
- text: Pode usar sintaxe de escrita, como URL, etiquetas, e referências
+ text: Pode usar sintaxe de publicações, como URL, etiquetas e referências
title: Opcional. Invisível para o destinatário
admin_account_action:
include_statuses: O utilizador verá quais as publicações que foram a razão da moderação ou advertência
@@ -24,7 +26,7 @@ pt-PT:
types:
disable: Impede o utilizador de usar a sua conta, mas não elimina ou oculta o seu conteúdo.
none: Use isto para enviar um aviso ao utilizador, sem espoletar nenhuma outra ação.
- sensitive: Força todos os anexos de media deste utilizador a serem sinalizados como problemáticos.
+ sensitive: Forçar todos os anexos multimédia deste utilizador a serem assinalados como sensíveis.
silence: Impede que o utilizador possa publicar com visibilidade pública, ocultando as suas publicações e notificações de pessoas que não o seguem. Encerra todas as denúncias contra esta conta.
suspend: Evita qualquer interação de ou para esta conta e elimina o seu conteúdo. Reversível num período de 30 dias. Encerra todas as denúncias contra esta conta.
warning_preset_id: Opcional. Tu ainda podes adicionar texto personalizado no fim do predefinido
@@ -52,14 +54,15 @@ pt-PT:
password: Use pelo menos 8 caracteres
phrase: Será correspondido independentemente da capitalização ou do aviso de conteúdo duma publicação
scopes: Quais as API a que a aplicação terá permissão para aceder. Se selecionar um âmbito de nível superior, não precisa de selecionar âmbitos individuais.
- setting_aggregate_reblogs: Não mostrar novos reforços de publicações recentemente reforçadas (só afecta publicações acabadas de reforçar)
+ setting_aggregate_reblogs: Não mostrar os novos impulsos para publicações que tenham sido recentemente impulsionadas (apenas afeta os impulsos recentemente recebidos)
setting_always_send_emails: Normalmente as notificações por e-mail não serão enviadas quando estiver a utilizar ativamente o Mastodon
- setting_default_sensitive: Media problemática oculta por padrão, pode ser revelada com um clique
- setting_display_media_default: Esconder media marcada como problemática
- setting_display_media_hide_all: Esconder sempre toda a media
- setting_display_media_show_all: Mostrar sempre a media
+ setting_default_sensitive: Os multimédia sensíveis são ocultados por predefinição e podem ser revelados com um clique/toque
+ setting_display_media_default: Esconder multimédia marcada como problemática
+ setting_display_media_hide_all: Esconder sempre toda a multimédia
+ setting_display_media_show_all: Mostrar sempre a multimédia
+ setting_system_scrollbars_ui: Aplica-se apenas a navegadores de desktop baseados no Safari e Chrome
setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
- setting_use_pending_items: Ocultar atualizações da cronologia por detrás dum clique, em vez de rolar automaticamente o fluxo
+ setting_use_pending_items: Ocultar as atualizações da cronologia após um clique em vez de percorrer automaticamente a cronologia
username: Pode utilizar letras, números e sublinhados
whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
domain_allow:
@@ -77,10 +80,10 @@ pt-PT:
form_admin_settings:
activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão da aplicação em dispositivos móveis por um ícone personalizado.
- backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
+ backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas publicações para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
- content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado ou favoritado. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
+ content_cache_retention_period: Todas as mensagens de outros servidores (incluindo impulsos e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas mensagens. Isto inclui mensagens em que um utilizador local as tenha marcado ou adicionado aos favoritos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
favicon: WEBP, PNG, GIF ou JPG. Substitui o ícone de favorito padrão do Mastodon por um ícone personalizado.
mascot: Sobrepõe-se à ilustração na interface web avançada.
@@ -120,13 +123,24 @@ pt-PT:
hint: Opcional. Forneça mais detalhes sobre a regra
text: Descreva uma regra ou requisito para os utilizadores nesta instância. Tente mantê-la curta e simples
sessions:
- otp: 'Insira o código de autenticação em duas etapas gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
+ otp: 'Insira o código de autenticação de dois fatores gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
webauthn: Se for uma chave USB tenha certeza de inseri-la e, se necessário, toque nela.
settings:
indexable: A sua página de perfil pode aparecer nos resultados de pesquisa no Google, Bing e outros.
show_application: Independentemente disso será sempre capaz de ver em que aplicação publicou a sua mensagem.
tag:
name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis
+ terms_of_service:
+ changelog: Pode ser estruturado com sintaxe Markdown.
+ text: Pode ser estruturado com sintaxe Markdown.
+ terms_of_service_generator:
+ admin_email: Os avisos legais incluem contra-avisos, ordens judiciais, pedidos de remoção e pedidos de aplicação da lei.
+ arbitration_address: Pode ser o mesmo que o endereço físico acima ou “N/A” se utilizar e-mail
+ arbitration_website: Pode ser um formulário web ou “N/A” se for utilizado o e-mail
+ dmca_address: Para operadores dos EUA, utilize o endereço registado no Diretório de Agentes Designados DMCA. A listagem de uma caixa postal está disponível mediante pedido direto. Utilize o DMCA Designated Agent Post Office Box Waiver Request para enviar uma mensagem de correio eletrónico ao Copyright Office e descreva que é um moderador de conteúdos baseado em casa que receia vingança ou represálias pelas suas acções e que necessita de utilizar uma caixa postal para retirar o seu endereço de casa da vista do público.
+ dmca_email: Pode ser o mesmo e-mail utilizado para “Endereço de e-mail para avisos legais” acima
+ domain: Identificação única do serviço online que está a prestar.
+ jurisdiction: Indique o país de residência de quem paga as contas. Se se tratar de uma empresa ou outra entidade, indique o país onde está constituída, bem como a cidade, região, território ou estado, consoante o caso.
user:
chosen_languages: Quando selecionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
role: A função controla as permissões que o utilizador tem.
@@ -142,6 +156,7 @@ pt-PT:
url: Para onde os eventos serão enviados
labels:
account:
+ attribution_domains_as_text: Sites autorizados a atribuir-lhe crédito
discoverable: Destacar perfil e publicações nos algoritmos de descoberta
fields:
name: Rótulo
@@ -177,7 +192,7 @@ pt-PT:
appeal:
text: Explique porque esta decisão deve ser revertida
defaults:
- autofollow: Convidar para seguir a tua conta
+ autofollow: Convidar para seguir a sua conta
avatar: Imagem de perfil
bot: Esta é uma conta robô
chosen_languages: Filtrar idiomas
@@ -198,32 +213,33 @@ pt-PT:
max_uses: Número máximo de utilizações
new_password: Nova palavra-passe
note: Biografia
- otp_attempt: Código de autenticação em duas etapas
+ otp_attempt: Código de autenticação de dois fatores
password: Palavra-passe
phrase: Palavra-chave ou frase
setting_advanced_layout: Ativar interface web avançada
- setting_aggregate_reblogs: Agrupar reforços em cronologias
- setting_always_send_emails: Enviar sempre notificações de email
+ setting_aggregate_reblogs: Agrupar impulsos em linhas de tempo
+ setting_always_send_emails: Enviar sempre notificações por e-mail
setting_auto_play_gif: Reproduzir GIF automaticamente
- setting_boost_modal: Solicitar confirmação antes de partilhar uma publicação
+ setting_boost_modal: Mostrar caixa de diálogo de confirmação antes de impulsionar
setting_default_language: Idioma de publicação
setting_default_privacy: Privacidade da publicação
- setting_default_sensitive: Marcar sempre os media como problemáticos
+ setting_default_sensitive: Marcar sempre os multimédia como problemáticos
setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
setting_disable_hover_cards: Desativar visualização de perfil ao passar o cursor
setting_disable_swiping: Desativar os movimentos de deslize
- setting_display_media: Visualização de media
+ setting_display_media: Visualização de multimédia
setting_display_media_default: Pré-definição
setting_display_media_hide_all: Esconder todos
setting_display_media_show_all: Mostrar todos
setting_expand_spoilers: Expandir sempre as publicações marcadas com avisos de conteúdo
setting_hide_network: Esconder a tua rede
- setting_reduce_motion: Reduz movimento em animações
+ setting_reduce_motion: Reduzir movimento em animações
setting_system_font_ui: Usar o tipo de letra padrão do sistema
+ setting_system_scrollbars_ui: Utilizar a barra de deslocação predefinida do sistema
setting_theme: Tema do sítio
setting_trends: Mostrar as tendências de hoje
setting_unfollow_modal: Solicitar confirmação antes de deixar de seguir alguém
- setting_use_blurhash: Mostrar gradientes coloridos para medias ocultas
+ setting_use_blurhash: Mostrar gradientes coloridos para multimédias ocultas
setting_use_pending_items: Modo lento
severity: Gravidade
sign_in_token_attempt: Código de segurança
@@ -250,7 +266,7 @@ pt-PT:
custom_css: CSS personalizado
favicon: Ícone de favoritos
mascot: Mascote personalizada (legado)
- media_cache_retention_period: Período de retenção de ficheiros de media em cache
+ media_cache_retention_period: Período de retenção de ficheiros multimédia em cache
peers_api_enabled: Publicar lista de servidores descobertos na API
profile_directory: Ativar o diretório de perfis
registrations_mode: Quem se pode inscrever
@@ -289,12 +305,12 @@ pt-PT:
notification_emails:
appeal: Alguém recorreu de uma decisão de moderação
digest: Enviar e-mails de resumo
- favourite: Alguém adicionou uma publicação sua aos marcadores
+ favourite: Quando alguém adiciona uma publicação sua aos favoritos
follow: Alguém começou a segui-lo
follow_request: Alguém pediu para ser seu seguidor
mention: Alguém o mencionou
pending_account: Uma nova conta aguarda aprovação
- reblog: Alguém reforçou uma publicação sua
+ reblog: Alguém impulsionou uma publicação sua
report: Uma nova denúncia foi submetida
software_updates:
all: Notificar todas as atualizações
@@ -313,7 +329,18 @@ pt-PT:
listable: Permitir que esta etiqueta apareça em pesquisas e no diretório de perfis
name: Etiqueta
trendable: Permitir que esta etiqueta apareça nas tendências
- usable: Permitir que as publicações usem esta hashtag localmente
+ usable: Permitir que as publicações usem esta etiqueta localmente
+ terms_of_service:
+ changelog: O que mudou?
+ text: Termos do serviço
+ terms_of_service_generator:
+ admin_email: Endereço de e-mail para avisos legais
+ arbitration_address: Endereço físico para avisos de arbitragem
+ arbitration_website: Website para enviar avisos de arbitragem
+ dmca_address: Endereço físico para avisos DMCA / direitos autorais
+ dmca_email: Endereço de e-mail para avisos DMCA/direitos autorais
+ domain: Domínio
+ jurisdiction: Jurisdição legal
user:
role: Função
time_zone: Fuso horário
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index ae142826f4..22c7a25658 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -130,6 +130,14 @@ ru:
show_application: Вы всегда сможете увидеть, какое приложение опубликовало ваше сообщение.
tag:
name: Вы можете изменить только регистр букв чтобы, например, сделать тег более читаемым
+ terms_of_service:
+ changelog: Можно использовать синтаксис языка разметки Markdown.
+ text: Можно использовать синтаксис языка разметки Markdown.
+ terms_of_service_generator:
+ admin_email: Юридические уведомления включают в себя встречные уведомления, постановления суда, запросы на удаление и запросы правоохранительных органов.
+ arbitration_address: Может совпадать с почтовым адресом, указанным выше, либо «N/A» в случае электронной почты
+ arbitration_website: Веб-форма или «N/A» в случае электронной почты
+ jurisdiction: Впишите страну, где находится лицо, оплачивающее счета. Если это компания либо организация, впишите страну инкорпорации, включая город, регион, территорию или штат, если это необходимо.
user:
chosen_languages: Если выбрано, то в публичных лентах будут показаны только посты на выбранных языках.
role: Роль определяет, какими правами обладает пользователь.
@@ -319,6 +327,17 @@ ru:
name: Хэштег
trendable: Разрешить показ хэштега в трендах
usable: Позволить этот хэштег в локальных сообщениях
+ terms_of_service:
+ changelog: Что изменилось?
+ text: Пользовательское соглашение
+ terms_of_service_generator:
+ admin_email: Адрес электронной почты для юридических уведомлений
+ arbitration_address: Почтовый адрес для уведомлений об арбитраже
+ arbitration_website: Вебсайт для подачи уведомления об арбитраже
+ dmca_address: Почтовый адрес для обращений правообладателей
+ dmca_email: Адрес электронной почты для обращений правообладателей
+ domain: Доменное имя
+ jurisdiction: Юрисдикция
user:
role: Роль
time_zone: Часовой пояс
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index f8f4d3f119..f644294092 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -223,6 +223,7 @@ th:
setting_hide_network: ซ่อนกราฟทางสังคมของคุณ
setting_reduce_motion: ลดการเคลื่อนไหวในภาพเคลื่อนไหว
setting_system_font_ui: ใช้แบบอักษรเริ่มต้นของระบบ
+ setting_system_scrollbars_ui: ใช้แถบเลื่อนเริ่มต้นของระบบ
setting_theme: ชุดรูปแบบไซต์
setting_trends: แสดงแนวโน้มของวันนี้
setting_unfollow_modal: แสดงกล่องโต้ตอบการยืนยันก่อนเลิกติดตามใครสักคน
@@ -317,6 +318,10 @@ th:
name: แฮชแท็ก
trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้ในเซิร์ฟเวอร์
+ terms_of_service:
+ text: เงื่อนไขการให้บริการ
+ terms_of_service_generator:
+ domain: โดเมน
user:
role: บทบาท
time_zone: โซนเวลา
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0eee797fec..aa2de7de32 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -925,6 +925,10 @@ sv:
search: Sök
title: Hashtaggar
updated_msg: Hashtagg-inställningarna har uppdaterats
+ terms_of_service:
+ draft: Utkast
+ publish: Publicera
+ title: Användarvillkor
title: Administration
trends:
allow: Tillåt
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 4f0a6e98bd..b945ee8650 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -211,6 +211,7 @@ th:
enable_user: เปิดใช้งานผู้ใช้
memorialize_account: ทำให้บัญชีเป็นอนุสรณ์
promote_user: เลื่อนขั้นผู้ใช้
+ publish_terms_of_service: เผยแพร่เงื่อนไขการให้บริการ
reject_appeal: ปฏิเสธการอุทธรณ์
reject_user: ปฏิเสธผู้ใช้
remove_avatar_user: เอาภาพประจำตัวออก
@@ -911,6 +912,25 @@ th:
search: ค้นหา
title: แฮชแท็ก
updated_msg: อัปเดตการตั้งค่าแฮชแท็กสำเร็จ
+ terms_of_service:
+ back: กลับไปที่เงื่อนไขการให้บริการ
+ create: ใช้ของคุณเอง
+ current: ปัจจุบัน
+ draft: แบบร่าง
+ generate: ใช้แม่แบบ
+ generates:
+ action: สร้าง
+ history: ประวัติ
+ live: สด
+ notify_users: แจ้งเตือนผู้ใช้
+ preview:
+ send_preview: ส่งตัวอย่างไปยัง %{email}
+ send_to_all:
+ other: ส่ง %{display_count} อีเมล
+ publish: เผยแพร่
+ published_on_html: เผยแพร่เมื่อ %{date}
+ save_draft: บันทึกแบบร่าง
+ title: เงื่อนไขการให้บริการ
title: การดูแล
trends:
allow: อนุญาต
@@ -1635,6 +1655,7 @@ th:
scheduled_statuses:
over_daily_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit} สำหรับวันนี้แล้ว
over_total_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit} แล้ว
+ too_soon: วันที่ต้องอยู่ในอนาคต
self_destruct:
lead_html: น่าเสียดาย %{domain} กำลังปิดตัวลงอย่างถาวร หากคุณมีบัญชีที่นั่น คุณจะไม่สามารถใช้บัญชีต่อไปได้ แต่คุณยังคงสามารถขอข้อมูลสำรองของข้อมูลของคุณ
title: เซิร์ฟเวอร์นี้กำลังปิดตัวลง
@@ -1793,6 +1814,8 @@ th:
too_late: สายเกินไปที่จะอุทธรณ์การดำเนินการนี้
tags:
does_not_match_previous_name: ไม่ตรงกับชื่อก่อนหน้านี้
+ terms_of_service:
+ title: เงื่อนไขการให้บริการ
themes:
contrast: Mastodon (ความคมชัดสูง)
default: Mastodon (มืด)
@@ -1853,6 +1876,8 @@ th:
further_actions_html: หากนี่ไม่ใช่คุณ เราแนะนำให้คุณ %{action} ทันทีและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยเพื่อรักษาบัญชีของคุณให้ปลอดภัย
subject: มีการเข้าถึงบัญชีของคุณจากที่อยู่ IP ใหม่
title: การลงชื่อเข้าใหม่
+ terms_of_service_changed:
+ sign_off: ทีม %{domain}
warning:
appeal: ส่งการอุทธรณ์
appeal_description: หากคุณเชื่อว่านี่เป็นข้อผิดพลาด คุณสามารถส่งการอุทธรณ์ไปยังพนักงานของ %{instance}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7c4840be60..65ec6ef58a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -948,6 +948,9 @@ tr:
preview:
explanation_html: 'E-posta, %{date} tarihinden önce kaydolan %{display_count} kullanıcıya gönderilecektir. E-posta içerisinde aşağıdaki metin yer alacaktır:'
send_preview: Ön izlemeyi %{email} adresine gönder
+ send_to_all:
+ one: "%{display_count} e-posta gönder"
+ other: "%{display_count} e-posta gönder"
title: Hizmet şartları bildirimini öz izle
publish: Yayınla
published_on_html: "%{date} tarihinde yayınlandı"
diff --git a/config/storage.yml b/config/storage.yml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/db/migrate/.rubocop.yml b/db/migrate/.rubocop.yml
deleted file mode 100644
index f594b8799a..0000000000
--- a/db/migrate/.rubocop.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-inherit_from: ../../.rubocop.yml
-
-# Below are all enabled as workaround for https://docs.rubocop.org/rubocop/configuration.html#path-relativity
-# TODO: Delete this file and move above config to base naming config
-
-Rails/CreateTableWithTimestamps:
- Include:
- - '*.rb'
-
-Rails/ThreeStateBooleanColumn:
- Include:
- - '*.rb'
-
-Rails/ReversibleMigration:
- Include:
- - '*.rb'
diff --git a/db/migrate/20170112154826_migrate_settings.rb b/db/migrate/20170112154826_migrate_settings.rb
index d1faa81f5d..166d90eab7 100644
--- a/db/migrate/20170112154826_migrate_settings.rb
+++ b/db/migrate/20170112154826_migrate_settings.rb
@@ -17,7 +17,7 @@ class MigrateSettings < ActiveRecord::Migration[4.2]
t.remove_index [:thing_type, :thing_id, :var]
t.rename :thing_id, :target_id
t.rename :thing_type, :target_type
- t.column :target_id, :integer, null: false
+ t.column :target_id, :integer, null: false # rubocop:disable Rails/NotNullColumn
t.column :target_type, :string, null: false, default: ''
t.index [:target_type, :target_id, :var], unique: true
end
diff --git a/db/migrate/20240808124338_migrate_notifications_policy_v2.rb b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
index 2e0684826a..ed1642d6b8 100644
--- a/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
+++ b/db/migrate/20240808124338_migrate_notifications_policy_v2.rb
@@ -9,7 +9,7 @@ class MigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def up
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
- for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+ for_not_followers = CASE filter_not_followers WHEN true THEN 1 ELSE 0 END,
for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
SQL
@@ -18,7 +18,7 @@ class MigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def down
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
- filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+ filter_not_followers = CASE for_not_followers WHEN 0 THEN false ELSE true END,
filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
SQL
diff --git a/db/migrate/20241213170027_add_not_null_to_account_conversation_account_column.rb b/db/migrate/20241213170027_add_not_null_to_account_conversation_account_column.rb
new file mode 100644
index 0000000000..5bfa55bcc6
--- /dev/null
+++ b/db/migrate/20241213170027_add_not_null_to_account_conversation_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToAccountConversationAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :account_conversations, 'account_id IS NOT NULL', name: 'account_conversations_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241213170036_validate_not_null_to_account_conversation_account_column.rb b/db/migrate/20241213170036_validate_not_null_to_account_conversation_account_column.rb
new file mode 100644
index 0000000000..0186559dc3
--- /dev/null
+++ b/db/migrate/20241213170036_validate_not_null_to_account_conversation_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToAccountConversationAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM account_conversations
+ WHERE account_id IS NULL
+ SQL
+
+ validate_check_constraint :account_conversations, name: 'account_conversations_account_id_null'
+ change_column_null :account_conversations, :account_id, false
+ remove_check_constraint :account_conversations, name: 'account_conversations_account_id_null'
+ end
+
+ def down
+ add_check_constraint :account_conversations, 'account_id IS NOT NULL', name: 'account_conversations_account_id_null', validate: false
+ change_column_null :account_conversations, :account_id, true
+ end
+end
diff --git a/db/migrate/20241213170043_add_not_null_to_account_conversation_conversation_column.rb b/db/migrate/20241213170043_add_not_null_to_account_conversation_conversation_column.rb
new file mode 100644
index 0000000000..e253a1b3e1
--- /dev/null
+++ b/db/migrate/20241213170043_add_not_null_to_account_conversation_conversation_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToAccountConversationConversationColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :account_conversations, 'conversation_id IS NOT NULL', name: 'account_conversations_conversation_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241213170053_validate_not_null_to_account_conversation_conversation_column.rb b/db/migrate/20241213170053_validate_not_null_to_account_conversation_conversation_column.rb
new file mode 100644
index 0000000000..324e9180e2
--- /dev/null
+++ b/db/migrate/20241213170053_validate_not_null_to_account_conversation_conversation_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToAccountConversationConversationColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM account_conversations
+ WHERE conversation_id IS NULL
+ SQL
+
+ validate_check_constraint :account_conversations, name: 'account_conversations_conversation_id_null'
+ change_column_null :account_conversations, :conversation_id, false
+ remove_check_constraint :account_conversations, name: 'account_conversations_conversation_id_null'
+ end
+
+ def down
+ add_check_constraint :account_conversations, 'conversation_id IS NOT NULL', name: 'account_conversations_conversation_id_null', validate: false
+ change_column_null :account_conversations, :conversation_id, true
+ end
+end
diff --git a/db/migrate/20241216223425_add_not_null_to_account_note_account_column.rb b/db/migrate/20241216223425_add_not_null_to_account_note_account_column.rb
new file mode 100644
index 0000000000..85c10ace22
--- /dev/null
+++ b/db/migrate/20241216223425_add_not_null_to_account_note_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToAccountNoteAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :account_notes, 'account_id IS NOT NULL', name: 'account_notes_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216223433_validate_not_null_to_account_note_account_column.rb b/db/migrate/20241216223433_validate_not_null_to_account_note_account_column.rb
new file mode 100644
index 0000000000..50907ffe9d
--- /dev/null
+++ b/db/migrate/20241216223433_validate_not_null_to_account_note_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToAccountNoteAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM account_notes
+ WHERE account_id IS NULL
+ SQL
+
+ validate_check_constraint :account_notes, name: 'account_notes_account_id_null'
+ change_column_null :account_notes, :account_id, false
+ remove_check_constraint :account_notes, name: 'account_notes_account_id_null'
+ end
+
+ def down
+ add_check_constraint :account_notes, 'account_id IS NOT NULL', name: 'account_notes_account_id_null', validate: false
+ change_column_null :account_notes, :account_id, true
+ end
+end
diff --git a/db/migrate/20241216223446_add_not_null_to_account_note_target_account_column.rb b/db/migrate/20241216223446_add_not_null_to_account_note_target_account_column.rb
new file mode 100644
index 0000000000..9b389bfbff
--- /dev/null
+++ b/db/migrate/20241216223446_add_not_null_to_account_note_target_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToAccountNoteTargetAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :account_notes, 'target_account_id IS NOT NULL', name: 'account_notes_target_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216223452_validate_not_null_to_account_note_target_account_column.rb b/db/migrate/20241216223452_validate_not_null_to_account_note_target_account_column.rb
new file mode 100644
index 0000000000..2021a0eb50
--- /dev/null
+++ b/db/migrate/20241216223452_validate_not_null_to_account_note_target_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToAccountNoteTargetAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM account_notes
+ WHERE target_account_id IS NULL
+ SQL
+
+ validate_check_constraint :account_notes, name: 'account_notes_target_account_id_null'
+ change_column_null :account_notes, :target_account_id, false
+ remove_check_constraint :account_notes, name: 'account_notes_target_account_id_null'
+ end
+
+ def down
+ add_check_constraint :account_notes, 'target_account_id IS NOT NULL', name: 'account_notes_target_account_id_null', validate: false
+ change_column_null :account_notes, :target_account_id, true
+ end
+end
diff --git a/db/migrate/20241216223852_add_not_null_to_marker_user_column.rb b/db/migrate/20241216223852_add_not_null_to_marker_user_column.rb
new file mode 100644
index 0000000000..9d08fd8964
--- /dev/null
+++ b/db/migrate/20241216223852_add_not_null_to_marker_user_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToMarkerUserColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :markers, 'user_id IS NOT NULL', name: 'markers_user_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216223859_validate_not_null_to_marker_user_column.rb b/db/migrate/20241216223859_validate_not_null_to_marker_user_column.rb
new file mode 100644
index 0000000000..37ec90eb9b
--- /dev/null
+++ b/db/migrate/20241216223859_validate_not_null_to_marker_user_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToMarkerUserColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM markers
+ WHERE user_id IS NULL
+ SQL
+
+ validate_check_constraint :markers, name: 'markers_user_id_null'
+ change_column_null :markers, :user_id, false
+ remove_check_constraint :markers, name: 'markers_user_id_null'
+ end
+
+ def down
+ add_check_constraint :markers, 'user_id IS NOT NULL', name: 'markers_user_id_null', validate: false
+ change_column_null :markers, :user_id, true
+ end
+end
diff --git a/db/migrate/20241216224211_add_not_null_to_poll_vote_account_column.rb b/db/migrate/20241216224211_add_not_null_to_poll_vote_account_column.rb
new file mode 100644
index 0000000000..827f146b5e
--- /dev/null
+++ b/db/migrate/20241216224211_add_not_null_to_poll_vote_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToPollVoteAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :poll_votes, 'account_id IS NOT NULL', name: 'poll_votes_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216224218_validate_not_null_to_poll_vote_account_column.rb b/db/migrate/20241216224218_validate_not_null_to_poll_vote_account_column.rb
new file mode 100644
index 0000000000..4dfa5403c1
--- /dev/null
+++ b/db/migrate/20241216224218_validate_not_null_to_poll_vote_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToPollVoteAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM poll_votes
+ WHERE account_id IS NULL
+ SQL
+
+ validate_check_constraint :poll_votes, name: 'poll_votes_account_id_null'
+ change_column_null :poll_votes, :account_id, false
+ remove_check_constraint :poll_votes, name: 'poll_votes_account_id_null'
+ end
+
+ def down
+ add_check_constraint :poll_votes, 'account_id IS NOT NULL', name: 'poll_votes_account_id_null', validate: false
+ change_column_null :poll_votes, :account_id, true
+ end
+end
diff --git a/db/migrate/20241216224229_add_not_null_to_poll_vote_poll_column.rb b/db/migrate/20241216224229_add_not_null_to_poll_vote_poll_column.rb
new file mode 100644
index 0000000000..6e8a2f4f67
--- /dev/null
+++ b/db/migrate/20241216224229_add_not_null_to_poll_vote_poll_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToPollVotePollColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :poll_votes, 'poll_id IS NOT NULL', name: 'poll_votes_poll_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216224237_validate_not_null_to_poll_vote_poll_column.rb b/db/migrate/20241216224237_validate_not_null_to_poll_vote_poll_column.rb
new file mode 100644
index 0000000000..9b71406548
--- /dev/null
+++ b/db/migrate/20241216224237_validate_not_null_to_poll_vote_poll_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToPollVotePollColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM poll_votes
+ WHERE poll_id IS NULL
+ SQL
+
+ validate_check_constraint :poll_votes, name: 'poll_votes_poll_id_null'
+ change_column_null :poll_votes, :poll_id, false
+ remove_check_constraint :poll_votes, name: 'poll_votes_poll_id_null'
+ end
+
+ def down
+ add_check_constraint :poll_votes, 'poll_id IS NOT NULL', name: 'poll_votes_poll_id_null', validate: false
+ change_column_null :poll_votes, :poll_id, true
+ end
+end
diff --git a/db/migrate/20241216224507_add_not_null_to_poll_account_column.rb b/db/migrate/20241216224507_add_not_null_to_poll_account_column.rb
new file mode 100644
index 0000000000..9ff5c2d8f3
--- /dev/null
+++ b/db/migrate/20241216224507_add_not_null_to_poll_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToPollAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :polls, 'account_id IS NOT NULL', name: 'polls_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216224514_validate_not_null_to_poll_account_column.rb b/db/migrate/20241216224514_validate_not_null_to_poll_account_column.rb
new file mode 100644
index 0000000000..91e835359c
--- /dev/null
+++ b/db/migrate/20241216224514_validate_not_null_to_poll_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToPollAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM polls
+ WHERE account_id IS NULL
+ SQL
+
+ validate_check_constraint :polls, name: 'polls_account_id_null'
+ change_column_null :polls, :account_id, false
+ remove_check_constraint :polls, name: 'polls_account_id_null'
+ end
+
+ def down
+ add_check_constraint :polls, 'account_id IS NOT NULL', name: 'polls_account_id_null', validate: false
+ change_column_null :polls, :account_id, true
+ end
+end
diff --git a/db/migrate/20241216224520_add_not_null_to_poll_status_column.rb b/db/migrate/20241216224520_add_not_null_to_poll_status_column.rb
new file mode 100644
index 0000000000..5c638c6af0
--- /dev/null
+++ b/db/migrate/20241216224520_add_not_null_to_poll_status_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToPollStatusColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :polls, 'status_id IS NOT NULL', name: 'polls_status_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216224530_validate_not_null_to_poll_status_column.rb b/db/migrate/20241216224530_validate_not_null_to_poll_status_column.rb
new file mode 100644
index 0000000000..b5985ce062
--- /dev/null
+++ b/db/migrate/20241216224530_validate_not_null_to_poll_status_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToPollStatusColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM polls
+ WHERE status_id IS NULL
+ SQL
+
+ validate_check_constraint :polls, name: 'polls_status_id_null'
+ change_column_null :polls, :status_id, false
+ remove_check_constraint :polls, name: 'polls_status_id_null'
+ end
+
+ def down
+ add_check_constraint :polls, 'status_id IS NOT NULL', name: 'polls_status_id_null', validate: false
+ change_column_null :polls, :status_id, true
+ end
+end
diff --git a/db/migrate/20241216224813_add_not_null_to_tombstone_account_column.rb b/db/migrate/20241216224813_add_not_null_to_tombstone_account_column.rb
new file mode 100644
index 0000000000..1a380cdef3
--- /dev/null
+++ b/db/migrate/20241216224813_add_not_null_to_tombstone_account_column.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotNullToTombstoneAccountColumn < ActiveRecord::Migration[7.2]
+ def change
+ add_check_constraint :tombstones, 'account_id IS NOT NULL', name: 'tombstones_account_id_null', validate: false
+ end
+end
diff --git a/db/migrate/20241216224825_validate_not_null_to_tombstone_account_column.rb b/db/migrate/20241216224825_validate_not_null_to_tombstone_account_column.rb
new file mode 100644
index 0000000000..5fefcca33d
--- /dev/null
+++ b/db/migrate/20241216224825_validate_not_null_to_tombstone_account_column.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ValidateNotNullToTombstoneAccountColumn < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM tombstones
+ WHERE account_id IS NULL
+ SQL
+
+ validate_check_constraint :tombstones, name: 'tombstones_account_id_null'
+ change_column_null :tombstones, :account_id, false
+ remove_check_constraint :tombstones, name: 'tombstones_account_id_null'
+ end
+
+ def down
+ add_check_constraint :tombstones, 'account_id IS NOT NULL', name: 'tombstones_account_id_null', validate: false
+ change_column_null :tombstones, :account_id, true
+ end
+end
diff --git a/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
index eb0c909729..5daf646643 100644
--- a/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
+++ b/db/post_migrate/20240808124339_post_deployment_migrate_notifications_policy_v2.rb
@@ -9,7 +9,7 @@ class PostDeploymentMigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def up
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
for_not_following = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
- for_not_followers = CASE filter_not_following WHEN true THEN 1 ELSE 0 END,
+ for_not_followers = CASE filter_not_followers WHEN true THEN 1 ELSE 0 END,
for_new_accounts = CASE filter_new_accounts WHEN true THEN 1 ELSE 0 END,
for_private_mentions = CASE filter_private_mentions WHEN true THEN 1 ELSE 0 END
SQL
@@ -18,7 +18,7 @@ class PostDeploymentMigrateNotificationsPolicyV2 < ActiveRecord::Migration[7.1]
def down
NotificationPolicy.in_batches.update_all(<<~SQL.squish)
filter_not_following = CASE for_not_following WHEN 0 THEN false ELSE true END,
- filter_not_following = CASE for_not_followers WHEN 0 THEN false ELSE true END,
+ filter_not_followers = CASE for_not_followers WHEN 0 THEN false ELSE true END,
filter_new_accounts = CASE for_new_accounts WHEN 0 THEN false ELSE true END,
filter_private_mentions = CASE for_private_mentions WHEN 0 THEN false ELSE true END
SQL
diff --git a/db/schema.rb b/db/schema.rb
index 7b9065f20c..bad510ac00 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
+ActiveRecord::Schema[7.2].define(version: 2024_12_16_224825) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -24,8 +24,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "account_conversations", force: :cascade do |t|
- t.bigint "account_id"
- t.bigint "conversation_id"
+ t.bigint "account_id", null: false
+ t.bigint "conversation_id", null: false
t.bigint "participant_account_ids", default: [], null: false, array: true
t.bigint "status_ids", default: [], null: false, array: true
t.bigint "last_status_id"
@@ -72,8 +72,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "account_notes", force: :cascade do |t|
- t.bigint "account_id"
- t.bigint "target_account_id"
+ t.bigint "account_id", null: false
+ t.bigint "target_account_id", null: false
t.text "comment", null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
@@ -804,7 +804,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "markers", force: :cascade do |t|
- t.bigint "user_id"
+ t.bigint "user_id", null: false
t.string "timeline", default: "", null: false
t.bigint "last_read_id", default: 0, null: false
t.integer "lock_version", default: 0, null: false
@@ -1076,8 +1076,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "poll_votes", force: :cascade do |t|
- t.bigint "account_id"
- t.bigint "poll_id"
+ t.bigint "account_id", null: false
+ t.bigint "poll_id", null: false
t.integer "choice", default: 0, null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
@@ -1087,8 +1087,8 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "polls", force: :cascade do |t|
- t.bigint "account_id"
- t.bigint "status_id"
+ t.bigint "account_id", null: false
+ t.bigint "status_id", null: false
t.datetime "expires_at", precision: nil
t.string "options", default: [], null: false, array: true
t.bigint "cached_tallies", default: [], null: false, array: true
@@ -1484,7 +1484,7 @@ ActiveRecord::Schema[7.2].define(version: 2024_12_12_154346) do
end
create_table "tombstones", force: :cascade do |t|
- t.bigint "account_id"
+ t.bigint "account_id", null: false
t.string "uri", null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
diff --git a/lib/mastodon/sidekiq_middleware.rb b/lib/mastodon/sidekiq_middleware.rb
index 8ce1124c69..4df22002c8 100644
--- a/lib/mastodon/sidekiq_middleware.rb
+++ b/lib/mastodon/sidekiq_middleware.rb
@@ -3,8 +3,10 @@
class Mastodon::SidekiqMiddleware
BACKTRACE_LIMIT = 3
- def call(*, &block)
- Chewy.strategy(:mastodon, &block)
+ def call(_worker_class, job, _queue, &block)
+ setup_query_log_tags(job) do
+ Chewy.strategy(:mastodon, &block)
+ end
rescue Mastodon::HostValidationError
# Do not retry
rescue => e
@@ -61,4 +63,14 @@ class Mastodon::SidekiqMiddleware
Thread.current[:statsd_socket]&.close
Thread.current[:statsd_socket] = nil
end
+
+ def setup_query_log_tags(job, &block)
+ if Rails.configuration.active_record.query_log_tags_enabled
+ # If `wrapped` is set, this is an `ActiveJob` which is already in the execution context
+ sidekiq_job_class = job['wrapped'].present? ? nil : job['class'].to_s
+ ActiveSupport::ExecutionContext.set(sidekiq_job_class: sidekiq_job_class, &block)
+ else
+ yield
+ end
+ end
end
diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb
index fe58d1bce1..b4ff4a12a0 100644
--- a/lib/paperclip/blurhash_transcoder.rb
+++ b/lib/paperclip/blurhash_transcoder.rb
@@ -23,7 +23,7 @@ module Paperclip
image = Vips::Image.thumbnail(@file.path, 100)
[image.width, image.height, image.colourspace(:srgb).extract_band(0, n: 3).to_a.flatten]
else
- pixels = convert(':source -flatten -depth 8 -compress none RGB:-', source: File.expand_path(@file.path)).unpack('C*')
+ pixels = convert(':source -depth 8 RGB:-', source: File.expand_path(@file.path)).unpack('C*')
geometry = options.fetch(:file_geometry_parser).from_file(@file)
[geometry.width, geometry.height, pixels]
end
diff --git a/lib/paperclip/gif_transcoder.rb b/lib/paperclip/gif_transcoder.rb
new file mode 100644
index 0000000000..32bdb8a863
--- /dev/null
+++ b/lib/paperclip/gif_transcoder.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+class GifReader
+ attr_reader :animated
+
+ EXTENSION_LABELS = [0xf9, 0x01, 0xff].freeze
+ GIF_HEADERS = %w(GIF87a GIF89a).freeze
+
+ class GifReaderException < StandardError; end
+
+ class UnknownImageType < GifReaderException; end
+
+ class CannotParseImage < GifReaderException; end
+
+ def self.animated?(path)
+ new(path).animated
+ rescue GifReaderException
+ false
+ end
+
+ def initialize(path, max_frames = 2)
+ @path = path
+ @nb_frames = 0
+
+ File.open(path, 'rb') do |s|
+ raise UnknownImageType unless GIF_HEADERS.include?(s.read(6))
+
+ # Skip to "packed byte"
+ s.seek(4, IO::SEEK_CUR)
+
+ # "Packed byte" gives us the size of the GIF color table
+ packed_byte, = s.read(1).unpack('C')
+
+ # Skip background color and aspect ratio
+ s.seek(2, IO::SEEK_CUR)
+
+ if packed_byte & 0x80 != 0
+ # GIF uses a global color table, skip it
+ s.seek(3 * (1 << ((packed_byte & 0x07) + 1)), IO::SEEK_CUR)
+ end
+
+ # Now read data
+ while @nb_frames < max_frames
+ separator = s.read(1)
+
+ case separator
+ when ',' # Image block
+ @nb_frames += 1
+
+ # Skip to "packed byte"
+ s.seek(8, IO::SEEK_CUR)
+ packed_byte, = s.read(1).unpack('C')
+
+ if packed_byte & 0x80 != 0
+ # Image uses a local color table, skip it
+ s.seek(3 * (1 << ((packed_byte & 0x07) + 1)), IO::SEEK_CUR)
+ end
+
+ # Skip lzw min code size
+ raise InvalidValue unless s.read(1).unpack1('C') >= 2
+
+ # Skip image data sub-blocks
+ skip_sub_blocks!(s)
+ when '!' # Extension block
+ skip_extension_block!(s)
+ when ';' # Trailer
+ break
+ else
+ raise CannotParseImage
+ end
+ end
+ end
+
+ @animated = @nb_frames > 1
+ end
+
+ private
+
+ def skip_extension_block!(file)
+ if EXTENSION_LABELS.include?(file.read(1).unpack1('C'))
+ block_size, = file.read(1).unpack('C')
+ file.seek(block_size, IO::SEEK_CUR)
+ end
+
+ # Read until extension block end marker
+ skip_sub_blocks!(file)
+ end
+
+ # Skip sub-blocks up until block end marker
+ def skip_sub_blocks!(file)
+ loop do
+ size, = file.read(1).unpack('C')
+
+ break if size.zero?
+
+ file.seek(size, IO::SEEK_CUR)
+ end
+ end
+end
+
+module Paperclip
+ # This transcoder is only to be used for the MediaAttachment model
+ # to convert animated GIFs to videos
+
+ class GifTranscoder < Paperclip::Processor
+ def make
+ return File.open(@file.path) unless needs_convert?
+
+ final_file = Paperclip::Transcoder.make(file, options, attachment)
+
+ if options[:style] == :original
+ attachment.instance.file_file_name = "#{File.basename(attachment.instance.file_file_name, '.*')}.mp4"
+ attachment.instance.file_content_type = 'video/mp4'
+ attachment.instance.type = MediaAttachment.types[:gifv]
+ end
+
+ final_file
+ end
+
+ private
+
+ def needs_convert?
+ GifReader.animated?(file.path)
+ end
+ end
+end
diff --git a/lib/paperclip/gifv_transcoder.rb b/lib/paperclip/gifv_transcoder.rb
deleted file mode 100644
index 4bb27e3b75..0000000000
--- a/lib/paperclip/gifv_transcoder.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Paperclip
- # This transcoder is only to be used for the MediaAttachment model
- # to convert animated GIFs and PNGs to videos
-
- class GifvTranscoder < Paperclip::Processor
- def make
- final_file = Paperclip::Transcoder.make(file, options, attachment)
-
- if options[:style] == :original
- attachment.instance.file_file_name = "#{File.basename(attachment.instance.file_file_name, '.*')}.mp4"
- attachment.instance.file_content_type = 'video/mp4'
- attachment.instance.type = MediaAttachment.types[:gifv]
- end
-
- final_file
- end
- end
-end
diff --git a/lint-staged.config.js b/lint-staged.config.js
index 1ee6962c2a..63f5258a94 100644
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -1,6 +1,6 @@
const config = {
'*': 'prettier --ignore-unknown --write',
- 'Capfile|Gemfile|*.{rb,ruby,ru,rake}': 'bin/rubocop --force-exclusion -a',
+ 'Gemfile|*.{rb,ruby,ru,rake}': 'bin/rubocop --force-exclusion -a',
'*.{js,jsx,ts,tsx}': 'eslint --fix',
'*.{css,scss}': 'stylelint --fix',
'*.haml': 'bin/haml-lint -a',
diff --git a/public/loading.gif b/public/loading.gif
new file mode 100755
index 0000000000..b3e1dbef8f
Binary files /dev/null and b/public/loading.gif differ
diff --git a/public/loading.png b/public/loading.png
new file mode 100755
index 0000000000..6a20cbfcb6
Binary files /dev/null and b/public/loading.png differ
diff --git a/spec/controllers/.rubocop.yml b/spec/controllers/.rubocop.yml
deleted file mode 100644
index 51d7c23de1..0000000000
--- a/spec/controllers/.rubocop.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit_from: ../../.rubocop.yml
-
-# Anonymous controllers in specs cannot access `described_class`, explanation:
-# https://github.com/rubocop/rubocop-rspec/blob/v2.26.1/lib/rubocop/cop/rspec/described_class.rb#L36-L56
-RSpec/DescribedClass:
- SkipBlocks: true
diff --git a/spec/controllers/admin/account_moderation_notes_controller_spec.rb b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
deleted file mode 100644
index 5ea546f418..0000000000
--- a/spec/controllers/admin/account_moderation_notes_controller_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::AccountModerationNotesController do
- render_views
-
- let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
- let(:target_account) { Fabricate(:account) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'POST #create' do
- subject { post :create, params: params }
-
- context 'when parameters are valid' do
- let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test content' } } }
-
- it 'successfully creates a note' do
- expect { subject }.to change(AccountModerationNote, :count).by(1)
- expect(response).to redirect_to admin_account_path(target_account.id)
- end
- end
-
- context 'when the content is too short' do
- let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: '' } } }
-
- it 'fails to create a note' do
- expect { subject }.to_not change(AccountModerationNote, :count)
- expect(response).to render_template 'admin/accounts/show'
- end
- end
-
- context 'when the content is too long' do
- let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test' * AccountModerationNote::CONTENT_SIZE_LIMIT } } }
-
- it 'fails to create a note' do
- expect { subject }.to_not change(AccountModerationNote, :count)
- expect(response).to render_template 'admin/accounts/show'
- end
- end
- end
-
- describe 'DELETE #destroy' do
- subject { delete :destroy, params: { id: note.id } }
-
- let!(:note) { Fabricate(:account_moderation_note, account: account, target_account: target_account) }
- let(:account) { Fabricate(:account) }
-
- it 'destroys note' do
- expect { subject }.to change(AccountModerationNote, :count).by(-1)
- expect(response).to redirect_to admin_account_path(target_account.id)
- end
- end
-end
diff --git a/spec/controllers/admin/custom_emojis_controller_spec.rb b/spec/controllers/admin/custom_emojis_controller_spec.rb
deleted file mode 100644
index 57c2a6d21b..0000000000
--- a/spec/controllers/admin/custom_emojis_controller_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::CustomEmojisController do
- render_views
-
- let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- before do
- Fabricate(:custom_emoji)
- end
-
- it 'renders index page' do
- get :index
-
- expect(response).to have_http_status 200
- expect(response).to render_template :index
- end
- end
-
- describe 'GET #new' do
- it 'renders new page' do
- get :new
-
- expect(response).to have_http_status 200
- expect(response).to render_template :new
- end
- end
-
- describe 'POST #create' do
- subject { post :create, params: { custom_emoji: params } }
-
- let(:image) { fixture_file_upload(Rails.root.join('spec', 'fixtures', 'files', 'emojo.png'), 'image/png') }
-
- context 'when parameter is valid' do
- let(:params) { { shortcode: 'test', image: image } }
-
- it 'creates custom emoji' do
- expect { subject }.to change(CustomEmoji, :count).by(1)
- end
- end
-
- context 'when parameter is invalid' do
- let(:params) { { shortcode: 't', image: image } }
-
- it 'renders new' do
- expect(subject).to render_template :new
- end
- end
- end
-end
diff --git a/spec/controllers/admin/domain_allows_controller_spec.rb b/spec/controllers/admin/domain_allows_controller_spec.rb
deleted file mode 100644
index 036d229091..0000000000
--- a/spec/controllers/admin/domain_allows_controller_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::DomainAllowsController do
- render_views
-
- before do
- sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
- end
-
- describe 'GET #new' do
- it 'assigns a new domain allow' do
- get :new
-
- expect(response).to have_http_status(200)
- end
- end
-
- describe 'POST #create' do
- it 'blocks the domain when succeeded to save' do
- post :create, params: { domain_allow: { domain: 'example.com' } }
-
- expect(flash[:notice]).to eq I18n.t('admin.domain_allows.created_msg')
- expect(response).to redirect_to(admin_instances_path)
- end
-
- it 'renders new when failed to save' do
- Fabricate(:domain_allow, domain: 'example.com')
-
- post :create, params: { domain_allow: { domain: 'example.com' } }
-
- expect(response).to render_template :new
- end
- end
-
- describe 'DELETE #destroy' do
- it 'disallows the domain' do
- service = instance_double(UnallowDomainService, call: true)
- allow(UnallowDomainService).to receive(:new).and_return(service)
- domain_allow = Fabricate(:domain_allow)
- delete :destroy, params: { id: domain_allow.id }
-
- expect(service).to have_received(:call).with(domain_allow)
- expect(flash[:notice]).to eq I18n.t('admin.domain_allows.destroyed_msg')
- expect(response).to redirect_to(admin_instances_path)
- end
- end
-end
diff --git a/spec/controllers/admin/ip_blocks_controller_spec.rb b/spec/controllers/admin/ip_blocks_controller_spec.rb
deleted file mode 100644
index 2e32db5a01..0000000000
--- a/spec/controllers/admin/ip_blocks_controller_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::IpBlocksController do
- render_views
-
- let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-
- describe 'GET #new' do
- it 'returns http success and renders view' do
- get :new
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:new)
- end
- end
-
- describe 'POST #create' do
- context 'with valid data' do
- it 'creates a new ip block and redirects' do
- expect do
- post :create, params: { ip_block: { ip: '1.1.1.1', severity: 'no_access', expires_in: 1.day.to_i.to_s } }
- end.to change(IpBlock, :count).by(1)
-
- expect(response).to redirect_to(admin_ip_blocks_path)
- expect(flash.notice).to match(I18n.t('admin.ip_blocks.created_msg'))
- end
- end
-
- context 'with invalid data' do
- it 'does not create new a ip block and renders new' do
- expect do
- post :create, params: { ip_block: { ip: '1.1.1.1' } }
- end.to_not change(IpBlock, :count)
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:new)
- end
- end
- end
-end
diff --git a/spec/controllers/admin/webhooks_controller_spec.rb b/spec/controllers/admin/webhooks_controller_spec.rb
deleted file mode 100644
index 4fe787c26c..0000000000
--- a/spec/controllers/admin/webhooks_controller_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::WebhooksController do
- render_views
-
- let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index
-
- expect(response).to have_http_status(:success)
- end
- end
-
- describe 'GET #new' do
- it 'returns http success and renders view' do
- get :new
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:new)
- end
- end
-
- describe 'POST #create' do
- it 'creates a new webhook record with valid data' do
- expect do
- post :create, params: { webhook: { url: 'https://example.com/hook', events: ['account.approved'] } }
- end.to change(Webhook, :count).by(1)
-
- expect(response).to be_redirect
- end
-
- it 'does not create a new webhook record with invalid data' do
- expect do
- post :create, params: { webhook: { url: 'https://example.com/hook', events: [] } }
- end.to_not change(Webhook, :count)
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:new)
- end
- end
-
- context 'with an existing record' do
- let!(:webhook) { Fabricate(:webhook, events: ['account.created', 'report.created']) }
-
- describe 'GET #show' do
- it 'returns http success and renders view' do
- get :show, params: { id: webhook.id }
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:show)
- end
- end
-
- describe 'GET #edit' do
- it 'returns http success and renders view' do
- get :edit, params: { id: webhook.id }
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:edit)
- end
- end
-
- describe 'PUT #update' do
- it 'updates the record with valid data' do
- put :update, params: { id: webhook.id, webhook: { url: 'https://example.com/new/location' } }
-
- expect(webhook.reload.url).to match(%r{new/location})
- expect(response).to redirect_to(admin_webhook_path(webhook))
- end
-
- it 'does not update the record with invalid data' do
- expect do
- put :update, params: { id: webhook.id, webhook: { url: '' } }
- end.to_not change(webhook, :url)
-
- expect(response).to have_http_status(:success)
- expect(response).to render_template(:edit)
- end
- end
-
- describe 'POST #enable' do
- it 'enables the webhook' do
- post :enable, params: { id: webhook.id }
-
- expect(webhook.reload).to be_enabled
- expect(response).to redirect_to(admin_webhook_path(webhook))
- end
- end
-
- describe 'POST #disable' do
- it 'disables the webhook' do
- post :disable, params: { id: webhook.id }
-
- expect(webhook.reload).to_not be_enabled
- expect(response).to redirect_to(admin_webhook_path(webhook))
- end
- end
-
- describe 'DELETE #destroy' do
- it 'destroys the record' do
- expect do
- delete :destroy, params: { id: webhook.id }
- end.to change(Webhook, :count).by(-1)
-
- expect(response).to redirect_to(admin_webhooks_path)
- end
- end
- end
-end
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 384406a0ea..4a44fd3498 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe AccountControllerConcern do
controller(ApplicationController) do
- include AccountControllerConcern
+ include AccountControllerConcern # rubocop:disable RSpec/DescribedClass
def success
render plain: @account.username # rubocop:disable RSpec/InstanceVariable
diff --git a/spec/controllers/concerns/api/rate_limit_headers_spec.rb b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
index 6372c94e6c..74ed81f5da 100644
--- a/spec/controllers/concerns/api/rate_limit_headers_spec.rb
+++ b/spec/controllers/concerns/api/rate_limit_headers_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe Api::RateLimitHeaders do
controller(ApplicationController) do
- include Api::RateLimitHeaders
+ include Api::RateLimitHeaders # rubocop:disable RSpec/DescribedClass
def show
head 200
diff --git a/spec/controllers/concerns/challengable_concern_spec.rb b/spec/controllers/concerns/challengable_concern_spec.rb
index 169e2122f8..01f979ff4c 100644
--- a/spec/controllers/concerns/challengable_concern_spec.rb
+++ b/spec/controllers/concerns/challengable_concern_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe ChallengableConcern do
controller(ApplicationController) do
- include ChallengableConcern
+ include ChallengableConcern # rubocop:disable RSpec/DescribedClass
before_action :require_challenge!
diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb
index b1f805ae50..4798e8270c 100644
--- a/spec/controllers/concerns/localized_spec.rb
+++ b/spec/controllers/concerns/localized_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe Localized do
controller(ApplicationController) do
- include Localized
+ include Localized # rubocop:disable RSpec/DescribedClass
def success
render plain: I18n.locale, status: 200
diff --git a/spec/controllers/concerns/preloading_concern_spec.rb b/spec/controllers/concerns/preloading_concern_spec.rb
index 795afbc45e..2cbccb411e 100644
--- a/spec/controllers/concerns/preloading_concern_spec.rb
+++ b/spec/controllers/concerns/preloading_concern_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe PreloadingConcern do
controller(ApplicationController) do
- include PreloadingConcern
+ include PreloadingConcern # rubocop:disable RSpec/DescribedClass
def empty_array
render plain: preload_collection([], Status).size
diff --git a/spec/controllers/concerns/settings/export_controller_concern_spec.rb b/spec/controllers/concerns/settings/export_controller_concern_spec.rb
index 2c67991e3a..6c1a06114c 100644
--- a/spec/controllers/concerns/settings/export_controller_concern_spec.rb
+++ b/spec/controllers/concerns/settings/export_controller_concern_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe Settings::ExportControllerConcern do
controller(ApplicationController) do
- include Settings::ExportControllerConcern
+ include Settings::ExportControllerConcern # rubocop:disable RSpec/DescribedClass
def index
send_export_file
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index cc61e285cc..d67b0ef5e7 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe UserTrackingConcern do
controller(ApplicationController) do
- include UserTrackingConcern
+ include UserTrackingConcern # rubocop:disable RSpec/DescribedClass
def show
render plain: 'show'
diff --git a/spec/controllers/filters_controller_spec.rb b/spec/controllers/filters_controller_spec.rb
deleted file mode 100644
index de043e8ae3..0000000000
--- a/spec/controllers/filters_controller_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe FiltersController do
- render_views
-
- describe 'GET #index' do
- context 'with signed out user' do
- before do
- get :index
- end
-
- it 'redirects' do
- expect(response).to be_redirect
- end
- end
-
- context 'with a signed in user' do
- before do
- sign_in(Fabricate(:user))
- get :index
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
-
- it 'returns private cache control headers' do
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
- end
-end
diff --git a/spec/controllers/settings/login_activities_controller_spec.rb b/spec/controllers/settings/login_activities_controller_spec.rb
deleted file mode 100644
index 3447620abb..0000000000
--- a/spec/controllers/settings/login_activities_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::LoginActivitiesController do
- render_views
-
- let!(:user) { Fabricate(:user) }
- let!(:login_activity) { Fabricate :login_activity, user: user }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #index' do
- before do
- get :index
- end
-
- it 'returns http success with private cache control headers', :aggregate_failures do
- expect(response).to have_http_status(200)
- expect(response.headers['Cache-Control']).to include('private, no-store')
- expect(response.body)
- .to include(login_activity.user_agent)
- .and include(login_activity.authentication_method)
- .and include(login_activity.ip.to_s)
- end
- end
-end
diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb
deleted file mode 100644
index 14f9b244ab..0000000000
--- a/spec/controllers/settings/preferences/appearance_controller_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::AppearanceController do
- render_views
-
- let!(:user) { Fabricate(:user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #show' do
- before do
- get :show
- end
-
- it 'returns http success with private cache control headers', :aggregate_failures do
- expect(response).to have_http_status(200)
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
-
- describe 'PUT #update' do
- subject { put :update, params: { user: { settings_attributes: { theme: 'contrast' } } } }
-
- it 'redirects correctly' do
- expect { subject }
- .to change { user.reload.settings.theme }.to('contrast')
-
- expect(response).to redirect_to(settings_preferences_appearance_path)
- end
- end
-end
diff --git a/spec/controllers/settings/preferences/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb
deleted file mode 100644
index edfdea50e0..0000000000
--- a/spec/controllers/settings/preferences/notifications_controller_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::NotificationsController do
- render_views
-
- let(:user) { Fabricate(:user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #show' do
- before do
- get :show
- end
-
- it 'returns http success with private cache control headers', :aggregate_failures do
- expect(response).to have_http_status(200)
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
-
- describe 'PUT #update' do
- it 'updates notifications settings' do
- user.settings.update('notification_emails.follow': false)
- user.save
-
- put :update, params: {
- user: {
- settings_attributes: {
- 'notification_emails.follow': '1',
- },
- },
- }
-
- expect(response).to redirect_to(settings_preferences_notifications_path)
- user.reload
- expect(user.settings['notification_emails.follow']).to be true
- end
- end
-end
diff --git a/spec/controllers/settings/preferences/other_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
deleted file mode 100644
index 117fdeea7c..0000000000
--- a/spec/controllers/settings/preferences/other_controller_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::Preferences::OtherController do
- render_views
-
- let(:user) { Fabricate(:user, chosen_languages: []) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #show' do
- before do
- get :show
- end
-
- it 'returns http success with private cache control headers', :aggregate_failures do
- expect(response).to have_http_status(200)
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
-
- describe 'PUT #update' do
- it 'updates the user record' do
- put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
-
- expect(response).to redirect_to(settings_preferences_other_path)
- user.reload
- expect(user.locale).to eq 'en'
- expect(user.chosen_languages).to eq %w(es fr)
- end
-
- it 'updates user settings' do
- user.settings.update('web.reblog_modal': false, 'web.delete_modal': true)
- user.save
-
- put :update, params: {
- user: {
- settings_attributes: {
- 'web.reblog_modal': '1',
- 'web.delete_modal': '0',
- },
- },
- }
-
- expect(response).to redirect_to(settings_preferences_other_path)
- user.reload
- expect(user.settings['web.reblog_modal']).to be true
- expect(user.settings['web.delete_modal']).to be false
- end
- end
-end
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
deleted file mode 100644
index e3197f0a6d..0000000000
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Settings::ProfilesController do
- render_views
-
- let!(:user) { Fabricate(:user) }
- let(:account) { user.account }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #show' do
- before do
- get :show
- end
-
- it 'returns http success with private cache control headers', :aggregate_failures do
- expect(response).to have_http_status(200)
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
-
- describe 'PUT #update' do
- before do
- user.account.update(display_name: 'Old name')
- end
-
- it 'updates the user profile' do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- put :update, params: { account: { display_name: 'New name' } }
- expect(account.reload.display_name).to eq 'New name'
- expect(response).to redirect_to(settings_profile_path)
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
- end
- end
-
- describe 'PUT #update with new profile image' do
- it 'updates profile image' do
- allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- expect(account.avatar.instance.avatar_file_name).to be_nil
-
- put :update, params: { account: { avatar: fixture_file_upload('avatar.gif', 'image/gif') } }
- expect(response).to redirect_to(settings_profile_path)
- expect(account.reload.avatar.instance.avatar_file_name).to_not be_nil
- expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
- end
- end
-end
diff --git a/spec/controllers/statuses_cleanup_controller_spec.rb b/spec/controllers/statuses_cleanup_controller_spec.rb
deleted file mode 100644
index 8a72621993..0000000000
--- a/spec/controllers/statuses_cleanup_controller_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe StatusesCleanupController do
- render_views
-
- let!(:user) { Fabricate(:user) }
-
- before do
- sign_in user, scope: :user
- end
-
- describe 'GET #show' do
- before do
- get :show
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
-
- it 'returns private cache control headers' do
- expect(response.headers['Cache-Control']).to include('private, no-store')
- end
- end
-
- describe 'PUT #update' do
- before do
- put :update, params: { account_statuses_cleanup_policy: { enabled: true, min_status_age: 2.weeks.seconds, keep_direct: false, keep_polls: true } }
- end
-
- it 'updates the account status cleanup policy' do
- expect(user.account.statuses_cleanup_policy.enabled).to be true
- expect(user.account.statuses_cleanup_policy.keep_direct).to be false
- expect(user.account.statuses_cleanup_policy.keep_polls).to be true
- end
-
- it 'redirects' do
- expect(response).to redirect_to(statuses_cleanup_path)
- end
- end
-end
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 121e4aa6c6..e14a7f6916 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -527,213 +527,4 @@ RSpec.describe StatusesController do
end
end
end
-
- describe 'GET #activity' do
- let(:account) { Fabricate(:account) }
- let(:status) { Fabricate(:status, account: account) }
-
- context 'when account is permanently suspended' do
- before do
- account.suspend!
- account.deletion_request.destroy
-
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http gone' do
- expect(response).to have_http_status(410)
- end
- end
-
- context 'when account is temporarily suspended' do
- before do
- account.suspend!
-
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http forbidden' do
- expect(response).to have_http_status(403)
- end
- end
-
- context 'when status is public' do
- before do
- status.update(visibility: :public)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
- end
-
- context 'when status is private' do
- before do
- status.update(visibility: :private)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
-
- context 'when status is direct' do
- before do
- status.update(visibility: :direct)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
-
- context 'when signed-in' do
- let(:user) { Fabricate(:user) }
-
- before do
- sign_in(user)
- end
-
- context 'when status is public' do
- before do
- status.update(visibility: :public)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
- end
-
- context 'when status is private' do
- before do
- status.update(visibility: :private)
- end
-
- context 'when user is authorized to see it' do
- before do
- user.account.follow!(account)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
- end
-
- context 'when user is not authorized to see it' do
- before do
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
- end
-
- context 'when status is direct' do
- before do
- status.update(visibility: :direct)
- end
-
- context 'when user is authorized to see it' do
- before do
- Fabricate(:mention, account: user.account, status: status)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
- end
-
- context 'when user is not authorized to see it' do
- before do
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
- end
- end
-
- context 'with signature' do
- let(:remote_account) { Fabricate(:account, domain: 'example.com') }
-
- before do
- allow(controller).to receive(:signed_request_actor).and_return(remote_account)
- end
-
- context 'when status is public' do
- before do
- status.update(visibility: :public)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
- end
-
- context 'when status is private' do
- before do
- status.update(visibility: :private)
- end
-
- context 'when user is authorized to see it' do
- before do
- remote_account.follow!(account)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
- end
-
- context 'when user is not authorized to see it' do
- before do
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
- end
-
- context 'when status is direct' do
- before do
- status.update(visibility: :direct)
- end
-
- context 'when user is authorized to see it' do
- before do
- Fabricate(:mention, account: remote_account, status: status)
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(200)
- end
- end
-
- context 'when user is not authorized to see it' do
- before do
- get :activity, params: { account_username: account.username, id: status.id }
- end
-
- it 'returns http not_found' do
- expect(response).to have_http_status(404)
- end
- end
- end
- end
- end
end
diff --git a/spec/fixtures/files/600x400-animated.gif b/spec/fixtures/files/600x400-animated.gif
deleted file mode 100644
index 1a773c0af1..0000000000
Binary files a/spec/fixtures/files/600x400-animated.gif and /dev/null differ
diff --git a/spec/fixtures/files/600x400-animated.png b/spec/fixtures/files/600x400-animated.png
deleted file mode 100644
index 6430fceabb..0000000000
Binary files a/spec/fixtures/files/600x400-animated.png and /dev/null differ
diff --git a/spec/fixtures/files/600x400.gif b/spec/fixtures/files/600x400.gif
deleted file mode 100644
index bab39cb6f7..0000000000
Binary files a/spec/fixtures/files/600x400.gif and /dev/null differ
diff --git a/spec/fixtures/files/attachment.gif b/spec/fixtures/files/attachment.gif
new file mode 100644
index 0000000000..89dd73ad3e
Binary files /dev/null and b/spec/fixtures/files/attachment.gif differ
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 677512f6bc..4393ce7b3e 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -172,14 +172,12 @@ RSpec.describe ActivityPub::Activity::Create do
subject { delivered_to_account_id ? described_class.new(json, sender, delivered_to_account_id: delivered_to_account_id) : described_class.new(json, sender) }
let(:sender_software) { 'mastodon' }
- let(:custom_before) { false }
let(:active_friend) { false }
let(:delivered_to_account_id) { nil }
before do
Fabricate(:instance_info, domain: 'example.com', software: sender_software)
Fabricate(:friend_domain, domain: 'example.com', active_state: :accepted) if active_friend
- subject.perform unless custom_before
end
context 'when object publication date is below ISO8601 range' do
@@ -193,6 +191,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status with a valid creation date', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -213,6 +213,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status with a valid creation date', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -234,6 +236,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status with appropriate creation and edition dates', :aggregate_failures do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -257,17 +261,13 @@ RSpec.describe ActivityPub::Activity::Create do
}
end
- it 'creates status' do
+ it 'creates status and does not mark it as edited' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.text).to eq 'Lorem ipsum'
- end
-
- it 'does not mark status as edited' do
- status = sender.statuses.first
-
- expect(status).to_not be_nil
expect(status.edited?).to be false
end
end
@@ -282,7 +282,7 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'does not create a status' do
- expect(sender.statuses.count).to be_zero
+ expect { subject.perform }.to_not change(sender.statuses, :count)
end
end
@@ -296,6 +296,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -303,6 +305,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'missing to/cc defaults to direct privacy' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -321,6 +325,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -339,6 +345,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -357,6 +365,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -375,6 +385,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -393,6 +405,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -411,6 +425,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -430,6 +446,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -450,6 +468,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:active_friend) { true }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -468,6 +488,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -490,6 +512,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -509,16 +533,14 @@ RSpec.describe ActivityPub::Activity::Create do
}
end
- it 'creates status' do
+ it 'creates status with a silent mention' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.visibility).to eq 'limited'
expect(status.limited_scope).to eq 'none'
- end
-
- it 'creates silent mention' do
- status = sender.statuses.first
expect(status.mentions.first).to be_silent
end
end
@@ -537,6 +559,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -559,6 +583,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -584,6 +610,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -605,6 +633,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with explicit public address' do
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -616,6 +646,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'as:Public' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -627,6 +659,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'Public' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -638,6 +672,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { ['http://example.com/followers', 'kmyblue:LocalPublic'] }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -650,6 +686,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:active_friend) { true }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -661,6 +699,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'http://example.com/followers' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -672,6 +712,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'https://example.com/actor' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -683,6 +725,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { '' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -694,6 +738,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'ohagi' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -705,6 +751,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { nil }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -716,6 +764,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -730,6 +780,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_all_users' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -741,6 +793,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_followers_only' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -752,6 +806,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_reacted_users_only' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -763,6 +819,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '#searchable_by_nobody' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -774,6 +832,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:sender_bio) { '' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -797,6 +857,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'without specify searchability from misskey' do
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -808,6 +870,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:to) { 'http://example.com/followers' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -830,6 +894,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -841,6 +907,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -862,6 +930,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -890,6 +960,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -912,6 +984,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -921,10 +995,8 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_reply_exclude_followers: true)
recipient.follow!(sender) if follow
- subject.perform
end
- let(:custom_before) { true }
let(:follow) { false }
let(:recipient) { Fabricate(:account) }
@@ -946,6 +1018,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:follow) { true }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -954,6 +1028,8 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when not follower' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
status = sender.statuses.first
expect(status).to be_nil
@@ -972,6 +1048,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -981,14 +1059,11 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when existing' do
- let(:custom_before) { true }
let!(:existing) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/invalid') }
- before do
- subject.perform
- end
-
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1010,6 +1085,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1032,6 +1109,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:existing) { Fabricate(:conversation, id: 3500) }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1042,8 +1121,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'with a context as a reply' do
- let(:custom_before) { true }
- let(:custom_before_sub) { false }
let(:ancestor_account) { Fabricate(:account, domain: 'or.example.com', inbox_url: 'http://or.example.com/actor/inbox') }
let(:mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/bob', inbox_url: 'http://example.com/bob/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
let(:local_mentioned_account) { Fabricate(:account, domain: nil) }
@@ -1081,11 +1158,11 @@ RSpec.describe ActivityPub::Activity::Create do
stub_request(:post, 'http://or.example.com/actor/inbox').to_return(status: 200)
stub_request(:post, 'http://example.com/bob/inbox').to_return(status: 200)
-
- subject.perform unless custom_before_sub
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1095,13 +1172,13 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
end
context 'when new mention is added' do
- let(:custom_before_sub) { true }
-
let(:new_mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/alice', inbox_url: 'http://example.com/alice/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
let(:new_local_mentioned_account) { Fabricate(:account, domain: nil) }
@@ -1127,10 +1204,11 @@ RSpec.describe ActivityPub::Activity::Create do
before do
stub_request(:post, 'http://example.com/alice/inbox').to_return(status: 200)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1138,6 +1216,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
expect(a_request(:post, 'http://example.com/alice/inbox')).to have_been_made.once
@@ -1145,8 +1225,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when unknown mentioned account' do
- let(:custom_before_sub) { true }
-
let(:actor_json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
@@ -1180,10 +1258,11 @@ RSpec.describe ActivityPub::Activity::Create do
stub_request(:get, 'https://foo.test/.well-known/webfinger?resource=acct:actor@foo.test').to_return(status: 200, body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
stub_request(:post, 'https://foo.test/inbox').to_return(status: 200)
stub_request(:get, 'https://foo.test/.well-known/nodeinfo').to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' })
- subject.perform
end
it 'creates status', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1191,6 +1270,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'forwards to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'https://foo.test/inbox')).to have_been_made.once
end
end
@@ -1199,6 +1280,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:conversation) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/inbox') }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1208,6 +1291,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'do not forward to observers', :inline_jobs do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to_not have_been_made
expect(a_request(:post, 'http://example.com/bob/inbox')).to_not have_been_made
end
@@ -1236,6 +1321,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status with correctly-ordered media attachments' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1262,6 +1349,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1287,6 +1376,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1312,6 +1403,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1335,6 +1428,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1357,6 +1452,42 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
+ status = sender.statuses.first
+
+ expect(status).to_not be_nil
+ expect(status.tags.map(&:name)).to include('test')
+ end
+ end
+
+ context 'with featured hashtags' do
+ let(:object_json) do
+ {
+ id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+ type: 'Note',
+ content: 'Lorem ipsum',
+ to: 'https://www.w3.org/ns/activitystreams#Public',
+ tag: [
+ {
+ type: 'Hashtag',
+ href: 'http://example.com/blah',
+ name: '#test',
+ },
+ ],
+ }
+ end
+
+ before do
+ sender.featured_tags.create!(name: 'test')
+ end
+
+ it 'creates status and updates featured tag' do
+ expect { subject.perform }
+ .to change(sender.statuses, :count).by(1)
+ .and change { sender.featured_tags.first.reload.statuses_count }.by(1)
+ .and change { sender.featured_tags.first.reload.last_status_at }.from(nil).to(be_within(0.1).of(Time.now.utc))
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1364,14 +1495,13 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'with domain-block' do
- let(:custom_before) { true }
-
before do
Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_hashtag: true)
- subject.perform
end
it 'does not create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1396,6 +1526,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1418,6 +1550,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1442,6 +1576,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1468,6 +1604,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1493,6 +1631,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1514,6 +1654,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -1544,13 +1686,13 @@ RSpec.describe ActivityPub::Activity::Create do
}
end
- it 'creates status' do
+ it 'creates status with a poll' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.poll).to_not be_nil
- end
- it 'creates a poll' do
poll = sender.polls.first
expect(poll).to_not be_nil
expect(poll.status).to_not be_nil
@@ -1573,6 +1715,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'adds a vote to the poll with correct uri' do
+ expect { subject.perform }.to change(poll.votes, :count).by(1)
+
vote = poll.votes.first
expect(vote).to_not be_nil
expect(vote.uri).to eq object_json[:id]
@@ -1580,15 +1724,14 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng rule is existing' do
- let(:custom_before) { true }
-
context 'when ng rule is match' do
before do
Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['vote'])
- subject.perform
end
it 'does not create a reblog by sender of status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(poll.votes.first).to be_nil
end
end
@@ -1596,10 +1739,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when ng rule is not match' do
before do
Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['vote'])
- subject.perform
end
it 'creates a reblog by sender of status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(poll.votes.first).to_not be_nil
end
end
@@ -1608,9 +1752,9 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when a vote to an expired local poll' do
let(:poll) do
- poll = Fabricate.build(:poll, options: %w(Yellow Blue), expires_at: 1.day.ago)
- poll.save(validate: false)
- poll
+ travel_to 2.days.ago do
+ Fabricate(:poll, options: %w(Yellow Blue), expires_at: 1.day.from_now)
+ end
end
let!(:local_status) { Fabricate(:status, poll: poll) }
@@ -1624,6 +1768,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'does not add a vote to the poll' do
+ expect { subject.perform }.to_not change(poll.votes, :count)
+
expect(poll.votes.first).to be_nil
end
end
@@ -1653,6 +1799,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1675,6 +1823,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1704,6 +1854,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1739,6 +1891,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1761,6 +1915,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1780,6 +1936,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1800,6 +1958,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1821,6 +1981,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'create status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -1829,8 +1991,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng word is set' do
- let(:custom_before) { true }
- let(:custom_before_sub) { false }
let(:content) { 'Lorem ipsum' }
let(:ng_word) { 'hello' }
let(:ng_word_for_stranger_mention) { 'ohagi' }
@@ -1846,13 +2006,14 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:ng_word, keyword: ng_word, stranger: false)
Fabricate(:ng_word, keyword: ng_word_for_stranger_mention, stranger: true)
- subject.perform unless custom_before_sub
end
context 'when not contains ng words' do
let(:content) { 'ohagi, world! OH GOOD' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -1861,10 +2022,14 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'hello, world!' }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
it 'records history' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
history = NgwordHistory.find_by(uri: object_json[:id])
expect(history).to_not be_nil
expect(history.status_blocked?).to be true
@@ -1884,6 +2049,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
@@ -1910,6 +2077,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'among us' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -1918,27 +2087,28 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'oh, ohagi!' }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with using ng words for stranger but receiver is following him' do
let(:content) { 'oh, ohagi!' }
- let(:custom_before_sub) { true }
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
context 'with using ng words for stranger but multiple receivers are partically following him' do
let(:content) { 'oh, ohagi' }
- let(:custom_before_sub) { true }
let(:object_json) do
{
@@ -1961,10 +2131,11 @@ RSpec.describe ActivityPub::Activity::Create do
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
@@ -1986,19 +2157,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with a simple case' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with following' do
- let(:custom_before_sub) { true }
-
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -2030,19 +2202,20 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with a simple case' do
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
end
end
context 'with following' do
- let(:custom_before_sub) { true }
-
before do
recipient.follow!(sender)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
end
end
@@ -2050,7 +2223,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when ng rule is set' do
- let(:custom_before) { true }
let(:content) { 'Lorem ipsum GOOD LINK' }
let(:object_json) do
{
@@ -2064,10 +2236,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when rule hits' do
before do
Fabricate(:ng_rule, status_text: 'ipsum', status_allow_follower_mention: false)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
status = sender.statuses.first
expect(status).to be_nil
end
@@ -2076,10 +2249,11 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when rule does not hit' do
before do
Fabricate(:ng_rule, status_text: 'amely', status_allow_follower_mention: false)
- subject.perform
end
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
end
@@ -2087,7 +2261,6 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'when sensitive word is set' do
- let(:custom_before) { true }
let(:content) { 'Lorem ipsum' }
let(:sensitive_words_all) { 'hello' }
let(:object_json) do
@@ -2102,11 +2275,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Fabricate(:sensitive_word, keyword: sensitive_words_all, remote: true, spoiler: false) if sensitive_words_all.present?
Fabricate(:sensitive_word, keyword: 'ipsum')
- subject.perform
end
context 'when not contains sensitive words' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -2118,6 +2292,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:content) { 'hello world' }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status).to_not be_nil
@@ -2128,7 +2304,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when hashtags limit is set' do
let(:post_hash_tags_max) { 2 }
- let(:custom_before) { true }
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
@@ -2152,11 +2327,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Form::AdminSettings.new(post_hash_tags_max: post_hash_tags_max).save
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2168,6 +2344,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_hash_tags_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2183,7 +2361,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when mentions limit is set' do
let(:post_mentions_max) { 3 }
let(:post_stranger_mentions_max) { 0 }
- let(:custom_before) { true }
let(:mention_recipient_alice) { Fabricate(:account) }
let(:mention_recipient_bob) { Fabricate(:account) }
let(:mention_recipient_ohagi) { Fabricate(:account) }
@@ -2217,12 +2394,12 @@ RSpec.describe ActivityPub::Activity::Create do
mention_recipient_alice.follow!(sender)
mention_recipient_bob.follow!(sender)
mention_recipient_ohagi.follow!(sender) if mention_recipient_ohagi_follow
-
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2234,6 +2411,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2248,6 +2427,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_stranger_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2260,6 +2441,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:mention_recipient_ohagi_follow) { false }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2273,7 +2456,6 @@ RSpec.describe ActivityPub::Activity::Create do
context 'when mentions limit for stranger is set' do
let(:post_stranger_mentions_max) { 2 }
- let(:custom_before) { true }
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
@@ -2295,11 +2477,12 @@ RSpec.describe ActivityPub::Activity::Create do
before do
Form::AdminSettings.new(post_stranger_mentions_max: post_stranger_mentions_max).save
- subject.perform
end
context 'when limit is enough' do
it 'creates status' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
expect(sender.statuses.first).to_not be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2311,6 +2494,8 @@ RSpec.describe ActivityPub::Activity::Create do
let(:post_stranger_mentions_max) { 1 }
it 'creates status' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
expect(sender.statuses.first).to be_nil
history = NgwordHistory.find_by(uri: object_json[:id])
@@ -2342,6 +2527,8 @@ RSpec.describe ActivityPub::Activity::Create do
end
it 'uses the counts from the created object' do
+ expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
status = sender.statuses.first
expect(status.untrusted_favourites_count).to eq 50
expect(status.untrusted_reblogs_count).to eq 100
@@ -2407,16 +2594,18 @@ RSpec.describe ActivityPub::Activity::Create do
before do
sender.update(suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
- subject.perform
end
it 'does not create a status' do
- status = sender.statuses.first
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+ status = sender.statuses.first
expect(status).to be_nil
end
it 'pending data is created' do
+ expect { subject.perform }.to_not change(sender.statuses, :count)
+
pending = PendingStatus.find_by(account: sender)
expect(pending).to_not be_nil
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 0a128355b5..533aa2e624 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -3,6 +3,17 @@
require 'rails_helper'
RSpec.describe UserMailer do
+ shared_examples 'delivery to memorialized user' do
+ context 'when the account is memorialized' do
+ before { receiver.account.update(memorial: true) }
+
+ it 'does not deliver mail' do
+ emails = capture_emails { mail.deliver_now }
+ expect(emails).to be_empty
+ end
+ end
+ end
+
let(:receiver) { Fabricate(:user) }
describe '#confirmation_instructions' do
@@ -21,6 +32,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.confirmation_instructions.subject',
instance: Rails.configuration.x.local_domain
+ include_examples 'delivery to memorialized user'
end
describe '#reconfirmation_instructions' do
@@ -39,6 +51,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.confirmation_instructions.subject',
instance: Rails.configuration.x.local_domain
+ include_examples 'delivery to memorialized user'
end
describe '#reset_password_instructions' do
@@ -55,6 +68,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.reset_password_instructions.subject'
+ include_examples 'delivery to memorialized user'
end
describe '#password_change' do
@@ -70,6 +84,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.password_change.subject'
+ include_examples 'delivery to memorialized user'
end
describe '#email_changed' do
@@ -85,6 +100,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.email_changed.subject'
+ include_examples 'delivery to memorialized user'
end
describe '#warning' do
@@ -115,6 +131,7 @@ RSpec.describe UserMailer do
include_examples 'localized subject',
'devise.mailer.webauthn_credential.deleted.subject'
+ include_examples 'delivery to memorialized user'
end
describe '#suspicious_sign_in' do
@@ -186,6 +203,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.two_factor_enabled.subject')))
.and(have_body_text(I18n.t('devise.mailer.two_factor_enabled.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#two_factor_disabled' do
@@ -197,6 +216,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.two_factor_disabled.subject')))
.and(have_body_text(I18n.t('devise.mailer.two_factor_disabled.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#webauthn_enabled' do
@@ -208,6 +229,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.webauthn_enabled.subject')))
.and(have_body_text(I18n.t('devise.mailer.webauthn_enabled.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#webauthn_disabled' do
@@ -219,6 +242,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.webauthn_disabled.subject')))
.and(have_body_text(I18n.t('devise.mailer.webauthn_disabled.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#two_factor_recovery_codes_changed' do
@@ -230,6 +255,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')))
.and(have_body_text(I18n.t('devise.mailer.two_factor_recovery_codes_changed.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#webauthn_credential_added' do
@@ -242,6 +269,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('devise.mailer.webauthn_credential.added.subject')))
.and(have_body_text(I18n.t('devise.mailer.webauthn_credential.added.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#welcome' do
@@ -259,6 +288,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('user_mailer.welcome.subject')))
.and(have_body_text(I18n.t('user_mailer.welcome.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#backup_ready' do
@@ -271,6 +302,8 @@ RSpec.describe UserMailer do
.and(have_subject(I18n.t('user_mailer.backup_ready.subject')))
.and(have_body_text(I18n.t('user_mailer.backup_ready.explanation')))
end
+
+ include_examples 'delivery to memorialized user'
end
describe '#terms_of_service_changed' do
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index 9bbbefa08e..548e1105a1 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -129,8 +129,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) }
it 'records the given id' do
- account_statuses_cleanup_policy.record_last_inspected(42)
- expect(account_statuses_cleanup_policy.last_inspected).to eq 42
+ expect { account_statuses_cleanup_policy.record_last_inspected(42) }
+ .to change(account_statuses_cleanup_policy, :last_inspected).from(nil).to(42)
end
end
@@ -153,8 +153,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'does not change the recorded id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 42
+ expect { subject }
+ .to_not change(account_statuses_cleanup_policy, :last_inspected).from(42)
end
end
@@ -164,8 +164,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'records the older id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 10
+ expect { subject }
+ .to change(account_statuses_cleanup_policy, :last_inspected).from(42).to(10)
end
end
end
@@ -179,8 +179,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'does not change the recorded id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 42
+ expect { subject }
+ .to_not change(account_statuses_cleanup_policy, :last_inspected).from(42)
end
end
@@ -190,8 +190,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'records the older id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 10
+ expect { subject }
+ .to change(account_statuses_cleanup_policy, :last_inspected).from(42).to(10)
end
end
end
@@ -205,8 +205,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'does not change the recorded id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 42
+ expect { subject }
+ .to_not change(account_statuses_cleanup_policy, :last_inspected).from(42)
end
end
@@ -216,8 +216,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
end
it 'records the older id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 10
+ expect { subject }
+ .to change(account_statuses_cleanup_policy, :last_inspected).from(42).to(10)
end
end
end
@@ -227,8 +227,8 @@ RSpec.describe AccountStatusesCleanupPolicy do
let(:status) { Fabricate(:status, account: account) }
it 'does not change the recorded id' do
- subject
- expect(account_statuses_cleanup_policy.last_inspected).to eq 42
+ expect { subject }
+ .to_not change(account_statuses_cleanup_policy, :last_inspected).from(42)
end
end
end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 517cc4f6ae..168cbb7c91 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -3,6 +3,8 @@
require 'rails_helper'
RSpec.describe CustomFilter do
+ include_examples 'Expireable'
+
describe 'Validations' do
it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:context) }
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 4ad589f2c7..e85885a8d8 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -3,6 +3,8 @@
require 'rails_helper'
RSpec.describe Invite do
+ include_examples 'Expireable'
+
describe '#valid_for_use?' do
it 'returns true when there are no limitations' do
invite = Fabricate(:invite, max_uses: nil, expires_at: nil)
diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
index b85856780a..93ee72423b 100644
--- a/spec/models/ip_block_spec.rb
+++ b/spec/models/ip_block_spec.rb
@@ -3,6 +3,8 @@
require 'rails_helper'
RSpec.describe IpBlock do
+ include_examples 'Expireable'
+
describe 'Validations' do
subject { Fabricate.build :ip_block }
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index cce4b30479..5f91ae0967 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe MediaAttachment, :attachment_processing do
media.destroy
end
- it 'saves metadata and generates styles' do
+ it 'saves media attachment with correct file and size metadata' do
expect(media)
.to be_persisted
.and be_processing_complete
@@ -98,28 +98,18 @@ RSpec.describe MediaAttachment, :attachment_processing do
file: be_present,
type: eq('image'),
file_content_type: eq(content_type),
- file_file_name: end_with(extension),
- blurhash: have_attributes(size: eq(36))
+ file_file_name: end_with(extension)
)
+ # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
+ expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
+
# Strip original file name
expect(media.file_file_name)
.to_not start_with '600x400'
- # Generate styles
- expect(FastImage.size(media.file.path(:original)))
- .to eq [600, 400]
- expect(FastImage.size(media.file.path(:small)))
- .to eq [588, 392]
-
- # Use extension recognized by Rack::Mime (used by PublicFileServerMiddleware)
- expect(media.file.path(:original))
- .to end_with(extension)
- expect(media.file.path(:small))
- .to end_with(extension)
-
# Set meta for original and thumbnail
- expect(media_metadata)
+ expect(media.file.meta.deep_symbolize_keys)
.to include(
original: include(
width: eq(600),
@@ -132,60 +122,6 @@ RSpec.describe MediaAttachment, :attachment_processing do
aspect: eq(1.5)
)
)
-
- # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
- expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
- end
- end
-
- shared_examples 'animated 600x400 image' do
- after do
- media.destroy
- end
-
- it 'saves metadata and generates styles' do
- expect(media)
- .to be_persisted
- .and be_processing_complete
- .and have_attributes(
- file: be_present,
- type: eq('gifv'),
- file_content_type: eq('video/mp4'),
- file_file_name: end_with('.mp4'),
- blurhash: have_attributes(size: eq(36))
- )
-
- # Strip original file name
- expect(media.file_file_name)
- .to_not start_with '600x400'
-
- # Transcode to MP4
- expect(media.file.path(:original))
- .to end_with('.mp4')
-
- # Generate static thumbnail
- expect(FastImage.size(media.file.path(:small)))
- .to eq [600, 400]
- expect(FastImage.animated?(media.file.path(:small)))
- .to be false
- expect(media.file.path(:small))
- .to end_with('.png')
-
- # Set meta for styles
- expect(media_metadata)
- .to include(
- original: include(
- width: eq(600),
- height: eq(400),
- duration: eq(3),
- frame_rate: '1/1'
- ),
- small: include(
- width: eq(600),
- height: eq(400),
- aspect: eq(1.5)
- )
- )
end
end
@@ -201,10 +137,10 @@ RSpec.describe MediaAttachment, :attachment_processing do
it_behaves_like 'static 600x400 image', 'image/png', '.png'
end
- describe 'gif' do
- let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.gif')) }
+ describe 'monochrome jpg' do
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('monochrome.png')) }
- it_behaves_like 'static 600x400 image', 'image/gif', '.gif'
+ it_behaves_like 'static 600x400 image', 'image/png', '.png'
end
describe 'webp' do
@@ -225,12 +161,6 @@ RSpec.describe MediaAttachment, :attachment_processing do
it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
end
- describe 'monochrome jpg' do
- let(:media) { Fabricate(:media_attachment, file: attachment_fixture('monochrome.png')) }
-
- it_behaves_like 'static 600x400 image', 'image/png', '.png'
- end
-
describe 'base64-encoded image' do
let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('600x400.jpeg').read)}" }
let(:media) { Fabricate(:media_attachment, file: base64_attachment) }
@@ -239,15 +169,51 @@ RSpec.describe MediaAttachment, :attachment_processing do
end
describe 'animated gif' do
- let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400-animated.gif')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('avatar.gif')) }
- it_behaves_like 'animated 600x400 image'
+ it 'sets correct file metadata' do
+ expect(media)
+ .to have_attributes(
+ type: eq('gifv'),
+ file_content_type: eq('video/mp4')
+ )
+ expect(media_metadata)
+ .to include(
+ original: include(
+ width: eq(128),
+ height: eq(128)
+ )
+ )
+ end
end
- describe 'animated png' do
- let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400-animated.png')) }
+ describe 'static gif' do
+ fixtures = [
+ { filename: 'attachment.gif', width: 600, height: 400, aspect: 1.5 },
+ { filename: 'mini-static.gif', width: 32, height: 32, aspect: 1.0 },
+ ]
- it_behaves_like 'animated 600x400 image'
+ fixtures.each do |fixture|
+ context fixture[:filename] do
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture(fixture[:filename])) }
+
+ it 'sets correct file metadata' do
+ expect(media)
+ .to have_attributes(
+ type: eq('image'),
+ file_content_type: eq('image/gif')
+ )
+ expect(media_metadata)
+ .to include(
+ original: include(
+ width: eq(fixture[:width]),
+ height: eq(fixture[:height]),
+ aspect: eq(fixture[:aspect])
+ )
+ )
+ end
+ end
+ end
end
describe 'ogg with cover art' do
diff --git a/spec/models/mute_spec.rb b/spec/models/mute_spec.rb
new file mode 100644
index 0000000000..33aa4f15dc
--- /dev/null
+++ b/spec/models/mute_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Mute do
+ include_examples 'Expireable'
+
+ describe 'Associations' do
+ it { is_expected.to belong_to(:account).required }
+ it { is_expected.to belong_to(:target_account).required }
+ end
+
+ describe 'Validations' do
+ subject { Fabricate.build :mute }
+
+ it { is_expected.to validate_uniqueness_of(:account_id).scoped_to(:target_account_id) }
+ end
+end
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index 66f521ab3f..3288119546 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -3,32 +3,7 @@
require 'rails_helper'
RSpec.describe Poll do
- describe 'Scopes' do
- let(:status) { Fabricate(:status) }
- let(:attached_poll) { Fabricate(:poll, status: status) }
- let(:not_attached_poll) do
- Fabricate(:poll).tap do |poll|
- poll.status = nil
- poll.save(validate: false)
- end
- end
-
- describe '.attached' do
- it 'finds the correct records' do
- results = described_class.attached
-
- expect(results).to eq([attached_poll])
- end
- end
-
- describe '.unattached' do
- it 'finds the correct records' do
- results = described_class.unattached
-
- expect(results).to eq([not_attached_poll])
- end
- end
- end
+ include_examples 'Expireable'
describe '#reset_votes!' do
let(:poll) { Fabricate :poll, cached_tallies: [2, 3], votes_count: 5, voters_count: 5 }
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index ecea6aee43..6cc5896786 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -18,6 +18,14 @@ RSpec.describe UserRole do
end
end
+ describe 'position' do
+ subject { Fabricate.build :user_role }
+
+ let(:limit) { described_class::POSITION_LIMIT }
+
+ it { is_expected.to validate_numericality_of(:position).is_in(-limit..limit) }
+ end
+
describe 'color' do
it { is_expected.to allow_values('#112233', '#aabbcc', '').for(:color) }
it { is_expected.to_not allow_values('x', '112233445566', '#xxyyzz').for(:color) }
diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index 3340e26b98..d7d0b92f11 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -137,7 +137,7 @@ RSpec.describe 'Media' do
end
context 'with image/gif', :attachment_processing do
- let(:params) { { file: fixture_file_upload('600x400.gif', 'image/gif') } }
+ let(:params) { { file: fixture_file_upload('attachment.gif', 'image/gif') } }
it_behaves_like 'a successful media upload', 'image'
end
diff --git a/spec/requests/filters_spec.rb b/spec/requests/filters_spec.rb
new file mode 100644
index 0000000000..a7b2eddc1b
--- /dev/null
+++ b/spec/requests/filters_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Filters' do
+ describe 'GET /filters' do
+ context 'with signed out user' do
+ it 'redirects to sign in page' do
+ get filters_path
+
+ expect(response)
+ .to redirect_to(new_user_session_path)
+ end
+ end
+ end
+end
diff --git a/spec/requests/statuses/activity_spec.rb b/spec/requests/statuses/activity_spec.rb
new file mode 100644
index 0000000000..20837a63a6
--- /dev/null
+++ b/spec/requests/statuses/activity_spec.rb
@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Status Activity' do
+ describe 'GET /users/:account_username/statuses/:id/activity' do
+ let(:account) { Fabricate(:account) }
+ let(:status) { Fabricate(:status, account: account) }
+
+ context 'when signed out' do
+ subject { get activity_account_status_path(account.username, status) }
+
+ context 'when account is permanently suspended' do
+ before do
+ account.suspend!
+ account.deletion_request.destroy
+ end
+
+ it 'returns http gone' do
+ subject
+
+ expect(response)
+ .to have_http_status(410)
+ end
+ end
+
+ context 'when account is temporarily suspended' do
+ before { account.suspend! }
+
+ it 'returns http forbidden' do
+ subject
+
+ expect(response)
+ .to have_http_status(403)
+ end
+ end
+
+ context 'when status is public' do
+ before { status.update(visibility: :public) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(:success)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when status is private' do
+ before { status.update(visibility: :private) }
+
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+
+ context 'when status is direct' do
+ before { status.update(visibility: :direct) }
+
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when signed in' do
+ subject { get activity_account_status_path(account.username, status) }
+
+ let(:user) { Fabricate(:user) }
+
+ before { sign_in(user) }
+
+ context 'when status is public' do
+ before { status.update(visibility: :public) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(:success)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when status is private' do
+ before { status.update(visibility: :private) }
+
+ context 'when user is authorized to see it' do
+ before { user.account.follow!(account) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when user is not authorized to see it' do
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when status is direct' do
+ before { status.update(visibility: :direct) }
+
+ context 'when user is authorized to see it' do
+ before { Fabricate(:mention, account: user.account, status: status) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when user is not authorized to see it' do
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+ end
+
+ context 'with signature' do
+ subject { get activity_account_status_path(account.username, status), headers: nil, sign_with: remote_account }
+
+ let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+
+ context 'when status is public' do
+ before { status.update(visibility: :public) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(:success)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when status is private' do
+ before { status.update(visibility: :private) }
+
+ context 'when user is authorized to see it' do
+ before { remote_account.follow!(account) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when user is not authorized to see it' do
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when status is direct' do
+ before { status.update(visibility: :direct) }
+
+ context 'when user is authorized to see it' do
+ before { Fabricate(:mention, account: remote_account, status: status) }
+
+ it 'returns http success' do
+ subject
+
+ expect(response)
+ .to have_http_status(200)
+ expect(response.content_type)
+ .to start_with('application/activity+json')
+ end
+ end
+
+ context 'when user is not authorized to see it' do
+ it 'returns http not_found' do
+ subject
+
+ expect(response)
+ .to have_http_status(404)
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/serializers/activitypub/accept_follow_serializer_spec.rb b/spec/serializers/activitypub/accept_follow_serializer_spec.rb
new file mode 100644
index 0000000000..0639e64b9d
--- /dev/null
+++ b/spec/serializers/activitypub/accept_follow_serializer_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::AcceptFollowSerializer do
+ subject { serialized_record_json(record, described_class, adapter: ActivityPub::Adapter) }
+
+ describe 'serializing an object' do
+ let(:record) { Fabricate :follow_request }
+
+ it 'returns expected attributes' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ actor: eq(ActivityPub::TagManager.instance.uri_for(record.target_account)),
+ id: match("#accepts/follows/#{record.id}"),
+ object: include(type: 'Follow'),
+ type: 'Accept'
+ )
+ end
+ end
+end
diff --git a/spec/serializers/activitypub/reject_follow_serializer_spec.rb b/spec/serializers/activitypub/reject_follow_serializer_spec.rb
new file mode 100644
index 0000000000..10d8749178
--- /dev/null
+++ b/spec/serializers/activitypub/reject_follow_serializer_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::RejectFollowSerializer do
+ subject { serialized_record_json(record, described_class, adapter: ActivityPub::Adapter) }
+
+ describe 'serializing an object' do
+ let(:record) { Fabricate :follow_request }
+
+ it 'returns expected attributes' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ actor: eq(ActivityPub::TagManager.instance.uri_for(record.target_account)),
+ id: match("#rejects/follows/#{record.id}"),
+ object: include(type: 'Follow'),
+ type: 'Reject'
+ )
+ end
+ end
+end
diff --git a/spec/serializers/rest/account_relationship_severance_event_serializer_spec.rb b/spec/serializers/rest/account_relationship_severance_event_serializer_spec.rb
index a69e1c2776..909fde39b3 100644
--- a/spec/serializers/rest/account_relationship_severance_event_serializer_spec.rb
+++ b/spec/serializers/rest/account_relationship_severance_event_serializer_spec.rb
@@ -11,14 +11,9 @@ RSpec.describe REST::AccountRelationshipSeveranceEventSerializer do
it 'returns expected values' do
expect(subject)
.to include(
- 'id' => be_a(String).and(eq('123'))
+ 'id' => be_a(String).and(eq('123')),
+ 'created_at' => match_api_datetime_format
)
end
end
-
- context 'when created_at is populated' do
- it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
- end
- end
end
diff --git a/spec/serializers/rest/account_serializer/field_serializer_spec.rb b/spec/serializers/rest/account_serializer/field_serializer_spec.rb
index 57f2b529c5..6d97fa573e 100644
--- a/spec/serializers/rest/account_serializer/field_serializer_spec.rb
+++ b/spec/serializers/rest/account_serializer/field_serializer_spec.rb
@@ -6,14 +6,16 @@ RSpec.describe REST::AccountSerializer::FieldSerializer do
subject { serialized_record_json(field, described_class) }
let(:default_datetime) { DateTime.new(2024, 11, 28, 16, 20, 0) }
- let(:user) { Fabricate(:user) }
- let(:account) { user.account }
+ let(:account) { Fabricate.build :account }
context 'when verified_at is populated' do
let(:field) { Account::Field.new(account, 'name' => 'Foo', 'value' => 'Bar', 'verified_at' => default_datetime) }
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['verified_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'verified_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/account_serializer_spec.rb b/spec/serializers/rest/account_serializer_spec.rb
index 37c6a776b0..5fd4f8d706 100644
--- a/spec/serializers/rest/account_serializer_spec.rb
+++ b/spec/serializers/rest/account_serializer_spec.rb
@@ -52,7 +52,10 @@ RSpec.describe REST::AccountSerializer do
end
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
diff --git a/spec/serializers/rest/account_warning_serializer_spec.rb b/spec/serializers/rest/account_warning_serializer_spec.rb
index ea2e48fbb4..a7a9dc5f63 100644
--- a/spec/serializers/rest/account_warning_serializer_spec.rb
+++ b/spec/serializers/rest/account_warning_serializer_spec.rb
@@ -12,9 +12,9 @@ RSpec.describe REST::AccountWarningSerializer do
expect(subject)
.to include(
'id' => be_a(String).and(eq('123')),
- 'status_ids' => be_a(Array).and(eq(['456', '789']))
+ 'status_ids' => be_a(Array).and(eq(['456', '789'])),
+ 'created_at' => match_api_datetime_format
)
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
end
end
end
diff --git a/spec/serializers/rest/admin/account_serializer_spec.rb b/spec/serializers/rest/admin/account_serializer_spec.rb
index ac7cec0bae..5f617207a7 100644
--- a/spec/serializers/rest/admin/account_serializer_spec.rb
+++ b/spec/serializers/rest/admin/account_serializer_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe REST::Admin::AccountSerializer do
let(:record) { Fabricate :account, user: Fabricate(:user) }
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
diff --git a/spec/serializers/rest/admin/cohort_serializer_spec.rb b/spec/serializers/rest/admin/cohort_serializer_spec.rb
index a2bd8fbfa2..1305f901bb 100644
--- a/spec/serializers/rest/admin/cohort_serializer_spec.rb
+++ b/spec/serializers/rest/admin/cohort_serializer_spec.rb
@@ -11,11 +11,11 @@ RSpec.describe REST::Admin::CohortSerializer do
it 'returns expected values' do
expect(subject)
.to include(
- 'data' => be_a(Array),
- 'period' => /2024-01-01/
+ 'data' => be_a(Array).and(
+ all(include('date' => match_api_datetime_format))
+ ),
+ 'period' => match(/2024-01-01/).and(match_api_datetime_format)
)
- expect { DateTime.rfc3339(subject['period']) }.to_not raise_error
- subject['data'].each { |datum| expect { DateTime.rfc3339(datum['date']) }.to_not raise_error }
end
end
end
diff --git a/spec/serializers/rest/admin/domain_allow_serializer_spec.rb b/spec/serializers/rest/admin/domain_allow_serializer_spec.rb
index 39c013d31c..ace35176a7 100644
--- a/spec/serializers/rest/admin/domain_allow_serializer_spec.rb
+++ b/spec/serializers/rest/admin/domain_allow_serializer_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe REST::Admin::DomainAllowSerializer do
context 'when created_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/domain_block_serializer_spec.rb b/spec/serializers/rest/admin/domain_block_serializer_spec.rb
index 5ab3ddc169..37d658b1f7 100644
--- a/spec/serializers/rest/admin/domain_block_serializer_spec.rb
+++ b/spec/serializers/rest/admin/domain_block_serializer_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe REST::Admin::DomainBlockSerializer do
context 'when created_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/email_domain_block_serializer_spec.rb b/spec/serializers/rest/admin/email_domain_block_serializer_spec.rb
index 2a1501a158..e146040e24 100644
--- a/spec/serializers/rest/admin/email_domain_block_serializer_spec.rb
+++ b/spec/serializers/rest/admin/email_domain_block_serializer_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe REST::Admin::EmailDomainBlockSerializer do
context 'when created_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/ip_block_serializer_spec.rb b/spec/serializers/rest/admin/ip_block_serializer_spec.rb
index c1239b5057..8a68161fc2 100644
--- a/spec/serializers/rest/admin/ip_block_serializer_spec.rb
+++ b/spec/serializers/rest/admin/ip_block_serializer_spec.rb
@@ -5,19 +5,15 @@ require 'rails_helper'
RSpec.describe REST::Admin::IpBlockSerializer do
subject { serialized_record_json(record, described_class) }
- let(:record) { Fabricate(:ip_block) }
-
- context 'when created_at is populated' do
- it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
- end
- end
-
- context 'when expires_at is populated' do
+ context 'when timestamps are populated' do
let(:record) { Fabricate(:ip_block, expires_at: DateTime.new(2024, 11, 28, 16, 20, 0)) }
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['expires_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format,
+ 'expires_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/ip_serializer_spec.rb b/spec/serializers/rest/admin/ip_serializer_spec.rb
index f93eada759..5aabf74756 100644
--- a/spec/serializers/rest/admin/ip_serializer_spec.rb
+++ b/spec/serializers/rest/admin/ip_serializer_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe REST::Admin::IpSerializer do
context 'when used_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['used_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'used_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/measure_serializer_spec.rb b/spec/serializers/rest/admin/measure_serializer_spec.rb
index 08c7170a4a..e158d9d9ba 100644
--- a/spec/serializers/rest/admin/measure_serializer_spec.rb
+++ b/spec/serializers/rest/admin/measure_serializer_spec.rb
@@ -12,7 +12,12 @@ RSpec.describe REST::Admin::MeasureSerializer do
context 'when start_at is populated' do
it 'parses as RFC 3339 datetime' do
- subject['data'].each { |datum| expect { DateTime.rfc3339(datum['date']) }.to_not raise_error }
+ expect(subject)
+ .to include(
+ 'data' => all(
+ include('date' => match_api_datetime_format)
+ )
+ )
end
end
end
diff --git a/spec/serializers/rest/admin/report_serializer_spec.rb b/spec/serializers/rest/admin/report_serializer_spec.rb
index c0f841d6bf..78d7d4f10a 100644
--- a/spec/serializers/rest/admin/report_serializer_spec.rb
+++ b/spec/serializers/rest/admin/report_serializer_spec.rb
@@ -5,23 +5,15 @@ require 'rails_helper'
RSpec.describe REST::Admin::ReportSerializer do
subject { serialized_record_json(report, described_class) }
- let(:report) { Fabricate(:report) }
-
- context 'with created_at' do
- it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
- end
- end
-
- context 'with action_taken_at' do
- let(:acting_account) { Fabricate(:account) }
-
- before do
- report.resolve!(acting_account)
- end
+ context 'with timestamps' do
+ let(:report) { Fabricate(:report, action_taken_at: 3.days.ago) }
it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['action_taken_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'action_taken_at' => match_api_datetime_format,
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/announcement_serializer_spec.rb b/spec/serializers/rest/announcement_serializer_spec.rb
index 6b746e5c2f..ee0acab981 100644
--- a/spec/serializers/rest/announcement_serializer_spec.rb
+++ b/spec/serializers/rest/announcement_serializer_spec.rb
@@ -19,10 +19,13 @@ RSpec.describe REST::AnnouncementSerializer do
context 'when date fields are populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['starts_at']) }.to_not raise_error
- expect { DateTime.rfc3339(subject['ends_at']) }.to_not raise_error
- expect { DateTime.rfc3339(subject['published_at']) }.to_not raise_error
- expect { DateTime.rfc3339(subject['updated_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'starts_at' => match_api_datetime_format,
+ 'ends_at' => match_api_datetime_format,
+ 'published_at' => match_api_datetime_format,
+ 'updated_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/annual_report_event_serializer_spec.rb b/spec/serializers/rest/annual_report_event_serializer_spec.rb
new file mode 100644
index 0000000000..b595bf3e36
--- /dev/null
+++ b/spec/serializers/rest/annual_report_event_serializer_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe REST::AnnualReportEventSerializer do
+ subject { serialized_record_json(record, described_class) }
+
+ describe 'serializing an object' do
+ let(:record) { Fabricate.build :generated_annual_report, year: 2024 }
+
+ it 'returns expected attributes' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ year: '2024'
+ )
+ end
+ end
+end
diff --git a/spec/serializers/rest/filter_serializer_spec.rb b/spec/serializers/rest/filter_serializer_spec.rb
index c2c0e1635a..4d38a29acb 100644
--- a/spec/serializers/rest/filter_serializer_spec.rb
+++ b/spec/serializers/rest/filter_serializer_spec.rb
@@ -10,11 +10,14 @@ RSpec.describe REST::FilterSerializer do
)
end
- let(:filter) { Fabricate :custom_filter, expires_at: DateTime.new(2024, 11, 28, 16, 20, 0) }
+ let(:filter) { Fabricate.build :custom_filter, expires_at: DateTime.new(2024, 11, 28, 16, 20, 0) }
context 'when expires_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['expires_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'expires_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/marker_serializer_spec.rb b/spec/serializers/rest/marker_serializer_spec.rb
index 8b8285c9e8..58266319eb 100644
--- a/spec/serializers/rest/marker_serializer_spec.rb
+++ b/spec/serializers/rest/marker_serializer_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe REST::MarkerSerializer do
context 'when updated_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['updated_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'updated_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/muted_account_serializer_spec.rb b/spec/serializers/rest/muted_account_serializer_spec.rb
index 2a6dd9fe17..2db3f7be95 100644
--- a/spec/serializers/rest/muted_account_serializer_spec.rb
+++ b/spec/serializers/rest/muted_account_serializer_spec.rb
@@ -25,7 +25,10 @@ RSpec.describe REST::MutedAccountSerializer do
end
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['mute_expires_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'mute_expires_at' => match_api_datetime_format
+ )
end
end
diff --git a/spec/serializers/rest/notification_group_serializer_spec.rb b/spec/serializers/rest/notification_group_serializer_spec.rb
index 2a1293292d..01fd8ce0a1 100644
--- a/spec/serializers/rest/notification_group_serializer_spec.rb
+++ b/spec/serializers/rest/notification_group_serializer_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe REST::NotificationGroupSerializer do
context 'when latest_page_notification_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['latest_page_notification_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'latest_page_notification_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/notification_request_serializer_spec.rb b/spec/serializers/rest/notification_request_serializer_spec.rb
index 34332679d6..6dc4b04f5c 100644
--- a/spec/serializers/rest/notification_request_serializer_spec.rb
+++ b/spec/serializers/rest/notification_request_serializer_spec.rb
@@ -17,15 +17,13 @@ RSpec.describe REST::NotificationRequestSerializer do
let(:current_user) { Fabricate(:user) }
let(:notification_request) { Fabricate :notification_request }
- context 'when created_at is populated' do
+ context 'when timestampts are populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
- end
- end
-
- context 'when updated_at is populated' do
- it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['updated_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format,
+ 'updated_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/notification_serializer_spec.rb b/spec/serializers/rest/notification_serializer_spec.rb
index 7296c1b935..b833bcb6e1 100644
--- a/spec/serializers/rest/notification_serializer_spec.rb
+++ b/spec/serializers/rest/notification_serializer_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe REST::NotificationSerializer do
context 'when created_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/poll_serializer_spec.rb b/spec/serializers/rest/poll_serializer_spec.rb
index 71ed9deb3e..3837ac1984 100644
--- a/spec/serializers/rest/poll_serializer_spec.rb
+++ b/spec/serializers/rest/poll_serializer_spec.rb
@@ -15,11 +15,14 @@ RSpec.describe REST::PollSerializer do
end
let(:current_user) { Fabricate(:user) }
- let(:poll) { Fabricate :poll }
+ let(:poll) { Fabricate.build :poll, expires_at: 5.days.from_now }
context 'when expires_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['expires_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'expires_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/report_serializer_spec.rb b/spec/serializers/rest/report_serializer_spec.rb
index 5cbeb0fee0..180cdbdb68 100644
--- a/spec/serializers/rest/report_serializer_spec.rb
+++ b/spec/serializers/rest/report_serializer_spec.rb
@@ -10,24 +10,15 @@ RSpec.describe REST::ReportSerializer do
)
end
- let(:status) { Fabricate(:status) }
- let(:report) { Fabricate(:report, status_ids: [status.id]) }
-
- context 'with created_at' do
- it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
- end
- end
-
- context 'with action_taken_at' do
- let(:acting_account) { Fabricate(:account) }
-
- before do
- report.resolve!(acting_account)
- end
+ context 'with timestamps' do
+ let(:report) { Fabricate(:report, action_taken_at: 3.days.ago) }
it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['action_taken_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format,
+ 'action_taken_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/scheduled_status_serializer_spec.rb b/spec/serializers/rest/scheduled_status_serializer_spec.rb
index 7d0d7c96bb..08ad8a6f8a 100644
--- a/spec/serializers/rest/scheduled_status_serializer_spec.rb
+++ b/spec/serializers/rest/scheduled_status_serializer_spec.rb
@@ -10,12 +10,15 @@ RSpec.describe REST::ScheduledStatusSerializer do
)
end
- let(:account) { Fabricate(:account) }
- let(:scheduled_status) { Fabricate.build(:scheduled_status, scheduled_at: 4.minutes.from_now, account: account) }
+ let(:scheduled_status) { Fabricate.build(:scheduled_status, scheduled_at: 4.minutes.from_now, params: { application_id: 123 }) }
- context 'with scheduled_at' do
- it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['scheduled_at']) }.to_not raise_error
+ describe 'serialization' do
+ it 'returns expected values and removes application_id from params' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ scheduled_at: be_a(String).and(match_api_datetime_format),
+ params: not_include(:application_id)
+ )
end
end
end
diff --git a/spec/serializers/rest/status_edit_serializer_spec.rb b/spec/serializers/rest/status_edit_serializer_spec.rb
index 1f5ac54b7b..95590d1f96 100644
--- a/spec/serializers/rest/status_edit_serializer_spec.rb
+++ b/spec/serializers/rest/status_edit_serializer_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe REST::StatusEditSerializer do
context 'when created_at is populated' do
it 'parses as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/serializers/rest/status_serializer_spec.rb b/spec/serializers/rest/status_serializer_spec.rb
index ca0591eb69..b6908aa414 100644
--- a/spec/serializers/rest/status_serializer_spec.rb
+++ b/spec/serializers/rest/status_serializer_spec.rb
@@ -54,7 +54,10 @@ RSpec.describe REST::StatusSerializer do
context 'with created_at' do
it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['created_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'created_at' => match_api_datetime_format
+ )
end
end
@@ -62,7 +65,10 @@ RSpec.describe REST::StatusSerializer do
let(:status) { Fabricate.build :status, edited_at: 3.days.ago }
it 'is serialized as RFC 3339 datetime' do
- expect { DateTime.rfc3339(subject['edited_at']) }.to_not raise_error
+ expect(subject)
+ .to include(
+ 'edited_at' => match_api_datetime_format
+ )
end
end
end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 238c49da75..63feb68570 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -262,16 +262,22 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
updated: '2021-09-08T22:39:25Z',
tag: [
{ type: 'Hashtag', name: 'foo' },
+ { type: 'Hashtag', name: 'bar' },
],
}
end
before do
- subject.call(status, json, json)
+ status.account.featured_tags.create!(name: 'bar')
+ status.account.featured_tags.create!(name: 'test')
end
- it 'updates tags' do
- expect(status.tags.reload.map(&:name)).to eq %w(foo)
+ it 'updates tags and featured tags' do
+ expect { subject.call(status, json, json) }
+ .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar))
+ .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
+ .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
+ .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_within(0.1).of(Time.now.utc))
end
end
diff --git a/spec/support/examples/models/concerns/expireable.rb b/spec/support/examples/models/concerns/expireable.rb
new file mode 100644
index 0000000000..098b98375a
--- /dev/null
+++ b/spec/support/examples/models/concerns/expireable.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'Expireable' do
+ subject { described_class.new(expires_at: expires_at) }
+
+ let(:expires_at) { nil }
+
+ describe 'Scopes' do
+ let!(:expired_record) do
+ travel_to 2.days.ago do
+ Fabricate factory_name, expires_at: 1.day.from_now
+ end
+ end
+ let!(:un_expired_record) { Fabricate factory_name, expires_at: 10.days.from_now }
+
+ describe '.expired' do
+ it 'returns expired records' do
+ expect(described_class.expired)
+ .to include(expired_record)
+ .and not_include(un_expired_record)
+ end
+ end
+ end
+
+ describe '#expires_in' do
+ context 'when expires at is nil' do
+ let(:expires_at) { nil }
+
+ it 'returns nil' do
+ expect(subject.expires_in)
+ .to be_nil
+ end
+ end
+ end
+
+ describe '#expires_in=' do
+ let(:record) { Fabricate.build factory_name }
+
+ context 'when set to nil' do
+ it 'sets expires_at to nil' do
+ record.expires_in = nil
+ expect(record.expires_at)
+ .to be_nil
+ end
+ end
+
+ context 'when set to empty' do
+ it 'sets expires_at to nil' do
+ record.expires_in = ''
+ expect(record.expires_at)
+ .to be_nil
+ end
+ end
+
+ context 'when set to a value' do
+ it 'sets expires_at to expected future time' do
+ record.expires_in = 60
+ expect(record.expires_at)
+ .to be_within(0.1).of(60.seconds.from_now)
+ end
+ end
+ end
+
+ describe '#expired?' do
+ context 'when expires_at is nil' do
+ let(:expires_at) { nil }
+
+ it { is_expected.to_not be_expired }
+ end
+
+ context 'when expires_at is in the past' do
+ let(:expires_at) { 5.days.ago }
+
+ it { is_expected.to be_expired }
+ end
+
+ context 'when expires_at is in the future' do
+ let(:expires_at) { 5.days.from_now }
+
+ it { is_expected.to_not be_expired }
+ end
+
+ describe '#expire!' do
+ subject { Fabricate factory_name }
+
+ it 'updates the timestamp' do
+ expect { subject.expire! }
+ .to change(subject, :expires_at)
+ end
+ end
+
+ describe '#expires?' do
+ context 'when value is missing' do
+ let(:expires_at) { nil }
+
+ it { is_expected.to_not be_expires }
+ end
+
+ context 'when value is present' do
+ let(:expires_at) { 3.days.from_now }
+
+ it { is_expected.to be_expires }
+ end
+ end
+ end
+
+ def factory_name
+ described_class.name.underscore.to_sym
+ end
+end
diff --git a/spec/support/matchers/api_datetime_format.rb b/spec/support/matchers/api_datetime_format.rb
new file mode 100644
index 0000000000..d19c909438
--- /dev/null
+++ b/spec/support/matchers/api_datetime_format.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :match_api_datetime_format do
+ match(notify_expectation_failures: true) do |value|
+ expect { DateTime.rfc3339(value) }
+ .to_not raise_error
+ end
+end
diff --git a/spec/system/admin/account_moderation_notes_spec.rb b/spec/system/admin/account_moderation_notes_spec.rb
new file mode 100644
index 0000000000..5d195143c2
--- /dev/null
+++ b/spec/system/admin/account_moderation_notes_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin::AccountModerationNotes' do
+ let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+ let(:target_account) { Fabricate(:account) }
+
+ before { sign_in current_user }
+
+ describe 'Managing account moderation note' do
+ it 'saves and then deletes a record' do
+ visit admin_account_path(target_account.id)
+
+ fill_in 'account_moderation_note_content', with: ''
+ expect { submit_form }
+ .to not_change(AccountModerationNote, :count)
+ expect(page)
+ .to have_content(/error below/)
+
+ fill_in 'account_moderation_note_content', with: 'Test message'
+ expect { submit_form }
+ .to change(AccountModerationNote, :count).by(1)
+ expect(page)
+ .to have_content(I18n.t('admin.account_moderation_notes.created_msg'))
+
+ expect { delete_note }
+ .to change(AccountModerationNote, :count).by(-1)
+ expect(page)
+ .to have_content(I18n.t('admin.account_moderation_notes.destroyed_msg'))
+ end
+
+ def submit_form
+ click_on I18n.t('admin.account_moderation_notes.create')
+ end
+
+ def delete_note
+ within('.report-notes__item__actions') do
+ click_on I18n.t('admin.reports.notes.delete')
+ end
+ end
+ end
+end
diff --git a/spec/system/admin/custom_emojis_spec.rb b/spec/system/admin/custom_emojis_spec.rb
index e47f21f8a9..d597e30313 100644
--- a/spec/system/admin/custom_emojis_spec.rb
+++ b/spec/system/admin/custom_emojis_spec.rb
@@ -5,8 +5,43 @@ require 'rails_helper'
RSpec.describe 'Admin::CustomEmojis' do
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
- before do
- sign_in current_user
+ before { sign_in current_user }
+
+ describe 'Listing existing emoji' do
+ let!(:custom_emoji) { Fabricate :custom_emoji }
+
+ it 'Shows records' do
+ visit admin_custom_emojis_path
+
+ expect(page)
+ .to have_content(I18n.t('admin.custom_emojis.title'))
+ .and have_content(custom_emoji.shortcode)
+ end
+ end
+
+ describe 'Creating a new emoji' do
+ it 'saves a new emoji record with valid attributes' do
+ visit new_admin_custom_emoji_path
+ expect(page)
+ .to have_content(I18n.t('admin.custom_emojis.title'))
+
+ expect { submit_form }
+ .to_not change(CustomEmoji, :count)
+ expect(page)
+ .to have_content(/errors below/)
+
+ fill_in I18n.t('admin.custom_emojis.shortcode'),
+ with: 'test'
+ attach_file 'custom_emoji_image',
+ Rails.root.join('spec', 'fixtures', 'files', 'emojo.png')
+
+ expect { submit_form }
+ .to change(CustomEmoji, :count).by(1)
+ end
+
+ def submit_form
+ click_on I18n.t('admin.custom_emojis.upload')
+ end
end
describe 'Performing batch updates' do
diff --git a/spec/system/admin/domain_allows_spec.rb b/spec/system/admin/domain_allows_spec.rb
new file mode 100644
index 0000000000..1c462ff7cc
--- /dev/null
+++ b/spec/system/admin/domain_allows_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin::DomainAllows' do
+ let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+ let(:domain) { 'host.example' }
+
+ before do
+ Fabricate :account, domain: domain
+ Instance.refresh
+ sign_in user
+ end
+
+ around do |example|
+ original = Rails.configuration.x.limited_federation_mode
+ Rails.configuration.x.limited_federation_mode = true
+
+ example.run
+
+ Rails.configuration.x.limited_federation_mode = original
+ end
+
+ describe 'Managing domain allows' do
+ it 'saves and then deletes a record' do
+ # Visit new page
+ visit new_admin_domain_allow_path
+ click_on I18n.t('admin.domain_allows.add_new')
+ expect(page)
+ .to have_content(I18n.t('admin.domain_allows.add_new'))
+
+ # Submit invalid with missing domain
+ fill_in 'domain_allow_domain', with: ''
+ expect { submit_form }
+ .to not_change(DomainAllow, :count)
+ expect(page)
+ .to have_content(/error below/)
+
+ # Submit valid with domain present
+ fill_in 'domain_allow_domain', with: domain
+ expect { submit_form }
+ .to change(DomainAllow, :count).by(1)
+ expect(page)
+ .to have_content(I18n.t('admin.domain_allows.created_msg'))
+
+ # Visit instance page and delete the domain allow
+ visit admin_instance_path(domain)
+ expect { delete_domain_allow }
+ .to change(DomainAllow, :count).by(-1)
+ expect(page)
+ .to have_content(I18n.t('admin.domain_allows.destroyed_msg'))
+ end
+
+ def submit_form
+ click_on I18n.t('admin.domain_allows.add_new')
+ end
+
+ def delete_domain_allow
+ click_on I18n.t('admin.domain_allows.undo')
+ end
+ end
+end
diff --git a/spec/system/admin/ip_blocks_spec.rb b/spec/system/admin/ip_blocks_spec.rb
index 9c03520277..c101b8e1c6 100644
--- a/spec/system/admin/ip_blocks_spec.rb
+++ b/spec/system/admin/ip_blocks_spec.rb
@@ -5,20 +5,46 @@ require 'rails_helper'
RSpec.describe 'Admin::IpBlocks' do
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
- before do
- sign_in current_user
+ before { sign_in current_user }
+
+ describe 'Creating an IP Block' do
+ it 'lists blocks and creates new ones' do
+ # Visit index page
+ visit admin_ip_blocks_path
+ expect(page)
+ .to have_content(I18n.t('admin.ip_blocks.title'))
+
+ # Navigate to new
+ click_on I18n.t('admin.ip_blocks.add_new')
+
+ # Invalid with missing IP
+ fill_in 'ip_block_ip', with: ''
+ expect { submit_form }
+ .to_not change(IpBlock, :count)
+ expect(page)
+ .to have_content(/error below/)
+
+ # Valid with IP
+ fill_in 'ip_block_ip', with: '192.168.1.1'
+ expect { submit_form }
+ .to change(IpBlock, :count).by(1)
+ expect(page)
+ .to have_content(I18n.t('admin.ip_blocks.created_msg'))
+ end
+
+ def submit_form
+ click_on I18n.t('admin.ip_blocks.add_new')
+ end
end
describe 'Performing batch updates' do
- before do
- visit admin_ip_blocks_path
- end
-
context 'without selecting any records' do
it 'displays a notice about selection' do
- click_on button_for_delete
+ visit admin_ip_blocks_path
- expect(page).to have_content(selection_error_text)
+ click_on button_for_delete
+ expect(page)
+ .to have_content(selection_error_text)
end
end
diff --git a/spec/system/admin/webhooks_spec.rb b/spec/system/admin/webhooks_spec.rb
new file mode 100644
index 0000000000..69e8a7d69f
--- /dev/null
+++ b/spec/system/admin/webhooks_spec.rb
@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Webhooks' do
+ describe 'Managing webhooks' do
+ before { sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+ describe 'Viewing webhooks' do
+ let!(:webhook) { Fabricate :webhook }
+
+ it 'lists existing records' do
+ visit admin_webhooks_path
+
+ expect(page)
+ .to have_content(I18n.t('admin.webhooks.title'))
+ .and have_content(webhook.url)
+
+ click_on(webhook.url)
+ expect(page)
+ .to have_content(I18n.t('admin.webhooks.title'))
+ end
+ end
+
+ describe 'Creating a new webhook' do
+ it 'creates new record with valid attributes' do
+ visit admin_webhooks_path
+
+ # Visit new page
+ click_on I18n.t('admin.webhooks.add_new')
+ expect(page)
+ .to have_content(I18n.t('admin.webhooks.new'))
+
+ # Invalid submission (missing url, no events selected)
+ fill_in 'webhook_url', with: ''
+ expect { submit_form }
+ .to_not change(Webhook, :count)
+ expect(page)
+ .to have_content(/errors below/)
+
+ # Valid submission
+ fill_in 'webhook_url', with: 'https://host.example/hooks/123'
+ check Webhook::EVENTS.first
+ expect { submit_form }
+ .to change(Webhook, :count).by(1)
+ expect(page)
+ .to have_content(I18n.t('admin.webhooks.title'))
+ end
+
+ it 'fails to create with no events selected' do
+ visit new_admin_webhook_path
+
+ fill_in 'webhook_url', with: 'https://host.example/hooks/123'
+ expect { submit_form }
+ .to_not change(Webhook, :count)
+ expect(page)
+ .to have_content(/errors below/)
+ end
+
+ def submit_form
+ click_on I18n.t('admin.webhooks.add_new')
+ end
+ end
+
+ describe 'Editing an existing webhook' do
+ let!(:webhook) { Fabricate :webhook, events: [Webhook::EVENTS.first] }
+
+ it 'updates with valid attributes' do
+ visit admin_webhook_path(webhook)
+
+ # Invalid submission (missing url)
+ click_on I18n.t('admin.webhooks.edit')
+ fill_in 'webhook_url', with: ''
+ expect { submit_form }
+ .to_not change(webhook.reload, :updated_at)
+
+ # Valid update
+ fill_in 'webhook_url', with: 'https://host.example/new/value/123'
+ expect { submit_form }
+ .to_not change(webhook.reload, :url)
+ end
+
+ def submit_form
+ click_on I18n.t('generic.save_changes')
+ end
+ end
+
+ describe 'Destroy a webhook' do
+ let!(:webhook) { Fabricate :webhook, events: [Webhook::EVENTS.first] }
+
+ it 'removes the record' do
+ visit admin_webhooks_path
+
+ expect { click_on I18n.t('admin.webhooks.delete') }
+ .to change(Webhook, :count).by(-1)
+ expect { webhook.reload }
+ .to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
+
+ describe 'Toggle state of webhook' do
+ let!(:webhook) { Fabricate :webhook, events: [Webhook::EVENTS.first], enabled: true }
+
+ it 'switches enabled and disabled as requested' do
+ visit admin_webhook_path(webhook)
+
+ # Disable the initially enabled record
+ expect { click_on I18n.t('admin.webhooks.disable') }
+ .to change { webhook.reload.enabled? }.to(false)
+
+ # Re-enable the record
+ expect { click_on I18n.t('admin.webhooks.enable') }
+ .to change { webhook.reload.enabled? }.to(true)
+ end
+ end
+ end
+end
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index 64de384c00..e681c6940e 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -8,6 +8,18 @@ RSpec.describe 'Filters' do
before { sign_in(user) }
+ describe 'Viewing existing filters' do
+ before { Fabricate :custom_filter, account: user.account, phrase: 'Photography' }
+
+ it 'shows a list of user filters' do
+ visit filters_path
+
+ expect(page)
+ .to have_content('Photography')
+ .and have_private_cache_control
+ end
+ end
+
describe 'Creating a filter' do
it 'Populates a new filter from form' do
navigate_to_filters
@@ -16,12 +28,22 @@ RSpec.describe 'Filters' do
fill_in_filter_form
expect(page).to have_content(filter_title)
end
+
+ it 'Does not save with invalid values' do
+ navigate_to_filters
+ click_on I18n.t('filters.new.title')
+
+ expect { click_on I18n.t('filters.new.save') }
+ .to_not change(CustomFilter, :count)
+ expect(page)
+ .to have_content("can't be blank")
+ end
end
describe 'Editing an existing filter' do
let(:new_title) { 'Change title value' }
- before { Fabricate :custom_filter, account: user.account, title: filter_title }
+ let!(:custom_filter) { Fabricate :custom_filter, account: user.account, title: filter_title }
it 'Updates the saved filter' do
navigate_to_filters
@@ -33,6 +55,18 @@ RSpec.describe 'Filters' do
expect(page).to have_content(new_title)
end
+
+ it 'Does not save with invalid values' do
+ navigate_to_filters
+ click_on filter_title
+
+ fill_in filter_title_field, with: ''
+
+ expect { click_on submit_button }
+ .to_not(change { custom_filter.reload.updated_at })
+ expect(page)
+ .to have_content("can't be blank")
+ end
end
describe 'Destroying an existing filter' do
diff --git a/spec/system/settings/login_activities_spec.rb b/spec/system/settings/login_activities_spec.rb
new file mode 100644
index 0000000000..ff89c3f37e
--- /dev/null
+++ b/spec/system/settings/login_activities_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Login activities page' do
+ let!(:user) { Fabricate :user }
+ let!(:login_activity) { Fabricate :login_activity, user: user }
+
+ context 'when signed in' do
+ before { sign_in user }
+
+ describe 'Viewing the login activities page' do
+ it 'shows the login activity history' do
+ visit edit_user_registration_path
+
+ click_on I18n.t('sessions.view_authentication_history')
+
+ expect(page)
+ .to have_content(browser_description)
+ .and have_content(login_activity.authentication_method)
+ .and have_content(login_activity.ip)
+ .and have_private_cache_control
+ end
+
+ def browser_description
+ I18n.t(
+ 'sessions.description',
+ browser: I18n.t("sessions.browsers.#{login_activity.browser}", default: login_activity.browser),
+ platform: I18n.t("sessions.platforms.#{login_activity.platform}", default: login_activity.platform)
+ )
+ end
+ end
+ end
+end
diff --git a/spec/system/settings/preferences/appearance_spec.rb b/spec/system/settings/preferences/appearance_spec.rb
new file mode 100644
index 0000000000..0b6f1e4b15
--- /dev/null
+++ b/spec/system/settings/preferences/appearance_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings preferences appearance page' do
+ let(:user) { Fabricate :user }
+
+ before { sign_in user }
+
+ it 'Views and updates user prefs' do
+ visit settings_preferences_appearance_path
+
+ expect(page)
+ .to have_private_cache_control
+
+ select 'contrast', from: theme_selection_field
+ check confirm_reblog_field
+ uncheck confirm_delete_field
+
+ expect { save_changes }
+ .to change { user.reload.settings.theme }.to('contrast')
+ .and change { user.reload.settings['web.reblog_modal'] }.to(true)
+ .and(change { user.reload.settings['web.delete_modal'] }.to(false))
+ expect(page)
+ .to have_title(I18n.t('settings.appearance'))
+ end
+
+ def save_changes
+ within('form') { click_on submit_button }
+ end
+
+ def confirm_delete_field
+ I18n.t('simple_form.labels.defaults.setting_delete_modal')
+ end
+
+ def confirm_reblog_field
+ I18n.t('simple_form.labels.defaults.setting_boost_modal')
+ end
+
+ def theme_selection_field
+ I18n.t('simple_form.labels.defaults.setting_theme')
+ end
+end
diff --git a/spec/system/settings/preferences/notifications_spec.rb b/spec/system/settings/preferences/notifications_spec.rb
new file mode 100644
index 0000000000..20ff549222
--- /dev/null
+++ b/spec/system/settings/preferences/notifications_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings preferences notifications page' do
+ let(:user) { Fabricate :user }
+
+ before { sign_in user }
+
+ it 'Views and updates user prefs' do
+ visit settings_preferences_notifications_path
+
+ expect(page)
+ .to have_private_cache_control
+
+ uncheck notifications_follow_field
+
+ expect { click_on submit_button }
+ .to change { user.reload.settings['notification_emails.follow'] }.to(false)
+ expect(page)
+ .to have_title(I18n.t('settings.notifications'))
+ end
+
+ def notifications_follow_field
+ I18n.t('simple_form.labels.notification_emails.follow')
+ end
+end
diff --git a/spec/system/settings/preferences/other_spec.rb b/spec/system/settings/preferences/other_spec.rb
new file mode 100644
index 0000000000..7cc15f87a4
--- /dev/null
+++ b/spec/system/settings/preferences/other_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings preferences other page' do
+ let(:user) { Fabricate :user }
+
+ before { sign_in user }
+
+ it 'Views and updates user prefs' do
+ visit settings_preferences_other_path
+
+ expect(page)
+ .to have_private_cache_control
+
+ check language_field(:es)
+ check language_field(:fr)
+ check mark_sensitive_field
+
+ expect { save_changes }
+ .to change { user.reload.chosen_languages }.to(%w(es fr))
+ .and(change { user.reload.settings.default_sensitive }.to(true))
+ expect(page)
+ .to have_title(I18n.t('settings.preferences'))
+ end
+
+ def save_changes
+ within('form') { click_on submit_button }
+ end
+
+ def mark_sensitive_field
+ I18n.t('simple_form.labels.defaults.setting_default_sensitive')
+ end
+
+ def language_field(key)
+ LanguagesHelper::SUPPORTED_LOCALES[key].last
+ end
+end
diff --git a/spec/system/settings/profiles_spec.rb b/spec/system/settings/profiles_spec.rb
new file mode 100644
index 0000000000..73a5751141
--- /dev/null
+++ b/spec/system/settings/profiles_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings profile page' do
+ let(:user) { Fabricate :user }
+ let(:account) { user.account }
+
+ before do
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ sign_in user
+ end
+
+ it 'Views and updates profile information' do
+ visit settings_profile_path
+
+ expect(page)
+ .to have_private_cache_control
+
+ fill_in display_name_field, with: 'New name'
+ attach_file avatar_field, Rails.root.join('spec', 'fixtures', 'files', 'avatar.gif')
+
+ expect { click_on submit_button }
+ .to change { account.reload.display_name }.to('New name')
+ .and(change { account.reload.avatar.instance.avatar_file_name }.from(nil).to(be_present))
+ expect(ActivityPub::UpdateDistributionWorker)
+ .to have_received(:perform_async).with(account.id)
+ end
+
+ def display_name_field
+ I18n.t('simple_form.labels.defaults.display_name')
+ end
+
+ def avatar_field
+ I18n.t('simple_form.labels.defaults.avatar')
+ end
+end
diff --git a/spec/system/statuses_cleanup_spec.rb b/spec/system/statuses_cleanup_spec.rb
new file mode 100644
index 0000000000..524f710af7
--- /dev/null
+++ b/spec/system/statuses_cleanup_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Automated post deletion settings' do
+ let(:user) { Fabricate :user }
+ let(:account) { user.account }
+
+ describe 'Updating settings' do
+ before { sign_in user }
+
+ it 'visits the page and updates the policy' do
+ visit statuses_cleanup_path
+ expect(page)
+ .to have_private_cache_control
+
+ check I18n.t('statuses_cleanup.enabled')
+ submit_form
+ expect(account.reload.statuses_cleanup_policy)
+ .to be_enabled
+
+ uncheck I18n.t('statuses_cleanup.keep_pinned')
+ expect { submit_form }
+ .to change { account.reload.statuses_cleanup_policy.keep_pinned? }.to(false)
+ expect(page)
+ .to have_content(I18n.t('settings.statuses_cleanup'))
+ end
+
+ def submit_form
+ click_on submit_button
+ end
+ end
+end
diff --git a/yarn.lock b/yarn.lock
index 2aab09edad..abc220d3a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6758,16 +6758,16 @@ __metadata:
languageName: node
linkType: hard
-"css-has-pseudo@npm:^7.0.1":
- version: 7.0.1
- resolution: "css-has-pseudo@npm:7.0.1"
+"css-has-pseudo@npm:^7.0.2":
+ version: 7.0.2
+ resolution: "css-has-pseudo@npm:7.0.2"
dependencies:
"@csstools/selector-specificity": "npm:^5.0.0"
postcss-selector-parser: "npm:^7.0.0"
postcss-value-parser: "npm:^4.2.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/13789b08b70169204be786d652190356ace9313099d3656bd2fc38afbdd28f3d9620f0e0b07425480961b7a1ec789794961d0472f205b959d3f64c9a78ce511c
+ checksum: 10c0/456e9ce1eec8a535683c329956acfe53ce5a208345d7f2fcbe662626be8b3c98681e9041d7f4980316714397b0c1c3defde25653d629c396df17803d599c4edf
languageName: node
linkType: hard
@@ -6903,10 +6903,10 @@ __metadata:
languageName: node
linkType: hard
-"cssdb@npm:^8.2.1":
- version: 8.2.1
- resolution: "cssdb@npm:8.2.1"
- checksum: 10c0/d27d7db0a39e1105181aac119a98d6c92cd5ceba2e8bd349cdf2ba4a8d9ead149b685a1dba9542ca24f094cc70eca4a3e02973fe1f74c11a373b508606e5e1c0
+"cssdb@npm:^8.2.3":
+ version: 8.2.3
+ resolution: "cssdb@npm:8.2.3"
+ checksum: 10c0/17c3ca6432ed02431db6b44bed74649ccef7d7b7b900ccbc7297525f030722c441dd67c71f28aef3cfa0814ba7b254a24adfb0dcd5728937da179ff437cdcd0c
languageName: node
linkType: hard
@@ -7121,15 +7121,15 @@ __metadata:
languageName: node
linkType: hard
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:~4.3.6":
- version: 4.3.7
- resolution: "debug@npm:4.3.7"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:~4.4.0":
+ version: 4.4.0
+ resolution: "debug@npm:4.4.0"
dependencies:
ms: "npm:^2.1.3"
peerDependenciesMeta:
supports-color:
optional: true
- checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b
+ checksum: 10c0/db94f1a182bf886f57b4755f85b3a74c39b5114b9377b7ab375dc2cfa3454f09490cc6c30f829df3fc8042bc8b8995f6567ce5cd96f3bc3688bd24027197d9de
languageName: node
linkType: hard
@@ -9968,8 +9968,8 @@ __metadata:
linkType: hard
"ioredis@npm:^5.3.2":
- version: 5.4.1
- resolution: "ioredis@npm:5.4.1"
+ version: 5.4.2
+ resolution: "ioredis@npm:5.4.2"
dependencies:
"@ioredis/commands": "npm:^1.1.1"
cluster-key-slot: "npm:^1.1.0"
@@ -9980,7 +9980,7 @@ __metadata:
redis-errors: "npm:^1.2.0"
redis-parser: "npm:^3.0.0"
standard-as-callback: "npm:^2.1.0"
- checksum: 10c0/5d28b7c89a3cab5b76d75923d7d4ce79172b3a1ca9be690133f6e8e393a7a4b4ffd55513e618bbb5504fed80d9e1395c9d9531a7c5c5c84aa4c4e765cca75456
+ checksum: 10c0/e59d2cceb43ed74b487d7b50fa91b93246e734e5d4835c7e62f64e44da072f12ab43b044248012e6f8b76c61a7c091a2388caad50e8ad69a8ce5515a730b23b8
languageName: node
linkType: hard
@@ -11527,10 +11527,10 @@ __metadata:
languageName: node
linkType: hard
-"lilconfig@npm:^3.1.2, lilconfig@npm:~3.1.2":
- version: 3.1.2
- resolution: "lilconfig@npm:3.1.2"
- checksum: 10c0/f059630b1a9bddaeba83059db00c672b64dc14074e9f232adce32b38ca1b5686ab737eb665c5ba3c32f147f0002b4bee7311ad0386a9b98547b5623e87071fbe
+"lilconfig@npm:^3.1.2, lilconfig@npm:~3.1.3":
+ version: 3.1.3
+ resolution: "lilconfig@npm:3.1.3"
+ checksum: 10c0/f5604e7240c5c275743561442fbc5abf2a84ad94da0f5adc71d25e31fa8483048de3dcedcb7a44112a942fed305fd75841cdf6c9681c7f640c63f1049e9a5dcc
languageName: node
linkType: hard
@@ -11542,28 +11542,28 @@ __metadata:
linkType: hard
"lint-staged@npm:^15.0.0":
- version: 15.2.10
- resolution: "lint-staged@npm:15.2.10"
+ version: 15.2.11
+ resolution: "lint-staged@npm:15.2.11"
dependencies:
chalk: "npm:~5.3.0"
commander: "npm:~12.1.0"
- debug: "npm:~4.3.6"
+ debug: "npm:~4.4.0"
execa: "npm:~8.0.1"
- lilconfig: "npm:~3.1.2"
- listr2: "npm:~8.2.4"
+ lilconfig: "npm:~3.1.3"
+ listr2: "npm:~8.2.5"
micromatch: "npm:~4.0.8"
pidtree: "npm:~0.6.0"
string-argv: "npm:~0.3.2"
- yaml: "npm:~2.5.0"
+ yaml: "npm:~2.6.1"
bin:
lint-staged: bin/lint-staged.js
- checksum: 10c0/6ad7b41f5e87a84fa2eb1990080ea3c68a2f2031b4e81edcdc2a458cc878538eedb310e6f98ffd878a1287e1a52ac968e540ee8a0e96c247e04b0cbc36421cdd
+ checksum: 10c0/28e2ad08b90460cc18398a023eaf93954d7753f958c2b889ead2d9305407d7b4ef0ee007875410d6ce1df758007fda77e079c82eb79c9ce684fba71e6f7d0452
languageName: node
linkType: hard
-"listr2@npm:~8.2.4":
- version: 8.2.4
- resolution: "listr2@npm:8.2.4"
+"listr2@npm:~8.2.5":
+ version: 8.2.5
+ resolution: "listr2@npm:8.2.5"
dependencies:
cli-truncate: "npm:^4.0.0"
colorette: "npm:^2.0.20"
@@ -11571,7 +11571,7 @@ __metadata:
log-update: "npm:^6.1.0"
rfdc: "npm:^1.4.1"
wrap-ansi: "npm:^9.0.0"
- checksum: 10c0/df5b129e9767de1997973cec6103cd4bd6fc3b3367685b7c23048d12b61d5b7e44fecd8a3d3534c0e1c963bd5ac43ca501d14712f46fa101050037be323a5c16
+ checksum: 10c0/f5a9599514b00c27d7eb32d1117c83c61394b2a985ec20e542c798bf91cf42b19340215701522736f5b7b42f557e544afeadec47866e35e5d4f268f552729671
languageName: node
linkType: hard
@@ -14038,8 +14038,8 @@ __metadata:
linkType: hard
"postcss-preset-env@npm:^10.0.0":
- version: 10.1.1
- resolution: "postcss-preset-env@npm:10.1.1"
+ version: 10.1.2
+ resolution: "postcss-preset-env@npm:10.1.2"
dependencies:
"@csstools/postcss-cascade-layers": "npm:^5.0.1"
"@csstools/postcss-color-function": "npm:^4.0.6"
@@ -14076,9 +14076,9 @@ __metadata:
autoprefixer: "npm:^10.4.19"
browserslist: "npm:^4.23.1"
css-blank-pseudo: "npm:^7.0.1"
- css-has-pseudo: "npm:^7.0.1"
+ css-has-pseudo: "npm:^7.0.2"
css-prefers-color-scheme: "npm:^10.0.0"
- cssdb: "npm:^8.2.1"
+ cssdb: "npm:^8.2.3"
postcss-attribute-case-insensitive: "npm:^7.0.1"
postcss-clamp: "npm:^4.1.0"
postcss-color-functional-notation: "npm:^7.0.6"
@@ -14106,7 +14106,7 @@ __metadata:
postcss-selector-not: "npm:^8.0.1"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/99931117735a66827c7318be023ddb614990457617ccbe7fd2fdc1f10345554652df180d4842768d68d57e14fc0be4d86d0b413c65e77e02db5511e57ed07c4f
+ checksum: 10c0/bd40330867a525679d434ff9602efbf229da9e745a3759c2d0b3cff166dd0f17bf99b44673ebb316df1906c2bf2edef97aeef1840aa6be170b43a34404df396d
languageName: node
linkType: hard
@@ -16843,8 +16843,8 @@ __metadata:
linkType: hard
"stylelint@npm:^16.11.0":
- version: 16.11.0
- resolution: "stylelint@npm:16.11.0"
+ version: 16.12.0
+ resolution: "stylelint@npm:16.12.0"
dependencies:
"@csstools/css-parser-algorithms": "npm:^3.0.4"
"@csstools/css-tokenizer": "npm:^3.0.3"
@@ -16882,11 +16882,11 @@ __metadata:
string-width: "npm:^4.2.3"
supports-hyperlinks: "npm:^3.1.0"
svg-tags: "npm:^1.0.0"
- table: "npm:^6.8.2"
+ table: "npm:^6.9.0"
write-file-atomic: "npm:^5.0.1"
bin:
stylelint: bin/stylelint.mjs
- checksum: 10c0/65638247fb4e5eacb032e3a98412a13ad8b343d2d58e22d61b96ada72808b5b7e736c845937b3bcfde04c0bfa2120383b507e530afe876dafe824a93c337258f
+ checksum: 10c0/d60bc6136f5bdc4e49ec22aee4d82130c4e9c94aa7d249da9dda315a862615e74acaefb24c560529b2102f8c27dde473b148ffcee861f5dab7b0225254765102
languageName: node
linkType: hard
@@ -17028,16 +17028,16 @@ __metadata:
languageName: node
linkType: hard
-"table@npm:^6.8.2":
- version: 6.8.2
- resolution: "table@npm:6.8.2"
+"table@npm:^6.9.0":
+ version: 6.9.0
+ resolution: "table@npm:6.9.0"
dependencies:
ajv: "npm:^8.0.1"
lodash.truncate: "npm:^4.4.2"
slice-ansi: "npm:^4.0.0"
string-width: "npm:^4.2.3"
strip-ansi: "npm:^6.0.1"
- checksum: 10c0/f8b348af38ee34e419d8ce7306ba00671ce6f20e861ccff22555f491ba264e8416086063ce278a8d81abfa8d23b736ec2cca7ac4029b5472f63daa4b4688b803
+ checksum: 10c0/35646185712bb65985fbae5975dda46696325844b78735f95faefae83e86df0a265277819a3e67d189de6e858c509b54e66ca3958ffd51bde56ef1118d455bf4
languageName: node
linkType: hard
@@ -18849,12 +18849,12 @@ __metadata:
languageName: node
linkType: hard
-"yaml@npm:~2.5.0":
- version: 2.5.0
- resolution: "yaml@npm:2.5.0"
+"yaml@npm:~2.6.1":
+ version: 2.6.1
+ resolution: "yaml@npm:2.6.1"
bin:
yaml: bin.mjs
- checksum: 10c0/771a1df083c8217cf04ef49f87244ae2dd7d7457094425e793b8f056159f167602ce172aa32d6bca21f787d24ec724aee3cecde938f6643564117bd151452631
+ checksum: 10c0/aebf07f61c72b38c74d2b60c3a3ccf89ee4da45bcd94b2bfb7899ba07a5257625a7c9f717c65a6fc511563d48001e01deb1d9e55f0133f3e2edf86039c8c1be7
languageName: node
linkType: hard