Browse Source

Add an asciiarrows option (for clients that do not support Unicode ones)

master v1.1.2
Bohdan Horbeshko 10 months ago
parent
commit
915c40f1ee
4 changed files with 29 additions and 9 deletions
  1. +11
    -0
      persistence/sessions.go
  2. +1
    -0
      persistence/sessions_test.go
  3. +11
    -3
      telegram/utils.go
  4. +6
    -6
      telegram/utils_test.go

+ 11
- 0
persistence/sessions.go View File

@ -38,12 +38,14 @@ type Session struct {
Timezone string `yaml:":timezone"`
KeepOnline bool `yaml:":keeponline"`
RawMessages bool `yaml:":rawmessages"`
AsciiArrows bool `yaml:":asciiarrows"`
}
var configKeys = []string{
"timezone",
"keeponline",
"rawmessages",
"asciiarrows",
}
var sessionDB *SessionsYamlDB
@ -114,6 +116,8 @@ func (s *Session) Get(key string) (string, error) {
return fromBool(s.KeepOnline), nil
case "rawmessages":
return fromBool(s.RawMessages), nil
case "asciiarrows":
return fromBool(s.AsciiArrows), nil
}
return "", errors.New("Unknown session property")
@ -150,6 +154,13 @@ func (s *Session) Set(key string, value string) (string, error) {
}
s.RawMessages = b
return value, nil
case "asciiarrows":
b, err := toBool(value)
if err != nil {
return "", err
}
s.AsciiArrows = b
return value, nil
}
return "", errors.New("Unknown session property")


+ 1
- 0
persistence/sessions_test.go View File

@ -53,6 +53,7 @@ func TestSessionToMap(t *testing.T) {
"timezone": "klsf",
"keeponline": "false",
"rawmessages": "true",
"asciiarrows": "false",
}
if !reflect.DeepEqual(m, sample) {
t.Errorf("Map does not match the sample: %v", m)


+ 11
- 3
telegram/utils.go View File

@ -617,10 +617,18 @@ func (c *Client) messageToPrefix(message *client.Message, fileString string) str
prefix := []string{}
// message direction
var directionChar string
if message.IsOutgoing {
directionChar = "➡ "
if c.Session.AsciiArrows {
if message.IsOutgoing {
directionChar = "> "
} else {
directionChar = "< "
}
} else {
directionChar = "⬅ "
if message.IsOutgoing {
directionChar = "➡ "
} else {
directionChar = "⬅ "
}
}
prefix = append(prefix, directionChar+strconv.FormatInt(message.Id, 10))
// show sender in group chats


+ 6
- 6
telegram/utils_test.go View File

@ -497,7 +497,7 @@ func TestMessageToPrefix1(t *testing.T) {
},
},
}
prefix := (&Client{}).messageToPrefix(&message, "")
prefix := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "")
if prefix != "➡ 42 | fwd: ziz" {
t.Errorf("Wrong prefix: %v", prefix)
}
@ -512,7 +512,7 @@ func TestMessageToPrefix2(t *testing.T) {
},
},
}
prefix := (&Client{}).messageToPrefix(&message, "")
prefix := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "")
if prefix != "⬅ 56 | fwd: (zaz)" {
t.Errorf("Wrong prefix: %v", prefix)
}
@ -525,8 +525,8 @@ func TestMessageToPrefix3(t *testing.T) {
Origin: &client.MessageForwardOriginChannel{},
},
}
prefix := (&Client{}).messageToPrefix(&message, "a.jpg")
if prefix != " 56 | fwd: | file: a.jpg" {
prefix := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "a.jpg")
if prefix != "< 56 | fwd: | file: a.jpg" {
t.Errorf("Wrong prefix: %v", prefix)
}
}
@ -536,8 +536,8 @@ func TestMessageToPrefix4(t *testing.T) {
Id: 23,
IsOutgoing: true,
}
prefix := (&Client{}).messageToPrefix(&message, "")
if prefix != " 23" {
prefix := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "")
if prefix != "> 23" {
t.Errorf("Wrong prefix: %v", prefix)
}
}

Loading…
Cancel
Save