From 3f1b7cdd26c32404087403bf1bd3817d16e664fb Mon Sep 17 00:00:00 2001
From: jfreegman <jfreegman@gmail.com>
Date: Mon, 30 Nov 2020 00:58:43 -0500
Subject: [PATCH] Update config example and some default settings to reflect
 recent changes

---
 misc/toxic.conf.example | 6 +++---
 src/settings.c          | 9 +++------
 src/settings.h          | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/misc/toxic.conf.example b/misc/toxic.conf.example
index 8573837..7678d50 100644
--- a/misc/toxic.conf.example
+++ b/misc/toxic.conf.example
@@ -30,7 +30,7 @@ ui = {
   time_format=24;
 
   // Timestamp format string according to date/strftime format. Overrides time_format setting
-  timestamp_format="%H:%M:%S";
+  timestamp_format="%H:%M";
 
   // true to show you when others are typing a message in 1-on-1 chats
   show_typing_other=true;
@@ -54,7 +54,7 @@ ui = {
   history_size=700;
 
   // time in milliseconds to display a notification
-  notification_timeout=3000;
+  notification_timeout=6000;
 
   // Indicator for display when someone connects or joins a group.
   line_join="-->";
@@ -66,7 +66,7 @@ ui = {
   line_alert="-!-";
 
   // Indicator for normal messages.
-  line_normal="---";
+  line_normal="-";
 
   // true to change status based on screen/tmux attach/detach, false to disable
   mplex_away=true;
diff --git a/src/settings.c b/src/settings.c
index 663abb5..af15589 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -116,7 +116,7 @@ static void ui_defaults(struct user_settings *settings)
     settings->bell_on_invite = 0;
     settings->colour_theme = DFLT_COLS;
     settings->history_size = 700;
-    settings->notification_timeout = 3000;
+    settings->notification_timeout = 6000;
     settings->show_typing_self = SHOW_TYPING_ON;
     settings->show_typing_other = SHOW_TYPING_ON;
     settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
@@ -130,10 +130,7 @@ static void ui_defaults(struct user_settings *settings)
     snprintf(settings->line_normal, LINE_HINT_MAX + 1, "%s", LINE_NORMAL);
 
     settings->mplex_away = MPLEX_ON;
-    snprintf(settings->mplex_away_note,
-             sizeof(settings->mplex_away_note),
-             "%s",
-             MPLEX_AWAY_NOTE);
+    snprintf(settings->mplex_away_note, sizeof(settings->mplex_away_note), "%s", MPLEX_AWAY_NOTE);
 }
 
 static const struct keys_strings {
@@ -339,7 +336,7 @@ int settings_load(struct user_settings *s, const char *patharg)
 
         if (config_setting_lookup_int(setting, ui_strings.time_format, &time)) {
             if (time == 12) {
-                snprintf(s->timestamp_format, sizeof(s->timestamp_format), "%s", "%I:%M:%S %p");
+                snprintf(s->timestamp_format, sizeof(s->timestamp_format), "%s", "%I:%M %p");
                 snprintf(s->log_timestamp_format, sizeof(s->log_timestamp_format), "%s", "%Y/%m/%d [%I:%M:%S %p]");
             }
         }
diff --git a/src/settings.h b/src/settings.h
index 6933a6f..aa8bfb1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -125,7 +125,7 @@ enum settings_values {
 #define LINE_NORMAL  "-"
 #define TIMESTAMP_DEFAULT      "%H:%M"
 #define LOG_TIMESTAMP_DEFAULT  "%Y/%m/%d [%H:%M:%S]"
-#define MPLEX_AWAY_NOTE "Detached from screen"
+#define MPLEX_AWAY_NOTE "Away from keyboard, be back soon!"
 
 int settings_load(struct user_settings *s, const char *patharg);