natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2022-06-24 19:47:48 +09:00
parent a1449455a2 a5241379af
commit 274352beab
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/misc/check-word-mute.ts
View File

@ -18,7 +18,7 @@ export async function checkWordMute(note: NoteLike, me: UserLike | null | undefi
if (mutedWords.length > 0) { if (mutedWords.length > 0) {
const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim(); const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim();
if (text == '') return false; if (text === '') return false;
const matched = mutedWords.some(filter => { const matched = mutedWords.some(filter => {
if (Array.isArray(filter)) { if (Array.isArray(filter)) {

2
packages/backend/src/remote/activitypub/type.ts
View File

@ -201,7 +201,7 @@ export interface IApMention extends IObject {
href: string; href: string;
} }
export const isMention = (object: IObject): object is IApMention=> export const isMention = (object: IObject): object is IApMention =>
getApType(object) === 'Mention' && getApType(object) === 'Mention' &&
typeof object.href === 'string'; typeof object.href === 'string';

1
packages/backend/src/server/api/define.ts
View File

@ -21,7 +21,6 @@ ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>) export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>)
: (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => Promise<any> { : (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => Promise<any> {
const validate = ajv.compile(paramDef); const validate = ajv.compile(paramDef);
return (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => { return (params: any, user: T['requireCredential'] extends true ? CacheableLocalUser : CacheableLocalUser | null, token: AccessToken | null, file?: any) => {

1
packages/backend/src/services/note/polls/update.ts
View File

@ -14,7 +14,6 @@ export async function deliverQuestionUpdate(noteId: Note['id']) {
if (user == null) throw new Error('note not found'); if (user == null) throw new Error('note not found');
if (Users.isLocalUser(user)) { if (Users.isLocalUser(user)) {
const content = renderActivity(renderUpdate(await renderNote(note, false), user)); const content = renderActivity(renderUpdate(await renderNote(note, false), user));
deliverToFollowers(user, content); deliverToFollowers(user, content);
deliverToRelays(user, content); deliverToRelays(user, content);

2
packages/client/src/scripts/check-word-mute.ts
View File

@ -5,7 +5,7 @@ export function checkWordMute(note: Record<string, any>, me: Record<string, any>
if (mutedWords.length > 0) { if (mutedWords.length > 0) {
const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim(); const text = ((note.cw ?? '') + '\n' + (note.text ?? '')).trim();
if (text == '') return false; if (text === '') return false;
const matched = mutedWords.some(filter => { const matched = mutedWords.some(filter => {
if (Array.isArray(filter)) { if (Array.isArray(filter)) {