Bug fixes, use calckey.js

CALCKEY.md

@@ -9,6 +9,7 @@
   - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
 - Function
   - Federate with note edits
+  - Admin customizable max note length (100-8000)
   - User "choices" (recommended users) like Mastodon and Soapbox
   - Join Reason system like Mastodon/Pleroma
   - Option to publicize instance blocks
@@ -97,6 +98,7 @@
 - Undo renote button inside original note
 - Custom locales
 - Obliteration of Ai-chan
+- Switch to [Calckey.js](https://codeberg.org/thatonecalculator/cal)
 - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
 - [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)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-beta1",
+	"version": "13.0.0-beta2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

packages/backend/package.json

@@ -42,6 +42,7 @@
 		"blurhash": "1.1.5",
 		"bull": "4.10.1",
 		"cacheable-lookup": "7.0.0",
+		"calckey-js": "^0.0.15",
 		"cbor": "8.1.0",
 		"chalk": "5.1.2",
 		"chalk-template": "0.4.0",
@@ -77,7 +78,6 @@
 		"koa-views": "7.0.2",
 		"mfm-js": "0.23.0",
 		"mime-types": "2.1.35",
-		"misskey-js": "0.0.14",
 		"mocha": "10.1.0",
 		"multer": "1.4.4-lts.1",
 		"nested-property": "4.0.0",

packages/backend/src/remote/resolve-user.ts

@@ -1,13 +1,13 @@
 import { URL } from 'node:url';
-import webFinger from './webfinger.js';
-import config from '@/config/index.js';
-import { createPerson, updatePerson } from './activitypub/models/person.js';
-import { remoteLogger } from './logger.js';
 import chalk from 'chalk';
-import { User, IRemoteUser } from '@/models/entities/user.js';
+import { IsNull } from 'typeorm';
+import config from '@/config/index.js';
+import type { User, IRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
-import { IsNull } from 'typeorm';
+import webFinger from './webfinger.js';
+import { createPerson, updatePerson } from './activitypub/models/person.js';
+import { remoteLogger } from './logger.js';
 
 const logger = remoteLogger.createSubLogger('resolve-user');
 
@@ -67,7 +67,7 @@ export async function resolveUser(username: string, host: string | null): Promis
 			// validate uri
 			const uri = new URL(self.href);
 			if (uri.hostname !== host) {
-				throw new Error(`Invalid uri`);
+				throw new Error('Invalid uri');
 			}
 
 			await Users.update({

packages/backend/src/server/api/endpoints/i/known-as.ts

@@ -28,7 +28,7 @@ export const meta = {
 			id: 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5',
 		},
 		notRemote: {
-			message: 'User not remote.',
+			message: 'User is not remote. You can only migrate to other instances.',
 			code: 'NOT_REMOTE',
 			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
 		},
@@ -61,8 +61,13 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const updates = {} as Partial<User>;
 
+	// FIXME: .uri is local uri, not remote uri!
 	if (!knownAs.uri) knownAs.uri = '';
+	if (updates.alsoKnownAs == null || updates.alsoKnownAs.length === 0) {
 		updates.alsoKnownAs = [knownAs.uri];
+	} else {
+		updates.alsoKnownAs.push(knownAs.uri);
+	}
 
 	await Users.update(user.id, updates);
 

packages/backend/test/utils.ts

@@ -6,7 +6,7 @@ import * as childProcess from 'child_process';
 import * as http from 'node:http';
 import { SIGKILL } from 'constants';
 import WebSocket from 'ws';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import fetch from 'node-fetch';
 import FormData from 'form-data';
 import { DataSource } from 'typeorm';

packages/client/package.json

@@ -19,6 +19,7 @@
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.18.1",
 		"browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git#commit=0380d12c8e736788ea7f4e6e985175521ea7b23c",
+		"calckey-js": "^0.0.15",
 		"chart.js": "4.0.1",
 		"chartjs-adapter-date-fns": "2.0.1",
 		"chartjs-plugin-gradient": "0.5.1",
@@ -34,7 +35,6 @@
 		"katex": "0.16.3",
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.0",
-		"misskey-js": "0.0.14",
 		"photoswipe": "5.3.3",
 		"prismjs": "1.29.0",
 		"punycode": "2.1.1",

packages/client/src/account.ts

@@ -1,5 +1,5 @@
 import { defineAsyncComponent, reactive } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { showSuspendedDialog } from './scripts/show-suspended-dialog';
 import { i18n } from './i18n';
 import { del, get, set } from '@/scripts/idb-proxy';

packages/client/src/components/MkAbuseReportWindow.vue

@@ -24,7 +24,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import XWindow from '@/components/MkWindow.vue';
 import MkTextarea from '@/components/form/textarea.vue';
 import MkButton from '@/components/MkButton.vue';

packages/client/src/components/MkCropperDialog.vue

@@ -27,7 +27,7 @@
 
 <script lang="ts" setup>
 import { nextTick, onMounted } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import Cropper from 'cropperjs';
 import tinycolor from 'tinycolor2';
 import XModalWindow from '@/components/MkModalWindow.vue';

packages/client/src/components/MkCwButton.vue

@@ -8,7 +8,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import { length } from 'stringz';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { concat } from '@/scripts/array';
 import { i18n } from '@/i18n';
 

packages/client/src/components/MkDrive.file.vue

@@ -33,7 +33,7 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
 import bytes from '@/filters/bytes';

packages/client/src/components/MkDrive.folder.vue

@@ -29,7 +29,7 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';

packages/client/src/components/MkDrive.navFolder.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 

packages/client/src/components/MkDrive.vue

@@ -89,7 +89,7 @@
 
 <script lang="ts" setup>
 import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import MkButton from './MkButton.vue';
 import XNavFolder from '@/components/MkDrive.navFolder.vue';
 import XFolder from '@/components/MkDrive.folder.vue';

packages/client/src/components/MkDriveFileThumbnail.vue

@@ -16,7 +16,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import type * as Misskey from 'misskey-js';
+import type * as Misskey from 'calckey-js';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 
 const props = defineProps<{

packages/client/src/components/MkDriveSelectDialog.vue

@@ -20,7 +20,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import XDrive from '@/components/MkDrive.vue';
 import XModalWindow from '@/components/MkModalWindow.vue';
 import number from '@/filters/number';

packages/client/src/components/MkDriveWindow.vue

@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import XDrive from '@/components/MkDrive.vue';
 import XWindow from '@/components/MkWindow.vue';
 import { i18n } from '@/i18n';

packages/client/src/components/MkEmojiPicker.vue

@@ -79,7 +79,7 @@
 
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import XSection from '@/components/MkEmojiPicker.section.vue';
 import { emojilist, UnicodeEmojiDef, unicodeEmojiCategories as categories } from '@/scripts/emojilist';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';

packages/client/src/components/MkFeaturedPhotos.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import * as os from '@/os';
 
 const meta = ref<Misskey.entities.DetailedInstanceMetadata>();

packages/client/src/components/MkFollowButton.vue

@@ -31,7 +31,7 @@
 
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted } from 'vue';
-import type * as Misskey from 'misskey-js';
+import type * as Misskey from 'calckey-js';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { i18n } from '@/i18n';

packages/client/src/components/MkImageViewer.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
 import MkModal from '@/components/MkModal.vue';

packages/client/src/components/MkInstanceCardMini.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 

packages/client/src/components/MkMediaBanner.vue

@@ -46,7 +46,7 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import VuePlyr from 'vue-plyr';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import { ColdDeviceStorage } from '@/store';
 import 'vue-plyr/dist/vue-plyr.css';
 import { i18n } from '@/i18n';

packages/client/src/components/MkMediaImage.vue

@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 import { watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import { defaultStore } from '@/store';

packages/client/src/components/MkMediaList.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import PhotoSwipeLightbox from 'photoswipe/lightbox';
 import PhotoSwipe from 'photoswipe';
 import 'photoswipe/style.css';

packages/client/src/components/MkMediaVideo.vue

@@ -43,7 +43,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import VuePlyr from 'vue-plyr';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import { defaultStore } from '@/store';
 import 'vue-plyr/dist/vue-plyr.css';
 import { i18n } from '@/i18n';

packages/client/src/components/MkNote.vue

@@ -107,7 +107,7 @@
 import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
 import * as mfm from 'mfm-js';
 import type { Ref } from 'vue';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import MkNoteSub from '@/components/MkNoteSub.vue';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import XNoteSimple from '@/components/MkNoteSimple.vue';

packages/client/src/components/MkNoteDetailed.vue

@@ -117,7 +117,7 @@
 <script lang="ts" setup>
 import { computed, inject, onMounted, onUnmounted, reactive, ref } from 'vue';
 import * as mfm from 'mfm-js';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import MkNoteSub from '@/components/MkNoteSub.vue';
 import XNoteSimple from '@/components/MkNoteSimple.vue';
 import XReactionsViewer from '@/components/MkReactionsViewer.vue';

packages/client/src/components/MkNoteHeader.vue

@@ -16,7 +16,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkVisibility from '@/components/MkVisibility.vue';
 import { notePage } from '@/filters/note';
 import { userPage } from '@/filters/user';

packages/client/src/components/MkNoteSimple.vue

@@ -18,7 +18,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
 import XCwButton from '@/components/MkCwButton.vue';

packages/client/src/components/MkNoteSub.vue

@@ -28,7 +28,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
 import XCwButton from '@/components/MkCwButton.vue';

packages/client/src/components/MkNotification.vue

@@ -74,7 +74,7 @@
 
 <script lang="ts" setup>
 import { ref, onMounted, onUnmounted, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XReactionIcon from '@/components/MkReactionIcon.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import XReactionTooltip from '@/components/MkReactionTooltip.vue';

packages/client/src/components/MkNotificationSettingWindow.vue

@@ -29,7 +29,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from 'calckey-js';
 import MkSwitch from './form/switch.vue';
 import MkInfo from './MkInfo.vue';
 import MkButton from './MkButton.vue';

packages/client/src/components/MkNotifications.vue

@@ -18,7 +18,7 @@
 
 <script lang="ts" setup>
 import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from 'calckey-js';
 import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import XNotification from '@/components/MkNotification.vue';
 import XList from '@/components/MkDateSeparatedList.vue';

packages/client/src/components/MkPagination.vue

@@ -33,7 +33,7 @@
 
 <script lang="ts" setup>
 import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref, ref, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import * as os from '@/os';
 import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
 import MkButton from '@/components/MkButton.vue';

packages/client/src/components/MkPoll.vue

@@ -23,7 +23,7 @@
 
 <script lang="ts" setup>
 import { computed, onUnmounted, ref, toRef } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { sum } from '@/scripts/array';
 import { pleaseLogin } from '@/scripts/please-login';
 import * as os from '@/os';

packages/client/src/components/MkPostForm.vue

@@ -65,7 +65,7 @@
 <script lang="ts" setup>
 import { inject, watch, nextTick, onMounted, defineAsyncComponent } from 'vue';
 import * as mfm from 'mfm-js';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import insertTextAtCursor from 'insert-text-at-cursor';
 import { length } from 'stringz';
 import { toASCII } from 'punycode/';

packages/client/src/components/MkReactionsViewer.reaction.vue

@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XDetails from '@/components/MkReactionsViewer.details.vue';
 import XReactionIcon from '@/components/MkReactionIcon.vue';
 import * as os from '@/os';

packages/client/src/components/MkReactionsViewer.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { $i } from '@/account';
 import XReaction from '@/components/MkReactionsViewer.reaction.vue';
 

packages/client/src/components/MkRenoteButton.vue

@@ -16,7 +16,7 @@
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import Ripple from '@/components/MkRipple.vue';
 import XDetails from '@/components/MkUsersTooltip.vue';
 import { pleaseLogin } from '@/scripts/please-login';

packages/client/src/components/MkSubNoteContent.vue

@@ -25,7 +25,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XMediaList from '@/components/MkMediaList.vue';
 import XPoll from '@/components/MkPoll.vue';
 import { i18n } from '@/i18n';

packages/client/src/components/MkTokenGenerateWindow.vue

@@ -30,7 +30,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import { permissions as kinds } from 'misskey-js';
+import { permissions as kinds } from 'calckey-js';
 import MkInput from './form/input.vue';
 import MkSwitch from './form/switch.vue';
 import MkButton from './MkButton.vue';

packages/client/src/components/MkUserCardMini.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { acct } from '@/filters/user';

packages/client/src/components/MkUserInfo.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';

packages/client/src/components/MkUserOnlineIndicator.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { i18n } from '@/i18n';
 
 const props = defineProps<{

packages/client/src/components/MkUserPreview.vue

@@ -36,7 +36,7 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import { userPage } from '@/filters/user';
 import * as os from '@/os';

packages/client/src/components/MkUserSelectDialog.vue

@@ -53,7 +53,7 @@
 
 <script lang="ts" setup>
 import { nextTick, onMounted } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkInput from '@/components/form/input.vue';
 import FormSplit from '@/components/form/split.vue';
 import XModalWindow from '@/components/MkModalWindow.vue';

packages/client/src/components/MkVisibilityPicker.vue

@@ -44,7 +44,7 @@
 
 <script lang="ts" setup>
 import { nextTick, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkModal from '@/components/MkModal.vue';
 import { i18n } from '@/i18n';
 

packages/client/src/components/global/MkAcct.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { toUnicode } from 'punycode/';
 import { host as hostRaw } from '@/config';
 

packages/client/src/components/global/MkAvatar.vue

@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import { onMounted, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
 import { acct, userPage } from '@/filters/user';

packages/client/src/components/global/MkUserName.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 
 const props = withDefaults(defineProps<{
 	user: misskey.entities.User;

packages/client/src/filters/user.ts

@@ -1,4 +1,4 @@
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import * as Acct from 'misskey-js/built/acct';
 import { url } from '@/config';
 

packages/client/src/instance.ts

@@ -1,5 +1,5 @@
 import { computed, reactive } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { api } from './os';
 
 // TODO: 他のタブと永続化されたstateを同期

packages/client/src/os.ts

@@ -3,7 +3,7 @@
 import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
 import { EventEmitter } from 'eventemitter3';
 import insertTextAtCursor from 'insert-text-at-cursor';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { apiUrl, url } from '@/config';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
 import MkWaitingDialog from '@/components/MkWaitingDialog.vue';

packages/client/src/pages/_error_.vue

@@ -19,7 +19,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkButton from '@/components/MkButton.vue';
 import { version } from '@/config';
 import * as os from '@/os';

packages/client/src/pages/about-calckey.vue

@@ -35,7 +35,7 @@
 					<template #label>{{ i18n.ts._aboutMisskey.contributors }}</template>
 					<div class="_formLinks">
 						<FormLink to="/@t1c@i.calckey.cloud"><Mfm :text="'$[sparkle @t1c@i.calckey.cloud] (Main developer)'"/></FormLink>
-						<FormLink to="/@cleo@tech.lgbt"><Mfm :text="'$[sparkle @cleo@tech.lgbt] (Maintainer)'"/></FormLink>
+						<FormLink to="/@cleo@tech.lgbt"><Mfm :text="'@cleo@tech.lgbt (Maintainer)'"/></FormLink>
 						<FormLink to="/@syuilo@misskey.io"><Mfm :text="'@syuilo@misskey.io (Original Misskey developer)'"/></FormLink>
 						<FormLink to="https://www.youtube.com/c/Henkiwashere" external>Henki (error images artist)</FormLink>
 					</div>

packages/client/src/pages/admin/overview.user.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { acct } from '@/filters/user';

packages/client/src/pages/api-console.vue

@@ -31,7 +31,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import JSON5 from 'json5';
-import { Endpoints } from 'misskey-js';
+import { Endpoints } from 'calckey-js';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/form/input.vue';
 import MkTextarea from '@/components/form/textarea.vue';

packages/client/src/pages/clip.vue

@@ -20,7 +20,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, provide } from 'vue';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import XNotes from '@/components/MkNotes.vue';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';

packages/client/src/pages/instance-info.vue

@@ -135,7 +135,7 @@
 import { watch } from 'vue';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import FormLink from '@/components/form/link.vue';

packages/client/src/pages/messaging/messaging-room.form.vue

@@ -28,7 +28,7 @@
 
 <script lang="ts" setup>
 import { onMounted, watch } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import autosize from 'autosize';
 //import insertTextAtCursor from 'insert-text-at-cursor';
 import { throttle } from 'throttle-debounce';

packages/client/src/pages/messaging/messaging-room.message.vue

@@ -38,7 +38,7 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import * as mfm from 'mfm-js';
-import type * as Misskey from 'misskey-js';
+import type * as Misskey from 'calckey-js';
 import XMediaList from '@/components/MkMediaList.vue';
 import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';

packages/client/src/pages/messaging/messaging-room.vue

@@ -52,7 +52,7 @@
 
 <script lang="ts" setup>
 import { computed, watch, onMounted, nextTick, onBeforeUnmount } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import * as Acct from 'misskey-js/built/acct';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';

packages/client/src/pages/note.vue

@@ -42,7 +42,7 @@
 
 <script lang="ts" setup>
 import { computed, defineComponent, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XNote from '@/components/MkNote.vue';
 import XNoteDetailed from '@/components/MkNoteDetailed.vue';
 import XNotes from '@/components/MkNotes.vue';

packages/client/src/pages/notifications.vue

@@ -38,7 +38,7 @@
 import { computed, ref, watch } from 'vue';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from 'calckey-js';
 import XNotifications from '@/components/MkNotifications.vue';
 import XNotes from '@/components/MkNotes.vue';
 import * as os from '@/os';

packages/client/src/pages/settings/migration.vue

@@ -38,9 +38,6 @@ let moveToAccount = $ref('');
 let accountAlias = $ref('');
 
 async function save(account): Promise<void> {
-	console.log(accountAlias);
-	console.log(accountAlias.toString());
-	console.log(account);
 	os.apiWithDialog('i/known-as', {
 		alsoKnownAs: account,
 	});

packages/client/src/pages/settings/notifications.vue

@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from 'calckey-js';
 import FormButton from '@/components/MkButton.vue';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';

packages/client/src/pages/share.vue

@@ -25,9 +25,9 @@
 // SPECIFICATION: https://misskey-hub.net/docs/features/share-form.html
 
 import { } from 'vue';
-import { noteVisibilities } from 'misskey-js';
+import { noteVisibilities } from 'calckey-js';
 import * as Acct from 'misskey-js/built/acct';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import MkButton from '@/components/MkButton.vue';
 import XPostForm from '@/components/MkPostForm.vue';
 import * as os from '@/os';

packages/client/src/pages/user-info.vue

@@ -153,7 +153,7 @@
 
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import FormTextarea from '@/components/form/textarea.vue';

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

@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkPagination from '@/components/MkPagination.vue';
 
 const props = defineProps<{

packages/client/src/pages/user/follow-list.vue

@@ -10,7 +10,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkUserInfo from '@/components/MkUserInfo.vue';
 import MkPagination from '@/components/MkPagination.vue';
 

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

@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XFollowList from './follow-list.vue';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';

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

@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'misskey-js/built/acct';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XFollowList from './follow-list.vue';
 import * as os from '@/os';
 import { definePageMetadata } from '@/scripts/page-metadata';

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

@@ -12,7 +12,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 

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

@@ -7,7 +7,7 @@
 			<!-- <div class="punished" v-if="user.isSilenced"><i class="ph-warning-bold ph-lg" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
 
 			<div class="profile">
-				<MkMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username" />
+				<MkMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username"/>
 				<MkRemoteCaution v-if="user.host != null" :href="user.url" class="warn"/>
 
 				<div :key="user.id" class="_block main">
@@ -112,8 +112,8 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
 import calcAge from 's-age';
-import * as misskey from 'misskey-js';
 import XUserTimeline from './index.timeline.vue';
+import type * as misskey from 'calckey-js';
 import XNote from '@/components/MkNote.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkContainer from '@/components/MkContainer.vue';

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

@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 import { } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkContainer from '@/components/MkContainer.vue';
 import MkChart from '@/components/MkChart.vue';
 import * as os from '@/os';

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

@@ -20,7 +20,7 @@
 
 <script lang="ts" setup>
 import { onMounted } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { notePage } from '@/filters/note';
 import * as os from '@/os';

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

@@ -13,7 +13,7 @@
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import XNotes from '@/components/MkNotes.vue';
 import MkTab from '@/components/MkTab.vue';
 import * as os from '@/os';

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

@@ -27,7 +27,7 @@
 import { defineAsyncComponent, computed, watch } from 'vue';
 import calcAge from 's-age';
 import * as Acct from 'misskey-js/built/acct';
-import type * as misskey from 'misskey-js';
+import type * as misskey from 'calckey-js';
 import { getScrollPosition } from '@/scripts/scroll';
 import number from '@/filters/number';
 import { userPage, acct as getAcct } from '@/filters/user';

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

@@ -10,7 +10,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkPagePreview from '@/components/MkPagePreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 

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

@@ -17,7 +17,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MkPagination from '@/components/MkPagination.vue';
 import MkNote from '@/components/MkNote.vue';
 import MkReactionIcon from '@/components/MkReactionIcon.vue';

packages/client/src/scripts/get-note-menu.ts

@@ -1,5 +1,5 @@
 import { defineAsyncComponent, Ref, inject } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { pleaseLogin } from './please-login';
 import { $i } from '@/account';
 import { i18n } from '@/i18n';

packages/client/src/scripts/get-note-summary.ts

@@ -1,4 +1,4 @@
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { i18n } from '@/i18n';
 
 /**

packages/client/src/scripts/page-metadata.ts

@@ -1,4 +1,4 @@
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { ComputedRef, inject, isRef, onActivated, onMounted, provide, ref, Ref } from 'vue';
 
 export const setPageMetadata = Symbol('setPageMetadata');

packages/client/src/scripts/upload.ts

@@ -1,5 +1,5 @@
 import { reactive, ref } from 'vue';
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { readAndCompressImage } from 'browser-image-resizer';
 import { defaultStore } from '@/store';
 import { apiUrl } from '@/config';

packages/client/src/scripts/use-note-capture.ts

@@ -1,5 +1,5 @@
 import { onUnmounted, Ref } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import { stream } from '@/stream';
 import { $i } from '@/account';
 

packages/client/src/stream.ts

@@ -1,4 +1,4 @@
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { markRaw } from 'vue';
 import { $i } from '@/account';
 import { url } from '@/config';

packages/client/src/types/menu.ts

@@ -1,4 +1,4 @@
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { Ref } from 'vue';
 
 export type MenuAction = (ev: MouseEvent) => void;

packages/client/src/ui/_common_/statusbar-federation.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MarqueeText from '@/components/MkMarquee.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';

packages/client/src/ui/_common_/statusbar-user-list.vue

@@ -21,7 +21,7 @@
 
 <script lang="ts" setup>
 import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import MarqueeText from '@/components/MkMarquee.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';

packages/client/src/ui/deck/deck-store.ts

@@ -1,6 +1,6 @@
 import { throttle } from 'throttle-debounce';
 import { markRaw } from 'vue';
-import { notificationTypes } from 'misskey-js';
+import { notificationTypes } from 'calckey-js';
 import { Storage } from '../../pizzax';
 import { i18n } from '@/i18n';
 import { api } from '@/os';

packages/sw/src/filters/user.ts

@@ -1,4 +1,4 @@
-import * as misskey from 'misskey-js';
+import * as misskey from 'calckey-js';
 import * as Acct from 'misskey-js/built/acct';
 
 export const acct = (user: misskey.Acct) => {

packages/sw/src/scripts/operations.ts

@@ -4,7 +4,7 @@
  */
 declare var self: ServiceWorkerGlobalScope;
 
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 import { SwMessage, swMessageOrderType } from '@/types';
 import { acct as getAcct } from '@/filters/user';
 import { getAccountFromId } from '@/scripts/get-account-from-id';

packages/sw/src/types.ts

@@ -1,4 +1,4 @@
-import * as Misskey from 'misskey-js';
+import * as Misskey from 'calckey-js';
 
 export type swMessageOrderType = 'post' | 'push';