Merge pull request 'develop' (#9034) from develop into main

Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9034

CALCKEY.md

@@ -75,6 +75,7 @@
 - Make showing the update popup optional
 - Improve PWA manifest
 - Fix incoming chat scrolling globally
+- Update notifier
 - Obliteration of Ai-chan
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)

README.md

@@ -86,6 +86,6 @@ NODE_ENV=production yarn run build && yarn run migrate
 
 ```sh
 # git pull
-sudo docker-compose build
+sudo docker compose build
-sudo docker-compose stop && sudo docker-compose up -d
+sudo docker compose stop && sudo docker compose up -d
 ```

docker-compose.yml

@@ -14,8 +14,8 @@ services:
       - internal_network
       - external_network
     volumes:
-      - ./files:/misskey/files
+      - ./files:/calckey/files
-      - ./.config:/misskey/.config:ro
+      - ./.config:/calckey/.config:ro
 
   redis:
     restart: always

locales/en-US.yml

@@ -913,6 +913,7 @@ recommendedInstances: "Recommended instances"
 recommendedInstancesDescription: "Recommended instances seperated by line breaks to appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
 caption: "Auto Caption"
 splash: "Splash Screen"
+updateAvailable: "There's an update available!"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."

locales/ja-JP.yml

@@ -913,6 +913,7 @@ recommendedInstances: "推奨インスタンス"
 recommendedInstancesDescription: "推奨タイムラインに表示するために改行で区切られた推奨インスタンス。`https：//`を追加しないでください。ドメインのみを追加してください。"
 caption: "自動キャプション"
 splash: "スプラッシュスクリーン"
+updateAvailable: "アップデートがありますよ"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc",
+	"version": "12.119.0-calc.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

packages/client/src/pages/admin/index.vue

@@ -11,6 +11,7 @@
 				<MkInfo v-if="noMaintainerInformation" warn class="info">{{ i18n.ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
 				<MkInfo v-if="noBotProtection" warn class="info">{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
 				<MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
+				<MkInfo v-if="updateAvailable" warn class="info">{{ i18n.ts.updateAvailable }} <MkA to="https://codeberg.org/thatonecalculator/calckey" class="_link">{{ i18n.ts.check }}</MkA></MkInfo>
 
 				<MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu>
 			</div>
@@ -29,6 +30,7 @@ import MkSuperMenu from '@/components/MkSuperMenu.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import { scroll } from '@/scripts/scroll';
 import { instance } from '@/instance';
+import { version } from '@/config';
 import * as os from '@/os';
 import { lookupUser } from '@/scripts/lookup-user';
 import { useRouter } from '@/router';
@@ -56,6 +58,7 @@ let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instan
 let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha;
 let noEmailServer = !instance.enableEmail;
 let thereIsUnresolvedAbuseReport = $ref(false);
+let updateAvailable = $ref(false);
 let currentPage = $computed(() => router.currentRef.value.child);
 
 os.api('admin/abuse-user-reports', {
@@ -65,6 +68,14 @@ os.api('admin/abuse-user-reports', {
 	if (reports.length > 0) thereIsUnresolvedAbuseReport = true;
 });
 
+fetch('https://codeberg.org/api/v1/repos/thatonecalculator/calckey/releases?draft=false&pre-release=false&page=1&limit=1')
+	.then((response) => response.json())
+	.then((data) => {
+		if (data.length > 0 && data[0].tag_name !== version) {
+			updateAvailable = true;
+		}
+	});
+
 const NARROW_THRESHOLD = 600;
 const ro = new ResizeObserver((entries, observer) => {
 	if (entries.length === 0) return;

packages/client/src/pages/user/index.vue

@@ -31,8 +31,6 @@
 	</div>
 	<MkError v-else-if="error" @retry="fetchUser()"/>
 	<MkLoading v-else/>
-	</swiper>
-	</div>
 </MkStickyContainer>
 </template>