From 20e6d2558e868d61d7168ffe5ca4f3bff0a240c7 Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Mon, 29 Jan 2024 05:00:42 -0500 Subject: [PATCH] Version 1.9.0 --- Makefile | 2 +- persistence/sessions_test.go | 3 +++ telegabber.go | 2 +- telegram/connect.go | 2 +- telegram/utils.go | 2 +- telegram/utils_test.go | 8 +++++--- xmpp/gateway/gateway.go | 1 + 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index cf7b441..cadda1c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ COMMIT := $(shell git rev-parse --short HEAD) TD_COMMIT := "5bbfc1cf5dab94f82e02f3430ded7241d4653551" -VERSION := "v1.9.0-dev" +VERSION := "v1.9.0" MAKEOPTS := "-j4" all: diff --git a/persistence/sessions_test.go b/persistence/sessions_test.go index 8ca6f4f..0339378 100644 --- a/persistence/sessions_test.go +++ b/persistence/sessions_test.go @@ -48,6 +48,7 @@ func TestSessionToMap(t *testing.T) { Timezone: "klsf", RawMessages: true, OOBMode: true, + Receipts: true, } m := session.ToMap() sample := map[string]string{ @@ -58,6 +59,8 @@ func TestSessionToMap(t *testing.T) { "oobmode": "true", "carbons": "false", "hideids": "false", + "receipts": "true", + "nativeedits": "false", } if !reflect.DeepEqual(m, sample) { t.Errorf("Map does not match the sample: %v", m) diff --git a/telegabber.go b/telegabber.go index 8db6077..8edd416 100644 --- a/telegabber.go +++ b/telegabber.go @@ -16,7 +16,7 @@ import ( goxmpp "gosrc.io/xmpp" ) -var version string = "1.9.0-dev" +var version string = "1.9.0" var commit string var sm *goxmpp.StreamManager diff --git a/telegram/connect.go b/telegram/connect.go index afa2d1f..f344759 100644 --- a/telegram/connect.go +++ b/telegram/connect.go @@ -158,7 +158,7 @@ func (c *Client) Connect(resource string) error { } gateway.SubscribeToTransport(c.xmpp, c.jid) - c.sendPresence(gateway.SPStatus("Logged in as: "+c.Session.Login)) + c.sendPresence(gateway.SPStatus("Logged in as: " + c.Session.Login)) }() return nil diff --git a/telegram/utils.go b/telegram/utils.go index 2082645..7ab5765 100644 --- a/telegram/utils.go +++ b/telegram/utils.go @@ -1298,7 +1298,7 @@ func (c *Client) roster(resource string) { c.ProcessStatusUpdate(chat, "", "") } - c.sendPresence(gateway.SPStatus("Logged in as: "+c.Session.Login)) + c.sendPresence(gateway.SPStatus("Logged in as: " + c.Session.Login)) c.addResource(resource) } diff --git a/telegram/utils_test.go b/telegram/utils_test.go index 534596f..fa9c107 100644 --- a/telegram/utils_test.go +++ b/telegram/utils_test.go @@ -519,9 +519,11 @@ func TestMessageToPrefix6(t *testing.T) { ChatId: 25, IsOutgoing: true, ReplyTo: &client.MessageReplyToMessage{ - ChatId: 41, - Quote: &client.FormattedText{ - Text: "tist\nuz\niz", + ChatId: 41, + Quote: &client.TextQuote{ + Text: &client.FormattedText{ + Text: "tist\nuz\niz", + }, }, Origin: &client.MessageOriginHiddenUser{ SenderName: "ziz", diff --git a/xmpp/gateway/gateway.go b/xmpp/gateway/gateway.go index 736f760..de0ec8d 100644 --- a/xmpp/gateway/gateway.go +++ b/xmpp/gateway/gateway.go @@ -24,6 +24,7 @@ type Reply struct { } type MarkerType byte + const ( MarkerTypeReceived MarkerType = iota MarkerTypeDisplayed