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

Revert "fix(server): Use inner join"

Browse source 
This reverts commit d7e7848c92.
This commit is contained in:
syuilo 2021-03-21 12:31:56 +09:00
parent e987a50e9f
commit c52b504140
19 changed files with 91 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/api/common/inject-featured.ts
View file

@ -23,7 +23,7 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
.andWhere(`note.score > 0`) .andWhere(`note.score > 0`)
.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) }) .andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
.andWhere(`note.visibility = 'public'`) .andWhere(`note.visibility = 'public'`)
.innerJoinAndSelect('note.user', 'user'); .leftJoinAndSelect('note.user', 'user');
if (user) { if (user) {
query.andWhere('note.userId != :userId', { userId: user.id }); query.andWhere('note.userId != :userId', { userId: user.id });

10
src/server/api/endpoints/antennas/notes.ts
View file

@ -73,11 +73,11 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere(`note.id IN (${ antennaQuery.getQuery() })`) .andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.setParameters(antennaQuery.getParameters()); .setParameters(antennaQuery.getParameters());
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);

10
src/server/api/endpoints/channels/timeline.ts
View file

@ -87,11 +87,11 @@ export default define(meta, async (ps, user) => {
//#region Construct query //#region Construct query
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('note.channelId = :channelId', { channelId: channel.id }) .andWhere('note.channelId = :channelId', { channelId: channel.id })
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel'); .leftJoinAndSelect('note.channel', 'channel');
//#endregion //#endregion

10
src/server/api/endpoints/clips/notes.ts
View file

@ -71,11 +71,11 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere(`note.id IN (${ clipQuery.getQuery() })`) .andWhere(`note.id IN (${ clipQuery.getQuery() })`)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.setParameters(clipQuery.getParameters()); .setParameters(clipQuery.getParameters());
if (user) { if (user) {

10
src/server/api/endpoints/i/notifications.ts
View file

@ -87,11 +87,11 @@ export default define(meta, async (ps, user) => {
.andWhere(`notification.notifieeId = :meId`, { meId: user.id }) .andWhere(`notification.notifieeId = :meId`, { meId: user.id })
.leftJoinAndSelect('notification.notifier', 'notifier') .leftJoinAndSelect('notification.notifier', 'notifier')
.leftJoinAndSelect('notification.note', 'note') .leftJoinAndSelect('notification.note', 'note')
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
query.andWhere(`notification.notifierId NOT IN (${ mutingQuery.getQuery() })`); query.andWhere(`notification.notifierId NOT IN (${ mutingQuery.getQuery() })`);
query.setParameters(mutingQuery.getParameters()); query.setParameters(mutingQuery.getParameters());

10
src/server/api/endpoints/notes.ts
View file

@ -76,11 +76,11 @@ export default define(meta, async (ps) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere(`note.visibility = 'public'`) .andWhere(`note.visibility = 'public'`)
.andWhere(`note.localOnly = FALSE`) .andWhere(`note.localOnly = FALSE`)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
if (ps.local) { if (ps.local) {
query.andWhere('note.userHost IS NULL'); query.andWhere('note.userHost IS NULL');

10
src/server/api/endpoints/notes/children.ts
View file

@ -64,11 +64,11 @@ export default define(meta, async (ps, user) => {
})); }));
})); }));
})) }))
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMutedUserQuery(query, user); if (user) generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/featured.ts
View file

@ -49,11 +49,11 @@ export default define(meta, async (ps, user) => {
.andWhere(`note.score > 0`) .andWhere(`note.score > 0`)
.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) }) .andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
.andWhere(`note.visibility = 'public'`) .andWhere(`note.visibility = 'public'`)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
if (user) generateMutedUserQuery(query, user); if (user) generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/global-timeline.ts
View file

@ -79,11 +79,11 @@ export default define(meta, async (ps, user) => {
ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('note.visibility = \'public\'') .andWhere('note.visibility = \'public\'')
.andWhere('note.channelId IS NULL') .andWhere('note.channelId IS NULL')
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateRepliesQuery(query, user); generateRepliesQuery(query, user);
if (user) generateMutedUserQuery(query, user); if (user) generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/hybrid-timeline.ts
View file

@ -127,11 +127,11 @@ export default define(meta, async (ps, user) => {
qb.where(`((note.userId IN (${ followingQuery.getQuery() })) OR (note.userId = :meId))`, { meId: user.id }) qb.where(`((note.userId IN (${ followingQuery.getQuery() })) OR (note.userId = :meId))`, { meId: user.id })
.orWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)'); .orWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)');
})) }))
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.setParameters(followingQuery.getParameters()); .setParameters(followingQuery.getParameters());
generateChannelQuery(query, user); generateChannelQuery(query, user);

