+1

appview/pages/funcmap.go

Reviewed

··· 427 427 text = strings.TrimPrefix(text, "http://") 428 428 return text 429 429 }, 430 430 + "socialLink": socialLinkPresentation, 430 431 "isNil": func(t any) bool { 431 432 // returns false for other "zero" values 432 433 return t == nil

+87

appview/pages/social_link.go

Reviewed

··· 1 1 + package pages 2 2 + 3 3 + import ( 4 4 + "net/url" 5 5 + "strings" 6 6 + ) 7 7 + 8 8 + type socialLinkView struct { 9 9 + Icon string 10 10 + Label string 11 11 + } 12 12 + 13 13 + func socialLinkPresentation(raw string) socialLinkView { 14 14 + link := socialLinkView{ 15 15 + Icon: "link", 16 16 + Label: strings.TrimSuffix(trimHTTPPrefix(raw), "/"), 17 17 + } 18 18 + 19 19 + u, err := url.Parse(raw) 20 20 + if err != nil || u.Host == "" { 21 21 + return link 22 22 + } 23 23 + 24 24 + link.Label = compactURL(u) 25 25 + host := strings.TrimPrefix(strings.ToLower(u.Hostname()), "www.") 26 26 + segments := pathSegments(u.Path) 27 27 + 28 28 + switch host { 29 29 + case "github.com": 30 30 + link.Icon = "github" 31 31 + if len(segments) == 1 { 32 32 + link.Label = segments[0] 33 33 + } 34 34 + case "gitlab.com": 35 35 + link.Icon = "gitlab" 36 36 + if len(segments) == 1 { 37 37 + link.Label = segments[0] 38 38 + } 39 39 + case "linkedin.com": 40 40 + link.Icon = "linkedin" 41 41 + if len(segments) == 2 { 42 42 + link.Label = strings.Join(segments, "/") 43 43 + } 44 44 + case "bsky.app": 45 45 + link.Icon = "bluesky" 46 46 + if len(segments) == 2 && segments[0] == "profile" { 47 47 + link.Label = "@" + strings.TrimPrefix(segments[1], "@") 48 48 + } 49 49 + } 50 50 + 51 51 + return link 52 52 + } 53 53 + 54 54 + func compactURL(u *url.URL) string { 55 55 + host := u.Host 56 56 + if strings.HasPrefix(strings.ToLower(host), "www.") { 57 57 + host = host[len("www."):] 58 58 + } 59 59 + 60 60 + label := host + u.EscapedPath() 61 61 + if u.RawQuery != "" { 62 62 + label += "?" + u.RawQuery 63 63 + } 64 64 + if u.Fragment != "" { 65 65 + label += "#" + u.EscapedFragment() 66 66 + } 67 67 + 68 68 + return strings.TrimSuffix(label, "/") 69 69 + } 70 70 + 71 71 + func pathSegments(path string) []string { 72 72 + path = strings.Trim(path, "/") 73 73 + if path == "" { 74 74 + return nil 75 75 + } 76 76 + return strings.Split(path, "/") 77 77 + } 78 78 + 79 79 + func trimHTTPPrefix(link string) string { 80 80 + lower := strings.ToLower(link) 81 81 + for _, prefix := range []string{"https://", "http://"} { 82 82 + if strings.HasPrefix(lower, prefix) { 83 83 + return link[len(prefix):] 84 84 + } 85 85 + } 86 86 + return link 87 87 + }

+61

appview/pages/social_link_test.go

Reviewed

··· 1 1 + package pages 2 2 + 3 3 + import "testing" 4 4 + 5 5 + func TestSocialLinkPresentation(t *testing.T) { 6 6 + tests := []struct { 7 7 + name string 8 8 + link string 9 9 + want socialLinkView 10 10 + }{ 11 11 + { 12 12 + name: "website", 13 13 + link: "https://www.siidorow.com/", 14 14 + want: socialLinkView{Icon: "link", Label: "siidorow.com"}, 15 15 + }, 16 16 + { 17 17 + name: "GitHub profile", 18 18 + link: "https://github.com/mikaelsiidorow", 19 19 + want: socialLinkView{Icon: "github", Label: "mikaelsiidorow"}, 20 20 + }, 21 21 + { 22 22 + name: "GitHub repository", 23 23 + link: "https://github.com/tangled-org/core", 24 24 + want: socialLinkView{Icon: "github", Label: "github.com/tangled-org/core"}, 25 25 + }, 26 26 + { 27 27 + name: "GitLab profile", 28 28 + link: "https://gitlab.com/example", 29 29 + want: socialLinkView{Icon: "gitlab", Label: "example"}, 30 30 + }, 31 31 + { 32 32 + name: "LinkedIn profile", 33 33 + link: "https://www.linkedin.com/in/mikaelsiidorow/", 34 34 + want: socialLinkView{Icon: "linkedin", Label: "in/mikaelsiidorow"}, 35 35 + }, 36 36 + { 37 37 + name: "Bluesky profile", 38 38 + link: "https://bsky.app/profile/siidorow.dev", 39 39 + want: socialLinkView{Icon: "bluesky", Label: "@siidorow.dev"}, 40 40 + }, 41 41 + { 42 42 + name: "non-HTTP URI", 43 43 + link: "mailto:hello@example.com", 44 44 + want: socialLinkView{Icon: "link", Label: "mailto:hello@example.com"}, 45 45 + }, 46 46 + { 47 47 + name: "malformed URL", 48 48 + link: "%gh&%ij", 49 49 + want: socialLinkView{Icon: "link", Label: "%gh&%ij"}, 50 50 + }, 51 51 + } 52 52 + 53 53 + for _, tt := range tests { 54 54 + t.Run(tt.name, func(t *testing.T) { 55 55 + got := socialLinkPresentation(tt.link) 56 56 + if got != tt.want { 57 57 + t.Errorf("socialLinkPresentation(%q) = %#v, want %#v", tt.link, got, tt.want) 58 58 + } 59 59 + }) 60 60 + } 61 61 + }

+3 -2

appview/pages/templates/user/fragments/profileCard.html

Reviewed

··· 66 66 {{ end }} 67 67 {{ range $link := .Links }} 68 68 {{ if $link }} 69 69 + {{ $social := socialLink $link }} 69 70 <div class="flex items-center gap-2"> 70 70 - <span class="flex-shrink-0">{{ i "link" "size-4" }}</span> 71 71 - <a rel="nofollow me" href="{{ $link }}">{{ $link }}</a> 71 71 + <span class="flex-shrink-0">{{ i $social.Icon "size-4" }}</span> 72 72 + <a rel="nofollow me" href="{{ $link }}" title="{{ $link }}">{{ $social.Label }}</a> 72 73 </div> 73 74 {{ end }} 74 75 {{ end }}