diff options
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/get-note-menu.ts | 12 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/hpml/evaluator.ts | 9 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/hpml/index.ts | 3 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/hpml/type-checker.ts | 9 |
4 files changed, 6 insertions, 27 deletions
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 00f2523bf9..d91f0b0eb6 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -15,7 +15,7 @@ import { clipsCache } from '@/cache'; export async function getNoteClipMenu(props: { note: misskey.entities.Note; isDeleted: Ref<boolean>; - currentClipPage?: Ref<misskey.entities.Clip>; + currentClip?: misskey.entities.Clip; }) { const isRenote = ( props.note.renote != null && @@ -42,7 +42,7 @@ export async function getNoteClipMenu(props: { }); if (!confirm.canceled) { os.apiWithDialog('clips/remove-note', { clipId: clip.id, noteId: appearNote.id }); - if (props.currentClipPage?.value.id === clip.id) props.isDeleted.value = true; + if (props.currentClip?.id === clip.id) props.isDeleted.value = true; } } else { os.alert({ @@ -92,7 +92,7 @@ export function getNoteMenu(props: { translation: Ref<any>; translating: Ref<boolean>; isDeleted: Ref<boolean>; - currentClipPage?: Ref<misskey.entities.Clip>; + currentClip?: misskey.entities.Clip; }) { const isRenote = ( props.note.renote != null && @@ -176,7 +176,7 @@ export function getNoteMenu(props: { } async function unclip(): Promise<void> { - os.apiWithDialog('clips/remove-note', { clipId: props.currentClipPage.value.id, noteId: appearNote.id }); + os.apiWithDialog('clips/remove-note', { clipId: props.currentClip.id, noteId: appearNote.id }); props.isDeleted.value = true; } @@ -230,7 +230,7 @@ export function getNoteMenu(props: { menu = [ ...( - props.currentClipPage?.value.userId === $i.id ? [{ + props.currentClip?.userId === $i.id ? [{ icon: 'ti ti-backspace', text: i18n.ts.unclip, danger: true, @@ -294,7 +294,7 @@ export function getNoteMenu(props: { text: i18n.ts.muteThread, action: () => toggleThreadMute(true), }), - appearNote.userId === $i.id ? ($i.pinnedNoteIds || []).includes(appearNote.id) ? { + appearNote.userId === $i.id ? ($i.pinnedNoteIds ?? []).includes(appearNote.id) ? { icon: 'ti ti-pinned-off', text: i18n.ts.unpin, action: () => togglePin(false), diff --git a/packages/frontend/src/scripts/hpml/evaluator.ts b/packages/frontend/src/scripts/hpml/evaluator.ts index 7bddd3f62d..9adfba7f27 100644 --- a/packages/frontend/src/scripts/hpml/evaluator.ts +++ b/packages/frontend/src/scripts/hpml/evaluator.ts @@ -1,4 +1,3 @@ -import autobind from 'autobind-decorator'; import { ref, Ref, unref } from 'vue'; import { collectPageVars } from '../collect-page-vars'; import { initHpmlLib } from './lib'; @@ -51,7 +50,6 @@ export class Hpml { this.eval(); } - @autobind public eval() { try { this.vars.value = this.evaluateVars(); @@ -60,7 +58,6 @@ export class Hpml { } } - @autobind public interpolate(str: string) { if (str == null) return null; return str.replace(/{(.+?)}/g, match => { @@ -69,12 +66,10 @@ export class Hpml { }); } - @autobind public registerCanvas(id: string, canvas: any) { this.canvases[id] = canvas; } - @autobind public updatePageVar(name: string, value: any) { const pageVar = this.pageVars.find(v => v.name === name); if (pageVar !== undefined) { @@ -84,13 +79,11 @@ export class Hpml { } } - @autobind public updateRandomSeed(seed: string) { this.opts.randomSeed = seed; this.envVars.SEED = seed; } - @autobind private _interpolateScope(str: string, scope: HpmlScope) { return str.replace(/{(.+?)}/g, match => { const v = scope.getState(match.slice(1, -1).trim()); @@ -98,7 +91,6 @@ export class Hpml { }); } - @autobind public evaluateVars(): Record<string, any> { const values: Record<string, any> = {}; @@ -117,7 +109,6 @@ export class Hpml { return values; } - @autobind private evaluate(expr: Expr, scope: HpmlScope): any { if (isLiteralValue(expr)) { if (expr.type === null) { diff --git a/packages/frontend/src/scripts/hpml/index.ts b/packages/frontend/src/scripts/hpml/index.ts index 587c6a36c8..994f286b9f 100644 --- a/packages/frontend/src/scripts/hpml/index.ts +++ b/packages/frontend/src/scripts/hpml/index.ts @@ -2,7 +2,6 @@ * Hpml */ -import autobind from 'autobind-decorator'; import { Hpml } from './evaluator'; import { funcDefs } from './lib'; @@ -61,7 +60,6 @@ export class HpmlScope { this.name = name ?? 'anonymous'; } - @autobind public createChildScope(states: Record<string, any>, name?: HpmlScope['name']): HpmlScope { const layer = [states, ...this.layerdStates]; return new HpmlScope(layer, name); @@ -71,7 +69,6 @@ export class HpmlScope { * 指定した名前の変数の値を取得します * @param name 変数名 */ - @autobind public getState(name: string): any { for (const later of this.layerdStates) { const state = later[name]; diff --git a/packages/frontend/src/scripts/hpml/type-checker.ts b/packages/frontend/src/scripts/hpml/type-checker.ts index 692826fc90..ea8133f297 100644 --- a/packages/frontend/src/scripts/hpml/type-checker.ts +++ b/packages/frontend/src/scripts/hpml/type-checker.ts @@ -1,4 +1,3 @@ -import autobind from 'autobind-decorator'; import { isLiteralValue } from './expr'; import { funcDefs } from './lib'; import { envVarsDef } from '.'; @@ -23,7 +22,6 @@ export class HpmlTypeChecker { this.pageVars = pageVars; } - @autobind public typeCheck(v: Expr): TypeError | null { if (isLiteralValue(v)) return null; @@ -61,7 +59,6 @@ export class HpmlTypeChecker { return null; } - @autobind public getExpectedType(v: Expr, slot: number): Type { const def = funcDefs[v.type ?? '']; if (def == null) { @@ -89,7 +86,6 @@ export class HpmlTypeChecker { } } - @autobind public infer(v: Expr): Type { if (v.type === null) return null; if (v.type === 'text') return 'string'; @@ -144,7 +140,6 @@ export class HpmlTypeChecker { } } - @autobind public getVarByName(name: string): Variable { const v = this.variables.find(x => x.name === name); if (v !== undefined) { @@ -154,25 +149,21 @@ export class HpmlTypeChecker { } } - @autobind public getVarsByType(type: Type): Variable[] { if (type == null) return this.variables; return this.variables.filter(x => (this.infer(x) === null) || (this.infer(x) === type)); } - @autobind public getEnvVarsByType(type: Type): string[] { if (type == null) return Object.keys(envVarsDef); return Object.entries(envVarsDef).filter(([k, v]) => v === null || type === v).map(([k, v]) => k); } - @autobind public getPageVarsByType(type: Type): string[] { if (type == null) return this.pageVars.map(v => v.name); return this.pageVars.filter(v => type === v.type).map(v => v.name); } - @autobind public isUsedName(name: string) { if (this.variables.some(v => v.name === name)) { return true; |