Add legal information (fixes #652)

lemmy-translations

@@ -1 +1 @@
-Subproject commit 2e9f6291c91a9c97fa7f7740f90ee3146515e03c
+Subproject commit f6140fee78e9b9f495072eeb0707f972d51aefad

package.json

@@ -74,7 +74,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^7.0.4",
     "import-sort-style-module": "^6.0.0",
-    "lemmy-js-client": "0.16.4-rc.1",
+    "lemmy-js-client": "git+https://github.com/LemmyNet/lemmy-js-client.git#legal-info",
     "lint-staged": "^12.4.1",
     "mini-css-extract-plugin": "^2.6.0",
     "node-fetch": "^2.6.1",

src/shared/components/app/footer.tsx

@@ -32,6 +32,13 @@ export class Footer extends Component<FooterProps, any> {
                 {i18n.t("modlog")}
               </NavLink>
             </li>
+            {this.props.site.site_view.site.legal_information && (
+              <li className="nav-item">
+                <NavLink className="nav-link" to="/legal">
+                  {i18n.t("legal_information")}
+                </NavLink>
+              </li>
+            )}
             {this.props.site.federated_instances && (
               <li class="nav-item">
                 <NavLink className="nav-link" to="/instances">

src/shared/components/home/admin-settings.tsx

@@ -2,6 +2,7 @@ import autosize from "autosize";
 import { Component, linkEvent } from "inferno";
 import {
   BannedPersonsResponse,
+  EditSite,
   GetBannedPersons,
   GetSiteConfig,
   GetSiteConfigResponse,
@@ -36,6 +37,7 @@ interface AdminSettingsState {
   siteRes: GetSiteResponse;
   siteConfigRes: GetSiteConfigResponse;
   siteConfigHjson: string;
+  legalInfo: string;
   loading: boolean;
   banned: PersonViewSafe[];
   siteConfigLoading: boolean;
@@ -44,11 +46,13 @@ interface AdminSettingsState {
 
 export class AdminSettings extends Component<any, AdminSettingsState> {
   private siteConfigTextAreaId = `site-config-${randomStr()}`;
+  private legalInfoTextAreaId = `legal-info-${randomStr()}`;
   private isoData = setIsoData(this.context);
   private subscription: Subscription;
   private emptyState: AdminSettingsState = {
     siteRes: this.isoData.site_res,
     siteConfigHjson: null,
+    legalInfo: null,
     siteConfigRes: {
       config_hjson: null,
     },
@@ -70,6 +74,8 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
     if (this.isoData.path == this.context.router.route.match.url) {
       this.state.siteConfigRes = this.isoData.routeData[0];
       this.state.siteConfigHjson = this.state.siteConfigRes.config_hjson;
+      this.state.legalInfo =
+        this.state.siteRes.site_view.site.legal_information;
       this.state.banned = this.isoData.routeData[1].banned;
       this.state.siteConfigLoading = false;
       this.state.loading = false;
@@ -195,7 +201,7 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
     return (
       <div>
         <h5>{i18n.t("admin_settings")}</h5>
-        <form onSubmit={linkEvent(this, this.handleSiteConfigSubmit)}>
+        <form onSubmit={linkEvent(this, this.handleAdminSettingsSubmit)}>
           <div class="form-group row">
             <label
               class="col-12 col-form-label"
@@ -213,6 +219,23 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
               />
             </div>
           </div>
+          <div class="form-group row">
+            <label
+              class="col-12 col-form-label"
+              htmlFor={this.legalInfoTextAreaId}
+            >
+              {i18n.t("legal_information")}
+            </label>
+            <div class="col-12">
+              <textarea
+                id={this.legalInfoTextAreaId}
+                value={this.state.legalInfo}
+                onInput={linkEvent(this, this.handleLegalInfoChange)}
+                class="form-control text-monospace"
+                rows={3}
+              />
+            </div>
+          </div>
           <div class="form-group row">
             <div class="col-12">
               <button type="submit" class="btn btn-secondary mr-2">
@@ -229,14 +252,24 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
     );
   }
 
-  handleSiteConfigSubmit(i: AdminSettings, event: any) {
+  handleAdminSettingsSubmit(i: AdminSettings, event: any) {
     event.preventDefault();
     i.state.siteConfigLoading = true;
-    let form: SaveSiteConfig = {
+
-      config_hjson: this.state.siteConfigHjson,
+    // save config
+    let form1: SaveSiteConfig = {
+      config_hjson: i.state.siteConfigHjson,
       auth: authField(),
     };
-    WebSocketService.Instance.send(wsClient.saveSiteConfig(form));
+    WebSocketService.Instance.send(wsClient.saveSiteConfig(form1));
+
+    // save legal info
+    let form2: EditSite = {
+      legal_information: i.state.legalInfo,
+      auth: authField(),
+    };
+    WebSocketService.Instance.send(wsClient.editSite(form2));
+
     i.setState(i.state);
   }
 
@@ -245,6 +278,11 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
     i.setState(i.state);
   }
 
+  handleLegalInfoChange(i: AdminSettings, event: any) {
+    i.state.legalInfo = event.target.value;
+    i.setState(i.state);
+  }
+
   handleLeaveAdminTeam(i: AdminSettings) {
     i.state.leaveAdminTeamLoading = true;
     WebSocketService.Instance.send(wsClient.leaveAdmin({ auth: authField() }));

src/shared/routes.ts

@@ -5,6 +5,7 @@ import { CreateCommunity } from "./components/community/create-community";
 import { AdminSettings } from "./components/home/admin-settings";
 import { Home } from "./components/home/home";
 import { Instances } from "./components/home/instances";
+import { Legal } from "./components/home/legal";
 import { Login } from "./components/home/login";
 import { Setup } from "./components/home/setup";
 import { Signup } from "./components/home/signup";
@@ -154,4 +155,5 @@ export const routes: IRoutePropsWithFetch[] = [
     component: VerifyEmail,
   },
   { path: `/instances`, component: Instances },
+  { path: `/legal`, component: Legal },
 ];

yarn.lock

@@ -4813,10 +4813,9 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lemmy-js-client@0.16.4-rc.1:
+"lemmy-js-client@git+https://github.com/LemmyNet/lemmy-js-client.git#legal-info":
-  version "0.16.4-rc.1"
+  version "0.17.0-rc.9"
-  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.16.4-rc.1.tgz#dfa94a152a7abe75f50f2599a8d9b40c143f37ff"
+  resolved "git+https://github.com/LemmyNet/lemmy-js-client.git#43def4db22e9068ddcee558f4cd5c1b3bd407f31"
-  integrity sha512-94Xh7A/WDywRaJ0GPXPaXZhyXqMzK0gAISNSB8m++2mC1WJalOqfjR72q/7PmLGxfjYO88/aWSz4Sk0SXWJjCw==
 
 levn@^0.4.1:
   version "0.4.1"