Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanvidrine committed Jul 12, 2024
2 parents 7fb88a0 + f9856c4 commit b39e27a
Show file tree
Hide file tree
Showing 10 changed files with 1,236 additions and 195 deletions.
2 changes: 2 additions & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
< 3.3.0.beta1-dev: 650d25a0cdebaf259836c49fb2347239dc04af95

7 changes: 0 additions & 7 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/eslint-theme");
11 changes: 11 additions & 0 deletions .github/workflows/discourse-theme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Discourse Theme

on:
push:
branches:
- main
pull_request:

jobs:
ci:
uses: discourse/.github/.github/workflows/discourse-theme.yml@v1
1 change: 1 addition & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/prettier");
1 change: 1 addition & 0 deletions .template-lintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/template-lint");
4 changes: 0 additions & 4 deletions .template-lintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions javascripts/discourse/components/whisper-warning.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ get showWarning() {
this.args.outletArgs.model.topic?.get("archetype") === "private_message";
// checks to make sure user is in group that PM is added to
const isInInboxGroup = allowedGroups
? this.currentUser.groups?.filter(group => {
? this.currentUser.groups?.filter((group) => {
for (let allowedGroup of allowedGroups) {
if (group.name === allowedGroup.name) {
return group;
Expand All @@ -29,7 +29,7 @@ get showWarning() {
const readRestricted =
this.args.outletArgs.model.category?.get("read_restricted");
const isWhisperWarningGroupMember =
this.currentUser.groups?.filter(group => {
this.currentUser.groups?.filter((group) => {
return group.name === "accidentalloudmouths";
}).length > 0;
const canWhisper = this.composer.showWhisperToggle;
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"author": "Jordan",
"license": "MIT",
"private": true,
"devDependencies": {
"eslint-config-discourse": "latest"
"@discourse/lint-configs": "^1.3.7",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"prettier": "^2.8.8"
}
}
1,392 changes: 1,213 additions & 179 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit b39e27a

Please sign in to comment.