10
src/server/api/endpoints/notes/local-timeline.ts
View file

@ -96,11 +96,11 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), const query = makePaginationQuery(Notes.createQueryBuilder('note'),
ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)') .andWhere('(note.visibility = \'public\') AND (note.userHost IS NULL)')
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateChannelQuery(query, user); generateChannelQuery(query, user);
generateRepliesQuery(query, user); generateRepliesQuery(query, user);

10
src/server/api/endpoints/notes/mentions.ts
View file

@ -63,11 +63,11 @@ export default define(meta, async (ps, user) => {
.where(`:meId = ANY(note.mentions)`, { meId: user.id }) .where(`:meId = ANY(note.mentions)`, { meId: user.id })
.orWhere(`:meId = ANY(note.visibleUserIds)`, { meId: user.id }); .orWhere(`:meId = ANY(note.visibleUserIds)`, { meId: user.id });
})) }))
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
generateMutedUserQuery(query, user); generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/renotes.ts
View file

@ -68,11 +68,11 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere(`note.renoteId = :renoteId`, { renoteId: note.id }) .andWhere(`note.renoteId = :renoteId`, { renoteId: note.id })
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMutedUserQuery(query, user); if (user) generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/replies.ts
View file

@ -59,11 +59,11 @@ export const meta = {
export default define(meta, async (ps, user) => { export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere('note.replyId = :replyId', { replyId: ps.noteId }) .andWhere('note.replyId = :replyId', { replyId: ps.noteId })
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);
if (user) generateMutedUserQuery(query, user); if (user) generateMutedUserQuery(query, user);

10
src/server/api/endpoints/notes/search-by-tag.ts
View file

@ -95,11 +95,11 @@ export const meta = {
export default define(meta, async (ps, me) => { export default define(meta, async (ps, me) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, me); generateVisibilityQuery(query, me);
if (me) generateMutedUserQuery(query, me); if (me) generateMutedUserQuery(query, me);

10
src/server/api/endpoints/notes/search.ts
View file

@ -79,11 +79,11 @@ export default define(meta, async (ps, me) => {
query query
.andWhere('note.text ILIKE :q', { q: `%${ps.query}%` }) .andWhere('note.text ILIKE :q', { q: `%${ps.query}%` })
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, me); generateVisibilityQuery(query, me);
if (me) generateMutedUserQuery(query, me); if (me) generateMutedUserQuery(query, me);

10
src/server/api/endpoints/notes/timeline.ts
View file

@ -120,11 +120,11 @@ export default define(meta, async (ps, user) => {
.where('note.userId = :meId', { meId: user.id }); .where('note.userId = :meId', { meId: user.id });
if (hasFollowing) qb.orWhere(`note.userId IN (${ followingQuery.getQuery() })`); if (hasFollowing) qb.orWhere(`note.userId IN (${ followingQuery.getQuery() })`);
})) }))
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.setParameters(followingQuery.getParameters()); .setParameters(followingQuery.getParameters());
generateChannelQuery(query, user); generateChannelQuery(query, user);

10
src/server/api/endpoints/notes/user-list-timeline.ts
View file

@ -130,11 +130,11 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
.andWhere(`note.userId IN (${ listQuery.getQuery() })`) .andWhere(`note.userId IN (${ listQuery.getQuery() })`)
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.setParameters(listQuery.getParameters()); .setParameters(listQuery.getParameters());
generateVisibilityQuery(query, user); generateVisibilityQuery(query, user);

10
src/server/api/endpoints/users/notes.ts
View file

@ -131,11 +131,11 @@ export default define(meta, async (ps, me) => {
//#region Construct query //#region Construct query
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('note.userId = :userId', { userId: user.id }) .andWhere('note.userId = :userId', { userId: user.id })
.innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.user', 'user')
.innerJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.innerJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
.innerJoinAndSelect('reply.user', 'replyUser') .leftJoinAndSelect('reply.user', 'replyUser')
.innerJoinAndSelect('renote.user', 'renoteUser'); .leftJoinAndSelect('renote.user', 'renoteUser');
generateVisibilityQuery(query, me); generateVisibilityQuery(query, me);
if (me) generateMutedUserQuery(query, me, user); if (me) generateMutedUserQuery(query, me, user);