graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-28 02:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

非正規化カラムを削除

Browse source 
非正規化するほどの情報じゃない
This commit is contained in:
syuilo 2019-04-12 00:42:39 +09:00
parent ab8c6515b8
commit 11c30eccb3
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/models/entities/note.ts
View file

@ -195,12 +195,6 @@ export class Note {
})
public userHost: string | null;
@Column('varchar', {
length: 128, nullable: true,
comment: '[Denormalized]'
})
public userInbox: string | null;
@Column({
...id(),
nullable: true,

9
src/services/note/create.ts
View file

@ -329,12 +329,16 @@ async function publish(user: User, note: Note, reply: Note, renote: Note, noteAc
if (Users.isLocalUser(user)) {
// 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送
if (reply && reply.userHost !== null) {
deliver(user, noteActivity, reply.userInbox);
Users.findOne(reply.userId).then(u => {
deliver(user, noteActivity, u.inbox);
});
}
// 投稿がRenoteかつ投稿者がローカルユーザーかつRenote元の投稿の投稿者がリモートユーザーなら配送
if (renote && renote.userHost !== null) {
deliver(user, noteActivity, renote.userInbox);
Users.findOne(renote.userId).then(u => {
deliver(user, noteActivity, u.inbox);
});
}
}
@ -377,7 +381,6 @@ async function insertNote(user: User, data: Option, tags: string[], emojis: stri
renoteUserId: data.renote ? data.renote.userId : null,
renoteUserHost: data.renote ? data.renote.userHost : null,
userHost: user.host,
userInbox: user.inbox,
};
if (data.uri != null) insert.uri = data.uri;

4
src/services/note/reaction/create.ts
View file

@ -90,7 +90,9 @@ export default async (user: User, note: Note, reaction: string) => {
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
if (Users.isLocalUser(user) && note.userHost !== null) {
const content = renderActivity(renderLike(user, note, reaction));
deliver(user, content, note.userInbox);
Users.findOne(note.userId).then(u => {
deliver(user, content, u.inbox);
});
}
//#endregion
};

4
src/services/note/reaction/delete.ts
View file

@ -41,7 +41,9 @@ export default async (user: User, note: Note) => {
// リアクターがローカルユーザーかつリアクション対象がリモートユーザーの投稿なら配送
if (Users.isLocalUser(user) && (note.userHost !== null)) {
const content = renderActivity(renderUndo(renderLike(user, note, exist.reaction), user));
deliver(user, content, note.userInbox);
Users.findOne(note.userId).then(u => {
deliver(user, content, u.inbox);
});
}
//#endregion
};