diff --git a/src/becca/becca_loader.ts b/src/becca/becca_loader.ts index f49436292..991fb00e4 100644 --- a/src/becca/becca_loader.ts +++ b/src/becca/becca_loader.ts @@ -183,7 +183,7 @@ function noteUpdated(entityRow: NoteRow) { const note = becca.notes[entityRow.noteId]; if (note) { - // FIXME, this wouldn't have worked in the original implementation since the variable was named __flatTextCache. + // TODO, this wouldn't have worked in the original implementation since the variable was named __flatTextCache. // type / mime could have been changed, and they are present in flatTextCache note.__flatTextCache = null; } diff --git a/src/becca/entities/abstract_becca_entity.ts b/src/becca/entities/abstract_becca_entity.ts index 519a4327f..bc7d3f06b 100644 --- a/src/becca/entities/abstract_becca_entity.ts +++ b/src/becca/entities/abstract_becca_entity.ts @@ -90,21 +90,21 @@ abstract class AbstractBeccaEntity> { } hasStringContent(): boolean { - // FIXME: Not sure why some entities don't implement it. + // TODO: Not sure why some entities don't implement it. return true; } abstract getPojo(): {}; get isDeleted(): boolean { - // FIXME: Not sure why some entities don't implement it. + // TODO: Not sure why some entities don't implement it. return false; } /** * Saves entity - executes SQL, but doesn't commit the transaction on its own */ - // FIXME: opts not used but called a few times, maybe should be used by derived classes or passed to beforeSaving. + // TODO: opts not used but called a few times, maybe should be used by derived classes or passed to beforeSaving. save(opts?: {}): this { const constructorData = (this.constructor as unknown as ConstructorData); const entityName = constructorData.entityName; diff --git a/src/becca/entities/battachment.ts b/src/becca/entities/battachment.ts index a5fc02698..be703886c 100644 --- a/src/becca/entities/battachment.ts +++ b/src/becca/entities/battachment.ts @@ -15,7 +15,7 @@ const attachmentRoleToNoteTypeMapping = { }; interface ContentOpts { - // FIXME: Found in bnote.ts, to check if it's actually used and not a typo. + // TODO: Found in bnote.ts, to check if it's actually used and not a typo. forceSave?: boolean; /** will also save this BAttachment entity */ @@ -135,7 +135,7 @@ class BAttachment extends AbstractBeccaEntity { } convertToNote(): { note: BNote, branch: BBranch } { - // FIXME: can this ever be "search"? + // TODO: can this ever be "search"? if (this.type as string === 'search') { throw new Error(`Note of type search cannot have child notes`); } diff --git a/src/becca/entities/bblob.ts b/src/becca/entities/bblob.ts index c37a20581..149b9070a 100644 --- a/src/becca/entities/bblob.ts +++ b/src/becca/entities/bblob.ts @@ -1,6 +1,6 @@ import { BlobRow } from "./rows"; -// FIXME: Why this does not extend the abstract becca? +// TODO: Why this does not extend the abstract becca? class BBlob { static get entityName() { return "blobs"; } static get primaryKeyName() { return "blobId"; } diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts index bda904f5b..036a3a5d3 100644 --- a/src/becca/entities/bnote.ts +++ b/src/becca/entities/bnote.ts @@ -899,7 +899,7 @@ class BNote extends AbstractBeccaEntity { const {searchResultNoteIds} = searchService.searchFromNote(this); const becca = this.becca; - return (searchResultNoteIds as string[]) // FIXME: remove cast once search is converted + return (searchResultNoteIds as string[]) // TODO: remove cast once search is converted .map(resultNoteId => becca.notes[resultNoteId]) .filter(note => !!note); } diff --git a/src/becca/entities/brevision.ts b/src/becca/entities/brevision.ts index 43c6631de..9b5e4a410 100644 --- a/src/becca/entities/brevision.ts +++ b/src/becca/entities/brevision.ts @@ -88,7 +88,7 @@ class BRevision extends AbstractBeccaEntity { * * This is the same approach as is used for Note's content. */ - // FIXME: initial declaration included Buffer, but everywhere it's treated as a string. + // TODO: initial declaration included Buffer, but everywhere it's treated as a string. getContent(): string { return this._getContent() as string; } diff --git a/src/becca/entities/rows.ts b/src/becca/entities/rows.ts index 82bd95a7f..f9316440e 100644 --- a/src/becca/entities/rows.ts +++ b/src/becca/entities/rows.ts @@ -1,4 +1,4 @@ -// FIXME: Booleans should probably be numbers instead (as SQLite does not have booleans.); +// TODO: Booleans should probably be numbers instead (as SQLite does not have booleans.); export interface AttachmentRow { attachmentId?: string; diff --git a/src/services/auth.ts b/src/services/auth.ts index 0f3ed051c..30f5687f3 100644 --- a/src/services/auth.ts +++ b/src/services/auth.ts @@ -10,7 +10,7 @@ import passwordService = require('./encryption/password'); const noAuthentication = config.General && config.General.noAuthentication === true; -// FIXME: We are using custom types for request & response because couldn't extract those pesky express types. +// TODO: We are using custom types for request & response because couldn't extract those pesky express types. interface Request { method: string; path: string; diff --git a/src/services/encryption/password.ts b/src/services/encryption/password.ts index 25ac90a57..4d6bf66a3 100644 --- a/src/services/encryption/password.ts +++ b/src/services/encryption/password.ts @@ -31,7 +31,7 @@ function changePassword(currentPassword: string, newPassword: string) { const newPasswordVerificationKey = utils.toBase64(myScryptService.getVerificationHash(newPassword)); if (decryptedDataKey) { - // FIXME: what should happen if the decrypted data key is null? + // TODO: what should happen if the decrypted data key is null? passwordEncryptionService.setDataKey(newPassword, decryptedDataKey); } diff --git a/src/services/notes.ts b/src/services/notes.ts index d223eda2e..4f177c58f 100644 --- a/src/services/notes.ts +++ b/src/services/notes.ts @@ -762,7 +762,7 @@ function updateNoteData(noteId: string, content: string, attachments: BAttachmen const existingAttachmentsByTitle = utils.toMap(note.getAttachments({includeContentLength: false}), 'title'); for (const attachment of attachments) { - // FIXME: The content property was extracted directly instead of `getContent`. To investigate. + // TODO: The content property was extracted directly instead of `getContent`. To investigate. const {attachmentId, role, mime, title, position} = attachment; const content = attachment.getContent(); @@ -835,7 +835,7 @@ function undeleteBranch(branchId: string, deleteId: string, taskContext: TaskCon for (const attributeRow of attributeRows) { // relation might point to a note which hasn't been undeleted yet and would thus throw up - // FIXME: skipValidation is not used. + // TODO: skipValidation is not used. new BAttribute(attributeRow).save({skipValidation: true}); } @@ -1015,7 +1015,7 @@ function duplicateSubtreeInner(origNote: BNote, origBranch: BBranch, newParentNo } // the relation targets may not be created yet, the mapping is pre-generated - // FIXME: This used to be `attr.save({skipValidation: true});`, but skipValidation is in beforeSaving. + // TODO: This used to be `attr.save({skipValidation: true});`, but skipValidation is in beforeSaving. attr.save(); } diff --git a/src/services/search/expressions/order_by_and_limit.ts b/src/services/search/expressions/order_by_and_limit.ts index 8f1f0826a..5159920a5 100644 --- a/src/services/search/expressions/order_by_and_limit.ts +++ b/src/services/search/expressions/order_by_and_limit.ts @@ -39,7 +39,6 @@ class OrderByAndLimitExp extends Expression { execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext) { if (!this.subExpression) { - // FIXME: who is setting the subexpression? throw new Error("Missing subexpression"); } diff --git a/src/services/sync_mutex.ts b/src/services/sync_mutex.ts index 655af4d59..9ad0fd08c 100644 --- a/src/services/sync_mutex.ts +++ b/src/services/sync_mutex.ts @@ -6,7 +6,7 @@ const Mutex = require('async-mutex').Mutex; const instance = new Mutex(); -async function doExclusively(func: () => void) { +async function doExclusively(func: () => T) { const releaseMutex = await instance.acquire(); try { diff --git a/src/services/utils.ts b/src/services/utils.ts index 852b9a1df..947dfac9c 100644 --- a/src/services/utils.ts +++ b/src/services/utils.ts @@ -82,7 +82,7 @@ function unescapeHtml(str: string) { } function toObject(array: T[], fn: (item: T) => [K, V]): Record { - const obj: Record = {} as Record; // FIXME: unsafe? + const obj: Record = {} as Record; // TODO: unsafe? for (const item of array) { const ret = fn(item); @@ -98,7 +98,7 @@ function stripTags(text: string) { } function union(a: T[], b: T[]): T[] { - const obj: Record = {} as Record; // FIXME: unsafe? + const obj: Record = {} as Record; // TODO: unsafe? for (let i = a.length-1; i >= 0; i--) { obj[a[i]] = a[i];