about summary refs log tree commit diff stats
path: root/commands/msg
diff options
context:
space:
mode:
authorReto Brunner <reto@labrat.space>2021-01-30 13:51:32 +0100
committerReto Brunner <reto@labrat.space>2021-01-30 14:04:23 +0100
commit8ea86cea41aa038a25a8fee9cd540a7336869dae (patch)
tree11970859b928dfa06203962b58941e889295edc0 /commands/msg
parent949781fa0a5f0654112b4f78558347ca991a89d3 (diff)
downloadaerc-8ea86cea41aa038a25a8fee9cd540a7336869dae.tar.gz
Get rid of the aerc.PushError(" " + $string) idiom
The individual callers should not be responsible for padding
Diffstat (limited to 'commands/msg')
-rw-r--r--commands/msg/archive.go2
-rw-r--r--commands/msg/copy.go2
-rw-r--r--commands/msg/delete.go2
-rw-r--r--commands/msg/modify-labels.go2
-rw-r--r--commands/msg/move.go2
-rw-r--r--commands/msg/pipe.go4
-rw-r--r--commands/msg/read.go2
-rw-r--r--commands/msg/recall.go2
8 files changed, 9 insertions, 9 deletions
diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index 07de13f..59ca985 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -86,7 +86,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
 			case *types.Done:
 				wg.Done()
 			case *types.Error:
-				aerc.PushError(" " + msg.Error.Error())
+				aerc.PushError(msg.Error.Error())
 				success = false
 				wg.Done()
 			}
diff --git a/commands/msg/copy.go b/commands/msg/copy.go
index f3d4030..8e5bad0 100644
--- a/commands/msg/copy.go
+++ b/commands/msg/copy.go
@@ -60,7 +60,7 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error {
 			case *types.Done:
 				aerc.PushStatus("Messages copied.", 10*time.Second)
 			case *types.Error:
-				aerc.PushError(" " + msg.Error.Error())
+				aerc.PushError(msg.Error.Error())
 			}
 		})
 	return nil
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 6eb35eb..baa5011 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -47,7 +47,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
 		case *types.Done:
 			aerc.PushStatus("Messages deleted.", 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(msg.Error.Error())
 		case *types.Unsupported:
 			// notmuch doesn't support it, we want the user to know
 			aerc.PushError(" error, unsupported for this worker")
diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
index f91075a..082742b 100644
--- a/commands/msg/modify-labels.go
+++ b/commands/msg/modify-labels.go
@@ -58,7 +58,7 @@ func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error {
 		case *types.Done:
 			aerc.PushStatus("labels updated", 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(msg.Error.Error())
 		}
 	})
 	return nil
diff --git a/commands/msg/move.go b/commands/msg/move.go
index 41f61da..31e243a 100644
--- a/commands/msg/move.go
+++ b/commands/msg/move.go
@@ -71,7 +71,7 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error {
 		case *types.Done:
 			aerc.PushStatus("Message moved to "+joinedArgs, 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(msg.Error.Error())
 		}
 	})
 	return nil
diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go
index 4e4ba67..0e22fd0 100644
--- a/commands/msg/pipe.go
+++ b/commands/msg/pipe.go
@@ -75,7 +75,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
 	doTerm := func(reader io.Reader, name string) {
 		term, err := commands.QuickTerm(aerc, cmd, reader)
 		if err != nil {
-			aerc.PushError(" " + err.Error())
+			aerc.PushError(err.Error())
 			return
 		}
 		aerc.NewTab(term, name)
@@ -93,7 +93,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
 		}()
 		err = ecmd.Run()
 		if err != nil {
-			aerc.PushError(" " + err.Error())
+			aerc.PushError(err.Error())
 		} else {
 			if ecmd.ProcessState.ExitCode() != 0 {
 				aerc.PushError(fmt.Sprintf(
diff --git a/commands/msg/read.go b/commands/msg/read.go
index 325b776..95becf7 100644
--- a/commands/msg/read.go
+++ b/commands/msg/read.go
@@ -187,7 +187,7 @@ func submitFlagChange(aerc *widgets.Aerc, store *lib.MessageStore,
 		case *types.Done:
 			wg.Done()
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(msg.Error.Error())
 			*success = false
 			wg.Done()
 		}
diff --git a/commands/msg/recall.go b/commands/msg/recall.go
index b6c7f65..44f8ddf 100644
--- a/commands/msg/recall.go
+++ b/commands/msg/recall.go
@@ -86,7 +86,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
 			}, func(msg types.WorkerMessage) {
 				switch msg := msg.(type) {
 				case *types.Error:
-					aerc.PushError(" " + msg.Error.Error())
+					aerc.PushError(msg.Error.Error())
 					composer.Close()
 				}
 			})
31 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610