projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e5d392
)
🔥 Remove unused “create” flag
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 7 Apr 2020 20:41:15 +0000
(22:41 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 8 Apr 2020 16:51:58 +0000
(18:51 +0200)
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
patch
|
blob
|
history
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
index
66c8ed2
..
c60fe56
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt
@@
-21,7
+21,7
@@
class GetNotificationsAjaxPage @Inject constructor(webInterface: WebInterface) :
override val requiresLogin = false
override fun createJsonObject(request: FreenetRequest) =
override val requiresLogin = false
override fun createJsonObject(request: FreenetRequest) =
- getCurrentSone(request.toadletContext
, false
).let { currentSone ->
+ getCurrentSone(request.toadletContext).let { currentSone ->
webInterface.getNotifications(currentSone)
.sortedBy(Notification::getCreatedTime)
.let { notifications ->
webInterface.getNotifications(currentSone)
.sortedBy(Notification::getCreatedTime)
.let { notifications ->
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
index
75f3c3c
..
5d17262
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt
@@
-35,7
+35,7
@@
class GetStatusAjaxPage(webInterface: WebInterface, private val elementLoader: E
}
override fun createJsonObject(request: FreenetRequest) =
}
override fun createJsonObject(request: FreenetRequest) =
- getCurrentSone(request.toadletContext
, false
).let { currentSone ->
+ getCurrentSone(request.toadletContext).let { currentSone ->
createSuccessJsonObject().apply {
this["loggedIn"] = currentSone != null
this["options"] = currentSone?.options?.toJsonOptions() ?: jsonObject {}
createSuccessJsonObject().apply {
this["loggedIn"] = currentSone != null
this["options"] = currentSone?.options?.toJsonOptions() ?: jsonObject {}
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
index
574a0a8
..
356aca6
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
@@
-31,7
+31,7
@@
abstract class JsonPage(protected val webInterface: WebInterface) : Page<Freenet
protected fun createErrorJsonObject(error: String) =
JsonErrorReturnObject(error)
protected fun createErrorJsonObject(error: String) =
JsonErrorReturnObject(error)
- protected fun getCurrentSone(toadletContext: ToadletContext
, createSession: Boolean = true
) =
+ protected fun getCurrentSone(toadletContext: ToadletContext) =
sessionProvider.getCurrentSone(toadletContext)
override fun handleRequest(request: FreenetRequest, response: Response): Response {
sessionProvider.getCurrentSone(toadletContext)
override fun handleRequest(request: FreenetRequest, response: Response): Response {