From 94294443e003fde436c303e0b4404258c3b7bbfd Mon Sep 17 00:00:00 2001 From: Szymon Uglis Date: Sun, 20 Nov 2022 14:52:29 +0100 Subject: [PATCH] Deploy and release 3.1.0 --- CHANGELOG.md | 5 +++++ docker-compose.prod.yml | 2 +- lib/src/commands/info.dart | 3 ++- lib/src/services/db.dart | 2 +- lib/src/settings.dart | 2 ++ pubspec.yaml | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b074d65..8b4f992 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.1.0 + +- Fixup tag deleting (invalid column in db) +- Add bot version to /info command + ## 3.0.2 - Fixup tag deleting diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 3e789c9..d7ff0b0 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,7 +1,7 @@ version: '3.9' services: running_on_dart: - image: ghcr.io/nyxx-discord/running_on_dart:3.0.2 + image: ghcr.io/nyxx-discord/running_on_dart:3.1.0 container_name: running_on_dart env_file: - .env diff --git a/lib/src/commands/info.dart b/lib/src/commands/info.dart index 228f967..76fcf1f 100644 --- a/lib/src/commands/info.dart +++ b/lib/src/commands/info.dart @@ -28,8 +28,9 @@ ChatCommand info = ChatCommand( }) ..addFooter((footer) { footer.text = 'nyxx ${Constants.version}' + ' | $version' ' | Shard ${(context.guild?.shard.id ?? 0) + 1} of ${(context.client as INyxxWebsocket).shards}' - ' | Dart SDK version ${Platform.version.split('(').first}'; + ' | Dart SDK ${Platform.version.split('(').first}'; }) ..addField(name: 'Cached guilds', content: context.client.guilds.length, inline: true) ..addField(name: 'Cached users', content: context.client.users.length, inline: true) diff --git a/lib/src/services/db.dart b/lib/src/services/db.dart index e9be253..b1f61f7 100644 --- a/lib/src/services/db.dart +++ b/lib/src/services/db.dart @@ -299,7 +299,7 @@ class DatabaseService { await _ready; final result = await _connection.query(''' - SELECT tu.* FROM tag_usage tu JOIN tags t ON t.id = tu.tag_id AND t.enabled = TRUE; + SELECT tu.* FROM tag_usage tu JOIN tags t ON t.id = tu.command_id AND t.enabled = TRUE; '''); return result.map(TagUsedEvent.fromRow); diff --git a/lib/src/settings.dart b/lib/src/settings.dart index db10c69..331bc99 100644 --- a/lib/src/settings.dart +++ b/lib/src/settings.dart @@ -2,6 +2,8 @@ import 'dart:io'; import 'package:nyxx/nyxx.dart'; +String get version => '3.1.0'; + /// Get a [String] from an environment variable, throwing an exception if it is not set. /// /// If [def] is provided and the environment variable [key] is not set, [def] will be returned diff --git a/pubspec.yaml b/pubspec.yaml index f17b7db..b8f1f1c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: running_on_dart -version: 3.0.1 +version: 3.1.0 description: Discord Bot for nyxx development homepage: https://github.com/nyxx-discord/running_on_dart repository: https://github.com/nyxx-discord/running_on_dart