From afbcae700213f51473b8c06f9c23b3b758d63625 Mon Sep 17 00:00:00 2001 From: yupix Date: Wed, 29 Dec 2021 20:09:50 +0900 Subject: [PATCH 01/25] fix: resolved AS-15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit メニューのフォロー申請にtrueとでるのを修正 --- locales/ja-JP.yml | 1 + src/client/app/desktop/views/components/ui.header.account.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 74f1691277..51cc425646 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1392,6 +1392,7 @@ desktop/views/components/ui.header.account.vue: follow-requests: "フォロー申請" admin: "管理" room: "ルーム" + follow-request-true: 新着 desktop/views/components/ui.header.nav.vue: game: "ゲーム" diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index ebb29ba387..43fd9552a4 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -52,7 +52,7 @@
  • - {{ $t('follow-requests') }}{{ $store.state.i.pendingReceivedFollowRequestsCount }} + {{ $t('follow-requests') }}{{ $t(`follow-request-${$store.state.i.pendingReceivedFollowRequestsCount}`) }}
    • From 905f7af8dbd7222c7a856d7e8a5504b1cad18030 Mon Sep 17 00:00:00 2001 From: yupix Date: Wed, 29 Dec 2021 20:11:30 +0900 Subject: [PATCH 02/25] =?UTF-8?q?feat:=20=E3=83=90=E3=83=83=E3=83=82?= =?UTF-8?q?=E3=81=AB=E3=82=AB=E3=83=BC=E3=82=BD=E3=83=AB=E3=82=92=E5=90=88?= =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=81=9F=E9=9A=9B=E3=81=AE=E5=8B=95=E4=BD=9C?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20AS-14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 4 ++++ src/client/app/common/views/components/note-header.vue | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 51cc425646..a7f5a55907 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -378,6 +378,10 @@ common: update-available-title: "更新があります" update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" + admin-user: "管理者" + lady-user: "お嬢様" + bot-user: "Bot" + cat-user: "猫(=^・・^=)" verified-user: "公式アカウント" premium-user: "プレミアムユーザー" hide-password: "パスワードを隠す" diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue index 058e0093b3..2af6f55248 100644 --- a/src/client/app/common/views/components/note-header.vue +++ b/src/client/app/common/views/components/note-header.vue @@ -5,10 +5,10 @@ - admin - bot - cat - lady + admin + bot + cat + lady
    From cf75d1be9e35965c6c75a2c789420da384cd480e Mon Sep 17 00:00:00 2001 From: yupix Date: Wed, 29 Dec 2021 20:18:11 +0900 Subject: [PATCH 03/25] docs: update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 509a5b64d0..92466fda38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- バッヂにカーソルを合わせた際に説明を出すように +- フォロー申請を有効にした状態でフォローリクエストが来ると メニューにtrueと表示される AS-15 - デスクトップ版で通知が何もないとemptyと出る不具合 AS-10 - YAMLファイルへのバックスペース文字混入対策 From 0e96c7daf6ced9fcc7dc31141c3ba6c0cb4568cd Mon Sep 17 00:00:00 2001 From: yupix Date: Wed, 29 Dec 2021 21:08:30 +0900 Subject: [PATCH 04/25] chore: add .gitconfig --- .gitconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..3070056da1 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,10 @@ +[gitflow "branch"] + master = v11-lts + develop = develop +[gitflow "prefix"] + feature = feat/ + bugfix = fix/ + release = release/ + hotfix = fix/ + support = chore/ + versiontag = From 36d9f66d37c55457772c38f972622282a6b21b9c Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Wed, 29 Dec 2021 21:24:45 +0900 Subject: [PATCH 05/25] =?UTF-8?q?Revert=20"feat:=20=E3=82=AB=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=A8=E3=82=AF?= =?UTF-8?q?=E3=82=B9=E3=83=9D=E3=83=BC=E3=83=88"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d1b5c86b65c3d3c6e9188077fe4151f9edd1e8dc. --- CHANGELOG.md | 1 - package.json | 2 - src/misc/download-url.ts | 2 +- src/queue/index.ts | 10 -- .../processors/db/export-custom-emojis.ts | 119 ------------------ src/queue/processors/db/export-notes.ts | 45 ++++--- src/queue/processors/db/index.ts | 4 +- .../api/endpoints/export-custom-emojis.ts | 17 --- yarn.lock | 91 +------------- 9 files changed, 35 insertions(+), 256 deletions(-) delete mode 100644 src/queue/processors/db/export-custom-emojis.ts delete mode 100644 src/server/api/endpoints/export-custom-emojis.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 509a5b64d0..a5de6e85d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - クライアント: メンションにユーザーのアバターを表示するように - インスタンスプロフィールレンダリング ready -- カスタム絵文字エクスポート機能 ### Fixed diff --git a/package.json b/package.json index 72d15b10ca..83237628b9 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,6 @@ "@typescript-eslint/parser": "5.8.0", "@vue/composition-api": "1.4.3", "abort-controller": "3.0.0", - "archiver": "5.3.0", "animejs": "3.2.1", "apexcharts": "3.32.1", "autobind-decorator": "2.4.0", @@ -187,7 +186,6 @@ "langmap": "0.0.16", "loader-utils": "2.0.0", "lodash": "4.17.21", - "mime-types": "2.1.34", "mocha": "9.1.3", "moji": "0.5.1", "ms": "2.1.3", diff --git a/src/misc/download-url.ts b/src/misc/download-url.ts index 1c4a82c333..e2bc4cc6de 100644 --- a/src/misc/download-url.ts +++ b/src/misc/download-url.ts @@ -11,7 +11,7 @@ const PrivateIp = require('private-ip'); const pipeline = util.promisify(stream.pipeline); -export async function downloadUrl(url: string, path: string): Promise { +export async function downloadUrl(url: string, path: string) { const logger = new Logger('download'); logger.info(`Downloading ${chalk.cyan(url)} ...`); diff --git a/src/queue/index.ts b/src/queue/index.ts index efa07ac2e6..e7c522e08d 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -13,7 +13,6 @@ import { DriveFile } from '../models/entities/drive-file'; import { getJobInfo } from './get-job-info'; import { IActivity } from '../remote/activitypub/type'; import { dbQueue, deliverQueue, inboxQueue, objectStorageQueue } from './queues'; -import { ThinUser } from './types'; function renderError(e: Error): any { return { @@ -109,15 +108,6 @@ export function createDeleteDriveFilesJob(user: ILocalUser) { }); } -export function createExportCustomEmojisJob(user: ILocalUser) { - return dbQueue.add('exportCustomEmojis', { - user: user, - }, { - removeOnComplete: true, - removeOnFail: true, - }); -} - export function createExportNotesJob(user: ILocalUser) { return dbQueue.add('exportNotes', { user: user diff --git a/src/queue/processors/db/export-custom-emojis.ts b/src/queue/processors/db/export-custom-emojis.ts deleted file mode 100644 index 3930b9d6d4..0000000000 --- a/src/queue/processors/db/export-custom-emojis.ts +++ /dev/null @@ -1,119 +0,0 @@ -import * as Bull from 'bull'; -import * as tmp from 'tmp'; -import * as fs from 'fs'; - -import { ulid } from 'ulid'; -const mime = require('mime-types'); -const archiver = require('archiver'); -import { queueLogger } from '../../logger'; -import addFile from '@/services/drive/add-file'; -import * as dateFormat from 'dateformat'; -import { Users, Emojis } from '@/models/index'; -import { } from '@/queue/types'; -import { downloadUrl } from '@/misc/download-url'; - -const logger = queueLogger.createSubLogger('export-custom-emojis'); - -export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promise { - logger.info(`Exporting custom emojis ...`); - - const user = await Users.findOne(job.data.user.id); - if (user == null) { - done(); - return; - } - - // Create temp dir - const [path, cleanup] = await new Promise<[string, () => void]>((res, rej) => { - tmp.dir((e, path, cleanup) => { - if (e) return rej(e); - res([path, cleanup]); - }); - }); - - logger.info(`Temp dir is ${path}`); - - const metaPath = path + '/meta.json'; - - fs.writeFileSync(metaPath, '', 'utf-8'); - - const metaStream = fs.createWriteStream(metaPath, { flags: 'a' }); - - const writeMeta = (text: string): Promise => { - return new Promise((res, rej) => { - metaStream.write(text, err => { - if (err) { - logger.error(err); - rej(err); - } else { - res(); - } - }); - }); - }; - - await writeMeta(`{"metaVersion":1,"emojis":[`); - - const customEmojis = await Emojis.find({ - where: { - host: null, - }, - order: { - id: 'ASC', - }, - }); - - for (const emoji of customEmojis) { - const exportId = ulid().toLowerCase(); - const ext = mime.extension(emoji.type); - const emojiPath = path + '/' + exportId + (ext ? '.' + ext : ''); - fs.writeFileSync(emojiPath, '', 'binary'); - let downloaded = false; - - try { - await downloadUrl(emoji.url, emojiPath); - downloaded = true; - } catch (e) { // TODO: 何度か再試行 - logger.error(e); - } - - const content = JSON.stringify({ - id: exportId, - downloaded: downloaded, - emoji: emoji, - }); - const isFirst = customEmojis.indexOf(emoji) === 0; - - await writeMeta(isFirst ? content : ',\n' + content); - } - - await writeMeta(']}'); - - metaStream.end(); - - // Create archive - const [archivePath, archiveCleanup] = await new Promise<[string, () => void]>((res, rej) => { - tmp.file((e, path, fd, cleanup) => { - if (e) return rej(e); - res([path, cleanup]); - }); - }); - const archiveStream = fs.createWriteStream(archivePath); - const archive = archiver('zip', { - zlib: { level: 0 }, - }); - archiveStream.on('close', async () => { - logger.succ(`Exported to: ${archivePath}`); - - const fileName = 'custom-emojis-' + dateFormat(new Date(), 'yyyy-mm-dd-HH-MM-ss') + '.zip'; - const driveFile = await addFile(user, archivePath, fileName, null, null, true); - - logger.succ(`Exported to: ${driveFile.id}`); - cleanup(); - archiveCleanup(); - done(); - }); - archive.pipe(archiveStream); - archive.directory(path, false); - archive.finalize(); -} diff --git a/src/queue/processors/db/export-notes.ts b/src/queue/processors/db/export-notes.ts index 321f852a82..82bbf4b8b7 100644 --- a/src/queue/processors/db/export-notes.ts +++ b/src/queue/processors/db/export-notes.ts @@ -35,20 +35,16 @@ export async function exportNotes(job: Bull.Job, done: any): Prom const stream = fs.createWriteStream(path, { flags: 'a' }); - const write = (text: string): Promise => { - return new Promise((res, rej) => { - stream.write(text, err => { - if (err) { - logger.error(err); - rej(err); - } else { - res(); - } - }); + await new Promise((res, rej) => { + stream.write('[', err => { + if (err) { + logger.error(err); + rej(err); + } else { + res(); + } }); - }; - - await write('['); + }); let exportedNotesCount = 0; let cursor: any = null; @@ -78,8 +74,16 @@ export async function exportNotes(job: Bull.Job, done: any): Prom poll = await Polls.findOne({ noteId: note.id }).then(ensure); } const content = JSON.stringify(serialize(note, poll)); - const isFirst = exportedNotesCount === 0; - await write(isFirst ? content : ',\n' + content); + await new Promise((res, rej) => { + stream.write(exportedNotesCount === 0 ? content : ',\n' + content, err => { + if (err) { + logger.error(err); + rej(err); + } else { + res(); + } + }); + }); exportedNotesCount++; } @@ -90,7 +94,16 @@ export async function exportNotes(job: Bull.Job, done: any): Prom job.progress(exportedNotesCount / total); } - await write(']'); + await new Promise((res, rej) => { + stream.write(']', err => { + if (err) { + logger.error(err); + rej(err); + } else { + res(); + } + }); + }); stream.end(); logger.succ(`Exported to: ${path}`); diff --git a/src/queue/processors/db/index.ts b/src/queue/processors/db/index.ts index 225a4686f8..12dd01aa1d 100644 --- a/src/queue/processors/db/index.ts +++ b/src/queue/processors/db/index.ts @@ -1,7 +1,5 @@ import * as Bull from 'bull'; -import { DbJobData } from '../../types'; import { deleteDriveFiles } from './delete-drive-files'; -import { exportCustomEmojis } from './export-custom-emojis'; import { exportNotes } from './export-notes'; import { exportFollowing } from './export-following'; import { exportMute } from './export-mute'; @@ -11,10 +9,10 @@ import { importFollowing } from './import-following'; import { importBlocking } from './import-blocking'; import { importUserLists } from './import-user-lists'; import { deleteAccount } from './delete-account'; +import { DbJobData } from '../../types'; const jobs = { deleteDriveFiles, - exportCustomEmojis, exportNotes, exportFollowing, exportMute, diff --git a/src/server/api/endpoints/export-custom-emojis.ts b/src/server/api/endpoints/export-custom-emojis.ts deleted file mode 100644 index 92738c8288..0000000000 --- a/src/server/api/endpoints/export-custom-emojis.ts +++ /dev/null @@ -1,17 +0,0 @@ -import $ from 'cafy'; -import define from '../define'; -import { createExportCustomEmojisJob } from '@/queue/index'; -import ms from 'ms'; - -export const meta = { - secure: true, - requireCredential: true as const, - limit: { - duration: ms('1hour'), - max: 1, - }, -}; - -export default define(meta, async (ps, user) => { - createExportCustomEmojisJob(user); -}); diff --git a/yarn.lock b/yarn.lock index d8dfbab7f8..59cdd7fe8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1597,35 +1597,6 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -archiver-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" - integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== - dependencies: - glob "^7.1.4" - graceful-fs "^4.2.0" - lazystream "^1.0.0" - lodash.defaults "^4.2.0" - lodash.difference "^4.5.0" - lodash.flatten "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.union "^4.6.0" - normalize-path "^3.0.0" - readable-stream "^2.0.0" - -archiver@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" - integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== - dependencies: - archiver-utils "^2.1.0" - async "^3.2.0" - buffer-crc32 "^0.2.1" - readable-stream "^3.6.0" - readdir-glob "^1.0.0" - tar-stream "^2.2.0" - zip-stream "^4.1.0" - archy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" @@ -2123,11 +2094,6 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4 escalade "^3.1.1" node-releases "^1.1.75" -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -2828,16 +2794,6 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -compress-commons@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" - integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== - dependencies: - buffer-crc32 "^0.2.13" - crc32-stream "^4.0.2" - normalize-path "^3.0.0" - readable-stream "^3.6.0" - compressible@~2.0.16: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" @@ -3024,7 +2980,7 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -crc-32@1.2.0, crc-32@^1.2.0: +crc-32@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== @@ -3032,14 +2988,6 @@ crc-32@1.2.0, crc-32@^1.2.0: exit-on-epipe "~1.0.1" printj "~1.1.0" -crc32-stream@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" - integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== - dependencies: - crc-32 "^1.2.0" - readable-stream "^3.4.0" - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -4938,7 +4886,7 @@ got@11.8.3: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -6718,11 +6666,6 @@ lodash.defaults@^4.0.1, lodash.defaults@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= - lodash.filter@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" @@ -6758,11 +6701,6 @@ lodash.isfinite@^3.3.2: resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M= -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - lodash.isregexp@3.0.5: version "3.0.5" resolved "https://registry.yarnpkg.com/lodash.isregexp/-/lodash.isregexp-3.0.5.tgz#e0f596242f2fa228a840086b6c8ad82e4b71fd2d" @@ -6832,11 +6770,6 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - lodash.uniq@^4.3.0, lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -7078,7 +7011,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== -mime-types@2.1.34, mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== @@ -9094,13 +9027,6 @@ readable-web-to-node-stream@^3.0.0: "@types/readable-stream" "^2.3.9" readable-stream "^3.6.0" -readdir-glob@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" - integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== - dependencies: - minimatch "^3.0.4" - readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -10505,7 +10431,7 @@ tar-fs@^2.0.0, tar-fs@^2.1.1: pump "^3.0.0" tar-stream "^2.1.4" -tar-stream@^2.1.4, tar-stream@^2.2.0: +tar-stream@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -12075,12 +12001,3 @@ zen-observable@^0.8.15: version "0.8.15" resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== - -zip-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" - integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== - dependencies: - archiver-utils "^2.1.0" - compress-commons "^4.1.0" - readable-stream "^3.6.0" From 95ec6b9be0349072beba13f97f362f9a3e8bd1f0 Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Wed, 29 Dec 2021 21:48:53 +0900 Subject: [PATCH 06/25] =?UTF-8?q?feat:=20=E7=8C=AB=E8=80=B3=E5=8B=95?= =?UTF-8?q?=E3=81=8B=E3=81=99=20AS-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../app/common/views/components/avatar.vue | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5de6e85d0..968c1edea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - クライアント: メンションにユーザーのアバターを表示するように - インスタンスプロフィールレンダリング ready +- 猫耳動かす AS-3 ### Fixed diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue index 4acdee1516..680b2d2d47 100644 --- a/src/client/app/common/views/components/avatar.vue +++ b/src/client/app/common/views/components/avatar.vue @@ -75,6 +75,19 @@ export default Vue.extend({ + From ef547ce78325767c83804906ac4a7d7a685b4984 Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Fri, 21 Jan 2022 15:11:07 +0900 Subject: [PATCH 19/25] chore: endpoint --- .github/workflows/docker-publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7b19439d2c..655df2f5eb 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -59,11 +59,13 @@ jobs: run: docker build . --file Dockerfile --tag $IMAGE_NAME - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + #run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Push image run: | - IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + #IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME + IMAGE_ID=ghcr.io/${{ github.repository }}/$IMAGE_NAME # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') From 31263b9d9bcd0d51a97af9bf7f53a01f1cd73dd7 Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Fri, 21 Jan 2022 15:34:51 +0900 Subject: [PATCH 20/25] fix: comment --- src/client/app/desktop/views/components/ui.header.clock.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/components/ui.header.clock.vue b/src/client/app/desktop/views/components/ui.header.clock.vue index 6fea076774..8526b7a8bc 100644 --- a/src/client/app/desktop/views/components/ui.header.clock.vue +++ b/src/client/app/desktop/views/components/ui.header.clock.vue @@ -107,6 +107,7 @@ export default Vue.extend({ background #899492 &.round - border-radius 16px # TODO:2021/12/30 + // TODO:2021/12/30 + border-radius 16px From d37380f342ec7a6c36a320a9008ad469d793c897 Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Mon, 24 Jan 2022 20:24:34 +0900 Subject: [PATCH 21/25] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6a09a5213..e3daa3e9fe 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "yupix ", "syuilo " ], - "version": "11.37.1-rei0784-5.17.2", + "version": "11.37.1-rei0784-5.18.0", "codename": "malachite", "repository": { "type": "git", From 25ebc2fa1b1ba1de7972e1fcf6f9ad5a602162aa Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Mon, 24 Jan 2022 20:50:44 +0900 Subject: [PATCH 22/25] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3daa3e9fe..532947fe9c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "yupix ", "syuilo " ], - "version": "11.37.1-rei0784-5.18.0", + "version": "11.37.1-rei0784-5.18.0-rc.1", "codename": "malachite", "repository": { "type": "git", From 80eb6994d93f11202e7c2629cacceb3c0dca7b7f Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Mon, 24 Jan 2022 20:58:08 +0900 Subject: [PATCH 23/25] ci: tune --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 655df2f5eb..b2f1b00c02 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -65,7 +65,7 @@ jobs: - name: Push image run: | #IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME - IMAGE_ID=ghcr.io/${{ github.repository }}/$IMAGE_NAME + IMAGE_ID=ghcr.io/teamblackcrystal/$IMAGE_NAME # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') From 2d7b26d8f7f3ad6d5bef64e7822e81ac7fca83ee Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Mon, 24 Jan 2022 21:09:30 +0900 Subject: [PATCH 24/25] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 532947fe9c..3e64ecd129 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "yupix ", "syuilo " ], - "version": "11.37.1-rei0784-5.18.0-rc.1", + "version": "11.37.1-rei0784-5.18.0-rc.2", "codename": "malachite", "repository": { "type": "git", From 1f5ef760cb23035f56014a77dc7a2e695c7d37b7 Mon Sep 17 00:00:00 2001 From: sousuke0422 Date: Tue, 25 Jan 2022 11:02:01 +0900 Subject: [PATCH 25/25] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e64ecd129..e3daa3e9fe 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "yupix ", "syuilo " ], - "version": "11.37.1-rei0784-5.18.0-rc.2", + "version": "11.37.1-rei0784-5.18.0", "codename": "malachite", "repository": { "type": "git",