diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml index afc2f4e..072aac0 100644 --- a/.idea/watcherTasks.xml +++ b/.idea/watcherTasks.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/LICENSE b/LICENSE index 78fdb4a..ad2d805 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Misskey Tools Copyrights (C) 2020-2022 Xeltica Copyrights (C) 2023 Shrimpia Network -Copyrights (C) 2023 LycheeBridge +Copyrights (C) 2023-2024 CloudToys 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 deleted file mode 100644 index 9f50e95..0000000 Binary files a/assets/lcb.png and /dev/null differ diff --git a/src/backend/const.ts b/src/backend/const.ts index 66f00b0..f015812 100644 --- a/src/backend/const.ts +++ b/src/backend/const.ts @@ -3,8 +3,8 @@ export const defaultTemplate = '어제의 제 Misskey 사용량을 공개합니 export const currentTokenVersion = 2; export const misskeyAppInfo = { - name: 'Misskey Tools with LycheeBridge', - description: 'LycheeBridge에서 관리하는 Misskey Tools의 포크 버전', + name: 'Misskey Tools', + description: '무라쿠모 스튜디오에서, ❤️를 담아.', permission: [ 'read:account', 'write:account', diff --git a/src/backend/server.ts b/src/backend/server.ts index 3ae9fcf..2704080 100644 --- a/src/backend/server.ts +++ b/src/backend/server.ts @@ -1,6 +1,6 @@ import Koa from 'koa'; import bodyParser from 'koa-bodyparser'; -import {Action, useKoaServer} from 'routing-controllers'; +import { Action, useKoaServer } from 'routing-controllers'; import {config, meta} from '../config.js'; import {render} from './render.js'; @@ -14,7 +14,7 @@ export default (): void => { const app = new Koa(); console.log(`** Misskey Tools ${meta.version} **`); - console.log('(C) Shrimpia Network, Powered by LycheeBridge'); + console.log('(C) Shrimpia Network, Powered by CloudToys'); app.use(render); app.use(bodyParser()); diff --git a/src/backend/services/send-alert.ts b/src/backend/services/send-alert.ts index 6fc94f2..975275e 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: user.notificationHeader ?? 'Misskey Tools with LycheeBridge', - icon: user.notificationIcon ?? 'https://t.psec.dev/assets/lcb.png', + header: user.notificationHeader ?? 'Misskey Tools', + icon: user.notificationIcon ?? 'https://t.psec.dev/assets/misskey.png', body: text, }, user.token); diff --git a/src/backend/services/worker.ts b/src/backend/services/worker.ts index a99bdb9..7fdba86 100644 --- a/src/backend/services/worker.ts +++ b/src/backend/services/worker.ts @@ -38,7 +38,7 @@ export const work = async () => { await calculateAllRating(groupedUsers); } catch (e) { - printLog('Misskey Tools with LycheeBridge 레이팅 계산에 실패했습니다.', 'error'); + printLog('Misskey Tools 레이팅 계산에 실패했습니다.', 'error'); printLog(e instanceof Error ? errorToString(e) : JSON.stringify(e, null, ' '), 'error'); Store.dispatch({ nowCalculating: false }); } @@ -51,10 +51,10 @@ export const work = async () => { printLog(`${users.length}개의 계정에 알림을 전송하고 있습니다.`); await sendAllAlerts(groupedUsers); } catch (e) { - printLog('Misskey Tools with LycheeBridge 알림 전송에 실패했습니다.', 'error'); + printLog('Misskey Tools 알림 전송에 실패했습니다.', 'error'); printLog(e instanceof Error ? errorToString(e) : JSON.stringify(e, null, ' '), 'error'); } finally { - printLog('Misskey Tools with LycheeBridge 알림 전송이 완료되었습니다.'); + printLog('Misskey Tools 알림 전송이 완료되었습니다.'); } }; @@ -124,7 +124,7 @@ const sendAlerts = async (host: string, users: User[]) => { try { await sendNotificationAlert(message, user); } catch (e) { - printLog('Misskey Tools with LycheeBridge 알림 전송에 실패했습니다.', 'error'); + printLog('Misskey Tools 알림 전송에 실패했습니다.', 'error'); printLog(e instanceof Error ? errorToString(e) : JSON.stringify(e, null, ' '), 'error'); } finally { if (user.alertMode === 'notification') { @@ -138,7 +138,7 @@ const sendAlerts = async (host: string, users: User[]) => { try { await sendNoteAlert(message, user); } catch (e) { - printLog('Misskey Tools with LycheeBridge 알림 전송에 실패했습니다.', 'error'); + printLog('Misskey Tools 알림 전송에 실패했습니다.', 'error'); printLog(e instanceof Error ? errorToString(e) : JSON.stringify(e, null, ' '), 'error'); } finally { await Promise.all([ diff --git a/src/backend/store.ts b/src/backend/store.ts index 7a9441b..5cc8799 100644 --- a/src/backend/store.ts +++ b/src/backend/store.ts @@ -2,7 +2,7 @@ // getStateを介してステートを取得し、dispatchによって更新する // stateを直接編集できないようになっている -import {Log} from '../common/types/log.js'; +import { Log } from '../common/types/log.js'; /** * 初期値 diff --git a/src/backend/views/frontend.pug b/src/backend/views/frontend.pug index 441ae5a..c7f55ce 100644 --- a/src/backend/views/frontend.pug +++ b/src/backend/views/frontend.pug @@ -4,22 +4,22 @@ html meta(charset="UTF-8") meta(name="viewport", content="width=device-width, initial-scale=1.0") block meta - - const title = t ? `${t} | Misskey Tools`: "Misskey Tools with LycheeBridge"; - - const desc = d || "🌠 연합우주의 모든 Misskey 사용자를 위한 다양한 도구 모음집 🚀"; + - const title = t ? `${t} | Misskey Tools`: "Misskey Tools"; + - const desc = d || "🌠 연합우주의 모든 Misskey/CherryPick 사용자를 위한 다양한 도구 모음집 🚀"; title= title meta(name="description" content=desc) meta(property="og:title" content=title) - meta(property="og:site_name" content="Misskey Tools with LycheeBridge") + meta(property="og:site_name" content="Misskey Tools") meta(property="og:description" content=desc) meta(property="og:type" content="website") meta(property="og:image" content="/assets/misskey.png") - link(rel="icon", href="/assets/lcb.png", type="image/png") + link(rel="icon", href="/assets/misskey.png", type="image/png") link(rel="preload", href="/assets/otadesign_rounded.woff") link(rel="preload", href="/assets/otadesign_rounded.woff2") link(rel="preload", href="/assets/PretendardJPVariable.woff2") script(src="https://kit.fontawesome.com/a4464bc6cd.js" crossorigin="anonymous") link(rel="stylesheet", href="/assets/style.css") - link(rel="me", href="https://oscar.surf/@tools") + link(rel="me", href="https://pla.is/@st") body #app: .loading 잠시만 기다려주세요... diff --git a/src/common/functions/create-gacha.ts b/src/common/functions/create-gacha.ts index d5fe223..e06d3ac 100644 --- a/src/common/functions/create-gacha.ts +++ b/src/common/functions/create-gacha.ts @@ -1,11 +1,18 @@ const allTexts: string[] = [ '아무말 빔----', '휴대폰용 보험은 가입하셨나요?', + '포항항 ꉂꉂ(ᴖᗜᴖ*)', + '알고 계셨나요? 이 서비스는 생체 서버로 운영되고 있어요...', + '으악개발하기귀찮아', + 'Misskey- Misskey- La- Tu- Ta-', + '집에 가고 싶어요', + '침대밖으로단한발짝도벗어날수없어요', + 'Special Thanks to ltlapy to help test', + '내일은... 출근/등교/외출 하셔야 해요...' ]; const getRandomText = () => allTexts[Math.floor(Math.random() * allTexts.length)]; export const createGacha = () => { - const result = getRandomText(); - return result; + return getRandomText(); }; diff --git a/src/frontend/App.tsx b/src/frontend/App.tsx index e3a40c0..6f0b24f 100644 --- a/src/frontend/App.tsx +++ b/src/frontend/App.tsx @@ -11,8 +11,8 @@ import { useGetSessionQuery } from './services/session'; import { Router } from './Router'; import {setAccounts, setMobile} from './store/slices/screen'; import { GeneralLayout } from './GeneralLayout'; -import {$get} from './misc/api'; -import {IUser} from '../common/types/user'; +import { $get } from './misc/api'; +import { IUser } from '../common/types/user'; const AppInner : React.VFC = () => { const { data: session } = useGetSessionQuery(undefined); diff --git a/src/frontend/pages/apps/misshai.tsx b/src/frontend/pages/apps/misshai.tsx index 698aaf6..78e665e 100644 --- a/src/frontend/pages/apps/misshai.tsx +++ b/src/frontend/pages/apps/misshai.tsx @@ -196,8 +196,8 @@ export const MisshaiPage: React.VFC = () => { }, [session.error]); const defaultTemplate = t('_template.default'); - const defaultHeader = 'Misskey Tools with LycheeBridge'; - const defaultIcon = 'https://t.psec.dev/assets/lcb.png'; + const defaultHeader = 'Misskey Tools'; + const defaultIcon = 'https://t.psec.dev/assets/misskey.png'; const remaining = 1024 - (draft.template ?? defaultTemplate).length; diff --git a/src/frontend/pages/index.session.tsx b/src/frontend/pages/index.session.tsx index 0492546..223fc0a 100644 --- a/src/frontend/pages/index.session.tsx +++ b/src/frontend/pages/index.session.tsx @@ -62,9 +62,9 @@ export const IndexSessionPage: React.VFC = () => {

{t('_developerInfo.title')}

{t('_developerInfo.description')}

- + - @tools@oscar.surf + @st@pla.is