From 30fb8e80e9a8c99be9f06f33e1691b7df9ee3a2d Mon Sep 17 00:00:00 2001 From: BreadMakesYouFat Date: Mon, 26 Jun 2023 15:26:48 -0400 Subject: [PATCH] urlparse for lemmy community full name --- system/lemmy/lemmy.go | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/system/lemmy/lemmy.go b/system/lemmy/lemmy.go index 055f570..ae7f3e9 100644 --- a/system/lemmy/lemmy.go +++ b/system/lemmy/lemmy.go @@ -6,7 +6,6 @@ import ( "net/http" "net/url" "strconv" - "strings" "time" "github.com/mrusme/neonmodem/models/author" @@ -157,24 +156,12 @@ func (sys *System) Load() error { } func communityFullname(community types.CommunitySafe) (communityName string) { - instanceName := "" - if community.ActorID != "" { - removeUrlScheme := strings.NewReplacer( - "http://", "", - "https://", "", - ) - instanceName = removeUrlScheme.Replace( - community.ActorID) - splitUrl := strings.Split(instanceName, "/") - if len(splitUrl) > 1 { - instanceName = splitUrl[0] - } + url, err := url.Parse(community.ActorID) + if err != nil { + return community.Name + } else { + return community.Name + "@" + url.Host } - communityName = community.Name - if instanceName != "" { - communityName += "@" + instanceName - } - return communityName } func (sys *System) ListForums() ([]forum.Forum, error) {