From d005daae8444836994ae71a3aac9d224be58a5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Sat, 19 Oct 2024 03:22:05 +0900 Subject: [PATCH] =?UTF-8?q?feat(announcement):=20=E3=81=8A=E7=9F=A5?= =?UTF-8?q?=E3=82=89=E3=81=9B=E3=81=AE=E6=97=A2=E8=AA=AD=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AB=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=83=AB=E5=8F=97=E8=AC=9B=E3=82=92=E8=A6=81=E6=B1=82=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(MisskeyIO#753)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ca-ES.yml | 2 +- locales/de-DE.yml | 2 +- locales/en-US.yml | 4 +++- locales/es-ES.yml | 2 +- locales/fr-FR.yml | 2 +- locales/id-ID.yml | 2 +- locales/index.d.ts | 10 +++++++++- locales/it-IT.yml | 2 +- locales/ja-JP.yml | 4 +++- locales/ja-KS.yml | 2 +- locales/ko-KR.yml | 4 +++- locales/th-TH.yml | 2 +- locales/zh-CN.yml | 2 +- locales/zh-TW.yml | 2 +- ...nouncement-NeedEnrollmentTutorialToRead.js | 11 +++++++++++ .../backend/src/core/AnnouncementService.ts | 2 ++ .../entities/AnnouncementEntityService.ts | 1 + packages/backend/src/models/Announcement.ts | 5 +++++ .../src/models/json-schema/announcement.ts | 4 ++++ .../endpoints/admin/announcements/create.ts | 6 ++++++ .../api/endpoints/admin/announcements/list.ts | 5 +++++ .../endpoints/admin/announcements/update.ts | 2 ++ .../MkAnnouncementDialog.stories.impl.ts | 1 + .../src/components/MkAnnouncementDialog.vue | 19 +++++++++++++++++-- .../src/components/MkTutorialDialog.vue | 2 ++ .../MkUserAnnouncementEditDialog.vue | 5 +++++ .../src/pages/admin/announcements.vue | 3 +++ packages/frontend/src/pages/announcement.vue | 18 ++++++++++++++++-- packages/frontend/src/pages/announcements.vue | 18 ++++++++++++++++-- packages/misskey-js/src/autogen/types.ts | 6 ++++++ 30 files changed, 130 insertions(+), 20 deletions(-) create mode 100644 packages/backend/migration/1729270181417-Announcement-NeedEnrollmentTutorialToRead.js diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 3989868ce..c00696340 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -1234,7 +1234,7 @@ _announcement: forExistingUsers: "Anunci per usuaris registrats" forExistingUsersDescription: "Aquest avís només es mostrarà als usuaris existents fins al moment de la publicació. Si no també es mostrarà als usuaris que es registrin després de la publicació." needConfirmationToRead: "Es necessita confirmació de lectura de la notificació " - needConfirmationToReadDescription: "Si s'activa es mostrarà un diàleg per confirmar la lectura d'aquesta notificació. A més aquesta notificació serà exclosa de qualsevol funcionalitat com \"Marcar tot com a llegit\"." + needConfirmationToReadDescription: "Si s'activa es mostrarà un diàleg per confirmar la lectura d'aquesta notificació." end: "Final de la notificació " tooManyActiveAnnouncementDescription: "Tenir massa notificacions actives pot empitjorar l'experiència de l'usuari. Considera finalitzar els anuncis que siguin antics." readConfirmTitle: "Marcar com llegida?" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 3e1c40512..e83d0d40b 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1189,7 +1189,7 @@ _announcement: forExistingUsers: "Nur für existierende Nutzer" forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt." needConfirmationToRead: "Separate Lesebestätigung erfordern" - needConfirmationToReadDescription: "Ist dies aktiviert, so wird beim Markieren dieser Ankündigung als gelesen ein separates Bestätigungsfenster angezeigt. Auch wird sie von der \"Alle als gelesen markieren\"-Funktion ausgenommen." + needConfirmationToReadDescription: "Ist dies aktiviert, so wird beim Markieren dieser Ankündigung als gelesen ein separates Bestätigungsfenster angezeigt." end: "Ankündigung archivieren" tooManyActiveAnnouncementDescription: "Zu viele aktive Ankündigungen können die Benutzerfreundlichkeit verschlechtern. Es wird empfohlen, veraltete Ankündigungen zu archivieren." readConfirmTitle: "Als gelesen markieren?" diff --git a/locales/en-US.yml b/locales/en-US.yml index 5f62bc8eb..971f771df 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1319,7 +1319,9 @@ _announcement: forExistingUsers: "Existing users only" forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it." needConfirmationToRead: "Require separate read confirmation" - needConfirmationToReadDescription: "A separate prompt to confirm marking this announcement as read will be displayed if enabled. This announcement will also be excluded from any \"Mark all as read\" functionality." + needConfirmationToReadDescription: "A separate prompt to confirm marking this announcement as read will be displayed if enabled." + needEnrollmentTutorialToRead: "Require tutorial completion to read" + needEnrollmentTutorialToReadDescription: "Users must complete the tutorial to read this announcement if enabled." end: "Archive announcement" tooManyActiveAnnouncementDescription: "Having too many active announcements may worsen the user experience. Please consider archiving announcements that have become obsolete." readConfirmTitle: "Mark as read?" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 61cdb4f06..ffe6b239f 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1252,7 +1252,7 @@ _announcement: forExistingUsers: "Solo para usuarios registrados" forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán." needConfirmationToRead: "Requerir confirmación de lectura aparte" - needConfirmationToReadDescription: "Si se habilita esta opción, se pedirá una confirmación de lectura aparte. Además, este anuncio será excluido de cualquier funcionalidad de \"Marcar todos como leídos\"." + needConfirmationToReadDescription: "Si se habilita esta opción, se pedirá una confirmación de lectura aparte." end: "Anuncios archivados" tooManyActiveAnnouncementDescription: "Tener demasiados anuncios activos empeora la experiencia de usuario. Por favor, considera archivar aquellos anuncios que hayan quedado obsoletos." readConfirmTitle: "¿Marcar como leído?" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 58a11a5cc..9fb852ca2 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -1237,7 +1237,7 @@ _bubbleGame: _announcement: forExistingUsers: "Pour les utilisateurs existants seulement" needConfirmationToRead: "Exiger la confirmation de la lecture" - needConfirmationToReadDescription: "Si activé, afficher un dialogue de confirmation quand l'annonce est marquée comme lue. Aussi, elle sera exclue de « marquer tout comme lu » ." + needConfirmationToReadDescription: "Si activé, afficher un dialogue de confirmation quand l'annonce est marquée comme lue." end: "Archiver l'annonce" tooManyActiveAnnouncementDescription: "Un grand nombre d'annonces actives peut baisser l'expérience utilisateur. Considérez d'archiver les annonces obsolètes." readConfirmTitle: "Marquer comme lu ?" diff --git a/locales/id-ID.yml b/locales/id-ID.yml index c93824ccb..dd67e2d5a 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -1254,7 +1254,7 @@ _announcement: forExistingUsers: "Hanya pengguna yang telah ada" forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya." needConfirmationToRead: "Membutuhkan konfirmasi terpisah bahwa telah dibaca" - needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan. Pengumuman ini juga akan dikecualikan dari fungsi \"Tandai semua telah dibaca\"." + needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan." end: "Arsipkan pengumuman" tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan." readConfirmTitle: "Tandai telah dibaca?" diff --git a/locales/index.d.ts b/locales/index.d.ts index 5da7951fb..888fd3870 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5305,9 +5305,17 @@ export interface Locale extends ILocale { */ "needConfirmationToRead": string; /** - * 有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象になりません。 + * 有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。 */ "needConfirmationToReadDescription": string; + /** + * チュートリアルの受講が必要 + */ + "needEnrollmentTutorialToRead": string; + /** + * 有効にすると、このお知らせを既読にするためにはチュートリアルの受講が必要です。 + */ + "needEnrollmentTutorialToReadDescription": string; /** * お知らせを終了 */ diff --git a/locales/it-IT.yml b/locales/it-IT.yml index e563a1779..af0dc9d05 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1252,7 +1252,7 @@ _announcement: forExistingUsers: "Solo ai profili attuali" forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio." needConfirmationToRead: "Richiede la conferma di lettura" - needConfirmationToReadDescription: "Sarà visualizzata una finestra di dialogo che richiede la conferma di lettura. Inoltre, non è soggetto a conferme di lettura massicce." + needConfirmationToReadDescription: "Sarà visualizzata una finestra di dialogo che richiede la conferma di lettura." end: "Archivia l'annuncio" tooManyActiveAnnouncementDescription: "L'esperienza delle persone può peggiorare se ci sono troppi annunci attivi. Considera anche l'archiviazione degli annunci conclusi." readConfirmTitle: "Segnare come già letto?" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 76611df58..e03a0d739 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1326,7 +1326,9 @@ _announcement: forExistingUsers: "既存ユーザーのみ" forExistingUsersDescription: "有効にすると、このお知らせ作成時点で存在するユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。" needConfirmationToRead: "既読にするのに確認が必要" - needConfirmationToReadDescription: "有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象になりません。" + needConfirmationToReadDescription: "有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。" + needEnrollmentTutorialToRead: "チュートリアルの受講が必要" + needEnrollmentTutorialToReadDescription: "有効にすると、このお知らせを既読にするためにはチュートリアルの受講が必要です。" end: "お知らせを終了" tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討してください。" readConfirmTitle: "既読にしますか？" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 1602d4f3a..121b12b1c 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1254,7 +1254,7 @@ _announcement: forExistingUsers: "もうおるユーザーのみ" forExistingUsersDescription: "オンにしたらこのお知らせができた時点でおる人らにだけお知らせが行くで。切ったらこの知らせが行ったあとにアカウント作った人にもちゃんとお知らせが行くで。" needConfirmationToRead: "既読にするんやったら確認してや" - needConfirmationToReadDescription: "オンにしたら、このお知らせを既読にする時に確認するで。ついでに、一括既読しても既読扱いにならへんで。" + needConfirmationToReadDescription: "オンにしたら、このお知らせを既読にする時に確認するで。" end: "お知らせやめる" tooManyActiveAnnouncementDescription: "お知らせが多すぎてUXが落ちそうや。終わったお知らせはアーカイブに突っ込んだほうがええかも。" readConfirmTitle: "既読にしてええんやな?" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 30daa72aa..4eb2d6f3a 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1312,7 +1312,9 @@ _announcement: forExistingUsers: "기존 유저에게만 알림" forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다." needConfirmationToRead: "읽음으로 표시하기 전에 확인하기" - needConfirmationToReadDescription: "활성화하면 이 공지사항을 읽음으로 표시하기 전에 확인 알림창을 띄웁니다. '모두 읽음'의 대상에서도 제외됩니다." + needConfirmationToReadDescription: "활성화하면 이 공지사항을 읽음으로 표시하기 전에 확인 알림창을 띄웁니다." + needEnrollmentTutorialToRead: "읽음으로 표시하기 전에 튜토리얼 진행하기" + needEnrollmentTutorialToReadDescription: "활성화하면 이 공지사항을 읽음으로 표시하기 전에 사용자에게 튜토리얼을 진행하도록 요구합니다." end: "공지에서 내리기" tooManyActiveAnnouncementDescription: "공지사항이 너무 많을 경우, 사용자 경험에 영향을 끼칠 가능성이 있습니다. 오래된 공지사항은 아카이브하시는 것을 권장드립니다." readConfirmTitle: "읽음으로 표시합니까?" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 847e5d354..37d6169d0 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1254,7 +1254,7 @@ _announcement: forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น" forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน" needConfirmationToRead: "จำเป็นต้องยืนยันว่าอ่านแล้ว" - needConfirmationToReadDescription: "กล่องโต้ตอบการยืนยันจะปรากฏขึ้นเมื่อจะทำเครื่องหมายว่าอ่านแล้ว นอกจากนี้ยังทำให้ประกาศนี้ยังไม่ถูกอ่านเมื่อใช้ฟังก์ชั่น “ทำเครื่องหมายฯ ทั้งหมดว่าอ่านแล้ว”" + needConfirmationToReadDescription: "กล่องโต้ตอบการยืนยันจะปรากฏขึ้นเมื่อจะทำเครื่องหมายว่าอ่านแล้ว" end: "เก็บประกาศ" tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ" readConfirmTitle: "ทำเครื่องหมายว่าอ่านแล้วเลยไหม?" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 25407db5e..1364ae375 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1275,7 +1275,7 @@ _announcement: forExistingUsers: "仅限现有用户" forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。" needConfirmationToRead: "需要确认才能标记为已读" - needConfirmationToReadDescription: "若启用，则会在标记已读时会显示确认对话框。此外，它也会不受批量已读操作的影响。" + needConfirmationToReadDescription: "若启用，则会在标记已读时会显示确认对话框。" end: "结束公告" tooManyActiveAnnouncementDescription: "若有大量活动公告，可能会造成用户体验下降。请考虑归档已完成的公告。" readConfirmTitle: "标记为已读？" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 2f083bb8e..7ad9ca909 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1254,7 +1254,7 @@ _announcement: forExistingUsers: "僅限既有的使用者" forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。" needConfirmationToRead: "必須確認才能標記為已讀" - needConfirmationToReadDescription: "啟用代表此公告將顯示對話方塊以確認是否標記為已讀，同時不會受「標記所有公告為已讀」功能影響。" + needConfirmationToReadDescription: "啟用代表此公告將顯示對話方塊以確認是否標記為已讀。" end: "結束公告" tooManyActiveAnnouncementDescription: "有過多公告可能會影響使用者體驗。請考慮歸檔已結束的公告。" readConfirmTitle: "標記為已讀嗎？" diff --git a/packages/backend/migration/1729270181417-Announcement-NeedEnrollmentTutorialToRead.js b/packages/backend/migration/1729270181417-Announcement-NeedEnrollmentTutorialToRead.js new file mode 100644 index 000000000..fb54fa4fd --- /dev/null +++ b/packages/backend/migration/1729270181417-Announcement-NeedEnrollmentTutorialToRead.js @@ -0,0 +1,11 @@ +export class AnnouncementNeedEnrollmentTutorialToRead1729270181417 { + name = 'AnnouncementNeedEnrollmentTutorialToRead1729270181417' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "announcement" ADD "needEnrollmentTutorialToRead" boolean NOT NULL DEFAULT false`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "needEnrollmentTutorialToRead"`); + } +} diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index 07a8a7833..5f9b48717 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -91,6 +91,7 @@ export class AnnouncementService { forExistingUsers: values.forExistingUsers, silence: values.silence, needConfirmationToRead: values.needConfirmationToRead, + needEnrollmentTutorialToRead: values.needEnrollmentTutorialToRead, closeDuration: values.closeDuration, displayOrder: values.displayOrder, userId: values.userId, @@ -200,6 +201,7 @@ export class AnnouncementService { icon: values.icon, forExistingUsers: values.forExistingUsers, needConfirmationToRead: values.needConfirmationToRead, + needEnrollmentTutorialToRead: values.needEnrollmentTutorialToRead, closeDuration: values.closeDuration, displayOrder: values.displayOrder, silence: values.silence, diff --git a/packages/backend/src/core/entities/AnnouncementEntityService.ts b/packages/backend/src/core/entities/AnnouncementEntityService.ts index b4a67460d..de05cade6 100644 --- a/packages/backend/src/core/entities/AnnouncementEntityService.ts +++ b/packages/backend/src/core/entities/AnnouncementEntityService.ts @@ -54,6 +54,7 @@ export class AnnouncementEntityService { display: announcement.display, forYou: announcement.userId === me?.id, needConfirmationToRead: announcement.needConfirmationToRead, + needEnrollmentTutorialToRead: announcement.needEnrollmentTutorialToRead, closeDuration: announcement.closeDuration, displayOrder: announcement.displayOrder, silence: announcement.silence, diff --git a/packages/backend/src/models/Announcement.ts b/packages/backend/src/models/Announcement.ts index 5c43e1368..9962e39ed 100644 --- a/packages/backend/src/models/Announcement.ts +++ b/packages/backend/src/models/Announcement.ts @@ -61,6 +61,11 @@ export class MiAnnouncement { }) public needConfirmationToRead: boolean; + @Column('boolean', { + default: false, + }) + public needEnrollmentTutorialToRead: boolean; + @Column('integer', { nullable: false, default: 0, diff --git a/packages/backend/src/models/json-schema/announcement.ts b/packages/backend/src/models/json-schema/announcement.ts index 51116bdab..35691c1a0 100644 --- a/packages/backend/src/models/json-schema/announcement.ts +++ b/packages/backend/src/models/json-schema/announcement.ts @@ -48,6 +48,10 @@ export const packedAnnouncementSchema = { type: 'boolean', optional: false, nullable: false, }, + needEnrollmentTutorialToRead: { + type: 'boolean', + optional: false, nullable: false, + }, forYou: { type: 'boolean', optional: false, nullable: false, diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts index 43931b862..0c7777e1c 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts @@ -62,6 +62,10 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, + needEnrollmentTutorialToRead: { + type: 'boolean', + optional: false, nullable: false, + }, closeDuration: { type: 'number', optional: false, nullable: false, @@ -92,6 +96,7 @@ export const paramDef = { display: { type: 'string', enum: ['normal', 'banner', 'dialog'], default: 'normal' }, forExistingUsers: { type: 'boolean', default: false }, needConfirmationToRead: { type: 'boolean', default: false }, + needEnrollmentTutorialToRead: { type: 'boolean', default: false }, closeDuration: { type: 'number', default: 0 }, displayOrder: { type: 'number', default: 0 }, silence: { type: 'boolean', default: false }, @@ -115,6 +120,7 @@ export default class extends Endpoint { // eslint- display: ps.display, forExistingUsers: ps.forExistingUsers, needConfirmationToRead: ps.needConfirmationToRead, + needEnrollmentTutorialToRead: ps.needEnrollmentTutorialToRead, closeDuration: ps.closeDuration, displayOrder: ps.displayOrder, silence: ps.silence, diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts index 573652ac5..a4d9cb99a 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts @@ -72,6 +72,10 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, + needEnrollmentTutorialToRead: { + type: 'boolean', + optional: false, nullable: false, + }, closeDuration: { type: 'number', optional: false, nullable: false, @@ -139,6 +143,7 @@ export default class extends Endpoint { // eslint- isActive: announcement.isActive, forExistingUsers: announcement.forExistingUsers, needConfirmationToRead: announcement.needConfirmationToRead, + needEnrollmentTutorialToRead: announcement.needEnrollmentTutorialToRead, closeDuration: announcement.closeDuration, displayOrder: announcement.displayOrder, silence: announcement.silence, diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts index d0456192d..4d51f157d 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -37,6 +37,7 @@ export const paramDef = { display: { type: 'string', enum: ['normal', 'banner', 'dialog'] }, forExistingUsers: { type: 'boolean' }, needConfirmationToRead: { type: 'boolean' }, + needEnrollmentTutorialToRead: { type: 'boolean' }, closeDuration: { type: 'number', default: 0 }, displayOrder: { type: 'number', default: 0 }, silence: { type: 'boolean' }, @@ -68,6 +69,7 @@ export default class extends Endpoint { // eslint- icon: ps.icon, forExistingUsers: ps.forExistingUsers, needConfirmationToRead: ps.needConfirmationToRead, + needEnrollmentTutorialToRead: ps.needEnrollmentTutorialToRead, closeDuration: ps.closeDuration, displayOrder: ps.displayOrder, silence: ps.silence, diff --git a/packages/frontend/src/components/MkAnnouncementDialog.stories.impl.ts b/packages/frontend/src/components/MkAnnouncementDialog.stories.impl.ts index bf3ddb935..92bf34150 100644 --- a/packages/frontend/src/components/MkAnnouncementDialog.stories.impl.ts +++ b/packages/frontend/src/components/MkAnnouncementDialog.stories.impl.ts @@ -46,6 +46,7 @@ export const Default = { imageUrl: null, display: 'dialog', needConfirmationToRead: false, + needEnrollmentTutorialToRead: false, silence: false, forYou: true, }, diff --git a/packages/frontend/src/components/MkAnnouncementDialog.vue b/packages/frontend/src/components/MkAnnouncementDialog.vue index 21a3c6d8e..229880936 100644 --- a/packages/frontend/src/components/MkAnnouncementDialog.vue +++ b/packages/frontend/src/components/MkAnnouncementDialog.vue @@ -19,13 +19,16 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.gotIt }} ({{ sec }}) + + {{ !announcement.needEnrollmentTutorialToRead ? i18n.ts.gotIt : i18n.ts._initialAccountSetting.startTutorial }} + ({{ sec }}) +