mirror of
https://activitypub.software/TransFem-org/Sharkey
synced 2024-11-25 07:25:12 +00:00
add filters for following feed
This commit is contained in:
parent
56e7d7e0b1
commit
463b9ac59d
16 changed files with 318 additions and 72 deletions
|
@ -1263,6 +1263,9 @@ authentication: "Authentication"
|
||||||
authenticationRequiredToContinue: "Please authenticate to continue"
|
authenticationRequiredToContinue: "Please authenticate to continue"
|
||||||
dateAndTime: "Timestamp"
|
dateAndTime: "Timestamp"
|
||||||
showRenotes: "Show boosts"
|
showRenotes: "Show boosts"
|
||||||
|
showQuotes: "Show quotes"
|
||||||
|
showReplies: "Show replies"
|
||||||
|
showNonPublicNotes: "Show non-public"
|
||||||
edited: "Edited"
|
edited: "Edited"
|
||||||
notificationRecieveConfig: "Notification Settings"
|
notificationRecieveConfig: "Notification Settings"
|
||||||
mutualFollow: "Mutual follow"
|
mutualFollow: "Mutual follow"
|
||||||
|
|
12
locales/index.d.ts
vendored
12
locales/index.d.ts
vendored
|
@ -5065,6 +5065,18 @@ export interface Locale extends ILocale {
|
||||||
* ブーストを表示
|
* ブーストを表示
|
||||||
*/
|
*/
|
||||||
"showRenotes": string;
|
"showRenotes": string;
|
||||||
|
/**
|
||||||
|
* Show quotes
|
||||||
|
*/
|
||||||
|
"showQuotes": string;
|
||||||
|
/**
|
||||||
|
* Show replies
|
||||||
|
*/
|
||||||
|
"showReplies": string;
|
||||||
|
/**
|
||||||
|
* Show non-public
|
||||||
|
*/
|
||||||
|
"showNonPublicNotes": string;
|
||||||
/**
|
/**
|
||||||
* 編集済み
|
* 編集済み
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1262,6 +1262,9 @@ authentication: "認証"
|
||||||
authenticationRequiredToContinue: "続けるには認証を行ってください"
|
authenticationRequiredToContinue: "続けるには認証を行ってください"
|
||||||
dateAndTime: "日時"
|
dateAndTime: "日時"
|
||||||
showRenotes: "ブーストを表示"
|
showRenotes: "ブーストを表示"
|
||||||
|
showQuotes: "Show quotes"
|
||||||
|
showReplies: "Show replies"
|
||||||
|
showNonPublicNotes: "Show non-public"
|
||||||
edited: "編集済み"
|
edited: "編集済み"
|
||||||
notificationRecieveConfig: "通知の受信設定"
|
notificationRecieveConfig: "通知の受信設定"
|
||||||
mutualFollow: "相互フォロー"
|
mutualFollow: "相互フォロー"
|
||||||
|
|
|
@ -11,14 +11,14 @@ export class TrackLatestNoteType1728420772835 {
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isPublic" boolean NOT NULL DEFAULT false`);
|
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isPublic" boolean NOT NULL DEFAULT false`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isReply" boolean NOT NULL DEFAULT false`);
|
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isReply" boolean NOT NULL DEFAULT false`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isQuote" boolean NOT NULL DEFAULT false`);
|
await queryRunner.query(`ALTER TABLE "latest_note" ADD "isQuote" boolean NOT NULL DEFAULT false`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" ADD CONSTRAINT "PK_a44ac8ca9cb916faeefc0912abd" PRIMARY KEY ("user_id", "isPublic", "isReply", "isQuote")`);
|
await queryRunner.query(`ALTER TABLE "latest_note" ADD CONSTRAINT "PK_a44ac8ca9cb916faeefc0912abd" PRIMARY KEY ("user_id", is_public, is_reply, is_quote)`);
|
||||||
}
|
}
|
||||||
|
|
||||||
async down(queryRunner) {
|
async down(queryRunner) {
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" DROP CONSTRAINT "PK_a44ac8ca9cb916faeefc0912abd"`);
|
await queryRunner.query(`ALTER TABLE "latest_note" DROP CONSTRAINT "PK_a44ac8ca9cb916faeefc0912abd"`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN "isQuote"`);
|
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN is_quote`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN "isReply"`);
|
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN is_reply`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN "isPublic"`);
|
await queryRunner.query(`ALTER TABLE "latest_note" DROP COLUMN is_public`);
|
||||||
await queryRunner.query(`ALTER TABLE "latest_note" ADD CONSTRAINT "PK_f619b62bfaafabe68f52fb50c9a" PRIMARY KEY ("user_id")`);
|
await queryRunner.query(`ALTER TABLE "latest_note" ADD CONSTRAINT "PK_f619b62bfaafabe68f52fb50c9a" PRIMARY KEY ("user_id")`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ import { isReply } from '@/misc/is-reply.js';
|
||||||
import { trackPromise } from '@/misc/promise-tracker.js';
|
import { trackPromise } from '@/misc/promise-tracker.js';
|
||||||
import { isUserRelated } from '@/misc/is-user-related.js';
|
import { isUserRelated } from '@/misc/is-user-related.js';
|
||||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||||
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
import { isPureRenote } from '@/misc/is-renote.js';
|
||||||
|
|
||||||
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
|
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
|
||||||
|
|
||||||
|
@ -1151,18 +1151,21 @@ export class NoteCreateService implements OnApplicationShutdown {
|
||||||
if (note.visibility === 'specified') return;
|
if (note.visibility === 'specified') return;
|
||||||
|
|
||||||
// Ignore pure renotes
|
// Ignore pure renotes
|
||||||
if (isRenote(note) && !isQuote(note)) return;
|
if (isPureRenote(note)) return;
|
||||||
|
|
||||||
|
// Compute the compound key of the entry to check
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
|
||||||
// Make sure that this isn't an *older* post.
|
// Make sure that this isn't an *older* post.
|
||||||
// We can get older posts through replies, lookups, etc.
|
// We can get older posts through replies, lookups, etc.
|
||||||
const currentLatest = await this.latestNotesRepository.findOneBy({ userId: note.userId });
|
const currentLatest = await this.latestNotesRepository.findOneBy(key);
|
||||||
if (currentLatest != null && currentLatest.noteId >= note.id) return;
|
if (currentLatest != null && currentLatest.noteId >= note.id) return;
|
||||||
|
|
||||||
// Record this as the latest note for the given user
|
// Record this as the latest note for the given user
|
||||||
const latestNote = new SkLatestNote({
|
const latestNote = new SkLatestNote({
|
||||||
userId: note.userId,
|
...key,
|
||||||
noteId: note.id,
|
noteId: note.id,
|
||||||
});
|
});
|
||||||
await this.latestNotesRepository.upsert(latestNote, ['userId']);
|
await this.latestNotesRepository.upsert(latestNote, ['userId', 'isPublic', 'isReply', 'isQuote']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
import { Brackets, In, Not } from 'typeorm';
|
import { Brackets, In, Not } from 'typeorm';
|
||||||
import { Injectable, Inject } from '@nestjs/common';
|
import { Injectable, Inject } from '@nestjs/common';
|
||||||
import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/User.js';
|
import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/User.js';
|
||||||
import type { MiNote, IMentionedRemoteUsers } from '@/models/Note.js';
|
import { MiNote, IMentionedRemoteUsers } from '@/models/Note.js';
|
||||||
import { SkLatestNote } from '@/models/LatestNote.js';
|
import { SkLatestNote } from '@/models/LatestNote.js';
|
||||||
import type { InstancesRepository, LatestNotesRepository, NotesRepository, UsersRepository } from '@/models/_.js';
|
import type { InstancesRepository, LatestNotesRepository, NotesRepository, UsersRepository } from '@/models/_.js';
|
||||||
import { RelayService } from '@/core/RelayService.js';
|
import { RelayService } from '@/core/RelayService.js';
|
||||||
|
@ -25,7 +25,7 @@ import { bindThis } from '@/decorators.js';
|
||||||
import { MetaService } from '@/core/MetaService.js';
|
import { MetaService } from '@/core/MetaService.js';
|
||||||
import { SearchService } from '@/core/SearchService.js';
|
import { SearchService } from '@/core/SearchService.js';
|
||||||
import { ModerationLogService } from '@/core/ModerationLogService.js';
|
import { ModerationLogService } from '@/core/ModerationLogService.js';
|
||||||
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class NoteDeleteService {
|
export class NoteDeleteService {
|
||||||
|
@ -240,8 +240,14 @@ export class NoteDeleteService {
|
||||||
// If it's a DM, then it can't possibly be the latest note so we can safely skip this.
|
// If it's a DM, then it can't possibly be the latest note so we can safely skip this.
|
||||||
if (note.visibility === 'specified') return;
|
if (note.visibility === 'specified') return;
|
||||||
|
|
||||||
|
// If it's a pure renote, then it can't possibly be the latest note so we can safely skip this.
|
||||||
|
if (isPureRenote(note)) return;
|
||||||
|
|
||||||
|
// Compute the compound key of the entry to check
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
|
||||||
// Check if the deleted note was possibly the latest for the user
|
// Check if the deleted note was possibly the latest for the user
|
||||||
const hasLatestNote = await this.latestNotesRepository.existsBy({ userId: note.userId });
|
const hasLatestNote = await this.latestNotesRepository.existsBy(key);
|
||||||
if (hasLatestNote) return;
|
if (hasLatestNote) return;
|
||||||
|
|
||||||
// Find the newest remaining note for the user.
|
// Find the newest remaining note for the user.
|
||||||
|
@ -250,8 +256,16 @@ export class NoteDeleteService {
|
||||||
.createQueryBuilder('note')
|
.createQueryBuilder('note')
|
||||||
.select()
|
.select()
|
||||||
.where({
|
.where({
|
||||||
userId: note.userId,
|
userId: key.userId,
|
||||||
visibility: Not('specified'),
|
visibility: key.isPublic
|
||||||
|
? 'public'
|
||||||
|
: Not('specified'),
|
||||||
|
replyId: key.isReply
|
||||||
|
? Not(null)
|
||||||
|
: null,
|
||||||
|
renoteId: key.isQuote
|
||||||
|
? Not(null)
|
||||||
|
: null,
|
||||||
})
|
})
|
||||||
.andWhere(`
|
.andWhere(`
|
||||||
(
|
(
|
||||||
|
@ -269,7 +283,7 @@ export class NoteDeleteService {
|
||||||
|
|
||||||
// Record it as the latest
|
// Record it as the latest
|
||||||
const latestNote = new SkLatestNote({
|
const latestNote = new SkLatestNote({
|
||||||
userId: note.userId,
|
...key,
|
||||||
noteId: nextLatest.id,
|
noteId: nextLatest.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,17 @@ type Quote =
|
||||||
hasPoll: true
|
hasPoll: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
type PureRenote =
|
||||||
|
Renote & {
|
||||||
|
text: null,
|
||||||
|
cw: null,
|
||||||
|
replyId: null,
|
||||||
|
hasPoll: false,
|
||||||
|
fileIds: {
|
||||||
|
length: 0,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export function isRenote(note: MiNote): note is Renote {
|
export function isRenote(note: MiNote): note is Renote {
|
||||||
return note.renoteId != null;
|
return note.renoteId != null;
|
||||||
}
|
}
|
||||||
|
@ -36,6 +47,10 @@ export function isQuote(note: Renote): note is Quote {
|
||||||
note.fileIds.length > 0;
|
note.fileIds.length > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isPureRenote(note: MiNote): note is PureRenote {
|
||||||
|
return isRenote(note) && !isQuote(note);
|
||||||
|
}
|
||||||
|
|
||||||
type PackedRenote =
|
type PackedRenote =
|
||||||
Packed<'Note'> & {
|
Packed<'Note'> & {
|
||||||
renoteId: NonNullable<Packed<'Note'>['renoteId']>
|
renoteId: NonNullable<Packed<'Note'>['renoteId']>
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm';
|
import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm';
|
||||||
import { MiUser } from '@/models/User.js';
|
import { MiUser } from '@/models/User.js';
|
||||||
import { MiNote } from '@/models/Note.js';
|
import { MiNote } from '@/models/Note.js';
|
||||||
|
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maps a user to the most recent post by that user.
|
* Maps a user to the most recent post by that user.
|
||||||
|
@ -69,4 +70,16 @@ export class SkLatestNote {
|
||||||
(this as Record<string, unknown>)[k] = v;
|
(this as Record<string, unknown>)[k] = v;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates a compound key matching a provided note.
|
||||||
|
*/
|
||||||
|
static keyFor(note: MiNote) {
|
||||||
|
return {
|
||||||
|
userId: note.userId,
|
||||||
|
isPublic: note.visibility === 'public',
|
||||||
|
isReply: note.replyId != null,
|
||||||
|
isQuote: isRenote(note) && isQuote(note),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,6 +92,8 @@ export const dbLogger = new MisskeyLogger('db');
|
||||||
const sqlLogger = dbLogger.createSubLogger('sql', 'gray');
|
const sqlLogger = dbLogger.createSubLogger('sql', 'gray');
|
||||||
|
|
||||||
class MyCustomLogger implements Logger {
|
class MyCustomLogger implements Logger {
|
||||||
|
private readonly isDevelopment = process.env.NODE_ENV === 'development';
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
private highlight(sql: string) {
|
private highlight(sql: string) {
|
||||||
return highlight.highlight(sql, {
|
return highlight.highlight(sql, {
|
||||||
|
@ -101,7 +103,13 @@ class MyCustomLogger implements Logger {
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public logQuery(query: string, parameters?: any[]) {
|
public logQuery(query: string, parameters?: any[]) {
|
||||||
sqlLogger.info(this.highlight(query).substring(0, 100));
|
let message = this.highlight(query);
|
||||||
|
|
||||||
|
if (!this.isDevelopment) {
|
||||||
|
message = message.substring(0, 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlLogger.info(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
|
|
|
@ -33,6 +33,11 @@ export const paramDef = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {
|
properties: {
|
||||||
mutualsOnly: { type: 'boolean', default: false },
|
mutualsOnly: { type: 'boolean', default: false },
|
||||||
|
filesOnly: { type: 'boolean', default: false },
|
||||||
|
includeNonPublic: { type: 'boolean', default: true },
|
||||||
|
includeReplies: { type: 'boolean', default: false },
|
||||||
|
includeQuotes: { type: 'boolean', default: true },
|
||||||
|
|
||||||
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
||||||
sinceId: { type: 'string', format: 'misskey:id' },
|
sinceId: { type: 'string', format: 'misskey:id' },
|
||||||
untilId: { type: 'string', format: 'misskey:id' },
|
untilId: { type: 'string', format: 'misskey:id' },
|
||||||
|
@ -76,6 +81,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
query.innerJoin(MiFollowing, 'mutuals', 'latest.user_id = mutuals."followerId" AND mutuals."followeeId" = :me');
|
query.innerJoin(MiFollowing, 'mutuals', 'latest.user_id = mutuals."followerId" AND mutuals."followeeId" = :me');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Limit to files, if requested
|
||||||
|
if (ps.filesOnly) {
|
||||||
|
query.andWhere('note."fileIds" != \'{}\'');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match selected note types.
|
||||||
|
if (!ps.includeNonPublic) {
|
||||||
|
query.andWhere('latest.is_public');
|
||||||
|
}
|
||||||
|
if (!ps.includeReplies) {
|
||||||
|
query.andWhere('latest.is_reply = false');
|
||||||
|
}
|
||||||
|
if (!ps.includeQuotes) {
|
||||||
|
query.andWhere('latest.is_quote = false');
|
||||||
|
}
|
||||||
|
|
||||||
// Respect blocks and mutes
|
// Respect blocks and mutes
|
||||||
this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
this.queryService.generateMutedUserQuery(query, me);
|
this.queryService.generateMutedUserQuery(query, me);
|
||||||
|
|
|
@ -17,6 +17,7 @@ import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
|
import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
|
||||||
import { ApiError } from '@/server/api/error.js';
|
import { ApiError } from '@/server/api/error.js';
|
||||||
|
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ['users', 'notes'],
|
tags: ['users', 'notes'],
|
||||||
|
@ -51,7 +52,10 @@ export const paramDef = {
|
||||||
properties: {
|
properties: {
|
||||||
userId: { type: 'string', format: 'misskey:id' },
|
userId: { type: 'string', format: 'misskey:id' },
|
||||||
withReplies: { type: 'boolean', default: false },
|
withReplies: { type: 'boolean', default: false },
|
||||||
|
withRepliesToSelf: { type: 'boolean', default: true },
|
||||||
|
withQuotes: { type: 'boolean', default: true },
|
||||||
withRenotes: { type: 'boolean', default: true },
|
withRenotes: { type: 'boolean', default: true },
|
||||||
|
withNonPublic: { type: 'boolean', default: true },
|
||||||
withChannelNotes: { type: 'boolean', default: false },
|
withChannelNotes: { type: 'boolean', default: false },
|
||||||
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
||||||
sinceId: { type: 'string', format: 'misskey:id' },
|
sinceId: { type: 'string', format: 'misskey:id' },
|
||||||
|
@ -103,6 +107,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
withChannelNotes: ps.withChannelNotes,
|
withChannelNotes: ps.withChannelNotes,
|
||||||
withFiles: ps.withFiles,
|
withFiles: ps.withFiles,
|
||||||
withRenotes: ps.withRenotes,
|
withRenotes: ps.withRenotes,
|
||||||
|
withQuotes: ps.withQuotes,
|
||||||
|
withNonPublic: ps.withNonPublic,
|
||||||
|
withRepliesToOthers: ps.withReplies,
|
||||||
|
withRepliesToSelf: ps.withRepliesToSelf,
|
||||||
}, me);
|
}, me);
|
||||||
|
|
||||||
return await this.noteEntityService.packMany(timeline, me);
|
return await this.noteEntityService.packMany(timeline, me);
|
||||||
|
@ -132,6 +140,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
if (note.visibility === 'specified' && (!me || (me.id !== note.userId && !note.visibleUserIds.some(v => v === me.id)))) return false;
|
if (note.visibility === 'specified' && (!me || (me.id !== note.userId && !note.visibleUserIds.some(v => v === me.id)))) return false;
|
||||||
if (note.visibility === 'followers' && !isFollowing && !isSelf) return false;
|
if (note.visibility === 'followers' && !isFollowing && !isSelf) return false;
|
||||||
|
|
||||||
|
// These are handled by DB fallback, but we duplicate them here in case a timeline was already populated with notes
|
||||||
|
if (!ps.withRepliesToSelf && note.reply?.userId === note.userId) return false;
|
||||||
|
if (!ps.withQuotes && isRenote(note) && isQuote(note)) return false;
|
||||||
|
if (!ps.withNonPublic && note.visibility !== 'public') return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
|
dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
|
||||||
|
@ -142,6 +155,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
withChannelNotes: ps.withChannelNotes,
|
withChannelNotes: ps.withChannelNotes,
|
||||||
withFiles: ps.withFiles,
|
withFiles: ps.withFiles,
|
||||||
withRenotes: ps.withRenotes,
|
withRenotes: ps.withRenotes,
|
||||||
|
withQuotes: ps.withQuotes,
|
||||||
|
withNonPublic: ps.withNonPublic,
|
||||||
|
withRepliesToOthers: ps.withReplies,
|
||||||
|
withRepliesToSelf: ps.withRepliesToSelf,
|
||||||
}, me),
|
}, me),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -157,6 +174,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
withChannelNotes: boolean,
|
withChannelNotes: boolean,
|
||||||
withFiles: boolean,
|
withFiles: boolean,
|
||||||
withRenotes: boolean,
|
withRenotes: boolean,
|
||||||
|
withQuotes: boolean,
|
||||||
|
withNonPublic: boolean,
|
||||||
|
withRepliesToOthers: boolean,
|
||||||
|
withRepliesToSelf: boolean,
|
||||||
}, me: MiLocalUser | null) {
|
}, me: MiLocalUser | null) {
|
||||||
const isSelf = me && (me.id === ps.userId);
|
const isSelf = me && (me.id === ps.userId);
|
||||||
|
|
||||||
|
@ -188,7 +209,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
query.andWhere('note.fileIds != \'{}\'');
|
query.andWhere('note.fileIds != \'{}\'');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ps.withRenotes === false) {
|
if (!ps.withRenotes && !ps.withQuotes) {
|
||||||
|
query.andWhere('note.renoteId IS NULL');
|
||||||
|
} else if (!ps.withRenotes) {
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb.orWhere('note.userId != :userId', { userId: ps.userId });
|
qb.orWhere('note.userId != :userId', { userId: ps.userId });
|
||||||
qb.orWhere('note.renoteId IS NULL');
|
qb.orWhere('note.renoteId IS NULL');
|
||||||
|
@ -196,6 +219,31 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
qb.orWhere('note.fileIds != \'{}\'');
|
qb.orWhere('note.fileIds != \'{}\'');
|
||||||
qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
|
qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
|
||||||
}));
|
}));
|
||||||
|
} else if (!ps.withQuotes) {
|
||||||
|
query.andWhere(`
|
||||||
|
(
|
||||||
|
note."renoteId" IS NULL
|
||||||
|
OR (
|
||||||
|
note.text IS NULL
|
||||||
|
AND note.cw IS NULL
|
||||||
|
AND note."replyId" IS NULL
|
||||||
|
AND note."hasPoll" IS FALSE
|
||||||
|
AND note."fileIds" = '{}'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ps.withRepliesToOthers && !ps.withRepliesToSelf) {
|
||||||
|
query.andWhere('reply.id IS NULL');
|
||||||
|
} else if (!ps.withRepliesToOthers) {
|
||||||
|
query.andWhere('(reply.id IS NULL OR reply."userId" = note."userId")');
|
||||||
|
} else if (!ps.withRepliesToSelf) {
|
||||||
|
query.andWhere('(reply.id IS NULL OR reply."userId" != note."userId")');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ps.withNonPublic) {
|
||||||
|
query.andWhere('note.visibility = \'public\'');
|
||||||
}
|
}
|
||||||
|
|
||||||
return await query.limit(ps.limit).getMany();
|
return await query.limit(ps.limit).getMany();
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { isQuote, isRenote } from '@/misc/is-renote.js';
|
import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
import { MiNote } from '@/models/Note.js';
|
import { MiNote } from '@/models/Note.js';
|
||||||
|
|
||||||
const base: MiNote = {
|
const base: MiNote = {
|
||||||
|
@ -86,4 +86,25 @@ describe('misc:is-renote', () => {
|
||||||
expect(isRenote(note)).toBe(true);
|
expect(isRenote(note)).toBe(true);
|
||||||
expect(isQuote(note as any)).toBe(true);
|
expect(isQuote(note as any)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('isPureRenote', () => {
|
||||||
|
it('should return true when note is pure renote', () => {
|
||||||
|
const note = new MiNote({ renoteId: 'abc123' });
|
||||||
|
const result = isPureRenote(note);
|
||||||
|
expect(result).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return false when note is quote', () => {
|
||||||
|
const note = new MiNote({ renoteId: 'abc123', text: 'text' });
|
||||||
|
const result = isPureRenote(note);
|
||||||
|
expect(result).toBeFalsy();
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return false when note is not renote', () => {
|
||||||
|
const note = new MiNote({ renoteId: null });
|
||||||
|
const result = isPureRenote(note);
|
||||||
|
expect(result).toBeFalsy();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
66
packages/backend/test/unit/models/LatestNote.ts
Normal file
66
packages/backend/test/unit/models/LatestNote.ts
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
import { SkLatestNote } from '@/models/LatestNote.js';
|
||||||
|
import { MiNote } from '@/models/Note.js';
|
||||||
|
|
||||||
|
describe(SkLatestNote, () => {
|
||||||
|
describe('keyFor', () => {
|
||||||
|
it('should include userId', () => {
|
||||||
|
const note = new MiNote({ userId: 'abc123' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.userId).toBe(note.userId);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isPublic when is public', () => {
|
||||||
|
const note = new MiNote({ visibility: 'public' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isPublic).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isPublic when is home-only', () => {
|
||||||
|
const note = new MiNote({ visibility: 'home' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isPublic).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isPublic when is followers-only', () => {
|
||||||
|
const note = new MiNote({ visibility: 'followers' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isPublic).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isPublic when is specified', () => {
|
||||||
|
const note = new MiNote({ visibility: 'specified' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isPublic).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isReply when is reply', () => {
|
||||||
|
const note = new MiNote({ replyId: 'abc123' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isReply).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isReply when is not reply', () => {
|
||||||
|
const note = new MiNote({ replyId: null });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isReply).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isQuote when is quote', () => {
|
||||||
|
const note = new MiNote({ renoteId: 'abc123', text: 'text' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isQuote).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isQuote when is reblog', () => {
|
||||||
|
const note = new MiNote({ renoteId: 'abc123' });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isQuote).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should include isQuote when is neither quote nor reblog', () => {
|
||||||
|
const note = new MiNote({ renoteId: null });
|
||||||
|
const key = SkLatestNote.keyFor(note);
|
||||||
|
expect(key.isQuote).toBeFalsy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -24,16 +24,13 @@ import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
|
||||||
import { Paging } from '@/components/MkPagination.vue';
|
import { Paging } from '@/components/MkPagination.vue';
|
||||||
import { misskeyApi } from '@/scripts/misskey-api.js';
|
import { misskeyApi } from '@/scripts/misskey-api.js';
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = defineProps<{
|
||||||
userId: string;
|
userId: string;
|
||||||
withRenotes?: boolean;
|
withNonPublic: boolean;
|
||||||
withReplies?: boolean;
|
withQuotes: boolean;
|
||||||
onlyFiles?: boolean;
|
withReplies: boolean;
|
||||||
}>(), {
|
onlyFiles: boolean;
|
||||||
withRenotes: false,
|
}>();
|
||||||
withReplies: true,
|
|
||||||
onlyFiles: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const loadError: Ref<string | null> = ref(null);
|
const loadError: Ref<string | null> = ref(null);
|
||||||
const user: Ref<Misskey.entities.UserDetailed | null> = ref(null);
|
const user: Ref<Misskey.entities.UserDetailed | null> = ref(null);
|
||||||
|
@ -43,9 +40,13 @@ const pagination: Paging<'users/notes'> = {
|
||||||
limit: 10,
|
limit: 10,
|
||||||
params: computed(() => ({
|
params: computed(() => ({
|
||||||
userId: props.userId,
|
userId: props.userId,
|
||||||
withRenotes: props.withRenotes,
|
withNonPublic: props.withNonPublic,
|
||||||
|
withRenotes: false,
|
||||||
|
withQuotes: props.withQuotes,
|
||||||
withReplies: props.withReplies,
|
withReplies: props.withReplies,
|
||||||
|
withRepliesToSelf: props.withReplies,
|
||||||
withFiles: props.onlyFiles,
|
withFiles: props.onlyFiles,
|
||||||
|
allowPartial: true,
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<div v-if="isWideViewport" ref="userScroll" :class="$style.user">
|
<div v-if="isWideViewport" ref="userScroll" :class="$style.user">
|
||||||
<MkHorizontalSwipe v-if="selectedUserId" v-model:tab="currentTab" :tabs="headerTabs">
|
<MkHorizontalSwipe v-if="selectedUserId" v-model:tab="currentTab" :tabs="headerTabs">
|
||||||
<SkUserRecentNotes ref="userRecentNotes" :userId="selectedUserId" :withRenotes="withUserRenotes" :withReplies="withUserReplies" :onlyFiles="withOnlyFiles"/>
|
<SkUserRecentNotes ref="userRecentNotes" :userId="selectedUserId" :withNonPublic="withNonPublic" :withQuotes="withQuotes" :withReplies="withReplies" :onlyFiles="onlyFiles"/>
|
||||||
</MkHorizontalSwipe>
|
</MkHorizontalSwipe>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -162,54 +162,58 @@ const latestNotesPagination: Paging<'notes/following'> = {
|
||||||
limit: 20,
|
limit: 20,
|
||||||
params: computed(() => ({
|
params: computed(() => ({
|
||||||
mutualsOnly: mutualsOnly.value,
|
mutualsOnly: mutualsOnly.value,
|
||||||
|
filesOnly: onlyFiles.value,
|
||||||
|
includeNonPublic: withNonPublic.value,
|
||||||
|
includeReplies: withReplies.value,
|
||||||
|
includeQuotes: withQuotes.value,
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
|
|
||||||
const withUserRenotes = ref(false);
|
const withNonPublic = ref(false);
|
||||||
const withUserReplies = ref(true);
|
const withQuotes = ref(false);
|
||||||
const withOnlyFiles = ref(false);
|
const withReplies = ref(false);
|
||||||
|
const onlyFiles = ref(false);
|
||||||
|
|
||||||
const headerActions = computed(() => {
|
const headerActions: PageHeaderItem[] = [
|
||||||
const actions: PageHeaderItem[] = [
|
{
|
||||||
{
|
icon: 'ti ti-refresh',
|
||||||
icon: 'ti ti-refresh',
|
text: i18n.ts.reload,
|
||||||
text: i18n.ts.reload,
|
handler: () => reload(),
|
||||||
handler: () => reload(),
|
},
|
||||||
|
{
|
||||||
|
icon: 'ti ti-dots',
|
||||||
|
text: i18n.ts.options,
|
||||||
|
handler: (ev) => {
|
||||||
|
os.popupMenu([
|
||||||
|
{
|
||||||
|
type: 'switch',
|
||||||
|
text: i18n.ts.showNonPublicNotes,
|
||||||
|
ref: withNonPublic,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'switch',
|
||||||
|
text: i18n.ts.showQuotes,
|
||||||
|
ref: withQuotes,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'switch',
|
||||||
|
text: i18n.ts.showReplies,
|
||||||
|
ref: withReplies,
|
||||||
|
disabled: onlyFiles,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'divider',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'switch',
|
||||||
|
text: i18n.ts.fileAttachedOnly,
|
||||||
|
ref: onlyFiles,
|
||||||
|
disabled: withReplies,
|
||||||
|
},
|
||||||
|
], ev.currentTarget ?? ev.target);
|
||||||
},
|
},
|
||||||
];
|
},
|
||||||
|
];
|
||||||
if (isWideViewport.value) {
|
|
||||||
actions.push({
|
|
||||||
icon: 'ti ti-dots',
|
|
||||||
text: i18n.ts.options,
|
|
||||||
handler: (ev) => {
|
|
||||||
os.popupMenu([
|
|
||||||
{
|
|
||||||
type: 'switch',
|
|
||||||
text: i18n.ts.showRenotes,
|
|
||||||
ref: withUserRenotes,
|
|
||||||
}, {
|
|
||||||
type: 'switch',
|
|
||||||
text: i18n.ts.showRepliesToOthersInTimeline,
|
|
||||||
ref: withUserReplies,
|
|
||||||
disabled: withOnlyFiles,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'divider',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'switch',
|
|
||||||
text: i18n.ts.fileAttachedOnly,
|
|
||||||
ref: withOnlyFiles,
|
|
||||||
disabled: withUserReplies,
|
|
||||||
},
|
|
||||||
], ev.currentTarget ?? ev.target);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return actions;
|
|
||||||
});
|
|
||||||
|
|
||||||
const headerTabs = computed(() => [
|
const headerTabs = computed(() => [
|
||||||
{
|
{
|
||||||
|
|
|
@ -22296,6 +22296,14 @@ export type operations = {
|
||||||
'application/json': {
|
'application/json': {
|
||||||
/** @default false */
|
/** @default false */
|
||||||
mutualsOnly?: boolean;
|
mutualsOnly?: boolean;
|
||||||
|
/** @default false */
|
||||||
|
filesOnly?: boolean;
|
||||||
|
/** @default true */
|
||||||
|
includeNonPublic?: boolean;
|
||||||
|
/** @default false */
|
||||||
|
includeReplies?: boolean;
|
||||||
|
/** @default true */
|
||||||
|
includeQuotes?: boolean;
|
||||||
/** @default 10 */
|
/** @default 10 */
|
||||||
limit?: number;
|
limit?: number;
|
||||||
/** Format: misskey:id */
|
/** Format: misskey:id */
|
||||||
|
@ -27228,7 +27236,13 @@ export type operations = {
|
||||||
/** @default false */
|
/** @default false */
|
||||||
withReplies?: boolean;
|
withReplies?: boolean;
|
||||||
/** @default true */
|
/** @default true */
|
||||||
|
withRepliesToSelf?: boolean;
|
||||||
|
/** @default true */
|
||||||
|
withQuotes?: boolean;
|
||||||
|
/** @default true */
|
||||||
withRenotes?: boolean;
|
withRenotes?: boolean;
|
||||||
|
/** @default true */
|
||||||
|
withNonPublic?: boolean;
|
||||||
/** @default false */
|
/** @default false */
|
||||||
withChannelNotes?: boolean;
|
withChannelNotes?: boolean;
|
||||||
/** @default 10 */
|
/** @default 10 */
|
||||||
|
|
Loading…
Reference in a new issue