Skip to content

Release v4.9.3 #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Mar 25, 2024
Merged

Release v4.9.3 #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1ef33e
build(hooks): ignore untracked files (#1041)
christolis Mar 25, 2024
a11088e
Removed now obsolete HelperPrune routine (config change) (#1076)
Zabuzard Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions application/config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@
"rateLimitWindowSeconds": 10,
"rateLimitRequestsInWindow": 3
},
"helperPruneConfig": {
"roleFullLimit": 100,
"roleFullThreshold": 95,
"pruneMemberAmount": 7,
"inactivateAfterDays": 90,
"recentlyJoinedDays": 4
},
"featureBlacklist": {
"normal": [
],
Expand Down
13 changes: 0 additions & 13 deletions application/src/main/java/org/togetherjava/tjbot/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public final class Config {
private final String openaiApiKey;
private final String sourceCodeBaseUrl;
private final JShellConfig jshell;
private final HelperPruneConfig helperPruneConfig;
private final FeatureBlacklistConfig featureBlacklistConfig;
private final String selectRolesChannelPattern;
private final String memberCountCategoryPattern;
Expand Down Expand Up @@ -89,8 +88,6 @@ private Config(@JsonProperty(value = "token", required = true) String token,
@JsonProperty(value = "jshell", required = true) JShellConfig jshell,
@JsonProperty(value = "memberCountCategoryPattern",
required = true) String memberCountCategoryPattern,
@JsonProperty(value = "helperPruneConfig",
required = true) HelperPruneConfig helperPruneConfig,
@JsonProperty(value = "featureBlacklist",
required = true) FeatureBlacklistConfig featureBlacklistConfig,
@JsonProperty(value = "selectRolesChannelPattern",
Expand Down Expand Up @@ -124,7 +121,6 @@ private Config(@JsonProperty(value = "token", required = true) String token,
this.openaiApiKey = Objects.requireNonNull(openaiApiKey);
this.sourceCodeBaseUrl = Objects.requireNonNull(sourceCodeBaseUrl);
this.jshell = Objects.requireNonNull(jshell);
this.helperPruneConfig = Objects.requireNonNull(helperPruneConfig);
this.featureBlacklistConfig = Objects.requireNonNull(featureBlacklistConfig);
this.selectRolesChannelPattern = Objects.requireNonNull(selectRolesChannelPattern);
}
Expand Down Expand Up @@ -382,15 +378,6 @@ public JShellConfig getJshell() {
return jshell;
}

/**
* Gets the config for automatic pruning of helper roles.
*
* @return the configuration
*/
public HelperPruneConfig getHelperPruneConfig() {
return helperPruneConfig;
}

/**
* The configuration of blacklisted features.
*
Expand Down
19 changes: 0 additions & 19 deletions application/src/main/java/org/togetherjava/tjbot/config/HelperPruneConfig.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions application/src/main/java/org/togetherjava/tjbot/features/Features.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
features.add(new ScamHistoryPurgeRoutine(scamHistoryStore));
features.add(new HelpThreadMetadataPurger(database));
features.add(new HelpThreadActivityUpdater(helpSystemHelper));
features
.add(new AutoPruneHelperRoutine(config, helpSystemHelper, modAuditLogWriter, database));
features.add(new HelpThreadAutoArchiver(helpSystemHelper));
features.add(new LeftoverBookmarksCleanupRoutine(bookmarksSystem));
features.add(new MemberCountDisplayRoutine(config));
Expand Down
191 changes: 0 additions & 191 deletions application/src/main/java/org/togetherjava/tjbot/features/help/AutoPruneHelperRoutine.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ if [ "$spotlessExitCode" -ne 0 ]; then
exit "$spotlessExitCode"
fi

# Spotless possibly found changes, apply them
git add -A
# Spotless possibly found changes, apply them, excluding untracked files
git add -u

# Restore back the unstaged changes
pop_stash
Expand Down
Loading