diff options
Diffstat (limited to 'internal/util/uri.go')
| -rw-r--r-- | internal/util/uri.go | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/internal/util/uri.go b/internal/util/uri.go index 0ee4a5120..8d64bdd8e 100644 --- a/internal/util/uri.go +++ b/internal/util/uri.go @@ -22,8 +22,6 @@ import ( "fmt" "net/url" "strings" - - "github.com/google/uuid" ) const ( @@ -109,8 +107,14 @@ type UserURIs struct { // GenerateURIForFollow returns the AP URI for a new follow -- something like: // https://example.org/users/whatever_user/follow/41c7f33f-1060-48d9-84df-38dcb13cf0d8 -func GenerateURIForFollow(username string, protocol string, host string) string { - return fmt.Sprintf("%s://%s/%s/%s/%s", protocol, host, UsersPath, FollowPath, uuid.NewString()) +func GenerateURIForFollow(username string, protocol string, host string, thisFollowID string) string { + return fmt.Sprintf("%s://%s/%s/%s/%s", protocol, host, UsersPath, FollowPath, thisFollowID) +} + +// GenerateURIForFollow returns the AP URI for a new like/fave -- something like: +// https://example.org/users/whatever_user/liked/41c7f33f-1060-48d9-84df-38dcb13cf0d8 +func GenerateURIForLike(username string, protocol string, host string, thisFavedID string) string { + return fmt.Sprintf("%s://%s/%s/%s/%s", protocol, host, UsersPath, LikedPath, thisFavedID) } // GenerateURIsForAccount throws together a bunch of URIs for the given username, with the given protocol and host. @@ -183,6 +187,11 @@ func IsLikedPath(id *url.URL) bool { return likedPathRegex.MatchString(strings.ToLower(id.Path)) } +// IsLikedPath returns true if the given URL path corresponds to eg /users/example_username/liked/SOME_UUID_OF_A_STATUS +func IsLikePath(id *url.URL) bool { + return likePathRegex.MatchString(strings.ToLower(id.Path)) +} + // IsStatusesPath returns true if the given URL path corresponds to eg /users/example_username/statuses/SOME_UUID_OF_A_STATUS func IsStatusesPath(id *url.URL) bool { return statusesPathRegex.MatchString(strings.ToLower(id.Path)) @@ -254,3 +263,15 @@ func ParseFollowingPath(id *url.URL) (username string, err error) { username = matches[1] return } + +// ParseLikedPath returns the username and uuid from a path such as /users/example_username/liked/SOME_UUID_OF_A_STATUS +func ParseLikedPath(id *url.URL) (username string, uuid string, err error) { + matches := likePathRegex.FindStringSubmatch(id.Path) + if len(matches) != 3 { + err = fmt.Errorf("expected 3 matches but matches length was %d", len(matches)) + return + } + username = matches[1] + uuid = matches[2] + return +} |