Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ The following section of the configuration contains information about your Squad
* `rconPassword` - The RCON password of the server.
* `logReaderMode` - `tail` will read from a local log file, `ftp` will read from a remote log file using the FTP protocol, `sftp` will read from a remote log file using the SFTP protocol.
* `logDir` - The folder where your Squad logs are saved. Most likely will be `C:/servers/squad_server/SquadGame/Saved/Logs`.
* `ftp` - FTP configuration for reading logs remotely.
* `sftp` - SFTP configuration for reading logs remotely.
* `ftp` - FTP configuration for reading logs remotely. Only required for `ftp` `logReaderMode`.
* `sftp` - SFTP configuration for reading logs remotely. Only required for `sftp` `logReaderMode`.
* `adminLists` - Sources for identifying an admins on the server, either remote or local.

---
Expand Down Expand Up @@ -631,9 +631,9 @@ Grafana:
</details>

<details>
<summary>DiscordRoundWinner</summary>
<h2>DiscordRoundWinner</h2>
<p>The <code>DiscordRoundWinner</code> plugin will send the round winner to a Discord channel.</p>
<summary>DiscordRoundEnded</summary>
<h2>DiscordRoundEnded</h2>
<p>The <code>DiscordRoundEnded</code> plugin will send the round winner to a Discord channel.</p>
<h3>Options</h3>
<ul><li><h4>discordClient (Required)</h4>
<h6>Description</h6>
Expand All @@ -642,7 +642,7 @@ Grafana:
<pre><code>discord</code></pre></li>
<li><h4>channelID (Required)</h4>
<h6>Description</h6>
<p>The ID of the channel to log admin broadcasts to.</p>
<p>The ID of the channel to log round end events to.</p>
<h6>Default</h6>
<pre><code></code></pre></li><h6>Example</h6>
<pre><code>667741905228136459</code></pre>
Expand All @@ -654,9 +654,9 @@ Grafana:
</details>

<details>
<summary>DiscordRoundEnded</summary>
<h2>DiscordRoundEnded</h2>
<p>The <code>DiscordRoundEnded</code> plugin will send the round winner to a Discord channel.</p>
<summary>DiscordRoundWinner</summary>
<h2>DiscordRoundWinner</h2>
<p>The <code>DiscordRoundWinner</code> plugin will send the round winner to a Discord channel.</p>
<h3>Options</h3>
<ul><li><h4>discordClient (Required)</h4>
<h6>Description</h6>
Expand All @@ -665,7 +665,7 @@ Grafana:
<pre><code>discord</code></pre></li>
<li><h4>channelID (Required)</h4>
<h6>Description</h6>
<p>The ID of the channel to log round end events to.</p>
<p>The ID of the channel to log admin broadcasts to.</p>
<h6>Default</h6>
<pre><code></code></pre></li><h6>Example</h6>
<pre><code>667741905228136459</code></pre>
Expand Down
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@
"prependAdminNameInBroadcast": false
},
{
"plugin": "DiscordRoundWinner",
"plugin": "DiscordRoundEnded",
"enabled": true,
"discordClient": "discord",
"channelID": "",
"color": 16761867
},
{
"plugin": "DiscordRoundEnded",
"plugin": "DiscordRoundWinner",
"enabled": true,
"discordClient": "discord",
"channelID": "",
Expand Down
4 changes: 2 additions & 2 deletions squad-server/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export default class SquadServerFactory {
const template = SquadServerFactory.parseConfig(templateString);

const pluginKeys = Object.keys(plugins).sort((a, b) =>
a.name < b.name ? -1 : a.name > b.name ? 1 : 0
a < b ? -1 : a > b ? 1 : 0
);

for (const pluginKey of pluginKeys) {
Expand Down Expand Up @@ -216,7 +216,7 @@ export default class SquadServerFactory {
const plugins = await Plugins.getPlugins();

const pluginKeys = Object.keys(plugins).sort((a, b) =>
a.name < b.name ? -1 : a.name > b.name ? 1 : 0
a < b ? -1 : a > b ? 1 : 0
);

const pluginInfo = [];
Expand Down