* Removing monads. Fixes #884 * Fixing post fetching. * Dont show not_logged_in error for navbar. * Adding the lemmy-js-client RC. * Fixing registration application mode
This commit is contained in:
parent
37c200571b
commit
b64f47cfe9
66 changed files with 5186 additions and 6250 deletions
|
|
@ -1,4 +1,3 @@
|
|||
import { None } from "@sniptt/monads";
|
||||
import { Component, linkEvent } from "inferno";
|
||||
import { T } from "inferno-i18next-dess";
|
||||
import {
|
||||
|
|
@ -11,7 +10,7 @@ import {
|
|||
import { i18n } from "../../i18next";
|
||||
import { CommentViewType } from "../../interfaces";
|
||||
import { WebSocketService } from "../../services";
|
||||
import { auth, wsClient } from "../../utils";
|
||||
import { myAuth, wsClient } from "../../utils";
|
||||
import { Icon } from "../common/icon";
|
||||
import { PersonListing } from "../person/person-listing";
|
||||
import { CommentNode } from "./comment-node";
|
||||
|
|
@ -59,8 +58,6 @@ export class CommentReport extends Component<CommentReportProps, any> {
|
|||
<CommentNode
|
||||
node={node}
|
||||
viewType={CommentViewType.Flat}
|
||||
moderators={None}
|
||||
admins={None}
|
||||
enableDownvotes={true}
|
||||
viewOnly={true}
|
||||
showCommunity={true}
|
||||
|
|
@ -74,24 +71,21 @@ export class CommentReport extends Component<CommentReportProps, any> {
|
|||
<div>
|
||||
{i18n.t("reason")}: {r.comment_report.reason}
|
||||
</div>
|
||||
{r.resolver.match({
|
||||
some: resolver => (
|
||||
<div>
|
||||
{r.comment_report.resolved ? (
|
||||
<T i18nKey="resolved_by">
|
||||
#
|
||||
<PersonListing person={resolver} />
|
||||
</T>
|
||||
) : (
|
||||
<T i18nKey="unresolved_by">
|
||||
#
|
||||
<PersonListing person={resolver} />
|
||||
</T>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
none: <></>,
|
||||
})}
|
||||
{r.resolver && (
|
||||
<div>
|
||||
{r.comment_report.resolved ? (
|
||||
<T i18nKey="resolved_by">
|
||||
#
|
||||
<PersonListing person={r.resolver} />
|
||||
</T>
|
||||
) : (
|
||||
<T i18nKey="unresolved_by">
|
||||
#
|
||||
<PersonListing person={r.resolver} />
|
||||
</T>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
<button
|
||||
className="btn btn-link btn-animate text-muted py-0"
|
||||
onClick={linkEvent(this, this.handleResolveReport)}
|
||||
|
|
@ -110,11 +104,14 @@ export class CommentReport extends Component<CommentReportProps, any> {
|
|||
}
|
||||
|
||||
handleResolveReport(i: CommentReport) {
|
||||
let form = new ResolveCommentReport({
|
||||
report_id: i.props.report.comment_report.id,
|
||||
resolved: !i.props.report.comment_report.resolved,
|
||||
auth: auth().unwrap(),
|
||||
});
|
||||
WebSocketService.Instance.send(wsClient.resolveCommentReport(form));
|
||||
let auth = myAuth();
|
||||
if (auth) {
|
||||
let form: ResolveCommentReport = {
|
||||
report_id: i.props.report.comment_report.id,
|
||||
resolved: !i.props.report.comment_report.resolved,
|
||||
auth,
|
||||
};
|
||||
WebSocketService.Instance.send(wsClient.resolveCommentReport(form));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue