[core] use RFC3339 dates format

android-sms-gateway · Oct 30, 2024 · 2164637 · 2164637
1 parent 164587f
commit 2164637
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/internal/commands/messages/send.go b/internal/commands/messages/send.go
@@ -40,7 +40,7 @@ var send = &cli.Command{
 		&cli.TimestampFlag{
 			Name:     "validUntil",
 			Usage:    "Valid until",
-			Layout:   time.DateTime,
+			Layout:   time.RFC3339,
 			Timezone: time.Local,
 		},
 	},

diff --git a/internal/core/output/text.go b/internal/core/output/text.go
@@ -33,22 +33,6 @@ func (*TextOutput) MessageState(src smsgateway.MessageState) (string, error) {
 	builder.WriteString("\nIsEncrypted: ")
 	builder.WriteString(boolToString(src.IsEncrypted))
 
-	if len(src.States) > 0 {
-		builder.WriteString("\nStates: ")
-
-		for _, k := range messageStates {
-			v, ok := src.States[k]
-			if !ok {
-				continue
-			}
-
-			builder.WriteString("\n\t")
-			builder.WriteString(k)
-			builder.WriteString("\t")
-			builder.WriteString(v.Local().Format(time.DateTime))
-		}
-	}
-
 	builder.WriteString("\nRecipients: ")
 
 	for _, r := range src.Recipients {
@@ -64,5 +48,21 @@ func (*TextOutput) MessageState(src smsgateway.MessageState) (string, error) {
 		}
 	}
 
+	if len(src.States) > 0 {
+		builder.WriteString("\nStates: ")
+
+		for _, k := range messageStates {
+			v, ok := src.States[k]
+			if !ok {
+				continue
+			}
+
+			builder.WriteString("\n\t")
+			builder.WriteString(k)
+			builder.WriteString("\t")
+			builder.WriteString(v.Local().Format(time.RFC3339))
+		}
+	}
+
 	return builder.String(), nil
 }