DEV: Update linting config and run gjs-codemod (#152)

Author: cvx

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.5.0.beta5-dev: 487205a51d55552043bdfd9be3a37facb39076de
 < 3.5.0.beta1-dev: 8e68082512df23fbf3bc057317267ad92f133be1
 < 3.4.0.beta3-dev: a84123531a6865f6e76cd210e769e0ac4d729963
 < 3.4.0.beta1-dev: 1294355185bb29e61d381d63b9b4036cc7af9fc9

Gemfile.lock

@@ -14,42 +14,44 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    drb (2.2.1)
+    connection_pool (2.5.3)
+    drb (2.2.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    logger (1.6.6)
+    logger (1.7.0)
     minitest (5.25.5)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
+    prism (1.4.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.15)
     rainbow (3.1.1)
     regexp_parser (2.10.0)
-    rubocop (1.74.0)
+    rubocop (1.75.8)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -65,13 +67,13 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.30.3)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.72.1, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -97,4 +99,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.6.6
+   2.6.9

…ts/discourse/components/follow-button.js …s/discourse/components/follow-button.gjsassets/javascripts/discourse/components/follow-button.js renamed to assets/javascripts/discourse/components/follow-button.gjs assets/javascripts/discourse/components/follow-button.js renamed to assets/javascripts/discourse/components/follow-button.gjs

@@ -1,6 +1,8 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import { alias } from "@ember/object/computed";
+import { and } from "truth-helpers";
+import DButton from "discourse/components/d-button";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import discourseComputed from "discourse/lib/decorators";
@@ -63,4 +65,15 @@ export default class FollowButton extends Component {
         this.set("loading", false);
       });
   }
+
+  <template>
+    {{#if (and this.showButton this.canFollow)}}
+      <DButton
+        @label={{this.labelKey}}
+        @icon={{this.icon}}
+        @disabled={{this.loading}}
+        @action={{action "toggleFollow"}}
+      />
+    {{/if}}
+  </template>
 }

assets/javascripts/discourse/components/follow-button.hbs

@@ -0,0 +1,62 @@
+import Component from "@ember/component";
+import { observes } from "@ember-decorators/object";
+import PreferenceCheckbox from "discourse/components/preference-checkbox";
+import { i18n } from "discourse-i18n";
+
+const preferences = [
+  "notify_me_when_followed",
+  "notify_followed_user_when_followed",
+  "notify_me_when_followed_replies",
+  "notify_me_when_followed_creates_topic",
+  "allow_people_to_follow_me",
+];
+
+export default class FollowNotificationPreferences extends Component {
+  @observes(...preferences.map((p) => `user.${p}`))
+  _updatePreferences() {
+    if (!this.user.custom_fields) {
+      this.user.set("custom_fields", {});
+    }
+    preferences.forEach((p) => {
+      this.user.set(`custom_fields.${p}`, this.user[p]);
+    });
+  }
+
+  <template>
+    <div class="control-group follow-notifications">
+      <label class="control-label">{{i18n "user.follow.label"}}</label>
+
+      <div class="controls">
+        <PreferenceCheckbox
+          @labelKey="user.follow_notifications_options.allow_people_to_follow_me"
+          @checked={{this.user.allow_people_to_follow_me}}
+          class="pref-allow-people-to-follow-me"
+        />
+
+        <PreferenceCheckbox
+          @labelKey="user.follow_notifications_options.notify_me_when_followed"
+          @checked={{this.user.notify_me_when_followed}}
+          class="pref-notify-me-when-followed"
+        />
+
+        <PreferenceCheckbox
+          @labelKey="user.follow_notifications_options.notify_followed_user_when_followed"
+          @checked={{this.user.notify_followed_user_when_followed}}
+          class="pref-notify-followed-user-when-followed"
+        />
+
+        <PreferenceCheckbox
+          @labelKey="user.follow_notifications_options.notify_me_when_followed_replies"
+          @checked={{this.user.notify_me_when_followed_replies}}
+          class="pref-notify-me-when-followed-replies"
+        />
+
+        <PreferenceCheckbox
+          @labelKey="user.follow_notifications_options.notify_me_when_followed_creates_topic"
+          @checked={{this.user.notify_me_when_followed_creates_topic}}
+          class="pref-notify-me-when-followed-creates-topic"
+        />
+      </div>
+    </div>
+  </template>
+}

assets/javascripts/discourse/components/follow-notification-preferences.gjs

@@ -1,7 +1,9 @@
 import Component from "@ember/component";
 import { notEmpty } from "@ember/object/computed";
+import UserInfo from "discourse/components/user-info";
 import { propertyEqual } from "discourse/lib/computed";
 import discourseComputed from "discourse/lib/decorators";
+import { i18n } from "discourse-i18n";
 
 export default class FollowUsersList extends Component {
   @notEmpty("users") hasUsers;
@@ -12,4 +14,19 @@ export default class FollowUsersList extends Component {
     let key = viewingSelf ? "none" : "none_other";
     return `user.${type}.${key}`;
   }
+
+  <template>
+    <div class="follow-users">
+      {{#if this.hasUsers}}
+        {{#each this.users as |user|}}
+          <UserInfo @user={{user}} />
+        {{/each}}
+      {{else}}
+        <div class="alert alert-info">{{i18n
+            this.noneMessage
+            username=this.user.username
+          }}</div>
+      {{/if}}
+    </div>
+  </template>
 }

assets/javascripts/discourse/components/follow-notification-preferences.hbs

@@ -0,0 +1,9 @@
+import Component from "@ember/component";
+import { classNames, tagName } from "@ember-decorators/component";
+import FollowButton from "../../components/follow-button";
+
+@tagName("li")
+@classNames("user-card-additional-buttons-outlet", "follow-button-container")
+export default class FollowButtonContainer extends Component {
+  <template><FollowButton @user={{this.user}} /></template>
+}