diff --git a/.editorconfig b/.editorconfig index fd17cd9..eedd617 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,4 +6,4 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -indent_size = 2 \ No newline at end of file +indent_size = 4 \ No newline at end of file diff --git a/LICENSE b/LICENSE index 9c8fdbb..78fdb4a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ Misskey Tools -Copyright (C) 2020-2022 Xeltica -Copyright (C) 2023 Shrimpia Network +Copyrights (C) 2020-2022 Xeltica +Copyrights (C) 2023 Shrimpia Network +Copyrights (C) 2023 LycheeBridge This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/assets/lcb.png b/assets/lcb.png new file mode 100644 index 0000000..9f50e95 Binary files /dev/null and b/assets/lcb.png differ diff --git a/assets/misskey.png b/assets/misskey.png new file mode 100644 index 0000000..3430e6e Binary files /dev/null and b/assets/misskey.png differ diff --git a/package.json b/package.json index 7c60249..4cfb689 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "misskey-tools", - "version": "3.2.0", + "version": "3.2.0-lyc.0", "description": "", "main": "built/app.js", - "author": "Shrimpia Network", + "author": "LycheeBridge", "private": true, "type": "module", "scripts": { diff --git a/src/app.ts b/src/app.ts index 1843841..d27b907 100644 --- a/src/app.ts +++ b/src/app.ts @@ -5,7 +5,7 @@ import axios from 'axios'; import { initDb } from './backend/services/db.js'; import {config} from './config.js'; -export const ua = `Mozilla/5.0 MisskeyTools +https://github.com/shrimpia/misskey-tools Node/${process.version} ${config.uaExtra ?? ''}`; +export const ua = `Mozilla/5.0 MisskeyTools +https://github.com/LycheeBridge/tools Node/${process.version} ${config.uaExtra ?? ''}`; axios.defaults.headers['User-Agent'] = ua; axios.defaults.headers['Content-Type'] = 'application/json'; diff --git a/src/backend/const.ts b/src/backend/const.ts index 6086f98..d5db7bc 100644 --- a/src/backend/const.ts +++ b/src/backend/const.ts @@ -11,8 +11,8 @@ export const defaultTemplate = '昨日のMisskeyの活動は\n\nノート: {note export const currentTokenVersion = 2; export const misskeyAppInfo = { - name: 'Misskey Tools on phater.live', - description: 'Misskey Tools의 포크를 통한 유지 버전', + name: 'Misskey Tools with LycheeBridge', + description: 'LycheeBridge에서 관리하는 Misskey Tools의 포크 버전', permission: [ 'read:account', 'write:account', diff --git a/src/backend/server.ts b/src/backend/server.ts index 1ae7136..3ae9fcf 100644 --- a/src/backend/server.ts +++ b/src/backend/server.ts @@ -14,7 +14,7 @@ export default (): void => { const app = new Koa(); console.log(`** Misskey Tools ${meta.version} **`); - console.log('(C) Shrimpia Network'); + console.log('(C) Shrimpia Network, Powered by LycheeBridge'); app.use(render); app.use(bodyParser()); diff --git a/src/backend/services/send-alert.ts b/src/backend/services/send-alert.ts index 9644da2..5c2f207 100644 --- a/src/backend/services/send-alert.ts +++ b/src/backend/services/send-alert.ts @@ -51,8 +51,8 @@ export const sendNoteAlert = async (text: string, user: User) => { */ export const sendNotificationAlert = async (text: string, user: User) => { const res = await api(user.host, 'notifications/create', { - header: 'Misskey Tools on phater.live', - icon: 'https://on.phater.live/logo.png', + header: 'Misskey Tools with LycheeBridge', + icon: 'https://in.gozou.moe/lcb.png', body: text, }, user.token); diff --git a/src/backend/services/worker.ts b/src/backend/services/worker.ts index 1f1bc12..9614637 100644 --- a/src/backend/services/worker.ts +++ b/src/backend/services/worker.ts @@ -41,9 +41,9 @@ export const work = async () => { printLog(`${users.length}개의 계정 레이팅 계산 완료, 알림을 전송하고 있습니다.`); await sendAllAlerts(groupedUsers); - printLog('Misskey Tools on phater.live 알림 전송이 완료되었습니다.'); + printLog('Misskey Tools with LycheeBridge 알림 전송이 완료되었습니다.'); } catch (e) { - printLog('Misskey Tools on phater.live 알림 전송에 실패했습니다.', 'error'); + printLog('Misskey Tools with LycheeBridge 알림 전송에 실패했습니다.', 'error'); printLog(e instanceof Error ? errorToString(e) : JSON.stringify(e, null, ' '), 'error'); } finally { Store.dispatch({ nowCalculating: false }); diff --git a/src/backend/views/frontend.pug b/src/backend/views/frontend.pug index cd9a4b6..9c8e814 100644 --- a/src/backend/views/frontend.pug +++ b/src/backend/views/frontend.pug @@ -5,20 +5,21 @@ html meta(name="viewport", content="width=device-width, initial-scale=1.0") block meta - const title = t ? `${t} | Misskey Tools`: 'Misskey Tools'; - - const desc = d || '✨Misskey での1日のノート数、フォロー数、フォロワー数をカウントし、深夜0時にお知らせする便利サービスです。'; + - const desc = d || '🌠 연합우주의 모든 Misskey 사용자를 위한 다양한 도구 모음집 🚀'; title= title meta(name='description' content=desc) meta(property='og:title' content=title) + meta(property='og:site_name' content='Misskey Tools on LycheeBridge') meta(property='og:description' content=desc) meta(property='og:type' content='website') - link(rel="preload" href="https://koruri.chillout.chat/koruri.css") + meta(property='og:image' content='assets/misskey.png') + link(rel="icon", href="/assets/lcb.png", type="image/png") link(rel="preload", href="/assets/otadesign_rounded.woff") link(rel="preload", href="/assets/otadesign_rounded.woff2") - link(rel="stylesheet" href="https://koruri.chillout.chat/koruri.css") - script(src='https://kit.fontawesome.com/c7ab6eba70.js' crossorigin='anonymous') + link(rel="preload", href="/assets/PretendardJPVariable.woff2") link(rel="stylesheet", href="/assets/style.css") body - #app: .loading Loading... + #app: .loading 불러오는 중입니다... if token script. diff --git a/src/backend/views/rescue.pug b/src/backend/views/rescue.pug index 7620399..69665cc 100644 --- a/src/backend/views/rescue.pug +++ b/src/backend/views/rescue.pug @@ -3,11 +3,11 @@ html head meta(charset="UTF-8") body - p 問題を修正するため、端末に残ったデータを削除しました。 - p 5秒後にトップページに移動します。 + p 클라이언트에 문제가 발생했습니다. 해결을 위해 브라우저에 있는 데이터를 제거했습니다. + p 3초 뒤에 메인 페이지로 자동으로 돌아갑니다... hr - p To solve the problem, deleted data remaining on the device. - p After 5 seconds, you will be redirected to the top page. + p There's a problem in client and deleted data on device to solve it. + p You will be redirected to the top in 3 seconds. script. localStorage.clear(); - setTimeout(() => location.href = '/', 5000); + setTimeout(() => location.href = '/', 3000); diff --git a/src/frontend/App.tsx b/src/frontend/App.tsx index 0919ec8..5249fb5 100644 --- a/src/frontend/App.tsx +++ b/src/frontend/App.tsx @@ -69,7 +69,7 @@ const AppInner : React.VFC = () => { ) : }