Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • api-redesign
  • main
  • 0.10.0
  • 0.10.1
  • 0.10.2
  • 0.7.0
  • 0.8.0
  • 0.8.1
  • 0.9.0
  • 0.9.1
  • 0.9.2
11 results

Target

Select target project
  • justJanne/libquassel
1 result
Select Git revision
  • api-redesign
  • main
  • 0.10.0
  • 0.10.1
  • 0.10.2
  • 0.7.0
  • 0.8.0
  • 0.8.1
  • 0.9.0
  • 0.9.1
  • 0.9.2
11 results
Show changes
Commits on Source (3)
Showing
with 92 additions and 35 deletions
......@@ -11,9 +11,9 @@ package de.justjanne.libquassel.protocol.api.client
import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.protocol.api.dto.AliasManagerDto
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.AliasManagerDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("AliasManager", side = ProtocolSide.CORE)
......@@ -21,5 +21,5 @@ interface AliasManagerClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: AliasManagerDto) = update(properties.serialize())
suspend fun update(properties: AliasManagerDto) = update(properties.let(AliasManagerDto.Serializer::serialize))
}
......@@ -13,9 +13,11 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.BacklogManagerDto
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.models.ids.MsgId
import de.justjanne.libquassel.protocol.variant.QVariantList
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("BacklogManager", side = ProtocolSide.CORE)
interface BacklogManagerClientApi {
......@@ -91,4 +93,9 @@ interface BacklogManagerClientApi {
@RpcParam.Int flags: Int = -1,
@RpcParam.QVariantList messages: QVariantList
)
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: BacklogManagerDto) = update(properties.let(BacklogManagerDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.BufferSyncerDto
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.models.ids.MsgId
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -45,4 +46,6 @@ interface BufferSyncerClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: BufferSyncerDto) = update(properties.let(BufferSyncerDto.Serializer::serialize))
}
......@@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.api.ObjectName
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.models.ids.NetworkId
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -21,47 +22,49 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("BufferViewConfig", side = ProtocolSide.CORE)
interface BufferViewConfigClientApi {
@RpcCall("addBuffer")
suspend fun addBuffer(@RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
suspend fun addBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
@RpcCall("moveBuffer")
suspend fun moveBuffer(@RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
suspend fun moveBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
@RpcCall("removeBuffer")
suspend fun removeBuffer(@RpcParam.UserType.BufferId buffer: BufferId)
suspend fun removeBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
@RpcCall("removeBufferPermanently")
suspend fun removeBufferPermanently(@RpcParam.UserType.BufferId buffer: BufferId)
suspend fun removeBufferPermanently(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
@RpcCall("setBufferViewName")
suspend fun setBufferViewName(@RpcParam.QString value: String)
suspend fun setBufferViewName(objectName: ObjectName, @RpcParam.QString value: String)
@RpcCall("setAddNewBuffersAutomatically")
suspend fun setAddNewBuffersAutomatically(@RpcParam.Bool value: Boolean)
suspend fun setAddNewBuffersAutomatically(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("setAllowedBufferTypes")
suspend fun setAllowedBufferTypes(@RpcParam.Int value: Int)
suspend fun setAllowedBufferTypes(objectName: ObjectName, @RpcParam.Int value: Int)
@RpcCall("setDisableDecoration")
suspend fun setDisableDecoration(@RpcParam.Bool value: Boolean)
suspend fun setDisableDecoration(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("setHideInactiveBuffers")
suspend fun setHideInactiveBuffers(@RpcParam.Bool value: Boolean)
suspend fun setHideInactiveBuffers(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("setHideInactiveNetworks")
suspend fun setHideInactiveNetworks(@RpcParam.Bool value: Boolean)
suspend fun setHideInactiveNetworks(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("setMinimumActivity")
suspend fun setMinimumActivity(@RpcParam.Int value: Int)
suspend fun setMinimumActivity(objectName: ObjectName, @RpcParam.Int value: Int)
@RpcCall("setNetworkId")
suspend fun setNetworkId(@RpcParam.UserType.NetworkId value: NetworkId)
suspend fun setNetworkId(objectName: ObjectName, @RpcParam.UserType.NetworkId value: NetworkId)
@RpcCall("setShowSearch")
suspend fun setShowSearch(@RpcParam.Bool value: Boolean)
suspend fun setShowSearch(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("setSortAlphabetically")
suspend fun setSortAlphabetically(@RpcParam.Bool value: Boolean)
suspend fun setSortAlphabetically(objectName: ObjectName, @RpcParam.Bool value: Boolean)
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
//suspend fun update(objectName: ObjectName, properties: BufferViewConfigDto) = update(objectName, properties.let(BufferViewConfigDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.BufferViewManagerDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("BufferViewManager", side = ProtocolSide.CORE)
......@@ -25,4 +26,6 @@ interface BufferViewManagerClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: BufferViewManagerDto) = update(properties.let(BufferViewManagerDto.Serializer::serialize))
}
......@@ -27,4 +27,6 @@ interface CertManagerClientApi {
@RpcCall("update")
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
//suspend fun update(objectName: ObjectName, properties: CertManagerDto) = update(objectName, properties.let(CertManagerDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.CoreInfoDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("CoreInfo", side = ProtocolSide.CORE)
......@@ -22,4 +23,6 @@ interface CoreInfoClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: CoreInfoDto) = update(properties.let(CoreInfoDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.HighlightRuleManagerDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("HighlightRuleManager", side = ProtocolSide.CORE)
......@@ -44,4 +45,6 @@ interface HighlightRuleManagerClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: HighlightRuleManagerDto) = update(properties.let(HighlightRuleManagerDto.Serializer::serialize))
}
......@@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.api.ObjectName
import de.justjanne.libquassel.protocol.dto.IdentityDto
import de.justjanne.libquassel.protocol.models.QStringList
import de.justjanne.libquassel.protocol.models.ids.IdentityId
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -98,4 +99,6 @@ interface IdentityClientApi {
@RpcCall("update")
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(objectName: ObjectName, properties: IdentityDto) = update(objectName, properties.let(IdentityDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.IgnoreListManagerDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("IgnoreListManager", side = ProtocolSide.CORE)
......@@ -36,4 +37,6 @@ interface IgnoreListManagerClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: IgnoreListManagerDto) = update(properties.let(IgnoreListManagerDto.Serializer::serialize))
}
......@@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.api.ObjectName
import de.justjanne.libquassel.protocol.dto.IrcChannelDto
import de.justjanne.libquassel.protocol.models.QStringList
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -61,4 +62,6 @@ interface IrcChannelClientApi {
@RpcCall("update")
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(objectName: ObjectName, properties: IrcChannelDto) = update(objectName, properties.let(IrcChannelDto.Serializer::serialize))
}
......@@ -13,9 +13,11 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.IrcListHelperDto
import de.justjanne.libquassel.protocol.models.QStringList
import de.justjanne.libquassel.protocol.models.ids.NetworkId
import de.justjanne.libquassel.protocol.variant.QVariantList
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("IrcListHelper", side = ProtocolSide.CORE)
interface IrcListHelperClientApi {
......@@ -27,4 +29,9 @@ interface IrcListHelperClientApi {
@RpcCall("reportFinishedList")
suspend fun reportFinishedList(@RpcParam.UserType.NetworkId netId: NetworkId)
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: IrcListHelperDto) = update(properties.let(IrcListHelperDto.Serializer::serialize))
}
......@@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.api.ObjectName
import de.justjanne.libquassel.protocol.dto.IrcUserDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
import org.threeten.bp.temporal.Temporal
......@@ -90,5 +91,6 @@ interface IrcUserClientApi {
@RpcCall("update")
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
}
suspend fun update(objectName: ObjectName, properties: IrcUserDto) = update(objectName, properties.let(IrcUserDto.Serializer::serialize))
}
......@@ -171,4 +171,6 @@ interface NetworkClientApi {
@RpcCall("update")
suspend fun update(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
//suspend fun update(objectName: ObjectName, properties: NetworkDto) = update(objectName, properties.let(NetworkDto.Serializer::serialize))
}
......@@ -13,6 +13,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.NetworkConfigDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("NetworkConfig", side = ProtocolSide.CORE)
......@@ -43,4 +44,6 @@ interface NetworkConfigClientApi {
@RpcCall("update")
suspend fun update(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun update(properties: NetworkConfigDto) = update(properties.let(NetworkConfigDto.Serializer::serialize))
}
......@@ -14,11 +14,11 @@ import de.justjanne.libquassel.protocol.variant.QVariantList
import de.justjanne.libquassel.protocol.variant.QVariant_
interface Proxy {
fun sync(className: String, objectName: ObjectName, function: String, params: QVariantList)
fun sync(className: String, objectName: ObjectName, function: String, vararg arg: QVariant_) =
suspend fun sync(className: String, objectName: ObjectName, function: String, params: QVariantList)
suspend fun sync(className: String, objectName: ObjectName, function: String, vararg arg: QVariant_) =
sync(className, objectName, function, arg.toList())
fun rpc(function: String, params: QVariantList)
fun rpc(function: String, vararg arg: QVariant_) =
suspend fun rpc(function: String, params: QVariantList)
suspend fun rpc(function: String, vararg arg: QVariant_) =
rpc(function, arg.toList())
}
......@@ -11,9 +11,9 @@ package de.justjanne.libquassel.protocol.api.server
import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.protocol.api.dto.AliasManagerDto
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.AliasManagerDto
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("AliasManager", side = ProtocolSide.CLIENT)
......@@ -25,9 +25,7 @@ interface AliasManagerServerApi {
)
@RpcCall("requestUpdate")
suspend fun requestUpdate(
@RpcParam.QVariantMap properties: QVariantMap
)
suspend fun requestUpdate(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun requestUpdate(properties: AliasManagerDto) = requestUpdate(properties.serialize())
suspend fun requestUpdate(properties: AliasManagerDto) = requestUpdate(properties.let(AliasManagerDto.Serializer::serialize))
}
......@@ -11,10 +11,12 @@ package de.justjanne.libquassel.protocol.api.server
import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.BacklogManagerDto
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.models.ids.MsgId
import de.justjanne.libquassel.protocol.variant.QVariantMap
@RpcApi("BacklogManager", side = ProtocolSide.CLIENT)
interface BacklogManagerServerApi {
......@@ -113,4 +115,9 @@ interface BacklogManagerServerApi {
@RpcParam.Int type: Int = -1,
@RpcParam.Int flags: Int = -1
)
@RpcCall("requestUpdate")
suspend fun requestUpdate(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun requestUpdate(properties: BacklogManagerDto) = requestUpdate(properties.let(BacklogManagerDto.Serializer::serialize))
}
......@@ -11,8 +11,9 @@ package de.justjanne.libquassel.protocol.api.server
import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.dto.BufferSyncerDto
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.models.ids.MsgId
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -54,4 +55,6 @@ interface BufferSyncerServerApi {
@RpcCall("requestUpdate")
suspend fun requestUpdate(@RpcParam.QVariantMap properties: QVariantMap)
suspend fun requestUpdate(properties: BufferSyncerDto) = requestUpdate(properties.let(BufferSyncerDto.Serializer::serialize))
}
......@@ -11,8 +11,8 @@ package de.justjanne.libquassel.protocol.api.server
import de.justjanne.libquassel.annotations.ProtocolSide
import de.justjanne.libquassel.annotations.RpcApi
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.annotations.RpcCall
import de.justjanne.libquassel.annotations.RpcParam
import de.justjanne.libquassel.protocol.api.ObjectName
import de.justjanne.libquassel.protocol.models.ids.BufferId
import de.justjanne.libquassel.protocol.variant.QVariantMap
......@@ -36,4 +36,6 @@ interface BufferViewConfigServerApi {
@RpcCall("requestUpdate")
suspend fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
//suspend fun requestUpdate(objectName: ObjectName, properties: BufferViewConfigDto) = requestUpdate(objectName, properties.let(BufferViewConfigDto.Serializer::serialize))
}