projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🎨 Replace last activity comparator with Kotlin version
[Sone.git]
/
src
/
main
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
KnownSonesPage.kt
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
index
4c801e0
..
439a163
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@
-13,8
+13,9
@@
import javax.inject.*
*/
@MenuName("KnownSones")
@TemplatePath("/templates/knownSones.html")
*/
@MenuName("KnownSones")
@TemplatePath("/templates/knownSones.html")
+@ToadletPath("knownSones.html")
class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
- SoneTemplatePage(
"knownSones.html",
webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
+ SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
getCurrentSone(soneRequest.toadletContext).let { currentSone ->
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
getCurrentSone(soneRequest.toadletContext).let { currentSone ->
@@
-28,9
+29,9
@@
class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Lo
.sortedWith(
when (soneRequest.parameters["sort"]) {
"images" -> Sone.IMAGE_COUNT_COMPARATOR
.sortedWith(
when (soneRequest.parameters["sort"]) {
"images" -> Sone.IMAGE_COUNT_COMPARATOR
- "name" ->
Sone.NICE_NAME_COMPARATOR
.reversed()
+ "name" ->
niceNameComparator
.reversed()
"posts" -> Sone.POST_COUNT_COMPARATOR
"posts" -> Sone.POST_COUNT_COMPARATOR
- else ->
Sone.LAST_ACTIVITY_COMPARATOR
+ else ->
lastActivityComparator
}.let { comparator ->
when (soneRequest.parameters["order"]) {
"asc" -> comparator.reversed()
}.let { comparator ->
when (soneRequest.parameters["order"]) {
"asc" -> comparator.reversed()