From f24869625ec12deb660f8f6bb8fe681af7ac0b2c Mon Sep 17 00:00:00 2001 From: xps2 <9610872+xps2@users.noreply.github.com> Date: Sun, 2 Sep 2018 01:09:27 +0900 Subject: [PATCH 1/5] fix --- src/client/app/desktop/views/components/media-image.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/components/media-image.vue b/src/client/app/desktop/views/components/media-image.vue index 52d029a26..0284872c6 100644 --- a/src/client/app/desktop/views/components/media-image.vue +++ b/src/client/app/desktop/views/components/media-image.vue @@ -48,7 +48,7 @@ export default Vue.extend({ const mouseY = e.clientY - rect.top; const xp = mouseX / this.$el.offsetWidth * 100; const yp = mouseY / this.$el.offsetHeight * 100; - this.$el.style.backgroundPosition = `${xp}% ${yp}%'; + this.$el.style.backgroundPosition = `${xp}% ${yp}%`; this.$el.style.backgroundImage = `url("${this.image.url}")`; }, From a4678e45deeac110acd76388983f27c6f68e8c07 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sun, 2 Sep 2018 04:48:42 +0900 Subject: [PATCH 2/5] Not check dependencies --- src/index.ts | 2 -- src/misc/dependencyInfo.ts | 32 -------------------------------- 2 files changed, 34 deletions(-) delete mode 100644 src/misc/dependencyInfo.ts diff --git a/src/index.ts b/src/index.ts index 470699eab..ed23ff7e7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -20,7 +20,6 @@ import Logger from './misc/logger'; import ProgressBar from './misc/cli/progressbar'; import EnvironmentInfo from './misc/environmentInfo'; import MachineInfo from './misc/machineInfo'; -import DependencyInfo from './misc/dependencyInfo'; import serverStats from './daemons/server-stats'; import notesStats from './daemons/notes-stats'; import loadConfig from './config/load'; @@ -116,7 +115,6 @@ async function init(): Promise { new Logger('Deps').info(`Node.js ${process.version}`); MachineInfo.show(); EnvironmentInfo.show(); - new DependencyInfo().showAll(); const configLogger = new Logger('Config'); let config; diff --git a/src/misc/dependencyInfo.ts b/src/misc/dependencyInfo.ts deleted file mode 100644 index 09d282822..000000000 --- a/src/misc/dependencyInfo.ts +++ /dev/null @@ -1,32 +0,0 @@ -import Logger from './logger'; -import { execSync } from 'child_process'; - -export default class { - private logger: Logger; - - constructor() { - this.logger = new Logger('Deps'); - } - - public showAll(): void { - this.show('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version:? v(.*)\r?\n/)); - this.show('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)); - } - - public show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void { - try { - // ステータス0以外のときにexecSyncはstderrをコンソール上に出力してしまうので - // プロセスからのstderrをすべて無視するように stdio オプションをセット - const x = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] }); - const ver = transform(x.toString()); - if (ver != null) { - this.logger.succ(`${serviceName} ${ver[1]} found`); - } else { - this.logger.warn(`${serviceName} not found`); - this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`); - } - } catch (e) { - this.logger.warn(`${serviceName} not found`); - } - } -} From 0177023ead75594c603e41f9c1f355e7f4b18369 Mon Sep 17 00:00:00 2001 From: mei23 Date: Sun, 2 Sep 2018 02:57:34 +0900 Subject: [PATCH 3/5] Use Tombstone for Delete --- src/remote/activitypub/renderer/tombstone.ts | 4 ++++ src/services/note/delete.ts | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/remote/activitypub/renderer/tombstone.ts diff --git a/src/remote/activitypub/renderer/tombstone.ts b/src/remote/activitypub/renderer/tombstone.ts new file mode 100644 index 000000000..553406b93 --- /dev/null +++ b/src/remote/activitypub/renderer/tombstone.ts @@ -0,0 +1,4 @@ +export default (id: string) => ({ + id, + type: 'Tombstone' +}); diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index d0e2b12b4..dea306fee 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -5,8 +5,9 @@ import renderDelete from '../../remote/activitypub/renderer/delete'; import pack from '../../remote/activitypub/renderer'; import { deliver } from '../../queue'; import Following from '../../models/following'; -import renderNote from '../../remote/activitypub/renderer/note'; +import renderTombstone from '../../remote/activitypub/renderer/tombstone'; import { updateNoteStats } from '../update-chart'; +import config from '../../config'; /** * 投稿を削除します。 @@ -32,7 +33,7 @@ export default async function(user: IUser, note: INote) { //#region ローカルの投稿なら削除アクティビティを配送 if (isLocalUser(user)) { - const content = pack(renderDelete(await renderNote(note), user)); + const content = pack(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user)); const followings = await Following.find({ followeeId: user._id, From 4f0d844b4383160bd9127ce8562d5235fea3bf99 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 2 Sep 2018 09:31:11 +0900 Subject: [PATCH 4/5] Remove needless properties --- src/models/drive-file.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index dbbc1f1cd..698ef092a 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -193,5 +193,10 @@ export const pack = ( */ } + delete _target.withoutChunks; + delete _target.storage; + delete _target.storageProps; + delete _target.isRemote; + resolve(_target); }); From 14c03f226d49d656a7c1b8d522fa2b50b6280ac7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 2 Sep 2018 09:33:55 +0900 Subject: [PATCH 5/5] 8.21.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 499d45356..522765359 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "8.21.0", - "clientVersion": "1.0.9259", + "version": "8.21.1", + "clientVersion": "1.0.9264", "codename": "nighthike", "main": "./built/index.js", "private": true,