github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-28 20:16:08 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Minor typefixes, fomat

Browse Source
This commit is contained in:
Alexander Skvortsov 2021-12-12 15:46:46 -05:00
parent 32daeffa8a
commit d62c20285d
4 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
framework/core/js/src/common/Model.ts
View File

@ -203,14 +203,12 @@ export default abstract class Model {
};
return app
.request<ApiPayloadSingle>(
{
method: this.exists ? 'PATCH' : 'POST',
url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
body: request,
...options,
},
)
.request<ApiPayloadSingle>({
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;

14
framework/core/js/src/common/Store.ts
View File

@ -174,14 +174,12 @@ export default class Store {
}
return app
.request<M extends Array<infer _T> ? ApiPayloadPlural : ApiPayloadSingle>(
{
method: 'GET',
url,
params,
...options,
}
)
.request<M extends Array<infer _T> ? ApiPayloadPlural : ApiPayloadSingle>({
method: 'GET',
url,
params,
...options,
})
.then((payload) => {
if (payloadIsPlural(payload)) {
return this.pushPayload<FlatArray<M, 1>[]>(payload);

4
framework/core/js/src/common/models/Discussion.tsx
View File

@ -61,7 +61,7 @@ export default class Discussion extends Model {
return computed<boolean, this>('unreadCount', (unreadCount) => !!unreadCount).call(this);
}
isRead() {
return computed<boolean, this>('unreadCount', (unreadCount) => app.session.user && !unreadCount).call(this);
return computed<boolean, this>('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));

2
framework/core/js/src/forum/components/DiscussionsSearchSource.tsx
View File

@ -38,7 +38,7 @@ export default class DiscussionsSearchSource implements SearchSource {
return (
<li className="DiscussionSearchResult" data-index={'discussions' + discussion.id()}>
<Link href={app.route.discussion(discussion, mostRelevantPost && mostRelevantPost.number())}>
<Link href={app.route.discussion(discussion, (mostRelevantPost && mostRelevantPost.number()) || 0)}>
<div className="DiscussionSearchResult-title">{highlight(discussion.title(), query)}</div>
{mostRelevantPost ? (
<div className="DiscussionSearchResult-excerpt">{highlight(mostRelevantPost.contentPlain() ?? '', query, 100)}</div>