From c856f02e140c53d165529a1b12d0c5d1a7b15037 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 31 Oct 2024 15:16:32 +0100
Subject: [PATCH 01/37] Initial api server commit

---
 bin/running_on_dart.dart        |   2 +
 docker-compose.yml              |   4 +-
 lib/running_on_dart.dart        |   2 +
 lib/src/api/api_server.dart     |  35 +++++++
 lib/src/api/jwt_middleware.dart |  13 +++
 pubspec.lock                    | 180 +++++---------------------------
 pubspec.yaml                    |   6 ++
 7 files changed, 86 insertions(+), 156 deletions(-)
 create mode 100644 lib/src/api/api_server.dart
 create mode 100644 lib/src/api/jwt_middleware.dart

diff --git a/bin/running_on_dart.dart b/bin/running_on_dart.dart
index 2b6206f..575e311 100644
--- a/bin/running_on_dart.dart
+++ b/bin/running_on_dart.dart
@@ -47,4 +47,6 @@ void main() async {
       ));
 
   await setupContainer(client);
+
+  WebServer().startServer();
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index e831fe4..8db9f0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     container_name: running_on_dart
     env_file:
      - .env
-    links:
-      - db
+    ports:
+      - "8088:8088"
     depends_on:
       - db
 
diff --git a/lib/running_on_dart.dart b/lib/running_on_dart.dart
index 2dc8d04..080f796 100644
--- a/lib/running_on_dart.dart
+++ b/lib/running_on_dart.dart
@@ -15,3 +15,5 @@ export 'src/settings.dart';
 export 'src/converter.dart';
 export 'src/error_handler.dart';
 export 'src/init.dart';
+
+export 'src/api/api_server.dart' show WebServer;
diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
new file mode 100644
index 0000000..6dfc1e1
--- /dev/null
+++ b/lib/src/api/api_server.dart
@@ -0,0 +1,35 @@
+import 'dart:convert';
+
+import 'package:injector/injector.dart';
+import 'package:running_on_dart/src/api/jwt_middleware.dart';
+import 'package:running_on_dart/src/modules/bot_start_duration.dart';
+
+import 'package:shelf_router/shelf_router.dart' as shelf_router;
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf/shelf_io.dart' as shelf_io;
+
+class WebServer {
+  Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
+    final botStartDuration = Injector.appInstance.get<BotStartDuration>();
+
+    return shelf.Response.ok(jsonEncode({"ok": true, 'uptime': botStartDuration.startDate.toIso8601String()}), headers: {'Content-Type': 'application/json'});
+  }
+
+  Future<shelf_router.Router> _setupRouter() async {
+    return shelf_router.Router()
+      ..get("/api/info", _handleBotInfo)
+      ..get("/api/test", _authorized(_handleBotInfo));
+  }
+
+  shelf.Handler _authorized(shelf.Handler inner) => const shelf.Pipeline().addMiddleware(jwtMiddleware()).addHandler(inner);
+
+  Future<void> startServer() async {
+    final router = await _setupRouter();
+
+    final app = const shelf.Pipeline()
+        .addMiddleware(shelf.logRequests())
+        .addHandler(router.call);
+
+    await shelf_io.serve(app, "0.0.0.0", 8088);
+  }
+}
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
new file mode 100644
index 0000000..0bc366b
--- /dev/null
+++ b/lib/src/api/jwt_middleware.dart
@@ -0,0 +1,13 @@
+import 'package:shelf/shelf.dart' as shelf;
+
+shelf.Middleware jwtMiddleware() => (shelf.Handler handler) {
+  return (shelf.Request request) {
+    final authHeader = request.headers['Authorization'];
+
+    if (authHeader == null) {
+      return shelf.Response.unauthorized(null);
+    }
+
+    return handler(request);
+  };
+};
diff --git a/pubspec.lock b/pubspec.lock
index a14364b..5f977dc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -85,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   collection:
     dependency: "direct main"
     description:
@@ -105,14 +105,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.0"
   crypto:
     dependency: transitive
     description:
@@ -169,14 +161,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
   fuzzy:
     dependency: "direct main"
     description:
@@ -209,14 +193,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.2"
-  http_multi_server:
+  http_methods:
     dependency: transitive
     description:
-      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      name: http_methods
+      sha256: "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "1.1.1"
   http_parser:
     dependency: transitive
     description:
@@ -245,26 +229,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.1"
+    version: "0.19.0"
   lints:
     dependency: "direct dev"
     description:
@@ -285,10 +253,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   meta:
     dependency: transitive
     description:
@@ -302,34 +270,18 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "82104b2934f7fa13a88e2cd596d4b4df932e6cd6"
+      resolved-ref: a31aaa35c975e8a6d17554d0241c11c297b7afb6
       url: "https://github.com/nyxx-discord/migent.git"
     source: git
-    version: "1.2.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
+    version: "1.1.0"
   nyxx:
     dependency: "direct main"
     description:
       name: nyxx
-      sha256: "3ee891f4098c0dd7b992dafc2b4e961b82bd076b3149a15408efda1e11c7c5aa"
+      sha256: "073c4f3a49269b4580c54aef32a472b3eae0e6f0e125eb1be2eeb5976210e886"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.2"
+    version: "6.5.0"
   nyxx_commands:
     dependency: "direct main"
     description:
@@ -342,10 +294,10 @@ packages:
     dependency: "direct main"
     description:
       name: nyxx_extensions
-      sha256: f0b6dfc5ed2350c10f3018c7fc5fbaa7c01fbce6fee8b8fb14724f57cc0d67fe
+      sha256: "8016605fc131320bfb58362e5124a0fb1c23e51c26f1638098611fa8f93760aa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.1"
+    version: "4.2.0"
   oauth2:
     dependency: transitive
     description:
@@ -398,10 +350,10 @@ packages:
     dependency: "direct main"
     description:
       name: postgres
-      sha256: e9802d4c9d78e432c4d4e57be9a91d99cf1552d45f17b17792f8e595060376a2
+      sha256: bc3a36f9960d822af1ac4c2e0a32c4e7a3e426d2ce4500c11afca40f53c34612
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.4.0"
   pub_semver:
     dependency: transitive
     description:
@@ -451,53 +403,21 @@ packages:
     source: hosted
     version: "1.0.3"
   shelf:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shelf
       sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
     version: "1.4.2"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.3"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  source_maps:
-    dependency: transitive
+  shelf_router:
+    dependency: "direct main"
     description:
-      name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      name: shelf_router
+      sha256: f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.12"
+    version: "1.1.4"
   source_span:
     dependency: transitive
     description:
@@ -555,14 +475,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  test:
-    dependency: "direct dev"
-    description:
-      name: test
-      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
@@ -571,14 +483,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.3"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.5"
   typed_data:
     dependency: transitive
     description:
@@ -595,14 +499,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
   watcher:
     dependency: transitive
     description:
@@ -615,34 +511,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.1"
-  web_socket:
-    dependency: transitive
-    description:
-      name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.6"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  webkit_inspection_protocol:
-    dependency: transitive
-    description:
-      name: webkit_inspection_protocol
-      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 973d3bf..b7bc43e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,9 +27,15 @@ dependencies:
     git: https://github.com/TentacleOrg/Tentacle.git
   injector: ^4.0.0
 
+  # directly used transitive dependencies
   dio: any
   built_collection: any
 
+  # api server
+  shelf: ^1.4.2
+  shelf_router: ^1.1.4
+  jaguar_jwt: ^3.0.0
+
 dev_dependencies:
   lints: ^5.0.0
   test: ^1.25.8

From ae2ac60bdb6c5ad2061a662d5a0b1119430e09ae Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 31 Oct 2024 15:33:30 +0100
Subject: [PATCH 02/37] Initial jwt auth implementation

---
 lib/src/api/jwt_middleware.dart | 34 +++++++++++++++++++++++++++++++--
 lib/src/api/utils.dart          | 11 +++++++++++
 pubspec.lock                    | 16 ++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/api/utils.dart

diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index 0bc366b..6f8313c 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -1,11 +1,41 @@
+import 'dart:convert';
+
+import 'package:jaguar_jwt/jaguar_jwt.dart';
+import 'package:running_on_dart/running_on_dart.dart';
+import 'package:running_on_dart/src/api/utils.dart';
 import 'package:shelf/shelf.dart' as shelf;
 
