Commit 2eef2f29849789b1430d9a006d8ee08634e653c7

Parents: 5f15f33a1464f831bac42650be14984deda11c1f

From: Moritz Poldrack <git@moritz.sh>
Date: Fri Jun 10 20:42:37 2022 +0700

added GROUP selection

		

Stats

README.md +1/-1
reader.go +26/-0
reader_test.go +56/-0
status.go +6/-1

Changeset

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
diff --git a/README.md b/README.md
index 8649c21efc2a2ea097cc734dc96b1a41d5c2645c..49dfd6e1cfd26fae0d36f7615147324dcac347a4 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ | POST              | POST          |            | RFC3977  |
 | ARTICLE           | READER        |            | RFC3977  |
 | BODY              | READER        |            | RFC3977  |
 | DATE              | READER        |            | RFC3977  |
-| GROUP             | READER        |            | RFC3977  |
+| GROUP             | READER        | 🗸           | RFC3977  |
 | LAST              | READER        |            | RFC3977  |
 | LISTGROUP         | READER        |            | RFC3977  |
 | NEWGROUPS         | READER        |            | RFC3977  |
diff --git a/reader.go b/reader.go
new file mode 100644
index 0000000000000000000000000000000000000000..483c749c0da2e0042fa0c8e0aad6821b70c6a8b1
--- /dev/null
+++ b/reader.go
@@ -0,0 +1,26 @@
+package nntp
+
+import (
+	"context"
+	"fmt"
+)
+
+func (c *Conn) Group(ctx context.Context, group string) error {
+	if c.caps&CapReader == 0 {
+		return ErrCapabilityNotSupported
+	}
+
+	resp, err := c.CmdNoBody(ctx, "group %s", group)
+	if err != nil {
+		return fmt.Errorf("failed to change group '%s': %w", group, err)
+	}
+
+	switch resp.Status.Code {
+	case StatusGroupSelected:
+		return nil
+	case StatusNoSuchNewsgroup:
+		return ErrNoSuchNewsgroup
+	default:
+		return ErrUnexpectedResponse
+	}
+}
diff --git a/reader_test.go b/reader_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..bf927953e9b669349ecffb8c3d436ac871b6b3f0
--- /dev/null
+++ b/reader_test.go
@@ -0,0 +1,56 @@
+package nntp_test
+
+import (
+	"context"
+	"errors"
+	"testing"
+	"time"
+
+	"mpldr.codes/usenet/nntp"
+)
+
+func TestGroup(t *testing.T) {
+	if NewsServerSecure == "" || NewsServerUser == "" || NewsServerPassword == "" {
+		t.Log("secure server address, username, and password required in variables_test.go")
+		t.SkipNow()
+	}
+	tests := []struct {
+		name          string
+		group         string
+		expectedError error
+	}{
+		{
+			name:          "invalid-group",
+			group:         "alt.binaries.fritzelschnitzelritzel",
+			expectedError: nntp.ErrNoSuchNewsgroup,
+		},
+		{
+			name:          "existing-group",
+			group:         "alt.binaries.test",
+			expectedError: nil,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			c, err := nntp.Dial(NewsServerSecure)
+			if err != nil {
+				t.Skipf("connection to '%s' failed: %v", NewsServerSecure, err)
+			}
+
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+			err = c.LoginUserPass(ctx, NewsServerUser, NewsServerPassword)
+			if err != nil {
+				t.Skipf("login failed: %v", err)
+			}
+
+			ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+			err = c.Group(ctx, test.group)
+			if !errors.Is(err, test.expectedError) {
+				t.Errorf("unexpected result:\n\tgot:      %v\n\texpected: %v\n", err, test.expectedError)
+			}
+		})
+	}
+}
diff --git a/status.go b/status.go
index b1bd50beecfca17ae02655b56c0ba91ca80f9174..1a0b54b4fd9e92f2f3c382dd966653f66450d539 100644
--- a/status.go
+++ b/status.go
@@ -5,6 +5,7 @@
 const (
 	StatusServiceAvailable       = 200
 	StatusServiceNoPosting       = 201
+	StatusGroupSelected          = 211
 	StatusAuthAccepted           = 281
 	StatusAuthAcceptedWithData   = 283
 	StatusAuthPassRequired       = 381
@@ -12,7 +13,11 @@ 	StatusAuthSASLContinue       = 383
 	StatusTemporarilyUnavailable = 400
 	StatusAuthFailed             = 481
 	StatusAuthInvalid            = 482
+	StatusNoSuchNewsgroup        = 411
 	StatusPermanentlyUnavailable = 502
 )
 
-var ErrUnexpectedResponse = errors.New("received unexpected response code")
+var (
+	ErrNoSuchNewsgroup    = errors.New("no such newsgroup")
+	ErrUnexpectedResponse = errors.New("received unexpected response code")
+)