Merge pull request #866 from nanu-c/updates

Updates
axolotl-chat · Aug 19, 2022 · 3a704ce · 3a704ce
2 parents 34ba811 + 4160583
commit 3a704ce
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 55 deletions.
diff --git a/app/config/config.go b/app/config/config.go
@@ -18,7 +18,7 @@ import (
 
 const AppName = "textsecure.nanuc"
 
-const AppVersion = "1.3.1"
+const AppVersion = "1.4.0"
 
 // Do not allow sending attachments larger than 100M for now
 const MaxAttachmentSize int64 = 100 * 1024 * 1024

diff --git a/app/handler/handler.go b/app/handler/handler.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 	"time"
 
@@ -68,7 +68,7 @@ func buildAndSaveMessage(msg *textsecure.Message, syncMessage bool) {
 		av := []byte{}
 
 		if gr.Avatar != nil {
-			av, err = ioutil.ReadAll(bytes.NewReader(gr.Avatar))
+			av, err = io.ReadAll(bytes.NewReader(gr.Avatar))
 			if err != nil {
 				log.Println("[axolotl] avatar", err)
 				return
@@ -216,7 +216,7 @@ func buildAndSaveMessage(msg *textsecure.Message, syncMessage bool) {
 		err, id := store.FindQuotedMessage(msg.Quote())
 		if err != nil || id == -1 {
 			// create quoted message
-			quoteMessage := session.Add(text, msg.Quote().GetAuthorE164(), nil, msg.Quote().GetText(), false, store.ActiveSessionID)
+			quoteMessage := session.Add(text, msg.Quote().GetAuthorUuid(), nil, msg.Quote().GetText(), false, store.ActiveSessionID)
 			quoteMessage.Flags = helpers.MsgFlagHiddenQuote
 			err, savedQuoteMessage := store.SaveMessage(quoteMessage)
 			id = savedQuoteMessage.ID

diff --git a/appimage/AppDir/axolotl.appdata.xml b/appimage/AppDir/axolotl.appdata.xml
@@ -29,6 +29,9 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="1.4.0" date="2022-08-19">
+            <url>https://github.com/nanu-c/axolotl/releases/tag/v1.4.0</url>
+        </release>
         <release version="1.3.1" date="2022-08-02">
             <url>https://github.com/nanu-c/axolotl/releases/tag/v1.3.1</url>
         </release>

diff --git a/axolotl-web/package-lock.json b/axolotl-web/package-lock.json
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.4.0 (Aug 19 2022)
+------------------------------------
+* update axolotl-web depencies to latest versions @nanu-c
+* update protobufs @nanu-c
+
 1.3.1 (Aug 2 2022)
 ------------------------------------
 * fix for ssh+git links in package-lock.json /fixes flatpack build @nanu-c

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -135,7 +135,7 @@ To build the application, use the following command from the root of this reposi
 
 To install the built snap, use snap:
 
-`sudo snap install axolotl_1.3.1_amd64.snap --dangerous`
+`sudo snap install axolotl_1.4.0_amd64.snap --dangerous`
 
 **Run**
 

diff --git a/flatpak/org.nanuc.Axolotl.appdata.xml b/flatpak/org.nanuc.Axolotl.appdata.xml
@@ -29,6 +29,9 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="1.4.0" date="2022-08-19">
+            <url>https://github.com/nanu-c/axolotl/releases/tag/v1.4.0</url>
+        </release>
         <release version="1.3.1" date="2022-08-02">
             <url>https://github.com/nanu-c/axolotl/releases/tag/v1.3.1</url>
         </release>

diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/signal-golang/go-vcard v0.1.2
 	github.com/signal-golang/libphonenumber v1.2.2-0.20220127214340-b765372d3707
-	github.com/signal-golang/textsecure v1.11.0
+	github.com/signal-golang/textsecure v1.12.1
 	github.com/sirupsen/logrus v1.9.0
 	github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0

diff --git a/go.sum b/go.sum
@@ -1,4 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/Blackoverflow/gcmsiv v0.0.0-20201031155123-20af2af977ff h1:l3WopnX/gWnDItXZdr2Ygq0+4ZwXCSyozyPNR8jdb8I=
+github.com/Blackoverflow/gcmsiv v0.0.0-20201031155123-20af2af977ff/go.mod h1:t1lmwOv+IYxaUkr2qIKXEfn90t4GgocS0qy8jkDonbg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
@@ -110,8 +112,8 @@ github.com/signal-golang/libphonenumber v1.2.2-0.20220127214340-b765372d3707 h1:
 github.com/signal-golang/libphonenumber v1.2.2-0.20220127214340-b765372d3707/go.mod h1:oW+JXk+4C0R5h8BQzfRA4k/vXuBfBcNSqKWjn7Dgncs=
 github.com/signal-golang/mimemagic v0.0.0-20200821045537-3f613cf2cd3f h1:S17lCk5rcobvgcaLf7XSAoLuNkRPgFyhvgRA9JwDzHc=
 github.com/signal-golang/mimemagic v0.0.0-20200821045537-3f613cf2cd3f/go.mod h1:tU6SWwv50oGkZNPlvTFvmqZvEBp0vWWCC+LCEVlTE5A=
-github.com/signal-golang/textsecure v1.11.0 h1:l8dtRCrPrtyWX27HN32GuYLBlCazSLJtrMJlPzj2SDw=
-github.com/signal-golang/textsecure v1.11.0/go.mod h1:teNGhh4TcoKEfPta0A8JKq25zerVF+mh1ZYWAelVeGQ=
+github.com/signal-golang/textsecure v1.12.1 h1:OXFyTbSMBh4SwiOQufhNzVyqxtCI+DJ5AmEvs7vJUEE=
+github.com/signal-golang/textsecure v1.12.1/go.mod h1:sna5yQxNwY/F54q/K4xxP90VgWMSBgm3L8zbWOkF2mk=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=

diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "textsecure.nanuc",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "description": "A Signal compatible messaging client for Ubuntu phones",
     "title": "Axolotl",
     "architecture": "@CLICK_ARCH@",

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@ grade: stable
 confinement: strict
 base: core20
 icon: snap/gui/axolotl.png
-version: "1.3.1"
+version: "1.4.0"
 architectures:
   - build-on: amd64
   - build-on: arm64