-shelf.Middleware jwtMiddleware() => (shelf.Handler handler) {
+final jwtKey = getEnv("JWT_KEY");
+
+class MissingPermissionsException implements Exception {}
+
+void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
+  final claims = jwt.payload['permissions'] as List<String>? ?? <String>[];
+
+  final valid = Set.of(claims).containsAll(requiredPermissions);
+  if (!valid) {
+    throw MissingPermissionsException();
+  }
+}
+
+shelf.Middleware jwtMiddleware([List<String> requiredPermissions = const []]) => (shelf.Handler handler) {
   return (shelf.Request request) {
     final authHeader = request.headers['Authorization'];
 
     if (authHeader == null) {
-      return shelf.Response.unauthorized(null);
+      return createUnauthorizedResponse('Missing authorization header');
+    }
+
+    try {
+      final jwt = verifyJwtHS256Signature(authHeader, jwtKey);
+
+      if (requiredPermissions.isNotEmpty) {
+        validateClaims(jwt, requiredPermissions);
+      }
+    } on JwtException catch (e) {
+      return createUnauthorizedResponse(e.message);
+    } on MissingPermissionsException {
+      return createForbiddenResponse();
     }
 
     return handler(request);
diff --git a/lib/src/api/utils.dart b/lib/src/api/utils.dart
new file mode 100644
index 0000000..e87e726
--- /dev/null
+++ b/lib/src/api/utils.dart
@@ -0,0 +1,11 @@
+import 'dart:convert';
+
+import 'package:shelf/shelf.dart' as shelf;
+
+shelf.Response createJsonErrorResponse(int errorCode, String errorMessage) {
+  return shelf.Response(errorCode, body: jsonEncode({"message": errorMessage}), headers: {"Content-Type": 'application/json'});
+}
+
+shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErrorResponse(400, errorMessage);
+
+shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
diff --git a/pubspec.lock b/pubspec.lock
index 5f977dc..a491852 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -33,6 +33,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.12.0"
+  auth_header:
+    dependency: transitive
+    description:
+      name: auth_header
+      sha256: "0a3938128b6124530de93ce1a20ccb58639195fe7952f638248ea1bc0e5408eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -233,6 +241,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.0"
+  jaguar_jwt:
+    dependency: "direct main"
+    description:
+      name: jaguar_jwt
+      sha256: c3ab24be5ba5f736f93eacfc94c4381bd93551a351ab5687e70c8d71a9916e8d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   lints:
     dependency: "direct dev"
     description:

From 7a35eabe8540d1f202bf9cb3efb0e027531cca97 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 31 Oct 2024 16:00:37 +0100
Subject: [PATCH 03/37] Fix jwt parsing

---
 lib/src/api/jwt_middleware.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index 6f8313c..d010280 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -9,6 +9,12 @@ final jwtKey = getEnv("JWT_KEY");
 
 class MissingPermissionsException implements Exception {}
 
+String generateJwtKey(String subject) {
+  final claimSet = JwtClaim(subject: subject, maxAge: Duration(days: 1));
+
+  return issueJwtHS256(claimSet, jwtKey);
+}
+
 void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
   final claims = jwt.payload['permissions'] as List<String>? ?? <String>[];
 
@@ -27,7 +33,7 @@ shelf.Middleware jwtMiddleware([List<String> requiredPermissions = const []]) =>
     }
 
     try {
-      final jwt = verifyJwtHS256Signature(authHeader, jwtKey);
+      final jwt = verifyJwtHS256Signature(authHeader.replaceFirst('Bearer ', ''), jwtKey);
 
       if (requiredPermissions.isNotEmpty) {
         validateClaims(jwt, requiredPermissions);

From 39c14f4b50039efd6172bd1a663b0ac003046219 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 31 Oct 2024 17:07:17 +0100
Subject: [PATCH 04/37] Minor naming fixes

---
 lib/src/api/api_server.dart     | 4 ++--
 lib/src/api/jwt_middleware.dart | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 6dfc1e1..0c5a848 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -17,8 +17,8 @@ class WebServer {
 
   Future<shelf_router.Router> _setupRouter() async {
     return shelf_router.Router()
-      ..get("/api/info", _handleBotInfo)
-      ..get("/api/test", _authorized(_handleBotInfo));
+      ..get("/api/info", _handleBotInfo);
+      // ..get("/api/test", _authorized(_handleBotInfo));
   }
 
   shelf.Handler _authorized(shelf.Handler inner) => const shelf.Pipeline().addMiddleware(jwtMiddleware()).addHandler(inner);
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index d010280..d8fbb9d 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -10,15 +10,15 @@ final jwtKey = getEnv("JWT_KEY");
 class MissingPermissionsException implements Exception {}
 
 String generateJwtKey(String subject) {
-  final claimSet = JwtClaim(subject: subject, maxAge: Duration(days: 1));
+  final jwtClaim = JwtClaim(subject: subject, maxAge: Duration(days: 1));
 
-  return issueJwtHS256(claimSet, jwtKey);
+  return issueJwtHS256(jwtClaim, jwtKey);
 }
 
 void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
-  final claims = jwt.payload['permissions'] as List<String>? ?? <String>[];
+  final permissions = jwt.payload['permissions'] as List<String>? ?? <String>[];
 
-  final valid = Set.of(claims).containsAll(requiredPermissions);
+  final valid = Set.of(permissions).containsAll(requiredPermissions);
   if (!valid) {
     throw MissingPermissionsException();
   }

From acf46d11f3c70491e9759fd126240d3e78a394bb Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 1 Nov 2024 00:25:13 +0100
Subject: [PATCH 05/37] Implement oauth discord login

---
 lib/src/api/api_server.dart     | 43 ++++++++++++++++++++++++-----
 lib/src/api/jwt_middleware.dart | 48 ++++++++++++++++-----------------
 lib/src/api/utils.dart          |  3 ++-
 pubspec.lock                    |  8 ++++++
 pubspec.yaml                    |  1 +
 5 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 0c5a848..77829fb 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -1,34 +1,63 @@
 import 'dart:convert';
 
 import 'package:injector/injector.dart';
+import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/api/jwt_middleware.dart';
 import 'package:running_on_dart/src/modules/bot_start_duration.dart';
 
+import 'package:shelf_cors_headers/shelf_cors_headers.dart';
 import 'package:shelf_router/shelf_router.dart' as shelf_router;
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf_io;
 
+import 'package:http/http.dart' as http;
+
+final clientId = getEnv('DISCORD_CLIENT_ID');
+final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
+final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
+
 class WebServer {
   Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
     final botStartDuration = Injector.appInstance.get<BotStartDuration>();
 
-    return shelf.Response.ok(jsonEncode({"ok": true, 'uptime': botStartDuration.startDate.toIso8601String()}), headers: {'Content-Type': 'application/json'});
+    return shelf.Response.ok(jsonEncode({"ok": true, 'uptime': botStartDuration.startDate.toIso8601String()}),
+        headers: {'Content-Type': 'application/json'});
+  }
+
+  Future<shelf.Response> _handleLogin(shelf.Request request) async {
+    final requestBody = jsonDecode(await request.readAsString()) as Map<String, dynamic>;
+    final authCode = requestBody['code'];
+
+    await http.post(Uri.https('discord.com', '/api/oauth2/token'), body: {
+      'client_id': clientId,
+      'client_secret': clientSecret,
+      'redirect_uri': clientRedirectUri,
+      'grant_type': 'authorization_code',
+      'code': authCode,
+    }, headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    });
+
+    final jwtToken = generateJwtKey('test');
+
+    return shelf.Response.ok(jsonEncode({'token': jwtToken}));
   }
 
   Future<shelf_router.Router> _setupRouter() async {
     return shelf_router.Router()
-      ..get("/api/info", _handleBotInfo);
-      // ..get("/api/test", _authorized(_handleBotInfo));
+      ..get("/api/info", _handleBotInfo)
+      ..post("/api/login", _handleLogin);
+    // ..get("/api/test", _authorized(_handleBotInfo));
   }
 
-  shelf.Handler _authorized(shelf.Handler inner) => const shelf.Pipeline().addMiddleware(jwtMiddleware()).addHandler(inner);
+  shelf.Handler _authorized(shelf.Handler inner) =>
+      const shelf.Pipeline().addMiddleware(jwtMiddleware()).addHandler(inner);
 
   Future<void> startServer() async {
     final router = await _setupRouter();
 
-    final app = const shelf.Pipeline()
-        .addMiddleware(shelf.logRequests())
-        .addHandler(router.call);
+    final app =
+        const shelf.Pipeline().addMiddleware(shelf.logRequests()).addMiddleware(corsHeaders()).addHandler(router.call);
 
     await shelf_io.serve(app, "0.0.0.0", 8088);
   }
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index d8fbb9d..b2bd375 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -1,11 +1,9 @@
-import 'dart:convert';
-
 import 'package:jaguar_jwt/jaguar_jwt.dart';
 import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/api/utils.dart';
 import 'package:shelf/shelf.dart' as shelf;
 
-final jwtKey = getEnv("JWT_KEY");
+final jwtKey = getEnv("JWT_SECRET");
 
 class MissingPermissionsException implements Exception {}
 
@@ -25,25 +23,25 @@ void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
 }
 
 shelf.Middleware jwtMiddleware([List<String> requiredPermissions = const []]) => (shelf.Handler handler) {
-  return (shelf.Request request) {
-    final authHeader = request.headers['Authorization'];
-
-    if (authHeader == null) {
-      return createUnauthorizedResponse('Missing authorization header');
-    }
-
-    try {
-      final jwt = verifyJwtHS256Signature(authHeader.replaceFirst('Bearer ', ''), jwtKey);
-
-      if (requiredPermissions.isNotEmpty) {
-        validateClaims(jwt, requiredPermissions);
-      }
-    } on JwtException catch (e) {
-      return createUnauthorizedResponse(e.message);
-    } on MissingPermissionsException {
-      return createForbiddenResponse();
-    }
-
-    return handler(request);
-  };
-};
+      return (shelf.Request request) {
+        final authHeader = request.headers['Authorization'];
+
+        if (authHeader == null) {
+          return createUnauthorizedResponse('Missing authorization header');
+        }
+
+        try {
+          final jwt = verifyJwtHS256Signature(authHeader.replaceFirst('Bearer ', ''), jwtKey);
+
+          if (requiredPermissions.isNotEmpty) {
+            validateClaims(jwt, requiredPermissions);
+          }
+        } on JwtException catch (e) {
+          return createUnauthorizedResponse(e.message);
+        } on MissingPermissionsException {
+          return createForbiddenResponse();
+        }
+
+        return handler(request);
+      };
+    };
diff --git a/lib/src/api/utils.dart b/lib/src/api/utils.dart
index e87e726..7a8e3c6 100644
--- a/lib/src/api/utils.dart
+++ b/lib/src/api/utils.dart
@@ -3,7 +3,8 @@ import 'dart:convert';
 import 'package:shelf/shelf.dart' as shelf;
 
 shelf.Response createJsonErrorResponse(int errorCode, String errorMessage) {
-  return shelf.Response(errorCode, body: jsonEncode({"message": errorMessage}), headers: {"Content-Type": 'application/json'});
+  return shelf.Response(errorCode,
+      body: jsonEncode({"message": errorMessage}), headers: {"Content-Type": 'application/json'});
 }
 
 shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErrorResponse(400, errorMessage);
diff --git a/pubspec.lock b/pubspec.lock
index a491852..b7b4b6e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -426,6 +426,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.2"
+  shelf_cors_headers:
+    dependency: "direct main"
+    description:
+      name: shelf_cors_headers
+      sha256: a127c80f99bbef3474293db67a7608e3a0f1f0fcdb171dad77fa9bd2cd123ae4
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
   shelf_router:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b7bc43e..a3feaa8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,6 +34,7 @@ dependencies:
   # api server
   shelf: ^1.4.2
   shelf_router: ^1.1.4
+  shelf_cors_headers: ^0.1.5
   jaguar_jwt: ^3.0.0
 
 dev_dependencies:

From e6aca2133cb5fbe7bec387341ca36fc146ca79b8 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 1 Nov 2024 00:26:26 +0100
Subject: [PATCH 06/37] pubspec.yaml missing new line at the end of file

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index a3feaa8..41600ee 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.9.0
+version: 4.10.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

From 141f36e93f97ad137106915a52e64ff3965f67d7 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 1 Nov 2024 11:45:51 +0100
Subject: [PATCH 07/37] Improvements for generating jwt token

---
 lib/src/api/api_server.dart     | 22 ++++++++++++++++++++--
 lib/src/api/jwt_middleware.dart |  4 ++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 77829fb..77f7a65 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:injector/injector.dart';
 import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/api/jwt_middleware.dart';
+import 'package:running_on_dart/src/api/utils.dart';
 import 'package:running_on_dart/src/modules/bot_start_duration.dart';
 
 import 'package:shelf_cors_headers/shelf_cors_headers.dart';
@@ -28,7 +29,7 @@ class WebServer {
     final requestBody = jsonDecode(await request.readAsString()) as Map<String, dynamic>;
     final authCode = requestBody['code'];
 
-    await http.post(Uri.https('discord.com', '/api/oauth2/token'), body: {
+    final response = await http.post(Uri.https('discord.com', '/api/oauth2/token'), body: {
       'client_id': clientId,
       'client_secret': clientSecret,
       'redirect_uri': clientRedirectUri,
@@ -38,7 +39,24 @@ class WebServer {
       'Content-Type': 'application/x-www-form-urlencoded',
     });
 
-    final jwtToken = generateJwtKey('test');
+    if (response.statusCode != 200) {
+      return createJsonErrorResponse(400, "Cannot login through discord. Try again");
+    }
+
+    final responseBody = jsonDecode(response.body) as Map<String, dynamic>;
+    final accessToken = responseBody['access_token'];
+
+    final authorizedUserResponse = await http.get(Uri.https('discord.com', '/api/oauth2/@me'),
+        headers: {"Accept": 'application/json', 'Authorization': 'Bearer $accessToken'});
+
+    if (authorizedUserResponse.statusCode != 200) {
+      return createJsonErrorResponse(400, "Cannot fetch user data from discord!");
+    }
+
+    final authorizedUserResponseBody = jsonDecode(authorizedUserResponse.body) as Map<String, dynamic>;
+
+    final jwtToken = generateJwtKey(authorizedUserResponseBody['user']['id'],
+        authorizedUserResponseBody['user']['global_name'] ?? authorizedUserResponseBody['user']['username']);
 
     return shelf.Response.ok(jsonEncode({'token': jwtToken}));
   }
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index b2bd375..1436e4f 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -7,8 +7,8 @@ final jwtKey = getEnv("JWT_SECRET");
 
 class MissingPermissionsException implements Exception {}
 
-String generateJwtKey(String subject) {
-  final jwtClaim = JwtClaim(subject: subject, maxAge: Duration(days: 1));
+String generateJwtKey(String discordUserId, String userName) {
+  final jwtClaim = JwtClaim(subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName});
 
   return issueJwtHS256(jwtClaim, jwtKey);
 }

From 02f647dcaf97ef296ca34069893cf79431d4ac1c Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 1 Nov 2024 20:12:22 +0100
Subject: [PATCH 08/37] Bot info collection improvements

---
 lib/src/api/api_server.dart     |  7 ++-
 lib/src/api/jwt_middleware.dart |  7 +--
 lib/src/api/utils.dart          |  4 ++
 lib/src/commands/info.dart      | 64 +++++++----------------
 lib/src/init.dart               |  4 +-
 lib/src/modules/tag.dart        |  1 +
 lib/src/services/bot_info.dart  | 92 +++++++++++++++++++++++++++++++++
 7 files changed, 125 insertions(+), 54 deletions(-)
 create mode 100644 lib/src/services/bot_info.dart

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 77f7a65..18bada5 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -4,7 +4,7 @@ import 'package:injector/injector.dart';
 import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/api/jwt_middleware.dart';
 import 'package:running_on_dart/src/api/utils.dart';
-import 'package:running_on_dart/src/modules/bot_start_duration.dart';
+import 'package:running_on_dart/src/services/bot_info.dart';
 
 import 'package:shelf_cors_headers/shelf_cors_headers.dart';
 import 'package:shelf_router/shelf_router.dart' as shelf_router;
@@ -19,10 +19,9 @@ final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
 
 class WebServer {
   Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
-    final botStartDuration = Injector.appInstance.get<BotStartDuration>();
+    final botInfo = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
 
-    return shelf.Response.ok(jsonEncode({"ok": true, 'uptime': botStartDuration.startDate.toIso8601String()}),
-        headers: {'Content-Type': 'application/json'});
+    return createOkResponse(botInfo.toJson());
   }
 
   Future<shelf.Response> _handleLogin(shelf.Request request) async {
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index 1436e4f..31d4d00 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -7,14 +7,15 @@ final jwtKey = getEnv("JWT_SECRET");
 
 class MissingPermissionsException implements Exception {}
 
-String generateJwtKey(String discordUserId, String userName) {
-  final jwtClaim = JwtClaim(subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName});
+String generateJwtKey(String discordUserId, String userName, {List<String> requiredPermissions = const []}) {
+  final jwtClaim = JwtClaim(
+      subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName, 'perms': requiredPermissions});
 
   return issueJwtHS256(jwtClaim, jwtKey);
 }
 
 void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
-  final permissions = jwt.payload['permissions'] as List<String>? ?? <String>[];
+  final permissions = jwt.payload['perms'] as List<String>? ?? <String>[];
 
   final valid = Set.of(permissions).containsAll(requiredPermissions);
   if (!valid) {
diff --git a/lib/src/api/utils.dart b/lib/src/api/utils.dart
index 7a8e3c6..9ca35e8 100644
--- a/lib/src/api/utils.dart
+++ b/lib/src/api/utils.dart
@@ -7,6 +7,10 @@ shelf.Response createJsonErrorResponse(int errorCode, String errorMessage) {
       body: jsonEncode({"message": errorMessage}), headers: {"Content-Type": 'application/json'});
 }
 
+shelf.Response createOkResponse(Object? body) {
+  return shelf.Response.ok(jsonEncode(body), headers: {"Content-Type": 'application/json'});
+}
+
 shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErrorResponse(400, errorMessage);
 
 shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
diff --git a/lib/src/commands/info.dart b/lib/src/commands/info.dart
index 7369b19..36c0cba 100644
--- a/lib/src/commands/info.dart
+++ b/lib/src/commands/info.dart
@@ -2,71 +2,43 @@ import 'package:injector/injector.dart';
 import 'package:nyxx/nyxx.dart';
 import 'package:nyxx_commands/nyxx_commands.dart';
 import 'package:nyxx_extensions/nyxx_extensions.dart';
-import 'package:running_on_dart/src/modules/bot_start_duration.dart';
-import 'package:running_on_dart/src/modules/docs.dart';
-import 'package:running_on_dart/src/modules/reminder.dart';
-import 'package:running_on_dart/src/modules/tag.dart';
-import 'package:running_on_dart/src/settings.dart';
+import 'package:running_on_dart/src/services/bot_info.dart';
 import 'package:running_on_dart/src/util/util.dart';
 
 final info = ChatCommand(
   'info',
   'Get info about the bot',
   id('info', (ChatContext context) async {
-    final color = getRandomColor();
     final currentUser = await context.client.user.get();
+    final botInfo = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
 
-    final startDate = Injector.appInstance.get<BotStartDuration>().startDate;
     final startDateStr =
-        "${startDate.format(TimestampStyle.longDateTime)} (${startDate.format(TimestampStyle.relativeTime)})";
-
-    final docsUpdatedDate = Injector.appInstance.get<DocsModule>().lastUpdate;
-    final docsUpdateStr = docsUpdatedDate != null
-        ? "${docsUpdatedDate.format(TimestampStyle.longDateTime)} (${docsUpdatedDate.format(TimestampStyle.relativeTime)})"
+        "${botInfo.uptime.format(TimestampStyle.longDateTime)} (${botInfo.uptime.format(TimestampStyle.relativeTime)})";
+    final docsUpdateStr = botInfo.docsUpdate != null
+        ? "${botInfo.docsUpdate!.format(TimestampStyle.longDateTime)} (${botInfo.docsUpdate!.format(TimestampStyle.relativeTime)})"
         : "Never";
 
     final embed = EmbedBuilder(
-      color: color,
+      color: getRandomColor(),
       author: EmbedAuthorBuilder(
         name: currentUser.username,
         iconUrl: currentUser.avatar.url,
         url: Uri.parse(ApiOptions.nyxxRepositoryUrl),
       ),
       footer: EmbedFooterBuilder(
-          text: 'nyxx ${ApiOptions.nyxxVersion}'
-              ' | ROD $version'
-              ' | Dart SDK ${getDartPlatform()}'),
+          text: 'nyxx ${botInfo.nyxxVersion}'
+              ' | ROD ${botInfo.version}'
+              ' | Dart SDK ${botInfo.dartPlatform}'),
       fields: [
-        EmbedFieldBuilder(name: 'Cached guilds', value: context.client.guilds.cache.length.toString(), isInline: true),
-        EmbedFieldBuilder(name: 'Cached users', value: context.client.users.cache.length.toString(), isInline: true),
-        EmbedFieldBuilder(
-            name: 'Cached channels', value: context.client.channels.cache.length.toString(), isInline: true),
-        EmbedFieldBuilder(
-            name: 'Cached voice states',
-            value: context.client.guilds.cache.values
-                .map((g) => g.voiceStates.length)
-                .fold<num>(0, (value, element) => value + element)
-                .toString(),
-            isInline: true),
-        EmbedFieldBuilder(name: 'Shard count', value: context.client.gateway.shards.length.toString(), isInline: true),
-        EmbedFieldBuilder(
-            name: 'Cached messages',
-            value: context.client.channels.cache.values
-                .whereType<TextChannel>()
-                .map((c) => c.messages.cache.length)
-                .fold<num>(0, (value, element) => value + element)
-                .toString(),
-            isInline: true),
-        EmbedFieldBuilder(name: 'Memory usage (current/RSS)', value: getCurrentMemoryString(), isInline: true),
-        EmbedFieldBuilder(
-            name: 'Tags in guild',
-            value:
-                Injector.appInstance.get<TagModule>().countCachedTags(context.guild?.id ?? context.user.id).toString(),
-            isInline: true),
-        EmbedFieldBuilder(
-            name: 'Current reminders',
-            value: Injector.appInstance.get<ReminderModule>().reminders.length.toString(),
-            isInline: true),
+        EmbedFieldBuilder(name: 'Cached guilds', value: botInfo.cachedGuilds.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Cached users', value: botInfo.cachedUsers.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Cached channels', value: botInfo.cachedChannels.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Cached voice states', value: botInfo.cachedVoiceStates.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Shard count', value: botInfo.shardCount.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Cached messages', value: botInfo.cachedMessages.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Memory usage (current/RSS)', value: botInfo.memoryUserString, isInline: true),
+        EmbedFieldBuilder(name: 'Tags in guild', value: botInfo.totalTagsCount.toString(), isInline: true),
+        EmbedFieldBuilder(name: 'Current reminders', value: botInfo.totalRemainderCount.toString(), isInline: true),
         EmbedFieldBuilder(name: 'Uptime', value: startDateStr, isInline: false),
         EmbedFieldBuilder(name: 'Docs Update', value: docsUpdateStr, isInline: false),
       ],
diff --git a/lib/src/init.dart b/lib/src/init.dart
index 485ffe1..0a9ac16 100644
--- a/lib/src/init.dart
+++ b/lib/src/init.dart
@@ -16,6 +16,7 @@ import 'package:running_on_dart/src/repository/jellyfin_config.dart';
 import 'package:running_on_dart/src/repository/kavita.dart';
 import 'package:running_on_dart/src/repository/reminder.dart';
 import 'package:running_on_dart/src/repository/tag.dart';
+import 'package:running_on_dart/src/services/bot_info.dart';
 import 'package:running_on_dart/src/services/db.dart';
 import 'package:running_on_dart/src/modules/feature_settings.dart';
 
@@ -39,7 +40,8 @@ Future<void> setupContainer(NyxxGateway client) async {
     ..registerSingleton(() => JellyfinModuleV2())
     ..registerSingleton(() => MentionsMonitoringModule())
     ..registerSingleton(() => KavitaModule())
-    ..registerSingleton(() => EmojiReactModule());
+    ..registerSingleton(() => EmojiReactModule())
+    ..registerSingleton(() => BotInfoService());
 
   await Injector.appInstance.get<DatabaseService>().init();
   await Injector.appInstance.get<FeatureSettingsModule>().init();
diff --git a/lib/src/modules/tag.dart b/lib/src/modules/tag.dart
index 98daf64..b9f89ab 100644
--- a/lib/src/modules/tag.dart
+++ b/lib/src/modules/tag.dart
@@ -38,6 +38,7 @@ class TagModule implements RequiresInitialization {
   }
 
   int countCachedTags(Snowflake targetId) => tags.where((tag) => tag.guildId == targetId).length;
+  int countTags() => tags.length;
 
   /// Get all the enabled tags in a guild.
   Iterable<Tag> getGuildTags(Snowflake guildId) => tags.where((tag) => tag.guildId == guildId && tag.enabled);
diff --git a/lib/src/services/bot_info.dart b/lib/src/services/bot_info.dart
new file mode 100644
index 0000000..354041b
--- /dev/null
+++ b/lib/src/services/bot_info.dart
@@ -0,0 +1,92 @@
+import 'package:injector/injector.dart';
+import 'package:nyxx/nyxx.dart';
+import 'package:running_on_dart/running_on_dart.dart';
+import 'package:running_on_dart/src/modules/bot_start_duration.dart';
+
+import 'package:running_on_dart/src/settings.dart' as settings;
+import 'package:running_on_dart/src/util/util.dart';
+
+class BotInfo {
+  String get nyxxVersion => ApiOptions.nyxxVersion;
+  String get version => settings.version;
+  String get dartPlatform => getDartPlatform();
+  String get memoryUserString => getCurrentMemoryString();
+
+  final int cachedGuilds;
+  final int cachedUsers;
+  final int cachedChannels;
+  final int cachedVoiceStates;
+  final int shardCount;
+  final int cachedMessages;
+  final int totalTagsCount;
+  final int totalRemainderCount;
+  final DateTime uptime;
+  final DateTime? docsUpdate;
+
+  BotInfo(
+      {required this.cachedGuilds,
+      required this.cachedUsers,
+      required this.cachedChannels,
+      required this.cachedVoiceStates,
+      required this.shardCount,
+      required this.cachedMessages,
+      required this.totalTagsCount,
+      required this.totalRemainderCount,
+      required this.uptime,
+      required this.docsUpdate});
+
+  Map<String, dynamic> toJson() => {
+        'nyxx_version': nyxxVersion,
+        'version': version,
+        'platform': dartPlatform,
+        'memory_usage_string': memoryUserString,
+        'cached_guilds': cachedGuilds,
+        'cached_users': cachedUsers,
+        'cached_voice_states': cachedVoiceStates,
+        'shard_count': shardCount,
+        'total_tags_count': totalTagsCount,
+        'total_reminder_count': totalRemainderCount,
+        'uptime': uptime.toIso8601String(),
+        'docs_update': docsUpdate?.toIso8601String(),
+      };
+}
+
+class BotInfoService {
+  final NyxxGateway client = Injector.appInstance.get();
+  final TagModule tagModule = Injector.appInstance.get();
+  final ReminderModule reminderModule = Injector.appInstance.get();
+  final BotStartDuration startDurationModule = Injector.appInstance.get();
+  final DocsModule docsModule = Injector.appInstance.get();
+
+  Future<BotInfo> getCurrentBotInfo() async {
+    final cachedGuilds = client.guilds.cache.length;
+    final cachedUsers = client.users.cache.length;
+    final cachedChannels = client.channels.cache.length;
+    final cachedVoiceStates = client.guilds.cache.values
+        .map((g) => g.voiceStates.length)
+        .fold<num>(0, (value, element) => value + element)
+        .ceil();
+    final shardCount = client.gateway.shards.length;
+    final cachedMessages = client.channels.cache.values
+        .whereType<TextChannel>()
+        .map((c) => c.messages.cache.length)
+        .fold<num>(0, (value, element) => value + element)
+        .ceil();
+    final totalTags = tagModule.countTags();
+    final totalReminders = reminderModule.reminders.length;
+    final botStartDateTime = startDurationModule.startDate;
+    final docsUpdateDateTime = docsModule.lastUpdate;
+
+    return BotInfo(
+        cachedGuilds: cachedGuilds,
+        cachedUsers: cachedUsers,
+        cachedChannels: cachedChannels,
+        cachedVoiceStates: cachedVoiceStates,
+        shardCount: shardCount,
+        cachedMessages: cachedMessages,
+        totalTagsCount: totalTags,
+        totalRemainderCount: totalReminders,
+        uptime: botStartDateTime,
+        docsUpdate: docsUpdateDateTime);
+  }
+}

From a649cca8442d80afc9b517a6fcfdad1ec0183073 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 2 Nov 2024 03:36:24 +0100
Subject: [PATCH 09/37] Fix missing public bot info fields

---
 lib/src/services/bot_info.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/services/bot_info.dart b/lib/src/services/bot_info.dart
index 354041b..6341186 100644
--- a/lib/src/services/bot_info.dart
+++ b/lib/src/services/bot_info.dart
@@ -40,6 +40,8 @@ class BotInfo {
         'version': version,
         'platform': dartPlatform,
         'memory_usage_string': memoryUserString,
+        'cached_channels': cachedChannels,
+        'cached_messages': cachedMessages,
         'cached_guilds': cachedGuilds,
         'cached_users': cachedUsers,
         'cached_voice_states': cachedVoiceStates,

From 0a887fa24a962da648cc6a0613b358ad1ee9d619 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 2 Nov 2024 04:18:22 +0100
Subject: [PATCH 10/37] Improve handling of endpoint permissions

---
 lib/src/api/api_server.dart     | 29 +++++++++++++++++++++++++----
 lib/src/api/jwt_middleware.dart |  9 ++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 18bada5..2263411 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:injector/injector.dart';
+import 'package:nyxx/nyxx.dart';
 import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/api/jwt_middleware.dart';
 import 'package:running_on_dart/src/api/utils.dart';
@@ -17,6 +18,14 @@ final clientId = getEnv('DISCORD_CLIENT_ID');
 final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
 final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
 
+enum WebApiPermission {
+  guilds('G');
+
+  final String name;
+
+  const WebApiPermission(this.name);
+}
+
 class WebServer {
   Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
     final botInfo = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
@@ -24,6 +33,18 @@ class WebServer {
     return createOkResponse(botInfo.toJson());
   }
 
+  Future<shelf.Response> _handleGuildInfo(shelf.Request request) async {
+    final outputJson = Injector.appInstance.get<NyxxGateway>().guilds.cache.values.map((guild) {
+      return <String, dynamic>{
+        "id": guild.id.toString(),
+        "name": guild.name,
+        "cached_members": guild.members.cache.length,
+      };
+    });
+
+    return createOkResponse(outputJson.toList());
+  }
+
   Future<shelf.Response> _handleLogin(shelf.Request request) async {
     final requestBody = jsonDecode(await request.readAsString()) as Map<String, dynamic>;
     final authCode = requestBody['code'];
@@ -63,12 +84,12 @@ class WebServer {
   Future<shelf_router.Router> _setupRouter() async {
     return shelf_router.Router()
       ..get("/api/info", _handleBotInfo)
-      ..post("/api/login", _handleLogin);
-    // ..get("/api/test", _authorized(_handleBotInfo));
+      ..post("/api/login", _handleLogin)
+      ..get("/api/guilds", _authorized(_handleGuildInfo, [WebApiPermission.guilds]));
   }
 
-  shelf.Handler _authorized(shelf.Handler inner) =>
-      const shelf.Pipeline().addMiddleware(jwtMiddleware()).addHandler(inner);
+  shelf.Handler _authorized(shelf.Handler inner, [List<WebApiPermission> requiredRoles = const []]) =>
+      shelf.Pipeline().addMiddleware(jwtMiddleware(requiredRoles.map((e) => e.name).toList())).addHandler(inner);
 
   Future<void> startServer() async {
     final router = await _setupRouter();
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
index 31d4d00..9167f0f 100644
--- a/lib/src/api/jwt_middleware.dart
+++ b/lib/src/api/jwt_middleware.dart
@@ -7,16 +7,15 @@ final jwtKey = getEnv("JWT_SECRET");
 
 class MissingPermissionsException implements Exception {}
 
-String generateJwtKey(String discordUserId, String userName, {List<String> requiredPermissions = const []}) {
-  final jwtClaim = JwtClaim(
-      subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName, 'perms': requiredPermissions});
+String generateJwtKey(String discordUserId, String userName, {List<String> perms = const []}) {
+  final jwtClaim =
+      JwtClaim(subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName, 'perms': perms});
 
   return issueJwtHS256(jwtClaim, jwtKey);
 }
 
 void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
-  final permissions = jwt.payload['perms'] as List<String>? ?? <String>[];
-
+  final permissions = (jwt.payload['perms'] as List<dynamic>? ?? []).cast<String>();
   final valid = Set.of(permissions).containsAll(requiredPermissions);
   if (!valid) {
     throw MissingPermissionsException();

From 5044d9762af53f4f9c2377c46374f773d9855709 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 2 Nov 2024 14:06:40 +0100
Subject: [PATCH 11/37] Send user data with token

---
 lib/src/api/api_server.dart | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 2263411..0cc75bd 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -75,10 +75,18 @@ class WebServer {
 
     final authorizedUserResponseBody = jsonDecode(authorizedUserResponse.body) as Map<String, dynamic>;
 
-    final jwtToken = generateJwtKey(authorizedUserResponseBody['user']['id'],
-        authorizedUserResponseBody['user']['global_name'] ?? authorizedUserResponseBody['user']['username']);
-
-    return shelf.Response.ok(jsonEncode({'token': jwtToken}));
+    final userName =
+        authorizedUserResponseBody['user']['global_name'] ?? authorizedUserResponseBody['user']['username'];
+    final jwtToken = generateJwtKey(authorizedUserResponseBody['user']['id'], userName);
+
+    return createOkResponse({
+      'token': jwtToken,
+      'user': {
+        'id': authorizedUserResponseBody['user']['id'],
+        'name': userName,
+        'avatar_hash': authorizedUserResponseBody['user']['avatar'],
+      },
+    });
   }
 
   Future<shelf_router.Router> _setupRouter() async {

From 84f536521ef0eee549a4b918881f1201ad302a92 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sun, 3 Nov 2024 00:51:51 +0100
Subject: [PATCH 12/37] Extend guild data

---
 lib/src/api/api_server.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index 0cc75bd..e6a3cf3 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -37,8 +37,11 @@ class WebServer {
     final outputJson = Injector.appInstance.get<NyxxGateway>().guilds.cache.values.map((guild) {
       return <String, dynamic>{
         "id": guild.id.toString(),
+        "icon_hash": guild.iconHash,
+        "banner_hash": guild.bannerHash,
         "name": guild.name,
         "cached_members": guild.members.cache.length,
+        "cached_roles": guild.roles.cache.length,
       };
     });
 

From 201d2a4df42b96aceb859aabfde299719002127d Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Mon, 18 Nov 2024 15:39:11 +0100
Subject: [PATCH 13/37] Initial commit

---
 lib/src/api/api_server.dart     | 107 +++++-----------
 lib/src/api/jwt_middleware.dart |  47 -------
 lib/src/services/bot_info.dart  |   4 +-
 pubspec.lock                    | 210 +++++++++++++++++++++++++++-----
 pubspec.yaml                    |   4 +-
 templates/index.html            |  10 ++
 6 files changed, 227 insertions(+), 155 deletions(-)
 delete mode 100644 lib/src/api/jwt_middleware.dart
 create mode 100644 templates/index.html

diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
index e6a3cf3..007fdc9 100644
--- a/lib/src/api/api_server.dart
+++ b/lib/src/api/api_server.dart
@@ -1,31 +1,20 @@
-import 'dart:convert';
+import 'dart:io';
 
 import 'package:injector/injector.dart';
-import 'package:nyxx/nyxx.dart';
+import 'package:mustachex/mustachex.dart';
 import 'package:running_on_dart/running_on_dart.dart';
-import 'package:running_on_dart/src/api/jwt_middleware.dart';
 import 'package:running_on_dart/src/api/utils.dart';
 import 'package:running_on_dart/src/services/bot_info.dart';
-
 import 'package:shelf_cors_headers/shelf_cors_headers.dart';
+
 import 'package:shelf_router/shelf_router.dart' as shelf_router;
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf_io;
 
-import 'package:http/http.dart' as http;
-
 final clientId = getEnv('DISCORD_CLIENT_ID');
 final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
 final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
 
-enum WebApiPermission {
-  guilds('G');
-
-  final String name;
-
-  const WebApiPermission(this.name);
-}
-
 class WebServer {
   Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
     final botInfo = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
@@ -33,74 +22,40 @@ class WebServer {
     return createOkResponse(botInfo.toJson());
   }
 
-  Future<shelf.Response> _handleGuildInfo(shelf.Request request) async {
-    final outputJson = Injector.appInstance.get<NyxxGateway>().guilds.cache.values.map((guild) {
-      return <String, dynamic>{
-        "id": guild.id.toString(),
-        "icon_hash": guild.iconHash,
-        "banner_hash": guild.bannerHash,
-        "name": guild.name,
-        "cached_members": guild.members.cache.length,
-        "cached_roles": guild.roles.cache.length,
-      };
-    });
-
-    return createOkResponse(outputJson.toList());
-  }
-
-  Future<shelf.Response> _handleLogin(shelf.Request request) async {
-    final requestBody = jsonDecode(await request.readAsString()) as Map<String, dynamic>;
-    final authCode = requestBody['code'];
+  // Future<shelf.Response> _handleGuildInfo(shelf.Request request) async {
+  //   final outputJson = Injector.appInstance.get<NyxxGateway>().guilds.cache.values.map((guild) {
+  //     return <String, dynamic>{
+  //       "id": guild.id.toString(),
+  //       "icon_hash": guild.iconHash,
+  //       "banner_hash": guild.bannerHash,
+  //       "name": guild.name,
+  //       "cached_members": guild.members.cache.length,
+  //       "cached_roles": guild.roles.cache.length,
+  //     };
+  //   });
+  //
+  //   return createOkResponse(outputJson.toList());
+  // }
 
-    final response = await http.post(Uri.https('discord.com', '/api/oauth2/token'), body: {
-      'client_id': clientId,
-      'client_secret': clientSecret,
-      'redirect_uri': clientRedirectUri,
-      'grant_type': 'authorization_code',
-      'code': authCode,
-    }, headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    });
-
-    if (response.statusCode != 200) {
-      return createJsonErrorResponse(400, "Cannot login through discord. Try again");
-    }
-
-    final responseBody = jsonDecode(response.body) as Map<String, dynamic>;
-    final accessToken = responseBody['access_token'];
-
-    final authorizedUserResponse = await http.get(Uri.https('discord.com', '/api/oauth2/@me'),
-        headers: {"Accept": 'application/json', 'Authorization': 'Bearer $accessToken'});
-
-    if (authorizedUserResponse.statusCode != 200) {
-      return createJsonErrorResponse(400, "Cannot fetch user data from discord!");
-    }
-
-    final authorizedUserResponseBody = jsonDecode(authorizedUserResponse.body) as Map<String, dynamic>;
+  Future<shelf_router.Router> _setupRouter() async {
+    return shelf_router.Router()
+        ..get("/", (shelf.Request request) async {
+          final data = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
 
-    final userName =
-        authorizedUserResponseBody['user']['global_name'] ?? authorizedUserResponseBody['user']['username'];
-    final jwtToken = generateJwtKey(authorizedUserResponseBody['user']['id'], userName);
+          var processor = MustachexProcessor(initialVariables: data.toJson());
 
-    return createOkResponse({
-      'token': jwtToken,
-      'user': {
-        'id': authorizedUserResponseBody['user']['id'],
-        'name': userName,
-        'avatar_hash': authorizedUserResponseBody['user']['avatar'],
-      },
-    });
-  }
+          final templateData = await File("templates/index.html").readAsString();
+          final rendered = await processor.process(templateData);
 
-  Future<shelf_router.Router> _setupRouter() async {
-    return shelf_router.Router()
-      ..get("/api/info", _handleBotInfo)
-      ..post("/api/login", _handleLogin)
-      ..get("/api/guilds", _authorized(_handleGuildInfo, [WebApiPermission.guilds]));
+          return shelf.Response.ok(rendered, headers: {"Content-Type": 'text/html'});
+        });
+      // ..get("/api/info", _handleBotInfo);
+      // ..post("/api/login", _handleLogin)
+      // ..get("/api/guilds", _authorized(_handleGuildInfo, [WebApiPermission.guilds]));
   }
 
-  shelf.Handler _authorized(shelf.Handler inner, [List<WebApiPermission> requiredRoles = const []]) =>
-      shelf.Pipeline().addMiddleware(jwtMiddleware(requiredRoles.map((e) => e.name).toList())).addHandler(inner);
+  shelf.Handler _authorized(shelf.Handler inner) =>
+      shelf.Pipeline()/*.addMiddleware()*/.addHandler(inner);
 
   Future<void> startServer() async {
     final router = await _setupRouter();
diff --git a/lib/src/api/jwt_middleware.dart b/lib/src/api/jwt_middleware.dart
deleted file mode 100644
index 9167f0f..0000000
--- a/lib/src/api/jwt_middleware.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'package:jaguar_jwt/jaguar_jwt.dart';
-import 'package:running_on_dart/running_on_dart.dart';
-import 'package:running_on_dart/src/api/utils.dart';
-import 'package:shelf/shelf.dart' as shelf;
-
-final jwtKey = getEnv("JWT_SECRET");
-
-class MissingPermissionsException implements Exception {}
-
-String generateJwtKey(String discordUserId, String userName, {List<String> perms = const []}) {
-  final jwtClaim =
-      JwtClaim(subject: discordUserId, maxAge: Duration(days: 1), payload: {"name": userName, 'perms': perms});
-
-  return issueJwtHS256(jwtClaim, jwtKey);
-}
-
-void validateClaims(JwtClaim jwt, List<String> requiredPermissions) {
-  final permissions = (jwt.payload['perms'] as List<dynamic>? ?? []).cast<String>();
-  final valid = Set.of(permissions).containsAll(requiredPermissions);
-  if (!valid) {
-    throw MissingPermissionsException();
-  }
-}
-
-shelf.Middleware jwtMiddleware([List<String> requiredPermissions = const []]) => (shelf.Handler handler) {
-      return (shelf.Request request) {
-        final authHeader = request.headers['Authorization'];
-
-        if (authHeader == null) {
-          return createUnauthorizedResponse('Missing authorization header');
-        }
-
-        try {
-          final jwt = verifyJwtHS256Signature(authHeader.replaceFirst('Bearer ', ''), jwtKey);
-
-          if (requiredPermissions.isNotEmpty) {
-            validateClaims(jwt, requiredPermissions);
-          }
-        } on JwtException catch (e) {
-          return createUnauthorizedResponse(e.message);
-        } on MissingPermissionsException {
-          return createForbiddenResponse();
-        }
-
-        return handler(request);
-      };
-    };
diff --git a/lib/src/services/bot_info.dart b/lib/src/services/bot_info.dart
index 6341186..1950f13 100644
--- a/lib/src/services/bot_info.dart
+++ b/lib/src/services/bot_info.dart
@@ -1,7 +1,9 @@
 import 'package:injector/injector.dart';
 import 'package:nyxx/nyxx.dart';
-import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/modules/bot_start_duration.dart';
+import 'package:running_on_dart/src/modules/docs.dart';
+import 'package:running_on_dart/src/modules/reminder.dart';
+import 'package:running_on_dart/src/modules/tag.dart';
 
 import 'package:running_on_dart/src/settings.dart' as settings;
 import 'package:running_on_dart/src/util/util.dart';
diff --git a/pubspec.lock b/pubspec.lock
index b7b4b6e..4fa7999 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -33,14 +33,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.12.0"
-  auth_header:
-    dependency: transitive
-    description:
-      name: auth_header
-      sha256: "0a3938128b6124530de93ce1a20ccb58639195fe7952f638248ea1bc0e5408eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -93,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: "direct main"
     description:
@@ -113,6 +105,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.0"
   crypto:
     dependency: transitive
     description:
@@ -169,6 +169,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
   fuzzy:
     dependency: "direct main"
     description:
@@ -209,6 +217,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -237,18 +253,26 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
-  jaguar_jwt:
-    dependency: "direct main"
+    version: "0.20.0"
+  io:
+    dependency: transitive
     description:
-      name: jaguar_jwt
-      sha256: c3ab24be5ba5f736f93eacfc94c4381bd93551a351ab5687e70c8d71a9916e8d
+      name: io
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "1.0.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.1"
   lints:
     dependency: "direct dev"
     description:
@@ -269,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
   meta:
     dependency: transitive
     description:
@@ -286,18 +310,50 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: a31aaa35c975e8a6d17554d0241c11c297b7afb6
+      resolved-ref: "82104b2934f7fa13a88e2cd596d4b4df932e6cd6"
       url: "https://github.com/nyxx-discord/migent.git"
     source: git
-    version: "1.1.0"
+    version: "1.2.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  mustache_recase:
+    dependency: transitive
+    description:
+      name: mustache_recase
+      sha256: "63a339ebdc67305444e465519df27cbc5beb59fb69f7fe43c0f16c2b376a5d43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  mustachex:
+    dependency: "direct main"
+    description:
+      name: mustachex
+      sha256: "6a9ea0861f3d8eb0db0862ee0dd3f1c6e4f623bb9fa47d13485c10f2fc946ca3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   nyxx:
     dependency: "direct main"
     description:
       name: nyxx
-      sha256: "073c4f3a49269b4580c54aef32a472b3eae0e6f0e125eb1be2eeb5976210e886"
+      sha256: "3ee891f4098c0dd7b992dafc2b4e961b82bd076b3149a15408efda1e11c7c5aa"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.5.2"
   nyxx_commands:
     dependency: "direct main"
     description:
@@ -310,10 +366,10 @@ packages:
     dependency: "direct main"
     description:
       name: nyxx_extensions
-      sha256: "8016605fc131320bfb58362e5124a0fb1c23e51c26f1638098611fa8f93760aa"
+      sha256: f0b6dfc5ed2350c10f3018c7fc5fbaa7c01fbce6fee8b8fb14724f57cc0d67fe
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.2.1"
   oauth2:
     dependency: transitive
     description:
@@ -366,10 +422,10 @@ packages:
     dependency: "direct main"
     description:
       name: postgres
-      sha256: bc3a36f9960d822af1ac4c2e0a32c4e7a3e426d2ce4500c11afca40f53c34612
+      sha256: e9802d4c9d78e432c4d4e57be9a91d99cf1552d45f17b17792f8e595060376a2
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.0"
+    version: "3.4.3"
   pub_semver:
     dependency: transitive
     description:
@@ -386,6 +442,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.2"
+  recase:
+    dependency: transitive
+    description:
+      name: recase
+      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   retry:
     dependency: transitive
     description:
@@ -434,6 +498,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.5"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   shelf_router:
     dependency: "direct main"
     description:
@@ -442,6 +514,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.4"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -499,6 +603,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  test:
+    dependency: "direct dev"
+    description:
+      name: test
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
@@ -507,6 +619,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.3"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
   typed_data:
     dependency: transitive
     description:
@@ -523,6 +643,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.3.1"
   watcher:
     dependency: transitive
     description:
@@ -535,10 +663,34 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "0.5.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 41600ee..747a1f8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,8 +34,8 @@ dependencies:
   # api server
   shelf: ^1.4.2
   shelf_router: ^1.1.4
-  shelf_cors_headers: ^0.1.5
-  jaguar_jwt: ^3.0.0
+  shelf_cors_headers: ^0.1.0
+  mustachex: ^1.0.0
 
 dev_dependencies:
   lints: ^5.0.0
diff --git a/templates/index.html b/templates/index.html
new file mode 100644
index 0000000..8fc8d63
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Test</title>
+</head>
+<body>
+<p>Memory usage: {{memory_usage_string}}</p>
+</body>
+</html>

From 843e30e2ab7a36c2acfed2f803e23d07f66972ad Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Mon, 18 Nov 2024 20:08:55 +0100
Subject: [PATCH 14/37] Implement session support

---
 lib/running_on_dart.dart            |   2 +-
 lib/src/api/api_server.dart         |  68 -------------------
 lib/src/web_app/api_server.dart     | 100 ++++++++++++++++++++++++++++
 lib/src/{api => web_app}/utils.dart |   9 +++
 pubspec.lock                        |   8 +++
 pubspec.yaml                        |   1 +
 templates/index.html                |  26 +++++++-
 7 files changed, 144 insertions(+), 70 deletions(-)
 delete mode 100644 lib/src/api/api_server.dart
 create mode 100644 lib/src/web_app/api_server.dart
 rename lib/src/{api => web_app}/utils.dart (59%)

diff --git a/lib/running_on_dart.dart b/lib/running_on_dart.dart
index 080f796..25699cc 100644
--- a/lib/running_on_dart.dart
+++ b/lib/running_on_dart.dart
@@ -16,4 +16,4 @@ export 'src/converter.dart';
 export 'src/error_handler.dart';
 export 'src/init.dart';
 
-export 'src/api/api_server.dart' show WebServer;
+export 'src/web_app/api_server.dart' show WebServer;
diff --git a/lib/src/api/api_server.dart b/lib/src/api/api_server.dart
deleted file mode 100644
index 007fdc9..0000000
--- a/lib/src/api/api_server.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'dart:io';
-
-import 'package:injector/injector.dart';
-import 'package:mustachex/mustachex.dart';
-import 'package:running_on_dart/running_on_dart.dart';
-import 'package:running_on_dart/src/api/utils.dart';
-import 'package:running_on_dart/src/services/bot_info.dart';
-import 'package:shelf_cors_headers/shelf_cors_headers.dart';
-
-import 'package:shelf_router/shelf_router.dart' as shelf_router;
-import 'package:shelf/shelf.dart' as shelf;
-import 'package:shelf/shelf_io.dart' as shelf_io;
-
-final clientId = getEnv('DISCORD_CLIENT_ID');
-final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
-final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
-
-class WebServer {
-  Future<shelf.Response> _handleBotInfo(shelf.Request request) async {
-    final botInfo = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
-
-    return createOkResponse(botInfo.toJson());
-  }
-
-  // Future<shelf.Response> _handleGuildInfo(shelf.Request request) async {
-  //   final outputJson = Injector.appInstance.get<NyxxGateway>().guilds.cache.values.map((guild) {
-  //     return <String, dynamic>{
-  //       "id": guild.id.toString(),
-  //       "icon_hash": guild.iconHash,
-  //       "banner_hash": guild.bannerHash,
-  //       "name": guild.name,
-  //       "cached_members": guild.members.cache.length,
-  //       "cached_roles": guild.roles.cache.length,
-  //     };
-  //   });
-  //
-  //   return createOkResponse(outputJson.toList());
-  // }
-
-  Future<shelf_router.Router> _setupRouter() async {
-    return shelf_router.Router()
-        ..get("/", (shelf.Request request) async {
-          final data = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
-
-          var processor = MustachexProcessor(initialVariables: data.toJson());
-
-          final templateData = await File("templates/index.html").readAsString();
-          final rendered = await processor.process(templateData);
-
-          return shelf.Response.ok(rendered, headers: {"Content-Type": 'text/html'});
-        });
-      // ..get("/api/info", _handleBotInfo);
-      // ..post("/api/login", _handleLogin)
-      // ..get("/api/guilds", _authorized(_handleGuildInfo, [WebApiPermission.guilds]));
-  }
-
-  shelf.Handler _authorized(shelf.Handler inner) =>
-      shelf.Pipeline()/*.addMiddleware()*/.addHandler(inner);
-
-  Future<void> startServer() async {
-    final router = await _setupRouter();
-
-    final app =
-        const shelf.Pipeline().addMiddleware(shelf.logRequests()).addMiddleware(corsHeaders()).addHandler(router.call);
-
-    await shelf_io.serve(app, "0.0.0.0", 8088);
-  }
-}
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
new file mode 100644
index 0000000..41674a0
--- /dev/null
+++ b/lib/src/web_app/api_server.dart
@@ -0,0 +1,100 @@
+import 'dart:convert';
+
+import 'package:injector/injector.dart';
+
+import 'package:running_on_dart/running_on_dart.dart';
+import 'package:running_on_dart/src/web_app/utils.dart';
+import 'package:running_on_dart/src/services/bot_info.dart';
+import 'package:shelf_cors_headers/shelf_cors_headers.dart';
+
+import 'package:shelf_router/shelf_router.dart' as shelf_router;
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf/shelf_io.dart' as shelf_io;
+
+import 'package:http/http.dart' as http;
+import 'package:shelf_session/cookies_middleware.dart';
+import 'package:shelf_session/session_middleware.dart';
+
+final clientId = getEnv('DISCORD_CLIENT_ID');
+final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
+final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
+
+class WebServer {
+  Future<shelf.Response> _handleIndex(shelf.Request request) async {
+    final data = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
+
+    return createTwigResponse("index.html", parameters: {
+      ...data.toJson(),
+      'clientId': clientId,
+      'redirectUri': clientRedirectUri,
+      'user_data': Session.getSession(request)?.data['user_data'] ?? false,
+    });
+  }
+
+  Future<shelf.Response> _handleRedirect(shelf.Request request) async {
+    final authCode = request.url.queryParameters['code'];
+
+    final tokenResponse = await http.post(Uri.https('discord.com', '/api/oauth2/token'), body: {
+      'client_id': clientId,
+      'client_secret': clientSecret,
+      'redirect_uri': clientRedirectUri,
+      'grant_type': 'authorization_code',
+      'code': authCode,
+    }, headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    });
+
+    final tokenBodyJson = jsonDecode(tokenResponse.body);
+    final token = tokenBodyJson['access_token'];
+
+    print(tokenResponse.body);
+    print(tokenResponse.statusCode);
+
+    final userData = await http.get(Uri.https('discord.com', '/api/oauth2/@me'), headers: {
+      "Accept": "application/json",
+      "Authorization": "Bearer $token",
+    });
+
+    final userDataJson = jsonDecode(userData.body);
+    print(userData.body);
+    print(userData.statusCode);
+
+    var session = Session.getSession(request);
+    session ??= Session.createSession(request);
+    session.data['user_data'] = {
+      'id': userDataJson['user']['id'],
+      'name': userDataJson['user']['global_name'] ?? userDataJson['user']['username'],
+      'avatar': userDataJson['user']['avatar'],
+      'expires_at': userDataJson['expires'],
+      'token': token,
+    };
+    session.expires = DateTime.now().add(Duration(seconds: tokenBodyJson['expires_in']));
+
+    return shelf.Response.seeOther("/");
+  }
+
+  Future<shelf.Response> _handleLogOut(shelf.Request request) async {
+    Session.deleteSession(request);
+
+    return shelf.Response.seeOther("/");
+  }
+
+  Future<shelf_router.Router> _setupRouter() async {
+    return shelf_router.Router()
+      ..get("/", _sessionAware(_handleIndex))
+      ..get("/redirect", _sessionAware(_handleRedirect))
+      ..get("/logout", _sessionAware(_handleLogOut));
+  }
+
+  shelf.Handler _sessionAware(shelf.Handler inner) =>
+      shelf.Pipeline().addMiddleware(cookiesMiddleware()).addMiddleware(sessionMiddleware()).addHandler(inner);
+
+  Future<void> startServer() async {
+    final router = await _setupRouter();
+
+    final app =
+        const shelf.Pipeline().addMiddleware(shelf.logRequests()).addMiddleware(corsHeaders()).addHandler(router.call);
+
+    await shelf_io.serve(app, "0.0.0.0", 8088);
+  }
+}
diff --git a/lib/src/api/utils.dart b/lib/src/web_app/utils.dart
similarity index 59%
rename from lib/src/api/utils.dart
rename to lib/src/web_app/utils.dart
index 9ca35e8..bccb208 100644
--- a/lib/src/api/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -1,5 +1,7 @@
 import 'dart:convert';
+import 'dart:io';
 
+import 'package:mustachex/mustachex.dart';
 import 'package:shelf/shelf.dart' as shelf;
 
 shelf.Response createJsonErrorResponse(int errorCode, String errorMessage) {
@@ -11,6 +13,13 @@ shelf.Response createOkResponse(Object? body) {
   return shelf.Response.ok(jsonEncode(body), headers: {"Content-Type": 'application/json'});
 }
 
+Future<shelf.Response> createTwigResponse(String name, {Map<String, dynamic>? parameters}) async {
+  final processor = MustachexProcessor(initialVariables: parameters);
+  final templateData = await File("templates/$name").readAsString();
+
+  return shelf.Response.ok(await processor.process(templateData), headers: {"Content-Type": 'text/html'});
+}
+
 shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErrorResponse(400, errorMessage);
 
 shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
diff --git a/pubspec.lock b/pubspec.lock
index 4fa7999..7ee5071 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -514,6 +514,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.4"
+  shelf_session:
+    dependency: "direct main"
+    description:
+      name: shelf_session
+      sha256: "5c658d16ddac1ad364d047e9a22e1023fcb383f2f32d5b621feb57c6c3ca8748"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2"
   shelf_static:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 747a1f8..40e857d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,6 +35,7 @@ dependencies:
   shelf: ^1.4.2
   shelf_router: ^1.1.4
   shelf_cors_headers: ^0.1.0
+  shelf_session: ^0.1.2
   mustachex: ^1.0.0
 
 dev_dependencies:
diff --git a/templates/index.html b/templates/index.html
index 8fc8d63..b5f57df 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,8 +3,32 @@
 <head>
     <meta charset="UTF-8">
     <title>Test</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">
 </head>
 <body>
-<p>Memory usage: {{memory_usage_string}}</p>
+<nav class="navbar" role="navigation" aria-label="main navigation">
+    <div class="navbar-brand">
+        <a class="navbar-item" href="/">Running on Dart</a>
+    </div>
+
+    <div id="navbarBasicExample" class="navbar-menu">
+        <div class="navbar-start">
+            <a class="navbar-item" href="/guild">Guild</a>
+        </div>
+
+        <div class="navbar-end">
+            <div class="navbar-item">
+                <div class="buttons">
+                    <a class="button is-light" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
+                    {{#user_data}}
+                    <a class="button is-light" href="/logout">Log out</a>
+                    {{/user_data}}
+                </div>
+            </div>
+        </div>
+    </div>
+</nav>
+
+<p>Is logged in: {{user_data}}</p>
 </body>
 </html>

From cb6b0760a0339a9a977e033519cd28b6a9f4ccc6 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Mon, 18 Nov 2024 23:49:31 +0100
Subject: [PATCH 15/37] Refactor session handling; Implement main page
 statistics

---
 lib/src/web_app/api_server.dart | 23 ++-------
 lib/src/web_app/utils.dart      | 21 ++++++++
 templates/index.html            | 86 +++++++++++++++++++++++++++++++--
 3 files changed, 108 insertions(+), 22 deletions(-)

diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 41674a0..82a6c2f 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -27,7 +27,7 @@ class WebServer {
       ...data.toJson(),
       'clientId': clientId,
       'redirectUri': clientRedirectUri,
-      'user_data': Session.getSession(request)?.data['user_data'] ?? false,
+      'user_data': getUserDataFromSession(request) ?? false,
     });
   }
 
@@ -47,34 +47,19 @@ class WebServer {
     final tokenBodyJson = jsonDecode(tokenResponse.body);
     final token = tokenBodyJson['access_token'];
 
-    print(tokenResponse.body);
-    print(tokenResponse.statusCode);
-
     final userData = await http.get(Uri.https('discord.com', '/api/oauth2/@me'), headers: {
       "Accept": "application/json",
       "Authorization": "Bearer $token",
     });
-
     final userDataJson = jsonDecode(userData.body);
-    print(userData.body);
-    print(userData.statusCode);
-
-    var session = Session.getSession(request);
-    session ??= Session.createSession(request);
-    session.data['user_data'] = {
-      'id': userDataJson['user']['id'],
-      'name': userDataJson['user']['global_name'] ?? userDataJson['user']['username'],
-      'avatar': userDataJson['user']['avatar'],
-      'expires_at': userDataJson['expires'],
-      'token': token,
-    };
-    session.expires = DateTime.now().add(Duration(seconds: tokenBodyJson['expires_in']));
+
+    initSession(request, userDataJson, tokenBodyJson);
 
     return shelf.Response.seeOther("/");
   }
 
   Future<shelf.Response> _handleLogOut(shelf.Request request) async {
-    Session.deleteSession(request);
+    deleteSession(request);
 
     return shelf.Response.seeOther("/");
   }
diff --git a/lib/src/web_app/utils.dart b/lib/src/web_app/utils.dart
index bccb208..6fb0bb1 100644
--- a/lib/src/web_app/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:mustachex/mustachex.dart';
 import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf_session/session_middleware.dart';
 
 shelf.Response createJsonErrorResponse(int errorCode, String errorMessage) {
   return shelf.Response(errorCode,
@@ -23,3 +24,23 @@ Future<shelf.Response> createTwigResponse(String name, {Map<String, dynamic>? pa
 shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErrorResponse(400, errorMessage);
 
 shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
+
+void initSession(shelf.Request request, Map<String, dynamic> userDataJson, Map<String, dynamic> tokenDataJson) {
+  var session = Session.getSession(request);
+  session ??= Session.createSession(request);
+  session.data['user_data'] = {
+    'id': userDataJson['user']['id'],
+    'name': userDataJson['user']['global_name'] ?? userDataJson['user']['username'],
+    'avatar': userDataJson['user']['avatar'],
+    'expires_at': userDataJson['expires'],
+    'token': tokenDataJson['access_token'],
+  };
+  session.expires = DateTime.now().add(Duration(seconds: tokenDataJson['expires_in']));
+}
+
+void deleteSession(shelf.Request request) {
+  Session.deleteSession(request);
+}
+
+Map<String, dynamic>? getUserDataFromSession(shelf.Request request) =>
+    Session.getSession(request)?.data['user_data'] as Map<String, dynamic>?;
diff --git a/templates/index.html b/templates/index.html
index b5f57df..ad29661 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,20 +6,23 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">
 </head>
 <body>
-<nav class="navbar" role="navigation" aria-label="main navigation">
+<nav class="navbar is-primary" role="navigation" aria-label="main navigation">
     <div class="navbar-brand">
         <a class="navbar-item" href="/">Running on Dart</a>
     </div>
 
     <div id="navbarBasicExample" class="navbar-menu">
         <div class="navbar-start">
-            <a class="navbar-item" href="/guild">Guild</a>
+            <a class="navbar-item" href="/guilds">Guilds</a>
         </div>
 
         <div class="navbar-end">
             <div class="navbar-item">
                 <div class="buttons">
+                    {{^user_data}}
                     <a class="button is-light" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
+                    {{/user_data}}
+
                     {{#user_data}}
                     <a class="button is-light" href="/logout">Log out</a>
                     {{/user_data}}
@@ -29,6 +32,83 @@
     </div>
 </nav>
 
-<p>Is logged in: {{user_data}}</p>
+<div class="container block mt-4">
+    <div class="notification is-danger">
+        Experimental version
+    </div>
+</div>
+
+<div class="container block">
+    <h1 class="title">Cache Info</h1>
+    <div class="grid">
+        <div class="hero-body cell">
+            <p class="title">{{cached_channels}}</p>
+            <p class="subtitle">Cached channels</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{cached_messages}}</p>
+            <p class="subtitle">Cached messages</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{cached_guilds}}</p>
+            <p class="subtitle">Cached guilds</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{cached_users}}</p>
+            <p class="subtitle">Cached Users</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{cached_voice_states}}</p>
+            <p class="subtitle">Cached voice states</p>
+        </div>
+    </div>
+</div>
+
+<div class="container block">
+    <h1 class="title">Modules Info</h1>
+    <div class="grid">
+        <div class="hero-body cell">
+            <p class="title">{{total_tags_count}}</p>
+            <p class="subtitle">Total tags</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{total_reminder_count}}</p>
+            <p class="subtitle">Total reminders</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">n/a</p>
+            <!--        <p class="title">{{docs_update}}</p>-->
+            <p class="subtitle">Last docs update</p>
+        </div>
+    </div>
+</div>
+
+<div class="container block">
+    <h1 class="title">Program Info</h1>
+    <div class="grid">
+        <div class="hero-body cell">
+            <p class="title">{{nyxx_version}}</p>
+            <p class="subtitle">Nyxx Version</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{version}}</p>
+            <p class="subtitle">Bot Version</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{platform}}</p>
+            <p class="subtitle">Dart Version</p>
+        </div>
+        <div class="hero-body cell">
+            <p class="title">{{memory_usage_string}}</p>
+            <p class="subtitle">Memory usage</p>
+        </div>
+        <div class="hero-body cell is-col-start-1">
+            <p class="title">n/a</p>
+            <!--        <p class="title">{{uptime}}</p>-->
+            <p class="subtitle">Uptime</p>
+        </div>
+    </div>
+</div>
+
 </body>
 </html>

From f0dbaa5eabdbab7b5afb12cfa99da296ef789c85 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Wed, 20 Nov 2024 00:45:43 +0100
Subject: [PATCH 16/37] Display logged-in user avatar (doesn't really work now)

---
 Makefile                        |  3 +++
 lib/src/web_app/api_server.dart |  2 +-
 lib/src/web_app/utils.dart      | 21 +++++++++++++++++----
 templates/index.html            | 21 ++++++++++++++++-----
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index e7ae943..39d38b2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ tests: ## Run unit tests
 run: ## Run dev project
 	docker compose up --build
 
+upgrade: ## Run dart pub upgrade
+	dart pub upgrade
+
 fix-project: fix analyze format ## Fix whole project
 
 check-project: fix-project tests ## Run all checks
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 82a6c2f..37ae36e 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -27,7 +27,7 @@ class WebServer {
       ...data.toJson(),
       'clientId': clientId,
       'redirectUri': clientRedirectUri,
-      'user_data': getUserDataFromSession(request) ?? false,
+      ...getCustomDataFromSession(request),
     });
   }
 
diff --git a/lib/src/web_app/utils.dart b/lib/src/web_app/utils.dart
index 6fb0bb1..b9fe9f0 100644
--- a/lib/src/web_app/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -2,6 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:mustachex/mustachex.dart';
+import 'package:nyxx/nyxx.dart';
+import 'package:running_on_dart/running_on_dart.dart';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf_session/session_middleware.dart';
 
@@ -28,13 +30,18 @@ shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
 void initSession(shelf.Request request, Map<String, dynamic> userDataJson, Map<String, dynamic> tokenDataJson) {
   var session = Session.getSession(request);
   session ??= Session.createSession(request);
+
+  final userId = userDataJson['user']['id'] as String;
+
   session.data['user_data'] = {
-    'id': userDataJson['user']['id'],
+    'id': userId,
     'name': userDataJson['user']['global_name'] ?? userDataJson['user']['username'],
     'avatar': userDataJson['user']['avatar'],
-    'expires_at': userDataJson['expires'],
+    'expires_t': userDataJson['expires'],
     'token': tokenDataJson['access_token'],
   };
+  session.data['is_admin'] = adminIds.contains(Snowflake.parse(userId));
+
   session.expires = DateTime.now().add(Duration(seconds: tokenDataJson['expires_in']));
 }
 
@@ -42,5 +49,11 @@ void deleteSession(shelf.Request request) {
   Session.deleteSession(request);
 }
 
-Map<String, dynamic>? getUserDataFromSession(shelf.Request request) =>
-    Session.getSession(request)?.data['user_data'] as Map<String, dynamic>?;
+Map<String, dynamic> getCustomDataFromSession(shelf.Request request) {
+  final session = Session.getSession(request);
+
+  return {
+    'user_data': session?.data['user_data'] as Map<String, dynamic>? ?? false,
+    'is_admin': session?.data['is_admin'] ?? false,
+  };
+}
diff --git a/templates/index.html b/templates/index.html
index ad29661..5cfb8a1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,21 +13,32 @@
 
     <div id="navbarBasicExample" class="navbar-menu">
         <div class="navbar-start">
+            {{#is_admin}}
             <a class="navbar-item" href="/guilds">Guilds</a>
+            {{/is_admin}}
         </div>
 
         <div class="navbar-end">
+            {{^user_data}}
             <div class="navbar-item">
                 <div class="buttons">
-                    {{^user_data}}
                     <a class="button is-light" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
-                    {{/user_data}}
+                </div>
+            </div>
+            {{/user_data}}
 
-                    {{#user_data}}
-                    <a class="button is-light" href="/logout">Log out</a>
-                    {{/user_data}}
+            {{#user_data}}
+            <div class="navbar-item has-dropdown is-hoverable navbar-brand">
+                <figure class="image is-32x32">
+                    <img class="is-rounded" src="https://media.discordapp.net/avatars/{{id}}/{{avatar}}.png?size=32" alt="Avatar of currently logged in user" />
+                </figure>
+                <div class="navbar-dropdown is-boxed">
+                    <div class="navbar-item">
+                        <a class="button is-light" href="/logout">Log out</a>
+                    </div>
                 </div>
             </div>
+            {{/user_data}}
         </div>
     </div>
 </nav>

From 3c60c66651081c627deb7d031156b5706d765acc Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Wed, 20 Nov 2024 23:45:03 +0100
Subject: [PATCH 17/37] Rework frontend to bootstrap

---
 templates/index.html | 237 +++++++++++++++++++++++++------------------
 1 file changed, 141 insertions(+), 96 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 5cfb8a1..7649bab 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,124 +2,169 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Test</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">
+    <title>Running on Dart</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
 </head>
 <body>
-<nav class="navbar is-primary" role="navigation" aria-label="main navigation">
-    <div class="navbar-brand">
-        <a class="navbar-item" href="/">Running on Dart</a>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="/">Running on Dart</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <li class="nav-item">
+                    <a class="nav-link active" aria-current="page" href="/">Home</a>
+                </li>
+                {{#is_admin}}
+                <li class="nav-item">
+                    <a class="nav-link" href="/guilds">Guilds</a>
+                </li>
+                {{/is_admin}}
+            </ul>
+            <ul class="navbar-nav ms-auto mb-2 mb-lg-0 profile-menu">
+                {{#user_data}}
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                        <img src="https://media.discordapp.net/avatars/{{id}}/{{avatar}}.png?size=3" alt="Profile Picture" class="rounded-circle">
+                    </a>
+                    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
+                        <li><a class="dropdown-item" href="#"><i class="fas fa-sliders-h fa-fw"></i> Profile</a></li>
+                        <li><a class="dropdown-item" href="#"><i class="fas fa-cog fa-fw"></i> Settings</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="/logout"><i class="fas fa-sign-out-alt fa-fw"></i> Log Out</a></li>
+                    </ul>
+                </li>
+                {{/user_data}}
+                {{^user_data}}
+                <li class="navbar-item justify-content-start">
+                    <a class="btn btn-outline-success" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
+                </li>
+                {{/user_data}}
+            </ul>
+        </div>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="alert alert-danger mt-4" role="alert">
+        <span class="bold">Experimental version</span>
     </div>
 
-    <div id="navbarBasicExample" class="navbar-menu">
-        <div class="navbar-start">
-            {{#is_admin}}
-            <a class="navbar-item" href="/guilds">Guilds</a>
-            {{/is_admin}}
+    <div class="container">
+        <div class="m-1">
+            <h1>Cache Info</h1>
         </div>
+        <div class="container row">
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{cached_channels}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Cached channels</h6>
+                </div>
+            </div>
 
-        <div class="navbar-end">
-            {{^user_data}}
-            <div class="navbar-item">
-                <div class="buttons">
-                    <a class="button is-light" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{cached_messages}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Cached messages</h6>
                 </div>
             </div>
-            {{/user_data}}
 
-            {{#user_data}}
-            <div class="navbar-item has-dropdown is-hoverable navbar-brand">
-                <figure class="image is-32x32">
-                    <img class="is-rounded" src="https://media.discordapp.net/avatars/{{id}}/{{avatar}}.png?size=32" alt="Avatar of currently logged in user" />
-                </figure>
-                <div class="navbar-dropdown is-boxed">
-                    <div class="navbar-item">
-                        <a class="button is-light" href="/logout">Log out</a>
-                    </div>
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{cached_guilds}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Cached guilds</h6>
                 </div>
             </div>
-            {{/user_data}}
-        </div>
-    </div>
-</nav>
 
-<div class="container block mt-4">
-    <div class="notification is-danger">
-        Experimental version
-    </div>
-</div>
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{cached_users}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Cached Users</h6>
+                </div>
+            </div>
 
-<div class="container block">
-    <h1 class="title">Cache Info</h1>
-    <div class="grid">
-        <div class="hero-body cell">
-            <p class="title">{{cached_channels}}</p>
-            <p class="subtitle">Cached channels</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">{{cached_messages}}</p>
-            <p class="subtitle">Cached messages</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">{{cached_guilds}}</p>
-            <p class="subtitle">Cached guilds</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">{{cached_users}}</p>
-            <p class="subtitle">Cached Users</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">{{cached_voice_states}}</p>
-            <p class="subtitle">Cached voice states</p>
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{cached_voice_states}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Cached voice states</h6>
+                </div>
+            </div>
         </div>
     </div>
-</div>
-
-<div class="container block">
-    <h1 class="title">Modules Info</h1>
-    <div class="grid">
-        <div class="hero-body cell">
-            <p class="title">{{total_tags_count}}</p>
-            <p class="subtitle">Total tags</p>
+    <div class="container">
+        <div class="m-1">
+            <h1>Modules Info</h1>
         </div>
-        <div class="hero-body cell">
-            <p class="title">{{total_reminder_count}}</p>
-            <p class="subtitle">Total reminders</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">n/a</p>
-            <!--        <p class="title">{{docs_update}}</p>-->
-            <p class="subtitle">Last docs update</p>
-        </div>
-    </div>
-</div>
+        <div class="container row">
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{total_tags_count}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Total tags</h6>
+                </div>
+            </div>
 
-<div class="container block">
-    <h1 class="title">Program Info</h1>
-    <div class="grid">
-        <div class="hero-body cell">
-            <p class="title">{{nyxx_version}}</p>
-            <p class="subtitle">Nyxx Version</p>
-        </div>
-        <div class="hero-body cell">
-            <p class="title">{{version}}</p>
-            <p class="subtitle">Bot Version</p>
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{total_reminder_count}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Total reminders</h6>
+                </div>
+            </div>
+
+            <div class="card col m-1">
+                <div class="card-body">
+<!--                    <h5 class="card-title">{{docs_update}}</h5>-->
+                    <h5 class="card-title">n/a</h5>
+                    <h6 class="card-subtitle text-body-secondary">Last docs update</h6>
+                </div>
+            </div>
         </div>
-        <div class="hero-body cell">
-            <p class="title">{{platform}}</p>
-            <p class="subtitle">Dart Version</p>
+    </div>
+    <div class="container">
+        <div class="m-1">
+            <h1>Program Info</h1>
         </div>
-        <div class="hero-body cell">
-            <p class="title">{{memory_usage_string}}</p>
-            <p class="subtitle">Memory usage</p>
+        <div class="container row">
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{nyxx_version}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Nyxx Version</h6>
+                </div>
+            </div>
+
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{version}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Bot Version</h6>
+                </div>
+            </div>
+
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{platform}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Dart Version</h6>
+                </div>
+            </div>
+
+            <div class="card col m-1">
+                <div class="card-body">
+                    <h5 class="card-title">{{memory_usage_string}}</h5>
+                    <h6 class="card-subtitle text-body-secondary">Memory usage</h6>
+                </div>
+            </div>
         </div>
-        <div class="hero-body cell is-col-start-1">
-            <p class="title">n/a</p>
-            <!--        <p class="title">{{uptime}}</p>-->
-            <p class="subtitle">Uptime</p>
+        <div class="container row">
+            <div class="card col-3 m-1">
+                <div class="card-body">
+                    <!--                    <h5 class="card-title">{{uptime}}</h5>-->
+                    <h5 class="card-title">n/a</h5>
+                    <h6 class="card-subtitle text-body-secondary">Uptime</h6>
+                </div>
+            </div>
         </div>
     </div>
 </div>
-
 </body>
 </html>

From d2856f74f5bb31c2cec8e76996306abde915c64b Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 17:09:49 +0100
Subject: [PATCH 18/37] Implement htmx; Implement guilds; Save sessions to file

---
 .gitignore                                  |  1 +
 bin/running_on_dart.dart                    |  1 +
 docker-compose.yml                          |  2 +
 lib/running_on_dart.dart                    |  1 +
 lib/src/web_app/api_server.dart             | 43 +++++++++++++++++++--
 lib/src/web_app/session_manager_plugin.dart | 37 ++++++++++++++++++
 lib/src/web_app/utils.dart                  |  6 +++
 pubspec.lock                                |  9 +++--
 pubspec.yaml                                |  3 +-
 templates/component/navigation.html         | 40 +++++++++++++++++++
 templates/guilds.html                       | 33 ++++++++++++++++
 templates/index.html                        | 42 +-------------------
 12 files changed, 170 insertions(+), 48 deletions(-)
 create mode 100644 lib/src/web_app/session_manager_plugin.dart
 create mode 100644 templates/component/navigation.html
 create mode 100644 templates/guilds.html

diff --git a/.gitignore b/.gitignore
index a36b221..9cd7f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ doc/api/
 *.db
 
 lib_old/
+sessions/
diff --git a/bin/running_on_dart.dart b/bin/running_on_dart.dart
index 575e311..421d97e 100644
--- a/bin/running_on_dart.dart
+++ b/bin/running_on_dart.dart
@@ -43,6 +43,7 @@ void main() async {
           IgnoreExceptions(),
           commands,
           pagination,
+          SessionManagerPlugin(),
         ],
       ));
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8db9f0a..7a96926 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ services:
       - "8088:8088"
     depends_on:
       - db
+    volumes:
+      - "./sessions:/sessions"
 
   db:
     image: postgres:17
diff --git a/lib/running_on_dart.dart b/lib/running_on_dart.dart
index 25699cc..dc54e15 100644
--- a/lib/running_on_dart.dart
+++ b/lib/running_on_dart.dart
@@ -17,3 +17,4 @@ export 'src/error_handler.dart';
 export 'src/init.dart';
 
 export 'src/web_app/api_server.dart' show WebServer;
+export 'src/web_app/session_manager_plugin.dart' show SessionManagerPlugin;
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 37ae36e..4d62384 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:injector/injector.dart';
+import 'package:nyxx/nyxx.dart';
 
 import 'package:running_on_dart/running_on_dart.dart';
 import 'package:running_on_dart/src/web_app/utils.dart';
@@ -20,14 +21,48 @@ final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
 final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
 
 class WebServer {
+  Future<shelf.Response> _handleGuilds(shelf.Request request) async {
+    if (!isAdminFromSession(request)) {
+      return shelf.Response.forbidden(null);
+    }
+
+    final client = Injector.appInstance.get<NyxxGateway>();
+
+    final guildData = client.guilds.cache.values
+        .map((entry) => {
+              'id': entry.id.toString(),
+              'name': entry.name,
+              'banner': entry.bannerHash,
+              'icon': entry.iconHash,
+              'cached_members': entry.members.cache.length,
+              'cached_channels':
+                  client.channels.cache.values.whereType<GuildChannel>().where((c) => c.guildId == entry.id).length,
+            })
+        .toList();
+
+    return createTwigResponse("guilds.html", parameters: {
+      'guilds': guildData,
+    });
+  }
+
+  Future<shelf.Response> _handleHx(shelf.Request request) async {
+    final templateName = request.url.queryParameters['c'];
+    if (templateName == null) {
+      return shelf.Response.badRequest();
+    }
+
+    return createTwigResponse('component/$templateName.html', parameters: {
+      ...getCustomDataFromSession(request),
+      'clientId': clientId,
+      'redirectUri': clientRedirectUri,
+    });
+  }
+
   Future<shelf.Response> _handleIndex(shelf.Request request) async {
     final data = await Injector.appInstance.get<BotInfoService>().getCurrentBotInfo();
 
     return createTwigResponse("index.html", parameters: {
       ...data.toJson(),
-      'clientId': clientId,
-      'redirectUri': clientRedirectUri,
-      ...getCustomDataFromSession(request),
     });
   }
 
@@ -67,6 +102,8 @@ class WebServer {
   Future<shelf_router.Router> _setupRouter() async {
     return shelf_router.Router()
       ..get("/", _sessionAware(_handleIndex))
+      ..get("/guilds", _sessionAware(_handleGuilds))
+      ..get("/hx", _sessionAware(_handleHx))
       ..get("/redirect", _sessionAware(_handleRedirect))
       ..get("/logout", _sessionAware(_handleLogOut));
   }
diff --git a/lib/src/web_app/session_manager_plugin.dart b/lib/src/web_app/session_manager_plugin.dart
new file mode 100644
index 0000000..16dc5f4
--- /dev/null
+++ b/lib/src/web_app/session_manager_plugin.dart
@@ -0,0 +1,37 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:nyxx/nyxx.dart';
+import 'package:shelf_session/session_middleware.dart';
+
+class SessionManagerPlugin extends NyxxPlugin<NyxxGateway> {
+  static const _sessionsFile = '/sessions/sessions.json';
+
+  void _restoreSessions() async {
+    restoreSessions(() async {
+      final file = File(_sessionsFile);
+      if (await file.exists()) {
+        logger.info("Loading session file.");
+        return File(_sessionsFile).readAsString();
+      }
+
+      logger.info("Session file missing. Returning default");
+      return '{}';
+    });
+  }
+
+  @override
+  FutureOr<void> afterConnect(NyxxGateway client) {
+    _restoreSessions();
+
+    Timer.periodic(Duration(minutes: 15), (timer) => _restoreSessions());
+  }
+
+  @override
+  FutureOr<void> afterClose() async {
+    await saveSessions((sessionData) async {
+      logger.info("Saving session file");
+      await File(_sessionsFile).writeAsString(sessionData);
+    });
+  }
+}
diff --git a/lib/src/web_app/utils.dart b/lib/src/web_app/utils.dart
index b9fe9f0..f805c05 100644
--- a/lib/src/web_app/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -49,6 +49,12 @@ void deleteSession(shelf.Request request) {
   Session.deleteSession(request);
 }
 
+bool isAdminFromSession(shelf.Request request) {
+  final session = Session.getSession(request);
+
+  return session?.data['is_admin'] as bool? ?? false;
+}
+
 Map<String, dynamic> getCustomDataFromSession(shelf.Request request) {
   final session = Session.getSession(request);
 
diff --git a/pubspec.lock b/pubspec.lock
index c82c855..baa9cb8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -517,10 +517,11 @@ packages:
   shelf_session:
     dependency: "direct main"
     description:
-      name: shelf_session
-      sha256: "5c658d16ddac1ad364d047e9a22e1023fcb383f2f32d5b621feb57c6c3ca8748"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "1cc10d0723ed7de0a75e44e896a7cd0380b4bd0f"
+      url: "https://github.com/l7ssha/shelf_session.git"
+    source: git
     version: "0.1.2"
   shelf_static:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index f943abf..34bb9c5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,7 +35,8 @@ dependencies:
   shelf: ^1.4.2
   shelf_router: ^1.1.4
   shelf_cors_headers: ^0.1.0
-  shelf_session: ^0.1.2
+  shelf_session:
+    git: https://github.com/l7ssha/shelf_session.git
   mustachex: ^1.0.0
 
 dev_dependencies:
diff --git a/templates/component/navigation.html b/templates/component/navigation.html
new file mode 100644
index 0000000..2ab9a4f
--- /dev/null
+++ b/templates/component/navigation.html
@@ -0,0 +1,40 @@
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="/">Running on Dart</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <li class="nav-item">
+                    <a class="nav-link active" aria-current="page" href="/">Home</a>
+                </li>
+                {{#is_admin}}
+                <li class="nav-item">
+                    <a class="nav-link" href="/guilds">Guilds</a>
+                </li>
+                {{/is_admin}}
+            </ul>
+            <ul class="navbar-nav ms-auto mb-2 mb-lg-0 profile-menu">
+                {{#user_data}}
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                        <img src="https://media.discordapp.net/avatars/{{id}}/{{avatar}}.png?size=32" alt="Profile Picture" class="rounded-circle">
+                    </a>
+                    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
+                        <li><a class="dropdown-item" href="#"><i class="fas fa-sliders-h fa-fw"></i> Profile</a></li>
+                        <li><a class="dropdown-item" href="#"><i class="fas fa-cog fa-fw"></i> Settings</a></li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li><a class="dropdown-item" href="/logout"><i class="fas fa-sign-out-alt fa-fw"></i> Log Out</a></li>
+                    </ul>
+                </li>
+                {{/user_data}}
+                {{^user_data}}
+                <li class="navbar-item justify-content-start">
+                    <a class="btn btn-outline-success" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
+                </li>
+                {{/user_data}}
+            </ul>
+        </div>
+    </div>
+</nav>
diff --git a/templates/guilds.html b/templates/guilds.html
new file mode 100644
index 0000000..749a508
--- /dev/null
+++ b/templates/guilds.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Running on Dart</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.3"></script>
+</head>
+<body>
+<nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
+
+<div class="container">
+    <div class="alert alert-danger mt-4" role="alert">
+        <span class="bold">Experimental version</span>
+    </div>
+
+    <div class="container">
+        <div class="grid">
+        {{#guilds}}
+            <div class="card col">
+<!--                <img src="..." class="card-img-top" alt="...">-->
+                <div class="card-body">
+                    <h5 class="card-title"><img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Profile Picture" class="rounded-circle inline m-1">{{name}}</h5>
+                    <p class="card-text"><span class="fw-bold">{{cached_members}}</span> Cached members <span class="fw-bold ms-3">{{cached_channels}}</span> Cached channels</p>
+                </div>
+            </div>
+        {{/guilds}}
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/templates/index.html b/templates/index.html
index 7649bab..5f2e8e0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,48 +5,10 @@
     <title>Running on Dart</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.3"></script>
 </head>
 <body>
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="/">Running on Dart</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item">
-                    <a class="nav-link active" aria-current="page" href="/">Home</a>
-                </li>
-                {{#is_admin}}
-                <li class="nav-item">
-                    <a class="nav-link" href="/guilds">Guilds</a>
-                </li>
-                {{/is_admin}}
-            </ul>
-            <ul class="navbar-nav ms-auto mb-2 mb-lg-0 profile-menu">
-                {{#user_data}}
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                        <img src="https://media.discordapp.net/avatars/{{id}}/{{avatar}}.png?size=3" alt="Profile Picture" class="rounded-circle">
-                    </a>
-                    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
-                        <li><a class="dropdown-item" href="#"><i class="fas fa-sliders-h fa-fw"></i> Profile</a></li>
-                        <li><a class="dropdown-item" href="#"><i class="fas fa-cog fa-fw"></i> Settings</a></li>
-                        <li><hr class="dropdown-divider"></li>
-                        <li><a class="dropdown-item" href="/logout"><i class="fas fa-sign-out-alt fa-fw"></i> Log Out</a></li>
-                    </ul>
-                </li>
-                {{/user_data}}
-                {{^user_data}}
-                <li class="navbar-item justify-content-start">
-                    <a class="btn btn-outline-success" href="https://discord.com/oauth2/authorize?response_type=code&client_id={{clientId}}&redirect_uri={{redirectUri}}&scope=identify">Log in</a>
-                </li>
-                {{/user_data}}
-            </ul>
-        </div>
-    </div>
-</nav>
+<nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
 
 <div class="container">
     <div class="alert alert-danger mt-4" role="alert">

From 6eebd16ab61cd81ea786f030d1e31ad1f15f030b Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:09:25 +0100
Subject: [PATCH 19/37] Pass only needed parameters for template

---
 lib/src/settings.dart           |  2 ++
 lib/src/web_app/api_server.dart | 15 +++++++++++++--
 templates/component/alert.html  |  3 +++
 templates/guilds.html           |  4 +---
 templates/index.html            |  4 +---
 5 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 templates/component/alert.html

diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 5bae0b1..9ec16d9 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -67,6 +67,8 @@ __Package repositories__:
 ${docsPackages.map((packageName) => '- $packageName: <https://github.com/nyxx-discord/$packageName>').join('\n')}
 ''');
 
+final String webServerAlertContent = getEnv('WEB_SERVER_ALERT_CONTENT', '<span class="bold">Experimental version</span>');
+
 /// The GitHub account to use when no other account is specified.
 final String githubAccount = getEnv('ROD_GITHUB_ACCOUNT', 'nyxx-discord');
 
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 4d62384..fc0b3a7 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -51,10 +51,21 @@ class WebServer {
       return shelf.Response.badRequest();
     }
 
+    final additionalParameters = switch (templateName) {
+      'navigation' => {
+        'clientId': clientId,
+        'redirectUri': clientRedirectUri,
+      },
+      'alert' => {
+        'inner_content': webServerAlertContent,
+      },
+      _ => {},
+    };
+
+
     return createTwigResponse('component/$templateName.html', parameters: {
       ...getCustomDataFromSession(request),
-      'clientId': clientId,
-      'redirectUri': clientRedirectUri,
+      ...additionalParameters,
     });
   }
 
diff --git a/templates/component/alert.html b/templates/component/alert.html
new file mode 100644
index 0000000..9cbd30e
--- /dev/null
+++ b/templates/component/alert.html
@@ -0,0 +1,3 @@
+<div class="alert alert-danger mt-4" role="alert">
+    {{inner_content}}
+</div>
diff --git a/templates/guilds.html b/templates/guilds.html
index 749a508..1639251 100644
--- a/templates/guilds.html
+++ b/templates/guilds.html
@@ -11,9 +11,7 @@
 <nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
 
 <div class="container">
-    <div class="alert alert-danger mt-4" role="alert">
-        <span class="bold">Experimental version</span>
-    </div>
+    <div hx-get="/hx?c=alert" hx-swap="outerHTML" hx-trigger="load"></div>
 
     <div class="container">
         <div class="grid">
diff --git a/templates/index.html b/templates/index.html
index 5f2e8e0..0b78969 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -11,9 +11,7 @@
 <nav hx-get="/hx?c=navigation" hx-swap="outerHTML" hx-trigger="load"></nav>
 
 <div class="container">
-    <div class="alert alert-danger mt-4" role="alert">
-        <span class="bold">Experimental version</span>
-    </div>
+    <div hx-get="/hx?c=alert" hx-swap="outerHTML" hx-trigger="load"></div>
 
     <div class="container">
         <div class="m-1">

From bc48e769a7c2dfec467532e4ade404ff13ed6981 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:24:29 +0100
Subject: [PATCH 20/37] Add web server configuration

---
 lib/src/settings.dart           | 13 +++++++++++++
 lib/src/web_app/api_server.dart | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 9ec16d9..8d5b9c2 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -17,6 +17,9 @@ String getEnv(String key, [String? def]) =>
 /// instead of throwing an exception.
 bool getEnvBool(String key, [bool? def]) => ['true', '1'].contains(getEnv(key, def?.toString()).toLowerCase());
 
+/// Get a [int] from an environment variable, throwing an exception if cannot be parsed to int.
+int getEnvInt(String key, [int? def]) => int.tryParse(getEnv(key, key.toString())) ?? (throw Exception('Environment variable `$key` cannot be parsed as int'));
+
 /// Name of the bot
 final String botName = getEnv('BOT_NAME', 'Running on Dart');
 
@@ -67,8 +70,18 @@ __Package repositories__:
 ${docsPackages.map((packageName) => '- $packageName: <https://github.com/nyxx-discord/$packageName>').join('\n')}
 ''');
 
+/// The custom content for web server alert box
 final String webServerAlertContent = getEnv('WEB_SERVER_ALERT_CONTENT', '<span class="bold">Experimental version</span>');
 
+/// Whether web server should be enabled
+final bool webServerEnabled = getEnvBool('WEB_SERVER_ENABLE', false);
+
+/// The host of web server
+final String webServerHost = getEnv("WEB_SERVER_HOST", 'localhost');
+
+/// The port of web server
+final int webServerPort = getEnvInt('WEB_SERVER_PORT', 8088);
+
 /// The GitHub account to use when no other account is specified.
 final String githubAccount = getEnv('ROD_GITHUB_ACCOUNT', 'nyxx-discord');
 
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index fc0b3a7..b6fd295 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -21,6 +21,8 @@ final clientSecret = getEnv('DISCORD_CLIENT_SECRET');
 final clientRedirectUri = getEnv('DISCORD_REDIRECT_URI');
 
 class WebServer {
+  final Logger _logger = Logger('WebServer');
+
   Future<shelf.Response> _handleGuilds(shelf.Request request) async {
     if (!isAdminFromSession(request)) {
       return shelf.Response.forbidden(null);
@@ -123,11 +125,17 @@ class WebServer {
       shelf.Pipeline().addMiddleware(cookiesMiddleware()).addMiddleware(sessionMiddleware()).addHandler(inner);
 
   Future<void> startServer() async {
+    if (!webServerEnabled) {
+      _logger.info("Web server not enabled skipping");
+      return;
+    }
+
     final router = await _setupRouter();
 
     final app =
         const shelf.Pipeline().addMiddleware(shelf.logRequests()).addMiddleware(corsHeaders()).addHandler(router.call);
 
-    await shelf_io.serve(app, "0.0.0.0", 8088);
+    _logger.info("Starting server at: http://$webServerHost:$webServerPort/");
+    await shelf_io.serve(app, webServerHost, webServerPort);
   }
 }

From 9ce2f44221ea5257dcdc8ec6ec4a595dff8a2fcf Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:24:58 +0100
Subject: [PATCH 21/37] Prepare infra for web server

---
 docker-compose.prod.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 3089fe2..5afaf78 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,14 +1,17 @@
 version: '3.9'
 services:
   running_on_dart:
-    image: ghcr.io/nyxx-discord/running_on_dart:4.9.3
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.0
     container_name: running_on_dart
     env_file:
      - .env
-    links:
-      - db
     depends_on:
       - db
+    volumes:
+      - "rod_sessions:/sessions"
+    networks:
+      - internal
+      - nginx-proxy_default
 
   db:
     image: postgres:17
@@ -18,6 +21,15 @@ services:
       - .env
     volumes:
       - "rod_db_17:/var/lib/postgresql/data"
+    networks:
+      - internal
 
 volumes:
   rod_db_17:
+  rod_sessions:
+
+networks:
+  nginx-proxy_default:
+    name: nginx-proxy_default
+    external: true
+  internal:

From 49c7fd717f52f6b2ea46d9ed500465254fdf7202 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:25:04 +0100
Subject: [PATCH 22/37] Release 4.10.0-dev.0

---
 lib/src/settings.dart | 2 +-
 pubspec.yaml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 8d5b9c2..7033a47 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.9.3';
+String get version => '4.10.0-dev.0';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 34bb9c5..18a420c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0
+version: 4.10.0-dev.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

From 63491d246826a51e7a8334b777ddb694f5bad48b Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:27:28 +0100
Subject: [PATCH 23/37] dart format

---
 lib/src/settings.dart           |  7 +++++--
 lib/src/web_app/api_server.dart | 11 +++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 7033a47..9541ff4 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -18,7 +18,9 @@ String getEnv(String key, [String? def]) =>
 bool getEnvBool(String key, [bool? def]) => ['true', '1'].contains(getEnv(key, def?.toString()).toLowerCase());
 
 /// Get a [int] from an environment variable, throwing an exception if cannot be parsed to int.
-int getEnvInt(String key, [int? def]) => int.tryParse(getEnv(key, key.toString())) ?? (throw Exception('Environment variable `$key` cannot be parsed as int'));
+int getEnvInt(String key, [int? def]) =>
+    int.tryParse(getEnv(key, key.toString())) ??
+    (throw Exception('Environment variable `$key` cannot be parsed as int'));
 
 /// Name of the bot
 final String botName = getEnv('BOT_NAME', 'Running on Dart');
@@ -71,7 +73,8 @@ ${docsPackages.map((packageName) => '- $packageName: <https://github.com/nyxx-di
 ''');
 
 /// The custom content for web server alert box
-final String webServerAlertContent = getEnv('WEB_SERVER_ALERT_CONTENT', '<span class="bold">Experimental version</span>');
+final String webServerAlertContent =
+    getEnv('WEB_SERVER_ALERT_CONTENT', '<span class="bold">Experimental version</span>');
 
 /// Whether web server should be enabled
 final bool webServerEnabled = getEnvBool('WEB_SERVER_ENABLE', false);
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index b6fd295..cd5569b 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -55,16 +55,15 @@ class WebServer {
 
     final additionalParameters = switch (templateName) {
       'navigation' => {
-        'clientId': clientId,
-        'redirectUri': clientRedirectUri,
-      },
+          'clientId': clientId,
+          'redirectUri': clientRedirectUri,
+        },
       'alert' => {
-        'inner_content': webServerAlertContent,
-      },
+          'inner_content': webServerAlertContent,
+        },
       _ => {},
     };
 
-
     return createTwigResponse('component/$templateName.html', parameters: {
       ...getCustomDataFromSession(request),
       ...additionalParameters,

From 862cb348978ebbd457d62c37a840d61a61109d5f Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 18:32:59 +0100
Subject: [PATCH 24/37] Fix getEnvInt default value

---
 lib/src/settings.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 9541ff4..8f3cdf1 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -19,7 +19,7 @@ bool getEnvBool(String key, [bool? def]) => ['true', '1'].contains(getEnv(key, d
 
 /// Get a [int] from an environment variable, throwing an exception if cannot be parsed to int.
 int getEnvInt(String key, [int? def]) =>
-    int.tryParse(getEnv(key, key.toString())) ??
+    int.tryParse(getEnv(key, def.toString())) ??
     (throw Exception('Environment variable `$key` cannot be parsed as int'));
 
 /// Name of the bot

From ce652796857ca3f6ddd31bffd00658f4587dbd9c Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 22:44:18 +0100
Subject: [PATCH 25/37] Remove image if cannot load

---
 templates/guilds.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/guilds.html b/templates/guilds.html
index 1639251..5e1d285 100644
--- a/templates/guilds.html
+++ b/templates/guilds.html
@@ -16,10 +16,13 @@
     <div class="container">
         <div class="grid">
         {{#guilds}}
-            <div class="card col">
-<!--                <img src="..." class="card-img-top" alt="...">-->
+            <div class="card col m-1">
                 <div class="card-body">
-                    <h5 class="card-title"><img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Profile Picture" class="rounded-circle inline m-1">{{name}}</h5>
+                    <h5 class="card-title">
+                        <img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Profile Picture" class="rounded-circle inline m-1" onerror="this.style.display='none'">
+                        {{name}}
+                    </h5>
+
                     <p class="card-text"><span class="fw-bold">{{cached_members}}</span> Cached members <span class="fw-bold ms-3">{{cached_channels}}</span> Cached channels</p>
                 </div>
             </div>

From 0f0edb0e0a3ce633156cc13b06309494d2c6352a Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Thu, 21 Nov 2024 22:44:42 +0100
Subject: [PATCH 26/37] Release 4.10.0-dev.1

---
 docker-compose.prod.yml | 2 +-
 lib/src/settings.dart   | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5afaf78..eb0fba5 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:4.10.0-dev.0
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.1
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 8f3cdf1..f29874f 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.0';
+String get version => '4.10.0-dev.1';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 18a420c..85fd112 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.0
+version: 4.10.0-dev.1
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From 9774eb66d1f5fd9a37793858c886e139c902f5d0 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 00:19:31 +0100
Subject: [PATCH 27/37] Save sessions periodically instead of restoring them

---
 lib/src/web_app/session_manager_plugin.dart | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/src/web_app/session_manager_plugin.dart b/lib/src/web_app/session_manager_plugin.dart
index 16dc5f4..43e313f 100644
--- a/lib/src/web_app/session_manager_plugin.dart
+++ b/lib/src/web_app/session_manager_plugin.dart
@@ -7,7 +7,15 @@ import 'package:shelf_session/session_middleware.dart';
 class SessionManagerPlugin extends NyxxPlugin<NyxxGateway> {
   static const _sessionsFile = '/sessions/sessions.json';
 
-  void _restoreSessions() async {
+  void _saveSessions() async {
+    await saveSessions((sessionData) async {
+      logger.info("Saving session file");
+      await File(_sessionsFile).writeAsString(sessionData);
+    });
+  }
+
+  @override
+  FutureOr<void> afterConnect(NyxxGateway client) {
     restoreSessions(() async {
       final file = File(_sessionsFile);
       if (await file.exists()) {
@@ -20,18 +28,10 @@ class SessionManagerPlugin extends NyxxPlugin<NyxxGateway> {
     });
   }
 
-  @override
-  FutureOr<void> afterConnect(NyxxGateway client) {
-    _restoreSessions();
-
-    Timer.periodic(Duration(minutes: 15), (timer) => _restoreSessions());
-  }
-
   @override
   FutureOr<void> afterClose() async {
-    await saveSessions((sessionData) async {
-      logger.info("Saving session file");
-      await File(_sessionsFile).writeAsString(sessionData);
-    });
+    _saveSessions();
+
+    Timer.periodic(Duration(minutes: 15), (timer) => _saveSessions());
   }
 }

From 15fc4852b4ae22cb31d6d7828b94f0d910b8d129 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 00:19:48 +0100
Subject: [PATCH 28/37] Release 4.10.0-dev.2

---
 docker-compose.prod.yml | 2 +-
 lib/src/settings.dart   | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index eb0fba5..2949e3b 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:4.10.0-dev.1
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.2
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index f29874f..ee337a0 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.1';
+String get version => '4.10.0-dev.2';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 85fd112..9a71fce 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.1
+version: 4.10.0-dev.2
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From 30113f20fbf7d0c6fccacf56d23d124361d75693 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 00:20:29 +0100
Subject: [PATCH 29/37] Move timer to correct place

---
 lib/src/web_app/session_manager_plugin.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/web_app/session_manager_plugin.dart b/lib/src/web_app/session_manager_plugin.dart
index 43e313f..f2da484 100644
--- a/lib/src/web_app/session_manager_plugin.dart
+++ b/lib/src/web_app/session_manager_plugin.dart
@@ -15,8 +15,8 @@ class SessionManagerPlugin extends NyxxPlugin<NyxxGateway> {
   }
 
   @override
-  FutureOr<void> afterConnect(NyxxGateway client) {
-    restoreSessions(() async {
+  FutureOr<void> afterConnect(NyxxGateway client) async {
+    await restoreSessions(() async {
       final file = File(_sessionsFile);
       if (await file.exists()) {
         logger.info("Loading session file.");
@@ -26,12 +26,12 @@ class SessionManagerPlugin extends NyxxPlugin<NyxxGateway> {
       logger.info("Session file missing. Returning default");
       return '{}';
     });
+
+    Timer.periodic(Duration(minutes: 15), (timer) => _saveSessions());
   }
 
   @override
   FutureOr<void> afterClose() async {
     _saveSessions();
-
-    Timer.periodic(Duration(minutes: 15), (timer) => _saveSessions());
   }
 }

From dff85208d94d5b8bc08fe57006cb33ec9f09fb11 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 20:46:01 +0100
Subject: [PATCH 30/37] Extend session after logging in; Extend session initial
 duration to 3 days; Do not save discord bearer token to session

---
 lib/src/web_app/api_server.dart | 30 ++++++++++++++++++------------
 lib/src/web_app/utils.dart      | 27 ++++++++++++++++++++++-----
 templates/guilds.html           |  8 ++++++--
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index cd5569b..989c061 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -30,17 +30,23 @@ class WebServer {
 
     final client = Injector.appInstance.get<NyxxGateway>();
 
-    final guildData = client.guilds.cache.values
-        .map((entry) => {
-              'id': entry.id.toString(),
-              'name': entry.name,
-              'banner': entry.bannerHash,
-              'icon': entry.iconHash,
-              'cached_members': entry.members.cache.length,
-              'cached_channels':
-                  client.channels.cache.values.whereType<GuildChannel>().where((c) => c.guildId == entry.id).length,
-            })
-        .toList();
+    final guildData = client.guilds.cache.values.map((entry) {
+      final guildChannels = client.channels.cache.values.whereType<GuildChannel>().where((c) => c.guildId == entry.id);
+
+      final guildCachedMessages = guildChannels
+          .whereType<TextChannel>()
+          .fold(0, (previous, channel) => previous = channel.messages.cache.length);
+
+      return {
+        'id': entry.id.toString(),
+        'name': entry.name,
+        'banner': entry.bannerHash,
+        'icon': entry.iconHash,
+        'cached_members': entry.members.cache.length,
+        'cached_channels': guildChannels.length,
+        'cached_messages': guildCachedMessages,
+      };
+    }).toList();
 
     return createTwigResponse("guilds.html", parameters: {
       'guilds': guildData,
@@ -100,7 +106,7 @@ class WebServer {
     });
     final userDataJson = jsonDecode(userData.body);
 
-    initSession(request, userDataJson, tokenBodyJson);
+    initSession(request, userDataJson);
 
     return shelf.Response.seeOther("/");
   }
diff --git a/lib/src/web_app/utils.dart b/lib/src/web_app/utils.dart
index f805c05..c3934af 100644
--- a/lib/src/web_app/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -27,7 +27,7 @@ shelf.Response createUnauthorizedResponse(String errorMessage) => createJsonErro
 
 shelf.Response createForbiddenResponse() => shelf.Response.forbidden(null);
 
-void initSession(shelf.Request request, Map<String, dynamic> userDataJson, Map<String, dynamic> tokenDataJson) {
+void initSession(shelf.Request request, Map<String, dynamic> userDataJson) {
   var session = Session.getSession(request);
   session ??= Session.createSession(request);
 
@@ -38,11 +38,10 @@ void initSession(shelf.Request request, Map<String, dynamic> userDataJson, Map<S
     'name': userDataJson['user']['global_name'] ?? userDataJson['user']['username'],
     'avatar': userDataJson['user']['avatar'],
     'expires_t': userDataJson['expires'],
-    'token': tokenDataJson['access_token'],
   };
   session.data['is_admin'] = adminIds.contains(Snowflake.parse(userId));
 
-  session.expires = DateTime.now().add(Duration(seconds: tokenDataJson['expires_in']));
+  session.expires = DateTime.now().add(Duration(days: 3));
 }
 
 void deleteSession(shelf.Request request) {
@@ -50,16 +49,34 @@ void deleteSession(shelf.Request request) {
 }
 
 bool isAdminFromSession(shelf.Request request) {
-  final session = Session.getSession(request);
+  final session = getSession(request);
 
   return session?.data['is_admin'] as bool? ?? false;
 }
 
 Map<String, dynamic> getCustomDataFromSession(shelf.Request request) {
-  final session = Session.getSession(request);
+  final session = getSession(request);
 
   return {
     'user_data': session?.data['user_data'] as Map<String, dynamic>? ?? false,
     'is_admin': session?.data['is_admin'] ?? false,
   };
 }
+
+Session? getSession(shelf.Request request) {
+  final session = Session.getSession(request);
+  if (session == null) {
+    return null;
+  }
+
+  final now = DateTime.now();
+  if (session.data['user_data'] != null) {
+    final nowPlusOneDay = now.add(Duration(days: 1));
+
+    if (session.expires.isBefore(nowPlusOneDay)) {
+      session.expires = now.add(Duration(days: 1, hours: 12));
+    }
+  }
+
+  return session;
+}
diff --git a/templates/guilds.html b/templates/guilds.html
index 5e1d285..cc28316 100644
--- a/templates/guilds.html
+++ b/templates/guilds.html
@@ -19,11 +19,15 @@
             <div class="card col m-1">
                 <div class="card-body">
                     <h5 class="card-title">
-                        <img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Profile Picture" class="rounded-circle inline m-1" onerror="this.style.display='none'">
+                        <img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Guild icon" class="rounded-circle inline m-1" onerror="this.style.display='none'">
                         {{name}}
                     </h5>
 
-                    <p class="card-text"><span class="fw-bold">{{cached_members}}</span> Cached members <span class="fw-bold ms-3">{{cached_channels}}</span> Cached channels</p>
+                    <p class="card-text">
+                        <span class="fw-bold">{{cached_members}}</span> Cached members
+                        <span class="fw-bold ms-3">{{cached_channels}}</span> Cached channels
+                        <span class="fw-bold ms-3">{{cached_messages}}</span> Cached messages
+                    </p>
                 </div>
             </div>
         {{/guilds}}

From deb76ad7bc216c96562d5dae10035de44b35035e Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 20:46:28 +0100
Subject: [PATCH 31/37] Release 4.10.0-dev.3

---
 docker-compose.prod.yml | 2 +-
 lib/src/settings.dart   | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 2949e3b..d0d10e3 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:4.10.0-dev.2
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.3
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index ee337a0..b601fa0 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.2';
+String get version => '4.10.0-dev.3';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 9a71fce..f712dd3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.2
+version: 4.10.0-dev.3
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From c7cc55c0cb3a66b12c61487cd12426b574514faa Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 20:53:17 +0100
Subject: [PATCH 32/37] Release 4.10.0-dev.4

---
 docker-compose.prod.yml         | 2 +-
 lib/src/settings.dart           | 2 +-
 lib/src/web_app/api_server.dart | 2 +-
 pubspec.yaml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d0d10e3..a01c25c 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:4.10.0-dev.3
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.4
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index b601fa0..946fd01 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.3';
+String get version => '4.10.0-dev.4';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 989c061..43e48f5 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -35,7 +35,7 @@ class WebServer {
 
       final guildCachedMessages = guildChannels
           .whereType<TextChannel>()
-          .fold(0, (previous, channel) => previous = channel.messages.cache.length);
+          .fold(0, (previous, channel) => previous + channel.messages.cache.length);
 
       return {
         'id': entry.id.toString(),
diff --git a/pubspec.yaml b/pubspec.yaml
index f712dd3..7667073 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.3
+version: 4.10.0-dev.4
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From dca2dca79d36e44cd1c19ba872e47cf0f2088d21 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Fri, 22 Nov 2024 23:28:38 +0100
Subject: [PATCH 33/37] Release 4.10.0-dev.5

---
 docker-compose.prod.yml |  2 +-
 lib/src/settings.dart   |  2 +-
 pubspec.lock            | 10 +++++-----
 pubspec.yaml            |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index a01c25c..7cebbf2 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:4.10.0-dev.4
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.5
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 946fd01..c9f4475 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.4';
+String get version => '4.10.0-dev.5';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.lock b/pubspec.lock
index baa9cb8..85576a2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -422,10 +422,10 @@ packages:
     dependency: "direct main"
     description:
       name: postgres
-      sha256: e9802d4c9d78e432c4d4e57be9a91d99cf1552d45f17b17792f8e595060376a2
+      sha256: d646bdc6f093babfa3337071c6f4ca2feabefdb7a6d18fc89f0f517c8d2e0819
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.4.4"
   pub_semver:
     dependency: transitive
     description:
@@ -519,7 +519,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "1cc10d0723ed7de0a75e44e896a7cd0380b4bd0f"
+      resolved-ref: "69aadbbd7572afcd076e122ae2ba63f1839a710e"
       url: "https://github.com/l7ssha/shelf_session.git"
     source: git
     version: "0.1.2"
@@ -535,10 +535,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   source_map_stack_trace:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7667073..5fe88a9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.4
+version: 4.10.0-dev.5
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From 84405d49d106b7bfd6f49d4eb69858de4034af8a Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 23 Nov 2024 11:28:46 +0100
Subject: [PATCH 34/37] Rework guilds template

---
 docker-compose.yml              |  1 +
 lib/src/settings.dart           |  3 +++
 lib/src/web_app/api_server.dart | 12 +++++++---
 lib/src/web_app/utils.dart      |  2 +-
 templates/guilds.html           | 41 ++++++++++++++++++++++++---------
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7a96926..1f53a55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - db
     volumes:
       - "./sessions:/sessions"
+      - "./templates:/templates"
 
   db:
     image: postgres:17
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index c9f4475..aba6a48 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -85,6 +85,9 @@ final String webServerHost = getEnv("WEB_SERVER_HOST", 'localhost');
 /// The port of web server
 final int webServerPort = getEnvInt('WEB_SERVER_PORT', 8088);
 
+/// Path to templates directory
+final String webServerTemplatesDirectory = getEnv('WEB_SERVER_TEMPLATES_DIRECTORY', "./templates");
+
 /// The GitHub account to use when no other account is specified.
 final String githubAccount = getEnv('ROD_GITHUB_ACCOUNT', 'nyxx-discord');
 
diff --git a/lib/src/web_app/api_server.dart b/lib/src/web_app/api_server.dart
index 43e48f5..28eca24 100644
--- a/lib/src/web_app/api_server.dart
+++ b/lib/src/web_app/api_server.dart
@@ -4,6 +4,7 @@ import 'package:injector/injector.dart';
 import 'package:nyxx/nyxx.dart';
 
 import 'package:running_on_dart/running_on_dart.dart';
+import 'package:running_on_dart/src/repository/feature_settings.dart';
 import 'package:running_on_dart/src/web_app/utils.dart';
 import 'package:running_on_dart/src/services/bot_info.dart';
 import 'package:shelf_cors_headers/shelf_cors_headers.dart';
@@ -30,13 +31,16 @@ class WebServer {
 
     final client = Injector.appInstance.get<NyxxGateway>();
 
-    final guildData = client.guilds.cache.values.map((entry) {
+    final guildData = Stream.fromIterable(client.guilds.cache.values).asyncMap((entry) async {
       final guildChannels = client.channels.cache.values.whereType<GuildChannel>().where((c) => c.guildId == entry.id);
 
       final guildCachedMessages = guildChannels
           .whereType<TextChannel>()
           .fold(0, (previous, channel) => previous + channel.messages.cache.length);
 
+      final enabledFeatures =
+          await Injector.appInstance.get<FeatureSettingsRepository>().fetchSettingsForGuild(entry.id);
+
       return {
         'id': entry.id.toString(),
         'name': entry.name,
@@ -45,11 +49,13 @@ class WebServer {
         'cached_members': entry.members.cache.length,
         'cached_channels': guildChannels.length,
         'cached_messages': guildCachedMessages,
+        'cached_roles': entry.roles.cache.length,
+        'enabled_features': enabledFeatures.map((s) => s.setting.name).join(", "),
       };
-    }).toList();
+    });
 
     return createTwigResponse("guilds.html", parameters: {
-      'guilds': guildData,
+      'guilds': await guildData.toList(),
     });
   }
 
diff --git a/lib/src/web_app/utils.dart b/lib/src/web_app/utils.dart
index c3934af..f992680 100644
--- a/lib/src/web_app/utils.dart
+++ b/lib/src/web_app/utils.dart
@@ -18,7 +18,7 @@ shelf.Response createOkResponse(Object? body) {
 
 Future<shelf.Response> createTwigResponse(String name, {Map<String, dynamic>? parameters}) async {
   final processor = MustachexProcessor(initialVariables: parameters);
-  final templateData = await File("templates/$name").readAsString();
+  final templateData = await File("$webServerTemplatesDirectory/$name").readAsString();
 
   return shelf.Response.ok(await processor.process(templateData), headers: {"Content-Type": 'text/html'});
 }
diff --git a/templates/guilds.html b/templates/guilds.html
index cc28316..d5d5916 100644
--- a/templates/guilds.html
+++ b/templates/guilds.html
@@ -14,20 +14,39 @@
     <div hx-get="/hx?c=alert" hx-swap="outerHTML" hx-trigger="load"></div>
 
     <div class="container">
-        <div class="grid">
+        <div class="accordion" id="guildsAccordion">
         {{#guilds}}
-            <div class="card col m-1">
-                <div class="card-body">
-                    <h5 class="card-title">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="heading{{id}}">
+                    <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{id}}" aria-expanded="true" aria-controls="collapse{{id}}">
                         <img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Guild icon" class="rounded-circle inline m-1" onerror="this.style.display='none'">
                         {{name}}
-                    </h5>
-
-                    <p class="card-text">
-                        <span class="fw-bold">{{cached_members}}</span> Cached members
-                        <span class="fw-bold ms-3">{{cached_channels}}</span> Cached channels
-                        <span class="fw-bold ms-3">{{cached_messages}}</span> Cached messages
-                    </p>
+                    </button>
+                </h2>
+                <div id="collapse{{id}}" class="accordion-collapse collapse" aria-labelledby="heading{{id}}" data-bs-parent="#guildsAccordion">
+                    <div class="accordion-body">
+                        <table class="table">
+                            <thead>
+                            <tr>
+                                <th scope="col">Cached members</th>
+                                <th scope="col">Cached channels</th>
+                                <th scope="col">Cached messages</th>
+                                <th scope="col">Cached roles</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>{{cached_members}}</td>
+                                <td>{{cached_channels}}</td>
+                                <td>{{cached_messages}}</td>
+                                <td>{{cached_roles}}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <p class="card-text">
+                            Features: <span class="fw-bold">{{enabled_features}}</span>
+                        </p>
+                    </div>
                 </div>
             </div>
         {{/guilds}}

From 5de317f7a6e61b0d8b893d4528f7b905c5b6e124 Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 23 Nov 2024 11:29:11 +0100
Subject: [PATCH 35/37] Release 4.10.0-dev.6

---
 docker-compose.prod.yml | 2 +-
 lib/src/settings.dart   | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 7cebbf2..8a52ac0 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:4.10.0-dev.5
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.6
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index aba6a48..f5bc1b7 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.5';
+String get version => '4.10.0-dev.6';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 5fe88a9..9543bd0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.5
+version: 4.10.0-dev.6
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart

From 1f01609df7112d4835d6d0458ca3b2746ce9ef9c Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 23 Nov 2024 16:39:35 +0100
Subject: [PATCH 36/37] Fix index page on mobile

---
 templates/guilds.html |  2 +-
 templates/index.html  | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/templates/guilds.html b/templates/guilds.html
index d5d5916..86af46b 100644
--- a/templates/guilds.html
+++ b/templates/guilds.html
@@ -18,7 +18,7 @@
         {{#guilds}}
             <div class="accordion-item">
                 <h2 class="accordion-header" id="heading{{id}}">
-                    <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{id}}" aria-expanded="true" aria-controls="collapse{{id}}">
+                    <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{id}}" aria-controls="collapse{{id}}">
                         <img src="https://media.discordapp.net/icons/{{id}}/{{icon}}.png?size=32" alt="Guild icon" class="rounded-circle inline m-1" onerror="this.style.display='none'">
                         {{name}}
                     </button>
diff --git a/templates/index.html b/templates/index.html
index 0b78969..a53248b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,6 +3,9 @@
 <head>
     <meta charset="UTF-8">
     <title>Running on Dart</title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
     <script src="https://unpkg.com/htmx.org@2.0.3"></script>
@@ -18,35 +21,35 @@
             <h1>Cache Info</h1>
         </div>
         <div class="container row">
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{cached_channels}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Cached channels</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{cached_messages}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Cached messages</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{cached_guilds}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Cached guilds</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{cached_users}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Cached Users</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{cached_voice_states}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Cached voice states</h6>
@@ -59,21 +62,21 @@ <h6 class="card-subtitle text-body-secondary">Cached voice states</h6>
             <h1>Modules Info</h1>
         </div>
         <div class="container row">
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{total_tags_count}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Total tags</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{total_reminder_count}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Total reminders</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
 <!--                    <h5 class="card-title">{{docs_update}}</h5>-->
                     <h5 class="card-title">n/a</h5>
@@ -87,28 +90,28 @@ <h6 class="card-subtitle text-body-secondary">Last docs update</h6>
             <h1>Program Info</h1>
         </div>
         <div class="container row">
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{nyxx_version}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Nyxx Version</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{version}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Bot Version</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{platform}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Dart Version</h6>
                 </div>
             </div>
 
-            <div class="card col m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <h5 class="card-title">{{memory_usage_string}}</h5>
                     <h6 class="card-subtitle text-body-secondary">Memory usage</h6>
@@ -116,7 +119,7 @@ <h6 class="card-subtitle text-body-secondary">Memory usage</h6>
             </div>
         </div>
         <div class="container row">
-            <div class="card col-3 m-1">
+            <div class="card col-12 col-md-2 m-1">
                 <div class="card-body">
                     <!--                    <h5 class="card-title">{{uptime}}</h5>-->
                     <h5 class="card-title">n/a</h5>

From bedcc250f8c188f293ee8506f2fc34fb331dd18a Mon Sep 17 00:00:00 2001
From: Szymon Uglis <szymon@l7ssha.xyz>
Date: Sat, 23 Nov 2024 17:23:10 +0100
Subject: [PATCH 37/37] Release 4.10.0-dev.7

---
 docker-compose.prod.yml | 2 +-
 lib/src/settings.dart   | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 8a52ac0..e4bbf49 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:4.10.0-dev.6
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.7
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index f5bc1b7..42cdd38 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.6';
+String get version => '4.10.0-dev.7';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 9543bd0..f65d4e9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.6
+version: 4.10.0-dev.7
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart