diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/controller/FollowsController.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/controller/FollowsController.kt index 357a5c1..32cea92 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/controller/FollowsController.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/controller/FollowsController.kt @@ -34,8 +34,12 @@ class FollowsController( data class FollowsBanStatusEntry( val userId: Long, val username: String, - val isBanned: Boolean, - val lastUpdate: OffsetDateTime + val secondsPlayed: Long?, + val pp: Double?, + val rank: Long?, + val isBanned: Boolean?, + val approximateBanTime: OffsetDateTime?, + val lastUpdate: OffsetDateTime? ) @GetMapping("follows") @@ -44,8 +48,12 @@ class FollowsController( val follows = dslContext.select( USERS.USER_ID, USERS.USERNAME, + USERS.SECONDS_PLAYED, USERS.IS_BANNED, - USERS.SYS_LAST_UPDATE + USERS.PP_RAW, + USERS.RANK, + USERS.SYS_LAST_UPDATE, + USERS.APPROX_BAN_DATE ) .from(USER_FOLLOWS) .join(USERS).on(USER_FOLLOWS.FOLLOWS_USER_ID.eq(USERS.USER_ID)) @@ -55,8 +63,12 @@ class FollowsController( FollowsBanStatusEntry( it[USERS.USER_ID]!!, it[USERS.USERNAME]!!, - it[USERS.IS_BANNED]!!, - it[USERS.SYS_LAST_UPDATE]!! + it[USERS.SECONDS_PLAYED], + it[USERS.PP_RAW], + it[USERS.RANK], + it[USERS.IS_BANNED], + it[USERS.APPROX_BAN_DATE], + it[USERS.SYS_LAST_UPDATE] ) } @@ -72,8 +84,12 @@ class FollowsController( val follows = dslContext.select( USERS.USER_ID, USERS.USERNAME, + USERS.SECONDS_PLAYED, USERS.IS_BANNED, - USERS.SYS_LAST_UPDATE + USERS.PP_RAW, + USERS.RANK, + USERS.SYS_LAST_UPDATE, + USERS.APPROX_BAN_DATE ) .from(USER_FOLLOWS) .join(USERS).on(USER_FOLLOWS.FOLLOWS_USER_ID.eq(USERS.USER_ID)) @@ -83,8 +99,12 @@ class FollowsController( FollowsBanStatusEntry( it[USERS.USER_ID]!!, it[USERS.USERNAME]!!, - it[USERS.IS_BANNED]!!, - it[USERS.SYS_LAST_UPDATE]!! + it[USERS.SECONDS_PLAYED], + it[USERS.PP_RAW], + it[USERS.RANK], + it[USERS.IS_BANNED], + it[USERS.APPROX_BAN_DATE], + it[USERS.SYS_LAST_UPDATE] ) } diff --git a/nise-frontend/src/app/profile/profile.component.html b/nise-frontend/src/app/profile/profile.component.html index 2ac4354..4cce6f4 100644 --- a/nise-frontend/src/app/profile/profile.component.html +++ b/nise-frontend/src/app/profile/profile.component.html @@ -2,39 +2,87 @@
You can follow users by going on their profile and clicking the (+) Add follow buttan.
You are not following anyone!
-You can follow users by going on their profile and clicking the (+) Add follow buttan.
Then, they'll appear here, and you'll be able to check if they've been banned or not.
| Username | -Is banned? | -Last check | -- | |
|---|---|---|---|---|
|
- |
- - - {{ user.username }} - - | -{{ user.isBanned }} | -{{ calculateTimeAgo(user.lastUpdate) }} | -- | -
null
+ | Username | +Time played | +Total PP | +Rank | +Is banned? | +Last check | +Approximate ban date | ++ | |
|---|---|---|---|---|---|---|---|---|
|
+ |
+ + + {{ user.username }} + + | +
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+ + | +