Only local user filter for users

Sources/VernissageServer/Controllers/HealthController.swift

@@ -103,8 +103,6 @@ struct HealthController {
             return true
         } catch {
             await request.logger.store("WebPush service health check error.", error, on: request.application)
-            await request.logger.store("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget magna eu felis viverra luctus. Donec vehicula lectus urna, ac facilisis leo sodales nec. Fusce id blandit turpis. Ut vestibulum odio ut neque semper ornare. Ut at diam nisl. Curabitur mollis lacus elit, eu placerat neque aliquam in. Quisque non eros velit. Duis posuere dui eget interdum vestibulum. Sed laoreet semper rutrum.", error, on: request.application)
-
             return false
         }
     }

Sources/VernissageServer/Controllers/UsersController.swift

@@ -228,6 +228,7 @@ struct UsersController {
         let page: Int = request.query["page"] ?? 0
         let size: Int = request.query["size"] ?? 10
         let query: String? = request.query["query"] ?? nil
+        let onlyLocal: Bool = request.query["onlyLocal"] ?? false
 
         let usersFromDatabaseQueryBuilder = User.query(on: request.db)
             .with(\.$flexiFields)
@@ -241,6 +242,11 @@ struct UsersController {
                         .filter(\.$name ~~ query)
                 }
         }
+
+        if onlyLocal {
+            usersFromDatabaseQueryBuilder
+                .filter(\.$isLocal == true)
+        }
 
         let usersFromDatabase = try await usersFromDatabaseQueryBuilder
             .sort(\.$createdAt, .descending)

Sources/VernissageServer/DataTransferObjects/UserDto.swift

@@ -27,6 +27,7 @@ struct UserDto: Codable {
     var activityPubProfile: String
     var fields: [FlexiFieldDto]?
     var bioHtml: String?
+    var lastLoginDate: Date?
     var createdAt: Date?
     var updatedAt: Date?
     var roles: [String]?
@@ -55,6 +56,7 @@ struct UserDto: Codable {
         case fields
         case bioHtml
         case activityPubProfile
+        case lastLoginDate
         case createdAt
         case updatedAt
         case roles
@@ -82,6 +84,7 @@ struct UserDto: Codable {
          activityPubProfile: String = "",
          fields: [FlexiFieldDto]? = nil,
          roles: [String]? = nil,
+         lastLoginDate: Date? = nil,
          createdAt: Date? = nil,
          updatedAt: Date? = nil,
          baseAddress: String,
@@ -103,6 +106,7 @@ struct UserDto: Codable {
         self.fields = fields
         self.activityPubProfile = activityPubProfile
         self.bioHtml = self.isLocal ? self.bio?.html(baseAddress: baseAddress, wrapInParagraph: true) : self.bio
+        self.lastLoginDate = lastLoginDate
         self.createdAt = createdAt
         self.updatedAt = updatedAt
         self.roles = roles
@@ -137,6 +141,7 @@ struct UserDto: Codable {
         locale = try values.decodeIfPresent(String.self, forKey: .locale)
         fields = try values.decodeIfPresent([FlexiFieldDto].self, forKey: .fields) ?? []
         activityPubProfile = try values.decodeIfPresent(String.self, forKey: .activityPubProfile) ?? ""
+        lastLoginDate = try values.decodeIfPresent(Date.self, forKey: .lastLoginDate)
         createdAt = try values.decodeIfPresent(Date.self, forKey: .createdAt)
         updatedAt = try values.decodeIfPresent(Date.self, forKey: .updatedAt)
         roles = try values.decodeIfPresent([String].self, forKey: .roles)
@@ -167,6 +172,7 @@ struct UserDto: Codable {
         try container.encodeIfPresent(fields, forKey: .fields)
         try container.encodeIfPresent(bioHtml, forKey: .bioHtml)
         try container.encodeIfPresent(activityPubProfile, forKey: .activityPubProfile)
+        try container.encodeIfPresent(lastLoginDate, forKey: .lastLoginDate)
         try container.encodeIfPresent(createdAt, forKey: .createdAt)
         try container.encodeIfPresent(updatedAt, forKey: .updatedAt)
         try container.encodeIfPresent(roles, forKey: .roles)

Sources/VernissageServer/Services/UsersService.swift

@@ -956,6 +956,7 @@ final class UsersService: UsersServiceType {
             userDto.isApproved = user.isApproved
             userDto.twoFactorEnabled = user.twoFactorEnabled
             userDto.manuallyApprovesFollowers = user.manuallyApprovesFollowers
+            userDto.lastLoginDate = user.lastLoginDate
         }
 
         return userDto

Tests/VernissageServerTests/AcceptanceTests/UsersController/UsersListActionTests.swift

@@ -85,6 +85,30 @@ extension ControllersTests {
             #expect(users.data.first?.userName == "karolfux", "Correct user should be filtered")
         }
 
+        @Test("Filtered list of users should be returned when local filter is applied")
+        func filteredListOfUsersShouldBeReturnedWhenLocalFilterIsApplied() async throws {
+
+            // Arrange.
+            _ = try await application.createUser(userName: "g0rg1_1fux", isLocal: true)
+            _ = try await application.createUser(userName: "g0rg1_2fux", isLocal: false)
+
+            let user = try await application.createUser(userName: "marianfux")
+            try await application.attach(user: user, role: Role.moderator)
+
+            // Act.
+            let users = try application.getResponse(
+                as: .user(userName: "marianfux", password: "p@ssword"),
+                to: "/users?query=g0rg1&onlyLocal=true",
+                method: .GET,
+                decodeTo: PaginableResultDto<UserDto>.self
+            )
+
+            // Assert.
+            #expect(users != nil, "Users should be returned.")
+            #expect(users.data.count == 1, "Filtered user should be returned.")
+            #expect(users.data.first?.userName == "g0rg1_1fux", "Correct user should be filtered")
+        }
+
         @Test("Forbidden shouldbe returned for regular user")
         func forbiddenShouldbeReturnedForRegularUser() async throws {