diff options
Diffstat (limited to 'lib')
34 files changed, 123 insertions, 49 deletions
diff --git a/lib/base.php b/lib/base.php index a603f67d78e..ab838d366b1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -243,6 +243,7 @@ class OC { // render error page $template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest'); \OCP\Util::addScript('core', 'maintenance'); + \OCP\Util::addScript('core', 'common'); \OCP\Util::addStyle('core', 'guest'); $template->printPage(); die(); diff --git a/lib/l10n/de.js b/lib/l10n/de.js index db04c57acff..de09d348eaf 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Einstellungen", "Log out" : "Abmelden", "Accounts" : "Konten", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "%s auf Bluesky anzeigen", "Email" : "E-Mail", "Mail %s" : "E-Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index c7ad725a2b6..bd676f0ec80 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -127,6 +127,8 @@ "Settings" : "Einstellungen", "Log out" : "Abmelden", "Accounts" : "Konten", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "%s auf Bluesky anzeigen", "Email" : "E-Mail", "Mail %s" : "E-Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index bea2fe3ba6d..8329f013a24 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Einstellungen", "Log out" : "Abmelden", "Accounts" : "Konten", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "%s auf Bluesky anzeigen", "Email" : "E-Mail", "Mail %s" : "E-Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index d754563af01..26c052d4233 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -127,6 +127,8 @@ "Settings" : "Einstellungen", "Log out" : "Abmelden", "Accounts" : "Konten", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "%s auf Bluesky anzeigen", "Email" : "E-Mail", "Mail %s" : "E-Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js index b406616574a..05dc12e854e 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Settings", "Log out" : "Log out", "Accounts" : "Accounts", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "View %s on Bluesky", "Email" : "Email", "Mail %s" : "Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json index cfe65d44222..e195477c74b 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -127,6 +127,8 @@ "Settings" : "Settings", "Log out" : "Log out", "Accounts" : "Accounts", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "View %s on Bluesky", "Email" : "Email", "Mail %s" : "Mail %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index a01ed7e43b8..91f0c8920c5 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Ajustes", "Log out" : "Cerrar sesión", "Accounts" : "Cuentas", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Ver %s en Bluesky", "Email" : "Correo electrónico", "Mail %s" : "Correo %s", "Fediverse" : "Fediverso", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index fc43c0e1d91..fd606bfb8a0 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -127,6 +127,8 @@ "Settings" : "Ajustes", "Log out" : "Cerrar sesión", "Accounts" : "Cuentas", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Ver %s en Bluesky", "Email" : "Correo electrónico", "Mail %s" : "Correo %s", "Fediverse" : "Fediverso", diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js index 92080235dd5..8371f694041 100644 --- a/lib/l10n/et_EE.js +++ b/lib/l10n/et_EE.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Seaded", "Log out" : "Logi välja", "Accounts" : "Kasutajakontod", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Vaata Bluesky's: %s", "Email" : "E-post", "Mail %s" : "E-post %s", "Fediverse" : "Födiversum", diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json index b8e16d36993..54d54acf434 100644 --- a/lib/l10n/et_EE.json +++ b/lib/l10n/et_EE.json @@ -127,6 +127,8 @@ "Settings" : "Seaded", "Log out" : "Logi välja", "Accounts" : "Kasutajakontod", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Vaata Bluesky's: %s", "Email" : "E-post", "Mail %s" : "E-post %s", "Fediverse" : "Födiversum", diff --git a/lib/l10n/ga.js b/lib/l10n/ga.js index 2de5f97ab4c..1eb9610c265 100644 --- a/lib/l10n/ga.js +++ b/lib/l10n/ga.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Socruithe", "Log out" : "Logáil Amach", "Accounts" : "Cuntais", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Féach %s ar Bluesky", "Email" : "Ríomhphost", "Mail %s" : "Ríomhphost %s", "Fediverse" : "Feidearálach", diff --git a/lib/l10n/ga.json b/lib/l10n/ga.json index a81cebc37e0..c719a58f656 100644 --- a/lib/l10n/ga.json +++ b/lib/l10n/ga.json @@ -127,6 +127,8 @@ "Settings" : "Socruithe", "Log out" : "Logáil Amach", "Accounts" : "Cuntais", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Féach %s ar Bluesky", "Email" : "Ríomhphost", "Mail %s" : "Ríomhphost %s", "Fediverse" : "Feidearálach", diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js index 002812cb4a3..77759ed722f 100644 --- a/lib/l10n/ja.js +++ b/lib/l10n/ja.js @@ -324,18 +324,36 @@ OC.L10N.register( "Storage is temporarily not available" : "ストレージは一時的に利用できません", "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s", "To allow this check to run you have to make sure that your Web server can connect to itself. Therefore it must be able to resolve and connect to at least one of its `trusted_domains` or the `overwrite.cli.url`. This failure may be the result of a server-side DNS mismatch or outbound firewall rule." : "このチェックを実行させるには、Webサーバーが自分自身に接続できることを確認しなければならない。そのため、少なくとも一つの `trusted_domains` または `overwrite.cli.url` を解決して接続できなければなりません。この失敗は、サーバ側のDNSの不一致やアウトバウンドファイアウォールルールの結果かもしれません。", + "Analyze images" : "画像を分析する", + "Ask a question about the given images." : "与えられた画像について質問してください。", "Images" : "画像", + "Images to ask a question about" : "質問したい画像", "Question" : "質問", + "What to ask about the images." : "画像について質問すべきこと。", "Generated response" : "生成された応答", + "The answer to the question" : "質問への回答", + "Audio chat" : "音声チャット", + "Voice chat with the assistant" : "アシスタントとの音声チャット", "System prompt" : "システムプロンプト", "Define rules and assumptions that the assistant should follow during the conversation." : "会話中にアシスタントが従うべきルールと前提条件を定義します。", + "Chat voice message" : "チャット音声メッセージ", + "Describe a task that you want the assistant to do or ask a question." : "アシスタントに実行してほしいタスクを説明するか質問を投げかけてください。", "Chat history" : "チャット履歴", + "The history of chat messages before the current message, starting with a message by the user." : "現在のメッセージ以前に送信されたチャットメッセージの履歴で、ユーザーが送信したメッセージから始まるもの。", + "Input transcript" : "文字起こしを入力", + "Transcription of the audio input" : "音声入力の文字起こし", + "Response voice message" : "応答音声メッセージ", + "The generated voice response as part of the conversation" : "会話の一部として生成された音声応答", + "Output transcript" : "文字起こしを出力", + "Transcription of the audio output" : "音声出力の文字起こし", "Transcribe audio" : "音声の書き起こし", "Transcribe the things said in an audio" : "音声で言ったことを書き起こす", "Audio input" : "音声入力", "The audio to transcribe" : "文字起こしする音声", "Transcription" : "書き起こし", "The transcribed text" : "書き起こされたテキスト", + "Chat by voice with an agent" : "エージェントと音声でチャットする", + "Describe a task that you want the agent to do or ask a question." : "エージェントに実行してほしいタスクを説明するか質問を投げかけてください。エージェントと音声でチャットできます。", "Confirmation" : "確認", "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "以前に要求されたアクションを承認するかどうか： 0なら拒否、1なら承認。", "Conversation token" : "会話トークン", diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json index 1fdcad48c1c..31f59295d19 100644 --- a/lib/l10n/ja.json +++ b/lib/l10n/ja.json @@ -322,18 +322,36 @@ "Storage is temporarily not available" : "ストレージは一時的に利用できません", "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s", "To allow this check to run you have to make sure that your Web server can connect to itself. Therefore it must be able to resolve and connect to at least one of its `trusted_domains` or the `overwrite.cli.url`. This failure may be the result of a server-side DNS mismatch or outbound firewall rule." : "このチェックを実行させるには、Webサーバーが自分自身に接続できることを確認しなければならない。そのため、少なくとも一つの `trusted_domains` または `overwrite.cli.url` を解決して接続できなければなりません。この失敗は、サーバ側のDNSの不一致やアウトバウンドファイアウォールルールの結果かもしれません。", + "Analyze images" : "画像を分析する", + "Ask a question about the given images." : "与えられた画像について質問してください。", "Images" : "画像", + "Images to ask a question about" : "質問したい画像", "Question" : "質問", + "What to ask about the images." : "画像について質問すべきこと。", "Generated response" : "生成された応答", + "The answer to the question" : "質問への回答", + "Audio chat" : "音声チャット", + "Voice chat with the assistant" : "アシスタントとの音声チャット", "System prompt" : "システムプロンプト", "Define rules and assumptions that the assistant should follow during the conversation." : "会話中にアシスタントが従うべきルールと前提条件を定義します。", + "Chat voice message" : "チャット音声メッセージ", + "Describe a task that you want the assistant to do or ask a question." : "アシスタントに実行してほしいタスクを説明するか質問を投げかけてください。", "Chat history" : "チャット履歴", + "The history of chat messages before the current message, starting with a message by the user." : "現在のメッセージ以前に送信されたチャットメッセージの履歴で、ユーザーが送信したメッセージから始まるもの。", + "Input transcript" : "文字起こしを入力", + "Transcription of the audio input" : "音声入力の文字起こし", + "Response voice message" : "応答音声メッセージ", + "The generated voice response as part of the conversation" : "会話の一部として生成された音声応答", + "Output transcript" : "文字起こしを出力", + "Transcription of the audio output" : "音声出力の文字起こし", "Transcribe audio" : "音声の書き起こし", "Transcribe the things said in an audio" : "音声で言ったことを書き起こす", "Audio input" : "音声入力", "The audio to transcribe" : "文字起こしする音声", "Transcription" : "書き起こし", "The transcribed text" : "書き起こされたテキスト", + "Chat by voice with an agent" : "エージェントと音声でチャットする", + "Describe a task that you want the agent to do or ask a question." : "エージェントに実行してほしいタスクを説明するか質問を投げかけてください。エージェントと音声でチャットできます。", "Confirmation" : "確認", "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "以前に要求されたアクションを承認するかどうか： 0なら拒否、1なら承認。", "Conversation token" : "会話トークン", diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index 8392d2b48b8..eb66a56742e 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Ustawienia", "Log out" : "Wyloguj", "Accounts" : "Konta", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Wyświetl %s na Bluesky", "Email" : "E-mail", "Mail %s" : "Poczta %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json index 10b4a8379a5..0138279e46b 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -127,6 +127,8 @@ "Settings" : "Ustawienia", "Log out" : "Wyloguj", "Accounts" : "Konta", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Wyświetl %s na Bluesky", "Email" : "E-mail", "Mail %s" : "Poczta %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index e8373461705..0e28c2f9102 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Configurações", "Log out" : "Sair", "Accounts" : "Contas", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Ver %s no Bluesky", "Email" : "E-mail", "Mail %s" : "Enviar e-mail para %s", "Fediverse" : "Fediverso", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index 7293cdb880a..40b5c4e5807 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -127,6 +127,8 @@ "Settings" : "Configurações", "Log out" : "Sair", "Accounts" : "Contas", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Ver %s no Bluesky", "Email" : "E-mail", "Mail %s" : "Enviar e-mail para %s", "Fediverse" : "Fediverso", diff --git a/lib/l10n/sw.js b/lib/l10n/sw.js index 84ddd8abf9b..aa914220945 100644 --- a/lib/l10n/sw.js +++ b/lib/l10n/sw.js @@ -1,6 +1,7 @@ OC.L10N.register( "lib", { + "Other activities" : "Other activities", "Authentication" : "Uthibitisho", "Unknown filetype" : "Aina ya faili haijulikani", "Invalid image" : "Taswira si halisi", @@ -22,12 +23,14 @@ OC.L10N.register( "Settings" : "Mipangilio", "Log out" : "Ondoka", "Accounts" : "Akaunti", + "Bluesky" : "Bluesky", "Email" : "Barua pepe", "Phone" : "Simu", "Twitter" : "Twitter", "Website" : "Wavuti", "Address" : "Anwani", "About" : "Kuhusu", + "Display name" : "Display name", "Additional settings" : "Mipangilio ya nyongeza", "%1$s shared %2$s with you" : "%1$s ameshirikisha %2$s na wewe", "Open %s" : "Fungua %s", diff --git a/lib/l10n/sw.json b/lib/l10n/sw.json index 6adf1f1d8ee..f0dc60848ce 100644 --- a/lib/l10n/sw.json +++ b/lib/l10n/sw.json @@ -1,4 +1,5 @@ { "translations": { + "Other activities" : "Other activities", "Authentication" : "Uthibitisho", "Unknown filetype" : "Aina ya faili haijulikani", "Invalid image" : "Taswira si halisi", @@ -20,12 +21,14 @@ "Settings" : "Mipangilio", "Log out" : "Ondoka", "Accounts" : "Akaunti", + "Bluesky" : "Bluesky", "Email" : "Barua pepe", "Phone" : "Simu", "Twitter" : "Twitter", "Website" : "Wavuti", "Address" : "Anwani", "About" : "Kuhusu", + "Display name" : "Display name", "Additional settings" : "Mipangilio ya nyongeza", "%1$s shared %2$s with you" : "%1$s ameshirikisha %2$s na wewe", "Open %s" : "Fungua %s", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index 4e871b4130f..6bbd064cdef 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "Налаштування", "Log out" : "Вихід", "Accounts" : "Облікові записи", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Переглянути %s в Bluesky", "Email" : "Електронна пошта", "Mail %s" : "Пошта %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 285c39ff532..dec165c8acb 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -127,6 +127,8 @@ "Settings" : "Налаштування", "Log out" : "Вихід", "Accounts" : "Облікові записи", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "Переглянути %s в Bluesky", "Email" : "Електронна пошта", "Mail %s" : "Пошта %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index bb1294601aa..5b78898b2db 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -1,7 +1,7 @@ OC.L10N.register( "lib", { - "Cannot write into \"config\" directory!" : "无法写入 \"config\" 目录！", + "Cannot write into \"config\" directory!" : "无法写入“config”目录！", "This can usually be fixed by giving the web server write access to the config directory." : "通常可以为 Web 服务器授予对 config 目录的写入权限来修复这个问题。", "But, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "但是，如果您更希望将 config.php 文件设为只读，可以将 \"config_is_read_only\" 选项设置为 true。", "See %s" : "查看 %s", @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "设置", "Log out" : "注销", "Accounts" : "账号", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上查看 %s", "Email" : "电子邮箱", "Mail %s" : "发邮件给 %s", "Fediverse" : "联邦宇宙", diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json index 28e3497decd..857e1ced95b 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -1,5 +1,5 @@ { "translations": { - "Cannot write into \"config\" directory!" : "无法写入 \"config\" 目录！", + "Cannot write into \"config\" directory!" : "无法写入“config”目录！", "This can usually be fixed by giving the web server write access to the config directory." : "通常可以为 Web 服务器授予对 config 目录的写入权限来修复这个问题。", "But, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "但是，如果您更希望将 config.php 文件设为只读，可以将 \"config_is_read_only\" 选项设置为 true。", "See %s" : "查看 %s", @@ -127,6 +127,8 @@ "Settings" : "设置", "Log out" : "注销", "Accounts" : "账号", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上查看 %s", "Email" : "电子邮箱", "Mail %s" : "发邮件给 %s", "Fediverse" : "联邦宇宙", diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js index 89b8457ef51..86f2a61e2ed 100644 --- a/lib/l10n/zh_HK.js +++ b/lib/l10n/zh_HK.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "設定", "Log out" : "登出", "Accounts" : "帳戶", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上查看 %s", "Email" : "電郵地址", "Mail %s" : "郵件 %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json index e9b3544b539..202410d95dd 100644 --- a/lib/l10n/zh_HK.json +++ b/lib/l10n/zh_HK.json @@ -127,6 +127,8 @@ "Settings" : "設定", "Log out" : "登出", "Accounts" : "帳戶", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上查看 %s", "Email" : "電郵地址", "Mail %s" : "郵件 %s", "Fediverse" : "Fediverse", diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js index a12ad471433..c6ff09d8cac 100644 --- a/lib/l10n/zh_TW.js +++ b/lib/l10n/zh_TW.js @@ -129,6 +129,8 @@ OC.L10N.register( "Settings" : "設定", "Log out" : "登出", "Accounts" : "帳號", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上檢視 %s", "Email" : "電子郵件", "Mail %s" : "寄送郵件給 %s", "Fediverse" : "聯邦宇宙", diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json index 0e01a122735..01e63631f3b 100644 --- a/lib/l10n/zh_TW.json +++ b/lib/l10n/zh_TW.json @@ -127,6 +127,8 @@ "Settings" : "設定", "Log out" : "登出", "Accounts" : "帳號", + "Bluesky" : "Bluesky", + "View %s on Bluesky" : "在 Bluesky 上檢視 %s", "Email" : "電子郵件", "Mail %s" : "寄送郵件給 %s", "Fediverse" : "聯邦宇宙", diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 0bce8ac193b..76261fe6b92 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -38,6 +38,7 @@ use OC\Log\PsrLoggerAdapter; use OC\ServerContainer; use OC\Settings\AuthorizedGroupMapper; use OCA\WorkflowEngine\Manager; +use OCP\App\IAppManager; use OCP\AppFramework\Http\IOutput; use OCP\AppFramework\IAppContainer; use OCP\AppFramework\QueryException; @@ -200,7 +201,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { $server->getUserSession()->isLoggedIn(), $c->get(IGroupManager::class), $c->get(ISubAdmin::class), - $server->getAppManager(), + $c->get(IAppManager::class), $server->getL10N('lib'), $c->get(AuthorizedGroupMapper::class), $c->get(IUserSession::class), diff --git a/lib/private/InitialStateService.php b/lib/private/InitialStateService.php index c930ffd9466..300aa238397 100644 --- a/lib/private/InitialStateService.php +++ b/lib/private/InitialStateService.php @@ -13,29 +13,23 @@ use OC\AppFramework\Bootstrap\Coordinator; use OCP\AppFramework\QueryException; use OCP\AppFramework\Services\InitialStateProvider; use OCP\IInitialStateService; -use OCP\IServerContainer; +use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; class InitialStateService implements IInitialStateService { - /** @var LoggerInterface */ - private $logger; /** @var string[][] */ - private $states = []; + private array $states = []; /** @var Closure[][] */ - private $lazyStates = []; + private array $lazyStates = []; - /** @var Coordinator */ - private $bootstrapCoordinator; - /** @var IServerContainer */ - private $container; - - public function __construct(LoggerInterface $logger, Coordinator $bootstrapCoordinator, IServerContainer $container) { - $this->logger = $logger; - $this->bootstrapCoordinator = $bootstrapCoordinator; - $this->container = $container; + public function __construct( + private LoggerInterface $logger, + private Coordinator $bootstrapCoordinator, + private ContainerInterface $container, + ) { } public function provideInitialState(string $appName, string $key, $data): void { diff --git a/lib/private/User/DisplayNameCache.php b/lib/private/User/DisplayNameCache.php index 40e1c752589..4321d95f88e 100644 --- a/lib/private/User/DisplayNameCache.php +++ b/lib/private/User/DisplayNameCache.php @@ -25,6 +25,8 @@ use OCP\User\Events\UserDeletedEvent; * @template-implements IEventListener<UserChangedEvent|UserDeletedEvent> */ class DisplayNameCache implements IEventListener { + private const CACHE_TTL = 24 * 60 * 60; // 1 day + private array $cache = []; private ICache $memCache; private IUserManager $userManager; @@ -56,7 +58,7 @@ class DisplayNameCache implements IEventListener { $displayName = null; } $this->cache[$userId] = $displayName; - $this->memCache->set($userId, $displayName, 60 * 10); // 10 minutes + $this->memCache->set($userId, $displayName, self::CACHE_TTL); return $displayName; } @@ -71,7 +73,7 @@ class DisplayNameCache implements IEventListener { $userId = $event->getUser()->getUID(); $newDisplayName = $event->getValue(); $this->cache[$userId] = $newDisplayName; - $this->memCache->set($userId, $newDisplayName, 60 * 10); // 10 minutes + $this->memCache->set($userId, $newDisplayName, self::CACHE_TTL); } if ($event instanceof UserDeletedEvent) { $userId = $event->getUser()->getUID(); diff --git a/lib/private/UserStatus/Manager.php b/lib/private/UserStatus/Manager.php index 4658f61df82..4cfd1c18e79 100644 --- a/lib/private/UserStatus/Manager.php +++ b/lib/private/UserStatus/Manager.php @@ -8,35 +8,21 @@ declare(strict_types=1); */ namespace OC\UserStatus; -use OCP\IServerContainer; use OCP\UserStatus\IManager; use OCP\UserStatus\IProvider; use Psr\Container\ContainerExceptionInterface; +use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var IServerContainer */ - private $container; - - /** @var LoggerInterface */ - private $logger; - - /** @var class-string */ - private $providerClass; - - /** @var IProvider */ - private $provider; - - /** - * Manager constructor. - * - * @param IServerContainer $container - * @param LoggerInterface $logger - */ - public function __construct(IServerContainer $container, - LoggerInterface $logger) { - $this->container = $container; - $this->logger = $logger; + /** @var ?class-string */ + private ?string $providerClass = null; + private ?IProvider $provider = null; + + public function __construct( + private ContainerInterface $container, + private LoggerInterface $logger, + ) { } /** @@ -89,7 +75,7 @@ class Manager implements IManager { public function setUserStatus(string $userId, string $messageId, string $status, bool $createBackup = false, ?string $customMessage = null): void { $this->setupProvider(); - if (!$this->provider || !($this->provider instanceof ISettableProvider)) { + if (!$this->provider instanceof ISettableProvider) { return; } @@ -98,7 +84,7 @@ class Manager implements IManager { public function revertUserStatus(string $userId, string $messageId, string $status): void { $this->setupProvider(); - if (!$this->provider || !($this->provider instanceof ISettableProvider)) { + if (!$this->provider instanceof ISettableProvider) { return; } $this->provider->revertUserStatus($userId, $messageId, $status); @@ -106,7 +92,7 @@ class Manager implements IManager { public function revertMultipleUserStatus(array $userIds, string $messageId, string $status): void { $this->setupProvider(); - if (!$this->provider || !($this->provider instanceof ISettableProvider)) { + if (!$this->provider instanceof ISettableProvider) { return; } $this->provider->revertMultipleUserStatus($userIds, $messageId, $status); diff --git a/lib/public/IInitialStateService.php b/lib/public/IInitialStateService.php index 672c086b22d..6c482c2cf20 100644 --- a/lib/public/IInitialStateService.php +++ b/lib/public/IInitialStateService.php @@ -11,13 +11,13 @@ use Closure; /** * @since 16.0.0 - * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider + * @deprecated 21 Use {@see \OCP\AppFramework\Services\IInitialState} or {@see \OCP\AppFramework\Services\InitialStateProvider} * @see \OCP\AppFramework\Services\IInitialState */ interface IInitialStateService { /** * Allows an app to provide its initial state to the template system. - * Use this if you know your initial state sill be used for example if + * Use this if you know your initial state still be used for example if * you are in the render function of you controller. * * @since 16.0.0 @@ -26,7 +26,7 @@ interface IInitialStateService { * @param string $key * @param bool|int|float|string|array|\JsonSerializable $data * - * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider + * @deprecated 21 Use {@see \OCP\AppFramework\Services\IInitialState} or {@see \OCP\AppFramework\Services\InitialStateProvider} * @see \OCP\AppFramework\Services\IInitialState::provideInitialState() */ public function provideInitialState(string $appName, string $key, $data): void; @@ -44,7 +44,7 @@ interface IInitialStateService { * @param string $key * @param Closure $closure returns a primitive or an object that implements JsonSerializable * - * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider + * @deprecated 21 Use {@see \OCP\AppFramework\Services\IInitialState} or {@see \OCP\AppFramework\Services\InitialStateProvider} * @see \OCP\AppFramework\Services\IInitialState::provideLazyInitialState() */ public function provideLazyInitialState(string $appName, string $key, Closure $closure): void; |