DEV: Update linting (#133)

davidtaylorhq · web-flow · commit 23f4abef0e92 · 2024-11-20T15:46:34.000+01:00
diff --git a/assets/javascripts/discourse/components/follow-button.hbs b/assets/javascripts/discourse/components/follow-button.hbs
@@ -1,8 +1,8 @@
-{{#if (and showButton canFollow)}}
+{{#if (and this.showButton this.canFollow)}}
   <DButton
-    @label={{labelKey}}
-    @icon={{icon}}
-    @disabled={{loading}}
+    @label={{this.labelKey}}
+    @icon={{this.icon}}
+    @disabled={{this.loading}}
     @action={{action "toggleFollow"}}
   />
 {{/if}}
diff --git a/assets/javascripts/discourse/components/follow-notification-preferences.hbs b/assets/javascripts/discourse/components/follow-notification-preferences.hbs
@@ -4,27 +4,27 @@
   <div class="controls">
     {{preference-checkbox
       labelKey="user.follow_notifications_options.allow_people_to_follow_me"
-      checked=user.allow_people_to_follow_me
+      checked=this.user.allow_people_to_follow_me
     }}
 
     {{preference-checkbox
       labelKey="user.follow_notifications_options.notify_me_when_followed"
-      checked=user.notify_me_when_followed
+      checked=this.user.notify_me_when_followed
     }}
 
     {{preference-checkbox
       labelKey="user.follow_notifications_options.notify_followed_user_when_followed"
-      checked=user.notify_followed_user_when_followed
+      checked=this.user.notify_followed_user_when_followed
     }}
 
     {{preference-checkbox
       labelKey="user.follow_notifications_options.notify_me_when_followed_replies"
-      checked=user.notify_me_when_followed_replies
+      checked=this.user.notify_me_when_followed_replies
     }}
 
     {{preference-checkbox
       labelKey="user.follow_notifications_options.notify_me_when_followed_creates_topic"
-      checked=user.notify_me_when_followed_creates_topic
+      checked=this.user.notify_me_when_followed_creates_topic
     }}
   </div>
 </div>
diff --git a/assets/javascripts/discourse/components/follow-post-stream.hbs b/assets/javascripts/discourse/components/follow-post-stream.hbs
@@ -1,3 +1,3 @@
-{{#each stream.content as |post|}}
+{{#each this.stream.content as |post|}}
   {{follow-feed-post post=post}}
 {{/each}}
diff --git a/assets/javascripts/discourse/components/follow-users-list.hbs b/assets/javascripts/discourse/components/follow-users-list.hbs
@@ -1,12 +1,12 @@
 <div class="follow-users">
-  {{#if hasUsers}}
-    {{#each users as |user|}}
+  {{#if this.hasUsers}}
+    {{#each this.users as |user|}}
       {{user-info user=user}}
     {{/each}}
   {{else}}
     <div class="alert alert-info">{{i18n
-        noneMessage
-        username=user.username
+        this.noneMessage
+        username=this.user.username
       }}</div>
   {{/if}}
 </div>
diff --git a/assets/javascripts/discourse/connectors/user-card-additional-buttons/follow-button-container.hbs b/assets/javascripts/discourse/connectors/user-card-additional-buttons/follow-button-container.hbs
@@ -1 +1 @@
-{{follow-button user=user}}
+{{follow-button user=this.user}}
diff --git a/assets/javascripts/discourse/connectors/user-card-metadata/follow-statistics-user-card.hbs b/assets/javascripts/discourse/connectors/user-card-metadata/follow-statistics-user-card.hbs
@@ -1,12 +1,12 @@
-{{#if user.total_following}}
+{{#if this.user.total_following}}
   <div class="metadata__following">
     <span>{{i18n "user.following.label"}}</span>
-    <span class="value">{{user.total_following}}</span>
+    <span class="value">{{this.user.total_following}}</span>
   </div>
 {{/if}}
-{{#if user.total_followers}}
+{{#if this.user.total_followers}}
   <div class="metadata__followers">
     <span>{{i18n "user.followers.label"}}</span>
-    <span class="value">{{user.total_followers}}</span>
+    <span class="value">{{this.user.total_followers}}</span>
   </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/connectors/user-main-nav/follow-user-container.hbs b/assets/javascripts/discourse/connectors/user-main-nav/follow-user-container.hbs
@@ -1,4 +1,4 @@
-{{#if model.can_see_network_tab}}
+{{#if this.model.can_see_network_tab}}
   <LinkTo @route="follow">
     {{d-icon "users"}}
     <span>{{i18n "user.follow_nav"}}</span>
diff --git a/assets/javascripts/discourse/connectors/user-preferences-notifications/follow-notification-preferences-container.hbs b/assets/javascripts/discourse/connectors/user-preferences-notifications/follow-notification-preferences-container.hbs
@@ -1 +1 @@
-{{follow-notification-preferences user=model}}
+{{follow-notification-preferences user=this.model}}
diff --git a/assets/javascripts/discourse/connectors/user-profile-controls/follow-button-container.hbs b/assets/javascripts/discourse/connectors/user-profile-controls/follow-button-container.hbs
@@ -1 +1 @@
-{{follow-button user=model}}
+{{follow-button user=this.model}}
diff --git a/assets/javascripts/discourse/connectors/user-profile-secondary/follow-statistics-user.hbs b/assets/javascripts/discourse/connectors/user-profile-secondary/follow-statistics-user.hbs
@@ -1,7 +1,13 @@
-{{#if model.total_following}}
-  {{follow-statistic label="user.following.label" total=model.total_following}}
+{{#if this.model.total_following}}
+  {{follow-statistic
+    label="user.following.label"
+    total=this.model.total_following
+  }}
 {{/if}}
 
-{{#if model.total_followers}}
-  {{follow-statistic label="user.followers.label" total=model.total_followers}}
+{{#if this.model.total_followers}}
+  {{follow-statistic
+    label="user.followers.label"
+    total=this.model.total_followers
+  }}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/feed.hbs b/assets/javascripts/discourse/templates/feed.hbs
@@ -1,12 +1,12 @@
-{{#if model.noContent}}
-  {{#if viewingSelf}}
+{{#if this.model.noContent}}
+  {{#if this.viewingSelf}}
     <div class="alert alert-info">{{i18n "user.feed.empty_feed_you"}}</div>
   {{else}}
     <div class="alert alert-info">{{i18n
         "user.feed.empty_feed_other"
-        username=user.username
+        username=this.user.username
       }}</div>
   {{/if}}
 {{else}}
-  {{follow-post-stream stream=model}}
+  {{follow-post-stream stream=this.model}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/follow.hbs b/assets/javascripts/discourse/templates/follow.hbs
@@ -2,19 +2,21 @@
 
 <div class="user-navigation user-navigation-secondary">
   <HorizontalOverflowNav>
-    {{#if (eq model.id currentUser.id)}}
+    {{#if (eq this.model.id this.currentUser.id)}}
       <DNavigationItem @route="feed">
         <span>{{i18n "user.feed.label"}}</span>
       </DNavigationItem>
     {{/if}}
 
-    {{#if model.can_see_following}}
+    {{#if this.model.can_see_following}}
       <DNavigationItem @route="following">
         <span>{{i18n "user.following.label"}}</span>
       </DNavigationItem>
     {{/if}}
 
-    {{#if (and model.can_see_followers model.allow_people_to_follow_me)}}
+    {{#if
+      (and this.model.can_see_followers this.model.allow_people_to_follow_me)
+    }}
       <DNavigationItem @route="followers">
         <span>{{i18n "user.followers.label"}}</span>
       </DNavigationItem>
diff --git a/assets/javascripts/discourse/templates/followers.hbs b/assets/javascripts/discourse/templates/followers.hbs
@@ -1 +1 @@
-{{follow-users-list users=users type="followers" user=user}}
+{{follow-users-list users=this.users type="followers" user=this.user}}
diff --git a/assets/javascripts/discourse/templates/following.hbs b/assets/javascripts/discourse/templates/following.hbs
@@ -1 +1 @@
-{{follow-users-list users=users type="following" user=user}}
+{{follow-users-list users=this.users type="following" user=this.user}}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@discourse/lint-configs": "2.0.1",
+    "@discourse/lint-configs": "2.2.0",
     "ember-template-lint": "6.0.0",
     "eslint": "9.14.0",
     "prettier": "2.8.8"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{follow-button user=user}}`
	`1`	`+{{follow-button user=this.user}}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{#if model.can_see_network_tab}}`
	`1`	`+{{#if this.model.can_see_network_tab}}`
`2`	`2`	`<LinkTo @route="follow">`
`3`	`3`	`{{d-icon "users"}}`
`4`	`4`	`<span>{{i18n "user.follow_nav"}}</span>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{follow-notification-preferences user=model}}`
	`1`	`+{{follow-notification-preferences user=this.model}}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{follow-button user=model}}`
	`1`	`+{{follow-button user=this.model}}`