From 4679691c940d13c73cc7be26559160780816b215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sun, 13 Jul 2025 14:24:35 -0700 Subject: [PATCH] refactor(googlereader): rename stream suffix constants for clarity --- internal/googlereader/handler.go | 18 ++++++++--------- internal/googlereader/prefix_suffix.go | 28 +++++++++++++------------- internal/googlereader/stream.go | 20 +++++++++--------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go index 17b4c8ef..f334d241 100644 --- a/internal/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -71,12 +71,12 @@ func checkAndSimplifyTags(addTags []Stream, removeTags []Stream) (map[StreamType switch s.Type { case ReadStream: if _, ok := tags[KeptUnreadStream]; ok { - return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnread, read) + return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnreadStreamSuffix, readStreamSuffix) } tags[ReadStream] = true case KeptUnreadStream: if _, ok := tags[ReadStream]; ok { - return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnread, read) + return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnreadStreamSuffix, readStreamSuffix) } tags[ReadStream] = false case StarredStream: @@ -91,17 +91,17 @@ func checkAndSimplifyTags(addTags []Stream, removeTags []Stream) (map[StreamType switch s.Type { case ReadStream: if _, ok := tags[ReadStream]; ok { - return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnread, read) + return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnreadStreamSuffix, readStreamSuffix) } tags[ReadStream] = false case KeptUnreadStream: if _, ok := tags[ReadStream]; ok { - return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnread, read) + return nil, fmt.Errorf("googlereader: %s and %s should not be supplied simultaneously", keptUnreadStreamSuffix, readStreamSuffix) } tags[ReadStream] = true case StarredStream: if _, ok := tags[StarredStream]; ok { - return nil, fmt.Errorf("googlereader: %s should not be supplied for add and remove simultaneously", starred) + return nil, fmt.Errorf("googlereader: %s should not be supplied for add and remove simultaneously", starredStreamSuffix) } tags[StarredStream] = false case BroadcastStream, LikeStream: @@ -701,9 +701,9 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque return } - userReadingList := fmt.Sprintf(userStreamPrefix, userID) + readingList - userRead := fmt.Sprintf(userStreamPrefix, userID) + read - userStarred := fmt.Sprintf(userStreamPrefix, userID) + starred + userReadingList := fmt.Sprintf(userStreamPrefix, userID) + readingListStreamSuffix + userRead := fmt.Sprintf(userStreamPrefix, userID) + readStreamSuffix + userStarred := fmt.Sprintf(userStreamPrefix, userID) + starredStreamSuffix itemIDs, err := parseItemIDsFromRequest(r) if err != nil { @@ -936,7 +936,7 @@ func (h *handler) tagListHandler(w http.ResponseWriter, r *http.Request) { } result.Tags = make([]subscriptionCategory, 0) result.Tags = append(result.Tags, subscriptionCategory{ - ID: fmt.Sprintf(userStreamPrefix, userID) + starred, + ID: fmt.Sprintf(userStreamPrefix, userID) + starredStreamSuffix, }) for _, category := range categories { result.Tags = append(result.Tags, subscriptionCategory{ diff --git a/internal/googlereader/prefix_suffix.go b/internal/googlereader/prefix_suffix.go index 6cbcae54..18de7b84 100644 --- a/internal/googlereader/prefix_suffix.go +++ b/internal/googlereader/prefix_suffix.go @@ -14,18 +14,18 @@ const ( userLabelPrefix = "user/%d/label/" // feedPrefix is the prefix for a feed stream feedPrefix = "feed/" - // read is the suffix for read stream - read = "read" - // starred is the suffix for starred stream - starred = "starred" - // readingList is the suffix for reading list stream - readingList = "reading-list" - // keptUnread is the suffix for kept unread stream - keptUnread = "kept-unread" - // broadcast is the suffix for broadcast stream - broadcast = "broadcast" - // broadcastFriends is the suffix for broadcast friends stream - broadcastFriends = "broadcast-friends" - // like is the suffix for like stream - like = "like" + // readStreamSuffix is the suffix for read stream + readStreamSuffix = "read" + // starredStreamSuffix is the suffix for starred stream + starredStreamSuffix = "starred" + // readingListStreamSuffix is the suffix for reading list stream + readingListStreamSuffix = "reading-list" + // keptUnreadStreamSuffix is the suffix for kept unread stream + keptUnreadStreamSuffix = "kept-unread" + // broadcastStreamSuffix is the suffix for broadcast stream + broadcastStreamSuffix = "broadcast" + // broadcastFriendsStreamSuffix is the suffix for broadcast friends stream + broadcastFriendsStreamSuffix = "broadcast-friends" + // likeStreamSuffix is the suffix for like stream + likeStreamSuffix = "like" ) diff --git a/internal/googlereader/stream.go b/internal/googlereader/stream.go index 5ce0f5fa..9b797712 100644 --- a/internal/googlereader/stream.go +++ b/internal/googlereader/stream.go @@ -74,30 +74,28 @@ func getStream(streamID string, userID int64) (Stream, error) { switch { case strings.HasPrefix(streamID, feedPrefix): return Stream{Type: FeedStream, ID: strings.TrimPrefix(streamID, feedPrefix)}, nil - case strings.HasPrefix(streamID, fmt.Sprintf(userStreamPrefix, userID)), - strings.HasPrefix(streamID, streamPrefix): + case strings.HasPrefix(streamID, fmt.Sprintf(userStreamPrefix, userID)), strings.HasPrefix(streamID, streamPrefix): id := strings.TrimPrefix(streamID, fmt.Sprintf(userStreamPrefix, userID)) id = strings.TrimPrefix(id, streamPrefix) switch id { - case read: + case readStreamSuffix: return Stream{ReadStream, ""}, nil - case starred: + case starredStreamSuffix: return Stream{StarredStream, ""}, nil - case readingList: + case readingListStreamSuffix: return Stream{ReadingListStream, ""}, nil - case keptUnread: + case keptUnreadStreamSuffix: return Stream{KeptUnreadStream, ""}, nil - case broadcast: + case broadcastStreamSuffix: return Stream{BroadcastStream, ""}, nil - case broadcastFriends: + case broadcastFriendsStreamSuffix: return Stream{BroadcastFriendsStream, ""}, nil - case like: + case likeStreamSuffix: return Stream{LikeStream, ""}, nil default: return Stream{NoStream, ""}, fmt.Errorf("googlereader: unknown stream with id: %s", id) } - case strings.HasPrefix(streamID, fmt.Sprintf(userLabelPrefix, userID)), - strings.HasPrefix(streamID, labelPrefix): + case strings.HasPrefix(streamID, fmt.Sprintf(userLabelPrefix, userID)), strings.HasPrefix(streamID, labelPrefix): id := strings.TrimPrefix(streamID, fmt.Sprintf(userLabelPrefix, userID)) id = strings.TrimPrefix(id, labelPrefix) return Stream{LabelStream, id}, nil