diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Line.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Line.kt index 665ee39f..d44059f4 100644 --- a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Line.kt +++ b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Line.kt @@ -22,6 +22,7 @@ import com.ubergeek42.weechat.ColorScheme open class Line( + @JvmField val id: Int?, @JvmField val pointer: Long, @JvmField val type: LineSpec.Type, @JvmField val timestamp: Long, diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt index fc128e20..8b89ed67 100644 --- a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt +++ b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt @@ -246,7 +246,7 @@ private val TITLE_LINE_POINTER = ++fakePointerCounter open class FakeLine(pointer: Long) : Line( - pointer, LineSpec.Type.Other, + null, pointer, LineSpec.Type.Other, timestamp = 0, rawPrefix = "", rawMessage = "", nick = null, isVisible = false, isHighlighted = false, LineSpec.DisplayAs.Unspecified, LineSpec.NotifyLevel.Low) diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Spec.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Spec.kt index 2a42e853..2132e977 100644 --- a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Spec.kt +++ b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Spec.kt @@ -154,6 +154,7 @@ class HotlistSpec(entry: HdataEntry) { @JvmInline value class LineSpec(val entry: HdataEntry) { inline val bufferPointer: Long get() = entry.getPointerLong("buffer") + inline val id: Int? get() = entry.getIntOrNull("id") inline val pointer: Long get() = entry.pointerLong inline val timestamp: Long get() = entry.getItem("date").asTime().time inline val prefix: String? get() = entry.getStringOrNull("prefix") @@ -170,7 +171,7 @@ class HotlistSpec(entry: HdataEntry) { companion object { fun makeLastLinesRequest(id: String, pointer: Long, numberOfLines: Int) = "($id) hdata buffer:${pointer.as0x}/own_lines/last_line(-$numberOfLines)/data " + - "date,displayed,prefix,message,highlight,notify,tags_array" + "id,date,displayed,prefix,message,highlight,notify,tags_array" } fun toLine(): Line { @@ -249,7 +250,7 @@ class HotlistSpec(entry: HdataEntry) { } } - return Line(pointer, type, + return Line(id, pointer, type, timestamp, prefix ?: "", message ?: "", nick, visible, highlight,