ref(contact): Rename report --ban to --block for naming consistency

The flag invokes contacts.block, not channels.editBanned, so call it --block.
This keeps the terminology unambiguous: "ban" is group/channel scope
(chat ban/unban), "block" is account scope (contact block/unblock, report
--block). Also reword the chat ban help so "block" isn't used for a group ban.

Author: cuiko

README.md

@@ -123,7 +123,7 @@ client commands route through when present).
 | `tg chat invite create <ref>` | Create an invite link. `--title`, `--expire <RFC3339\|dur>`, `--usage-limit <n>`, `--request-needed`. |
 | `tg chat invite list <ref>` | List invite links. `--revoked`, `--admin <user>`, `--limit`. |
 | `tg chat invite revoke <ref> <link>` / `delete <ref> <link>` | Revoke a link, or delete a revoked one. |
-| `tg chat ban <ref> <user>` / `tg chat unban <ref> <user>` | Ban (remove + block) or unban a member. Ban prompts unless `--yes`. |
+| `tg chat ban <ref> <user>` / `tg chat unban <ref> <user>` | Ban (remove + restrict) or unban a member of a group/channel. Ban prompts unless `--yes`. |
 | `tg chat admin promote <ref> <user>` / `tg chat admin demote <ref> <user>` | Grant or revoke admin rights. `--rights <keywords>` grants a specific set (`info,post,edit,delete,ban,invite,pin,add_admins,anonymous,call,topics,post_stories,edit_stories,delete_stories`); omit `--rights` for a broad default set. `--title <rank>` sets a custom admin title (≤16 chars); omit `--title` to keep the current title, pass `--title ""` to clear it. |
 | `tg chat member set-perms <ref> <user>` | Set a member's permissions with `--deny`/`--allow` keywords (`send,media,stickers,bots,polls,links,invite,pin,info,topics`) and optional `--until <RFC3339\|dur>` (default permanent). |
 | `tg chat member unset-perms <ref> <user>` | Clear all permission restrictions on a member. |
@@ -159,7 +159,7 @@ client commands route through when present).
 | `tg contact delete <ref>` | Delete a contact. |
 | `tg contact block <ref>` | Block a user, bot, or channel. |
 | `tg contact unblock <ref>` | Unblock a user, bot, or channel. |
-| `tg contact report <ref>` | Report a peer to Telegram. `--reason` (spam (default), violence, porn, child-abuse, copyright, fake, drugs, personal-details, geo-irrelevant, other), `--message <comment>`, `--ban` (also block). Prompts unless `--yes`. |
+| `tg contact report <ref>` | Report a peer to Telegram. `--reason` (spam (default), violence, porn, child-abuse, copyright, fake, drugs, personal-details, geo-irrelevant, other), `--message <comment>`, `--block` (also block the peer). Prompts unless `--yes`. |
 | `tg me` | Print the current Telegram identity. |
 | `tg profile set-name <first>` | Set first name; `--last` sets or clears last name. |
 | `tg profile set-username <username>` | Set or clear the public username. |

internal/action/contact/report.go

@@ -31,7 +31,7 @@ type ReportRequest struct {
 	RawRef   string
 	Reason   string
 	Message  string
-	Ban      bool // also block the peer after reporting
+	Block    bool // also block the peer after reporting
 	Yes      bool
 	Prompter ui.Prompter
 }
@@ -41,7 +41,7 @@ type ReportQuery struct {
 	Ref     ref.Ref
 	Reason  string
 	Message string
-	Ban     bool
+	Block   bool
 }
 
 // ReportFunc reports one peer after request validation.
@@ -64,11 +64,11 @@ func Report(ctx context.Context, req ReportRequest, do ReportFunc) error {
 		return fmt.Errorf("%w: contact report called without report function", command.ErrPrecondition)
 	}
 	prompt := fmt.Sprintf("report %s for %s?", req.RawRef, reason)
-	if req.Ban {
+	if req.Block {
 		prompt = fmt.Sprintf("report %s for %s and block them?", req.RawRef, reason)
 	}
 	if err := ui.ConfirmDestructive(req.Prompter, prompt, req.Yes); err != nil {
 		return err
 	}
-	return do(ctx, ReportQuery{Ref: parsed, Reason: reason, Message: req.Message, Ban: req.Ban})
+	return do(ctx, ReportQuery{Ref: parsed, Reason: reason, Message: req.Message, Block: req.Block})
 }

