From 3609c2784de540090733ab1bff5ff93210a790c2 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 18 Jul 2022 19:00:45 -0700 Subject: [PATCH] Calckey --- docs/DONATORS.md | 25 ----------------- locales/en-US.yml | 28 +++++++++---------- package.json | 2 +- packages/backend/assets/redoc.html | 2 +- packages/backend/src/models/entities/meta.ts | 4 +-- packages/backend/src/server/web/manifest.json | 4 +-- packages/backend/src/server/web/manifest.ts | 4 +-- .../backend/src/server/web/views/base.pug | 10 +++---- .../backend/src/server/web/views/bios.pug | 6 ++-- packages/backend/src/server/web/views/cli.pug | 6 ++-- .../backend/src/server/web/views/flush.pug | 2 +- packages/client/src/components/sample.vue | 4 +-- packages/client/src/pages/about-misskey.vue | 27 ++++-------------- packages/client/src/pages/admin/overview.vue | 2 +- packages/client/src/pages/settings/2fa.vue | 2 +- .../client/src/pages/welcome.entrance.a.vue | 2 +- packages/client/src/pages/welcome.setup.vue | 2 +- packages/client/src/ui/visitor/a.vue | 2 +- packages/client/src/ui/visitor/b.vue | 10 ++----- packages/client/src/ui/visitor/kanban.vue | 2 +- packages/sw/build.js | 2 +- 21 files changed, 50 insertions(+), 98 deletions(-) delete mode 100644 docs/DONATORS.md diff --git a/docs/DONATORS.md b/docs/DONATORS.md deleted file mode 100644 index 9da5c1a94e..0000000000 --- a/docs/DONATORS.md +++ /dev/null @@ -1,25 +0,0 @@ -DONATORS -======== -The list of people who have sent donation for Misskey. - -(In random order, honorific titles are omitted.) - -* らふぁ -* 俺様 -* なぎうり -* スルメ https://surume.tk/ -* 藍 -* 音船 https://otofune.me/ -* aqz https://misskey.xyz/aqz -* kotodu "虚無創作中" -* Maya Minatsuki -* Knzk https://knzk.me/@Knzk -* ねじりわさび https://knzk.me/@y -* NCLS https://knzk.me/@imncls] -* こじま @skoji@sandbox.skoji.jp - -:heart: Thanks for donating, guys! - ---- - -If your name is missing, please contact us! diff --git a/locales/en-US.yml b/locales/en-US.yml index 92c85507de..b5b6389a1c 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1,7 +1,7 @@ --- _lang_: "English" headlineMisskey: "A network connected by notes" -introMisskey: "Welcome! Misskey is an open source, decentralized microblogging service.\nCreate \"notes\" to share your thoughts with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀" +introMisskey: "Welcome! Calckey is an open source, decentralized microblogging service.\nCreate \"notes\" to share your thoughts with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀" monthAndDay: "{month}/{day}" search: "Search" notifications: "Notifications" @@ -138,7 +138,7 @@ settingGuide: "Recommended settings" cacheRemoteFiles: "Cache remote files" cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated." flagAsBot: "Mark this account as a bot" -flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot." +flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Calckey's internal systems to treat this account as a bot." flagAsCat: "Mark this account as a cat" flagAsCatDescription: "Enable this option to mark this account as a cat." flagShowTimelineReplies: "Show replies in timeline" @@ -198,7 +198,7 @@ noUsers: "There are no users" editProfile: "Edit profile" noteDeleteConfirm: "Are you sure you want to delete this note?" pinLimitExceeded: "You cannot pin any more notes" -intro: "Installation of Misskey has been finished! Please create an admin user." +intro: "Installation of Calckey has been finished! Please create an admin user." done: "Done" processing: "Processing..." preview: "Preview" @@ -377,7 +377,7 @@ exploreFediverse: "Explore the Fediverse" popularTags: "Popular tags" userList: "Lists" about: "About" -aboutMisskey: "About Misskey" +aboutMisskey: "About Calckey" administrator: "Administrator" token: "Token" twoStepAuthentication: "Two-factor authentication" @@ -523,7 +523,7 @@ sort: "Sort" ascendingOrder: "Ascending" descendingOrder: "Descending" scratchpad: "Scratchpad" -scratchpadDescription: "The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Misskey in it." +scratchpadDescription: "The scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Calckey in it." output: "Output" script: "Script" disablePagesScript: "Disable AiScript on Pages" @@ -648,7 +648,7 @@ createNewClip: "Create new clip" unclip: "Unclip" confirmToUnclipAlreadyClippedNote: "This note is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?" public: "Public" -i18nInfo: "Misskey is being translated into various languages by volunteers. You can help at {link}." +i18nInfo: "Misskey/Calckey is being translated into various languages by volunteers. You can help at {link}." manageAccessTokens: "Manage access tokens" accountInfo: "Account Info" notesCount: "Number of notes" @@ -790,7 +790,7 @@ hashtags: "Hashtags" troubleshooting: "Troubleshooting" useBlurEffect: "Use blur effects in the UI" learnMore: "Learn more" -misskeyUpdated: "Misskey has been updated!" +misskeyUpdated: "Calckey has been updated!" whatIsNew: "Show changes" translate: "Translate" translatedFrom: "Translated from {x}" @@ -948,21 +948,21 @@ _registry: domain: "Domain" createKey: "Create key" _aboutMisskey: - about: "Misskey is open-source software being developed by syuilo since 2014." + about: "Calckey is a fork of Misskey made by ThatOneCalculator being developed since 2022." contributors: "Main contributors" allContributors: "All contributors" source: "Source code" translation: "Translate Misskey" donate: "Donate to Misskey" morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰" - patrons: "Patrons" + patrons: "Misskey patrons" _nsfw: respect: "Hide NSFW media" ignore: "Don't hide NSFW media" force: "Hide all media" _mfm: cheatSheet: "MFM Cheatsheet" - intro: "MFM is a Misskey-exclusive markup language that can be used in many places. Here you can view a list of all available MFM syntax." + intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax." dummy: "Misskey expands the world of the Fediverse" mention: "Mention" mentionDescription: "You can specify a user by using an At-Symbol and a username." @@ -1159,7 +1159,7 @@ _time: hour: "Hour(s)" day: "Day(s)" _tutorial: - title: "How to use Misskey" + title: "How to use Calckey" step1_1: "Welcome!" step1_2: "This page is called the \"timeline\". It shows chronologically ordered \"notes\" of people who you \"follow\"." step1_3: "Your timeline is currently empty, since you have not posted any notes or followed anyone yet." @@ -1178,9 +1178,9 @@ _tutorial: step6_1: "You should be able to see other users' notes on your timeline now." step6_2: "You can also put \"reactions\" on other people's notes to quickly respond to them." step6_3: "To attach a \"reaction\", press the \"+\" mark on another user's note and choose an emoji you'd like to react with." - step7_1: "Congratulations! You have now finished Misskey's basic tutorial." - step7_2: "If you would like to learn more about Misskey, try the {help} section." - step7_3: "Now then, good luck and have fun with Misskey! 🚀" + step7_1: "Congratulations! You have now finished Calckey's basic tutorial." + step7_2: "If you would like to learn more about Calckey, try the {help} section." + step7_3: "Now then, good luck and have fun with Calckey! 🚀" _2fa: alreadyRegistered: "You have already registered a 2-factor authentication device." registerDevice: "Register a new device" diff --git a/package.json b/package.json index 2699b7dc96..91291cd2d4 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "codename": "indigo", "repository": { "type": "git", - "url": "https://github.com/misskey-dev/misskey.git" + "url": "https://codeberg.org/thatonecalculator/calckey.git" }, "private": true, "scripts": { diff --git a/packages/backend/assets/redoc.html b/packages/backend/assets/redoc.html index 9ee5a95c05..4013abe310 100644 --- a/packages/backend/assets/redoc.html +++ b/packages/backend/assets/redoc.html @@ -1,7 +1,7 @@ - Misskey API + Calckey API diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index d33ff2519e..78882ca7fe 100644 --- a/packages/backend/src/models/entities/meta.ts +++ b/packages/backend/src/models/entities/meta.ts @@ -354,14 +354,14 @@ export class Meta { @Column('varchar', { length: 512, - default: 'https://github.com/misskey-dev/misskey', + default: 'https://codeberg.org/thatonecalculator/calckey', nullable: false, }) public repositoryUrl: string; @Column('varchar', { length: 512, - default: 'https://github.com/misskey-dev/misskey/issues/new', + default: 'https://codeberg.org/thatonecalculator/calckey/issues/new', nullable: true, }) public feedbackUrl: string | null; diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json index 48030a2980..8414362771 100644 --- a/packages/backend/src/server/web/manifest.json +++ b/packages/backend/src/server/web/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Misskey", - "name": "Misskey", + "short_name": "Calckey", + "name": "Calckey", "start_url": "/", "display": "standalone", "background_color": "#313a42", diff --git a/packages/backend/src/server/web/manifest.ts b/packages/backend/src/server/web/manifest.ts index ee568b8077..36dfbbf420 100644 --- a/packages/backend/src/server/web/manifest.ts +++ b/packages/backend/src/server/web/manifest.ts @@ -9,8 +9,8 @@ export const manifestHandler = async (ctx: Koa.Context) => { const instance = await fetchMeta(true); - res.short_name = instance.name || 'Misskey'; - res.name = instance.name || 'Misskey'; + res.short_name = instance.name || 'Calckey'; + res.name = instance.name || 'Calckey'; if (instance.themeColor) res.theme_color = instance.themeColor; ctx.set('Cache-Control', 'max-age=300'); diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 5bb156f0f4..0418f51842 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -12,7 +12,7 @@ doctype html | | | | |_ -|_ -| '_| -_| | | |_|_|_|_|___|___|_,_|___|_ | |___| - Thank you for using Misskey! + Thank you for using Calckey! If you are reading this message... how about joining the development? https://github.com/misskey-dev/misskey @@ -21,12 +21,12 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Misskey') + meta(name='application-name' content='Calckey') meta(name='referrer' content='origin') meta(name='theme-color' content= themeColor || '#86b300') meta(name='theme-color-orig' content= themeColor || '#86b300') meta(property='twitter:card' content='summary') - meta(property='og:site_name' content= instanceName || 'Misskey') + meta(property='og:site_name' content= instanceName || 'Calckey') meta(name='viewport' content='width=device-width, initial-scale=1') link(rel='icon' href= icon || '/favicon.ico') link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png') @@ -45,7 +45,7 @@ html title block title - = title || 'Misskey' + = title || 'Calckey' block desc meta(name='description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') @@ -53,7 +53,7 @@ html block meta block og - meta(property='og:title' content= title || 'Misskey') + meta(property='og:title' content= title || 'Calckey') meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') meta(property='og:image' content= img) diff --git a/packages/backend/src/server/web/views/bios.pug b/packages/backend/src/server/web/views/bios.pug index 39a151a29b..791863f204 100644 --- a/packages/backend/src/server/web/views/bios.pug +++ b/packages/backend/src/server/web/views/bios.pug @@ -4,8 +4,8 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Misskey') - title Misskey Repair Tool + meta(name='application-name' content='Calckey') + title Calckey Repair Tool style include ../bios.css script @@ -13,7 +13,7 @@ html body header - h1 Misskey Repair Tool #{version} + h1 Calckey Repair Tool #{version} main div.tabs button#ls edit local storage diff --git a/packages/backend/src/server/web/views/cli.pug b/packages/backend/src/server/web/views/cli.pug index d2cf7c4335..92872819c5 100644 --- a/packages/backend/src/server/web/views/cli.pug +++ b/packages/backend/src/server/web/views/cli.pug @@ -4,8 +4,8 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Misskey') - title Misskey Cli + meta(name='application-name' content='Calckey') + title Calckey Cli style include ../cli.css script @@ -13,7 +13,7 @@ html body header - h1 Misskey Cli #{version} + h1 Calckey Cli #{version} main div#form textarea#text diff --git a/packages/backend/src/server/web/views/flush.pug b/packages/backend/src/server/web/views/flush.pug index ec585a34db..331a91e252 100644 --- a/packages/backend/src/server/web/views/flush.pug +++ b/packages/backend/src/server/web/views/flush.pug @@ -4,7 +4,7 @@ html #msg script. const msg = document.getElementById('msg'); - const successText = `\nSuccess Flush! Back to Misskey\n成功しました。Misskeyを開き直してください。`; + const successText = `\nSuccess Flush! Back to Calckey\n成功しました。Misskeyを開き直してください。`; message('Start flushing.'); diff --git a/packages/client/src/components/sample.vue b/packages/client/src/components/sample.vue index f80b9c96b7..848daa4101 100644 --- a/packages/client/src/components/sample.vue +++ b/packages/client/src/components/sample.vue @@ -8,7 +8,7 @@ Switch is now {{ flag ? 'on' : 'off' }}
- Misskey + Calckey Mastodon Pleroma
@@ -78,7 +78,7 @@ export default defineComponent({ }, baz: { type: 'string', - default: 'Misskey makes you happy.', + default: 'Calckey makes you happy.', label: 'This is a string property' }, }); diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue index fd7b5f936d..0ab303d549 100644 --- a/packages/client/src/pages/about-misskey.vue +++ b/packages/client/src/pages/about-misskey.vue @@ -19,37 +19,20 @@
- + {{ i18n.ts._aboutMisskey.source }} - - - - - {{ i18n.ts._aboutMisskey.translation }} - - - - - {{ i18n.ts._aboutMisskey.donate }} - +
+ ThatOneCalculator (fork developer) @syuilo - @AyaMorisawa - @mei23 - @acid-chicken - @tamaina - @rinsuki - @Xeltica - @u1-liquid - @marihachi
- + @@ -186,7 +169,7 @@ function gravity() { function iLoveMisskey() { os.post({ - initialText: 'I $[jelly ❤] #Misskey', + initialText: 'I $[jelly ❤] #Calckey and #Misskey', instant: true, }); } diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue index c186df15a7..96ff26a03d 100644 --- a/packages/client/src/pages/admin/overview.vue +++ b/packages/client/src/pages/admin/overview.vue @@ -54,7 +54,7 @@
Enviroment
-
Misskey
+
Calckey
{{ version }}
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue index d72d3e2060..f0716570a0 100644 --- a/packages/client/src/pages/settings/2fa.vue +++ b/packages/client/src/pages/settings/2fa.vue @@ -180,7 +180,7 @@ function addSecurityKey() { challenge: byteify(reg!.challenge, 'base64'), rp: { id: hostname, - name: 'Misskey' + name: 'Calckey' }, user: { id: byteify($i!.id, 'ascii'), diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 240177c9d9..a44f1c7961 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -7,7 +7,7 @@
- + diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue index 4892ab6ea2..f618ce61d3 100644 --- a/packages/client/src/pages/welcome.setup.vue +++ b/packages/client/src/pages/welcome.setup.vue @@ -1,6 +1,6 @@