From c7f050a1e4c92575fc849e3b728759ec39c40f11 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Tue, 3 Feb 2026 14:51:15 +0000
Subject: [PATCH] Fixed lintr & complexity issues

---
 R/UFApi.R             | 1 +
 R/UFDatabase.R        | 1 +
 R/aaa.R               | 4 ++--
 R/ufWrapApplication.R | 8 ++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/R/UFApi.R b/R/UFApi.R
index a1a9e63..20d157d 100644
--- a/R/UFApi.R
+++ b/R/UFApi.R
@@ -33,6 +33,7 @@ names(member_list) <- member_names
 NULL
 
 #' @export
+# nolint next: object_name_linter. R6Class
 UFApi <- R6::R6Class(
   "UFApi",
   public = fn_list,
diff --git a/R/UFDatabase.R b/R/UFDatabase.R
index 34c01e0..b2650f4 100644
--- a/R/UFDatabase.R
+++ b/R/UFDatabase.R
@@ -2,6 +2,7 @@
 #' @title UFDatabase
 #' @description UserFrosting Database class
 #' @export
+# nolint next: object_name_linter. R6Class
 UFDatabase <- R6::R6Class(
   "UFDatabase",
   public = list(
diff --git a/R/aaa.R b/R/aaa.R
index 27f8750..37d9232 100644
--- a/R/aaa.R
+++ b/R/aaa.R
@@ -1,5 +1,5 @@
-if(getRversion() >= "2.15.1") utils::globalVariables(c("self"))
-if(getRversion() >= "2.15.1") utils::globalVariables(c("private"))
+if (getRversion() >= "2.15.1") utils::globalVariables(c("self"))
+if (getRversion() >= "2.15.1") utils::globalVariables(c("private"))
 
 #' @importFrom rlang .data
 #' @importFrom R6 R6Class
diff --git a/R/ufWrapApplication.R b/R/ufWrapApplication.R
index 8301dcb..a101916 100644
--- a/R/ufWrapApplication.R
+++ b/R/ufWrapApplication.R
@@ -29,15 +29,15 @@ ufWrapApplication <- function(
 
 
     isSessionRequired <- function() {
-      return(!(length(with_users) > 0 && !with_users))
+      !(length(with_users) > 0 && !with_users)
     }
 
     isSessionValid <- function() {
-      return(ufApi$verifyUFSession(shiny::getQueryString(session)))
+      ufApi$verifyUFSession(shiny::getQueryString(session))
     }
 
     isSessionOptional <- function() {
-      return(length(user_optional) > 0 && user_optional)
+      (length(user_optional) > 0 && user_optional)
     }
 
 
@@ -127,5 +127,5 @@ ufWrapApplication <- function(
     wrapped_server
   }
 
-  return(app)
+  app
 }