internal/action/contact/report_test.go

@@ -20,19 +20,19 @@ func TestReportDefaultsToSpam(t *testing.T) {
 		func(_ context.Context, q contact.ReportQuery) error {
 			require.Equal(t, "bob", q.Ref.Value)
 			require.Equal(t, "spam", q.Reason)
-			require.False(t, q.Ban)
+			require.False(t, q.Block)
 			return nil
 		})
 	require.NoError(t, err)
 }
 
-func TestReportPassesReasonMessageAndBan(t *testing.T) {
+func TestReportPassesReasonMessageAndBlock(t *testing.T) {
 	err := contact.Report(context.Background(), contact.ReportRequest{
-		RawRef: "@bob", Reason: "fake", Message: "scam", Ban: true, Yes: true,
+		RawRef: "@bob", Reason: "fake", Message: "scam", Block: true, Yes: true,
 	}, func(_ context.Context, q contact.ReportQuery) error {
 		require.Equal(t, "fake", q.Reason)
 		require.Equal(t, "scam", q.Message)
-		require.True(t, q.Ban)
+		require.True(t, q.Block)
 		return nil
 	})
 	require.NoError(t, err)

internal/cli/contact/report/report.go

@@ -22,7 +22,7 @@ type Options struct {
 	RawRef  string
 	Reason  string
 	Message string
-	Ban     bool
+	Block   bool
 	Yes     bool
 
 	IOStreams *ui.IOStreams
@@ -53,7 +53,7 @@ func New(f *runtime.Invocation, runF func(*Options) error) *cobra.Command {
 	}
 	cmd.Flags().StringVar(&opts.Reason, "reason", "spam", "Report reason: spam, violence, porn, child-abuse, copyright, fake, drugs, personal-details, geo-irrelevant, other")
 	cmd.Flags().StringVar(&opts.Message, "message", "", "Optional comment for report moderation")
-	cmd.Flags().BoolVar(&opts.Ban, "ban", false, "Also block the peer after reporting")
+	cmd.Flags().BoolVar(&opts.Block, "block", false, "Also block the peer after reporting")
 	cmd.Flags().BoolVarP(&opts.Yes, "yes", "y", false, "Skip confirmation prompt")
 	command.SetMeta(cmd, command.Meta{NeedsAccount: true, NeedsClient: true})
 	return cmd
@@ -65,14 +65,14 @@ func Run(ctx context.Context, opts *Options) error {
 		RawRef:   opts.RawRef,
 		Reason:   opts.Reason,
 		Message:  opts.Message,
-		Ban:      opts.Ban,
+		Block:    opts.Block,
 		Yes:      opts.Yes,
 		Prompter: opts.Prompter,
 	}, opts.Report); err != nil {
 		return err
 	}
 	verb := "reported"
-	if opts.Ban {
+	if opts.Block {
 		verb = "reported+blocked"
 	}
 	_, _ = fmt.Fprintf(opts.IOStreams.Out, "%s\t%s\n", verb, opts.RawRef)

internal/telegram/contacts.go

@@ -116,8 +116,8 @@ func UnblockContact(ctx context.Context, api *tg.Client, resolver *peer.Resolver
 }
 
 // ReportPeer reports one resolved peer to Telegram moderation via
-// account.reportPeer with the given reason and optional comment. When q.Ban is
-// set it also blocks the peer (contacts.block) after a successful report.
+// account.reportPeer with the given reason and optional comment. When q.Block
+// is set it also blocks the peer (contacts.block) after a successful report.
 func ReportPeer(ctx context.Context, api *tg.Client, resolver *peer.Resolver, q actioncontact.ReportQuery) error {
 	resolved, err := resolver.Resolve(ctx, q.Ref)
 	if err != nil {
@@ -130,7 +130,7 @@ func ReportPeer(ctx context.Context, api *tg.Client, resolver *peer.Resolver, q
 	}); err != nil {
 		return err
 	}
-	if q.Ban {
+	if q.Block {
 		if _, err := api.ContactsBlock(ctx, &tg.ContactsBlockRequest{ID: resolved.InputPeer}); err != nil {
 			return err
 		}