diff --git a/framework/core/js/src/common/Model.ts b/framework/core/js/src/common/Model.ts index a8693cad8..9cea14335 100644 --- a/framework/core/js/src/common/Model.ts +++ b/framework/core/js/src/common/Model.ts @@ -203,14 +203,12 @@ export default abstract class Model { }; return app - .request( - { - method: this.exists ? 'PATCH' : 'POST', - url: app.forum.attribute('apiUrl') + this.apiEndpoint(), - body: request, - ...options, - }, - ) + .request({ + method: this.exists ? 'PATCH' : 'POST', + url: app.forum.attribute('apiUrl') + this.apiEndpoint(), + body: request, + ...options, + }) .then( // If everything went well, we'll make sure the store knows that this // model exists now (if it didn't already), and we'll push the data that @@ -238,14 +236,12 @@ export default abstract class Model { if (!this.exists) return Promise.resolve(); return app - .request( - { - method: 'DELETE', - url: app.forum.attribute('apiUrl') + this.apiEndpoint(), - body, - ...options, - }, - ) + .request({ + method: 'DELETE', + url: app.forum.attribute('apiUrl') + this.apiEndpoint(), + body, + ...options, + }) .then(() => { this.exists = false; diff --git a/framework/core/js/src/common/Store.ts b/framework/core/js/src/common/Store.ts index a576fa320..02636daeb 100644 --- a/framework/core/js/src/common/Store.ts +++ b/framework/core/js/src/common/Store.ts @@ -174,14 +174,12 @@ export default class Store { } return app - .request ? ApiPayloadPlural : ApiPayloadSingle>( - { - method: 'GET', - url, - params, - ...options, - } - ) + .request ? ApiPayloadPlural : ApiPayloadSingle>({ + method: 'GET', + url, + params, + ...options, + }) .then((payload) => { if (payloadIsPlural(payload)) { return this.pushPayload[]>(payload); diff --git a/framework/core/js/src/common/models/Discussion.tsx b/framework/core/js/src/common/models/Discussion.tsx index f1146a5d7..53517cdbe 100644 --- a/framework/core/js/src/common/models/Discussion.tsx +++ b/framework/core/js/src/common/models/Discussion.tsx @@ -61,7 +61,7 @@ export default class Discussion extends Model { return computed('unreadCount', (unreadCount) => !!unreadCount).call(this); } isRead() { - return computed('unreadCount', (unreadCount) => app.session.user && !unreadCount).call(this); + return computed('unreadCount', (unreadCount) => !!(app.session.user && !unreadCount)).call(this); } hiddenAt() { @@ -112,7 +112,7 @@ export default class Discussion extends Model { * user. */ unreadCount(): number { - const user: User = app.session.user; + const user = app.session.user; if (user && (user.markedAllAsReadAt()?.getTime() ?? 0) < this.lastPostedAt()?.getTime()!) { const unreadCount = Math.max(0, (this.lastPostNumber() ?? 0) - (this.lastReadPostNumber() || 0)); diff --git a/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx b/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx index d362ce0d5..a9889a804 100644 --- a/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx +++ b/framework/core/js/src/forum/components/DiscussionsSearchSource.tsx @@ -38,7 +38,7 @@ export default class DiscussionsSearchSource implements SearchSource { return (
  • - +
    {highlight(discussion.title(), query)}
    {mostRelevantPost ? (
    {highlight(mostRelevantPost.contentPlain() ?? '', query, 100)}