morpheus

commit 23673413bd0587416f00cda73b4107ae40943277
parent df4045ef159a9edb35754342975b15811c6428e1
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 22 Aug 2017 23:32:43 +0200

Add Various typos.

Diffstat:
M
main.go
 | 
2
+-
M
matrix/ownUser.go
 | 
33
+++++++++++++++++++++++++++------
M
matrix/types.go
 | 
4
++--
M
uis.go
 | 
8
++++----

4 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/main.go b/main.go
@@ -10,10 +10,10 @@ import (
 )
 
 var window *widgets.QMainWindow
+var localLog *log.Logger
 
 func main() {
 	var file *os.File
-	var localLog *log.Logger
 	localLog = util.Logger()
 	localLog, file = util.StartFileLog(localLog)
 	defer file.Close()
diff --git a/matrix/ownUser.go b/matrix/ownUser.go
@@ -1,21 +1,37 @@
 package matrix
 
 import (
+	"log"
+	"os"
 	"strings"
 
+	"github.com/Nordgedanken/Neo/util"
 	"github.com/therecipe/qt/gui"
 	"github.com/tidwall/buntdb"
 )
 
+var localLog *log.Logger
+
+func init() {
+	var file *os.File
+	localLog = util.Logger()
+	localLog, file = util.StartFileLog(localLog)
+	defer file.Close()
+}
+
 // getUserDisplayName returns the Dispaly name to a MXID
 func getUserDisplayName(mxid string, cli *Client) (displayName string, err error) {
 	// Get cache
-	db.View(func(tx *Tx) error {
-		tx.AscendKeys("user:displayName",
+	db.View(func(tx *buntdb.Tx) error {
+		QueryErr := tx.AscendKeys("user:displayName",
 			func(key, value string) bool {
 				displayName = value
 				return true
 			})
+		if QueryErr != nil {
+			return QueryErr
+		}
+		return nil
 	})
 
 	// If cache is empty query the api
@@ -42,17 +58,20 @@ func getOwnUserAvatar(cli *Client) *gui.QPixmap {
 	var IMGdata string
 
 	// Get cache
-	db.View(func(tx *Tx) error {
-		tx.AscendKeys("user:avatarData100x100",
+	db.View(func(tx *buntdb.Tx) error {
+		QueryErr := tx.AscendKeys("user:avatarData100x100",
 			func(key, value string) bool {
 				avatarData = value
 				return true
 			})
+		if QueryErr != nil {
+			return QueryErr
+		}
+		return nil
 	})
 
 	//If cache is empty do a ServerQuery
 	if avatarData == "" {
-
 		// Get avatarURL
 		avatarURL, avatarErr := cli.GetAvatarURL()
 		if avatarErr != nil {
@@ -82,8 +101,10 @@ func getOwnUserAvatar(cli *Client) *gui.QPixmap {
 			return nil
 		})
 		if DBerr != nil {
-			localLog.Fatalln(err)
+			localLog.Fatalln(DBerr)
 		}
+	} else {
+		IMGdata = avatarData
 	}
 
 	// Convert avatarimage to QPixmap for usage in QT
diff --git a/matrix/types.go b/matrix/types.go
@@ -15,8 +15,8 @@ type RespUserDisplayName struct {
 }
 
 // GetUserDisplayName returns the Dispaly name to a MXID
-func (cli *Client) GetUserDisplayName(mxid string) (resp *RespUserDisplayName, err error) {
-	resp, err = getUserDisplayName(mxid, cli)
+func (cli *Client) GetUserDisplayName(mxid string) (displayName string, err error) {
+	displayName, err = getUserDisplayName(mxid, cli)
 	return
 }
 
diff --git a/uis.go b/uis.go
@@ -91,11 +91,11 @@ func NewMainUI(windowWidth, windowHeight int, cli *matrix.Client) *widgets.QWidg
 	mxidLabel.SetText(fmt.Sprint(username))
 
 	// Set Dispalyname Label
-	DisplayNameResp, DisplayNameErr := cli.GetUserDisplayName(username)
-	if DisplayNameErr != nil {
-		localLog.Println(DisplayNameErr)
+	displayName, displayNameErr := cli.GetUserDisplayName(username)
+	if displayNameErr != nil {
+		localLog.Println(displayNameErr)
 	}
-	usernameLabel.SetText(fmt.Sprint(DisplayNameResp.DisplayName))
+	usernameLabel.SetText(fmt.Sprint(displayName))
 
 	// Set Avatar
 	avatarLogo.SetAlignment(core.Qt__AlignBottom | core.Qt__AlignRight)