mirror of
https://github.com/mrusme/neonmodem.git
synced 2024-09-22 04:35:55 -04:00
Fullnames for lemmy instances: catalog@instance
This commit is contained in:
parent
a047a392bd
commit
fb84533aea
@ -6,6 +6,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/mrusme/neonmodem/models/author"
|
"github.com/mrusme/neonmodem/models/author"
|
||||||
@ -154,6 +155,27 @@ func (sys *System) Load() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
communityName = community.Name
|
||||||
|
if instanceName != "" {
|
||||||
|
communityName += "@" + instanceName
|
||||||
|
}
|
||||||
|
return communityName
|
||||||
|
}
|
||||||
|
|
||||||
func (sys *System) ListForums() ([]forum.Forum, error) {
|
func (sys *System) ListForums() ([]forum.Forum, error) {
|
||||||
var models []forum.Forum
|
var models []forum.Forum
|
||||||
for j := 1; j < 100; j++ {
|
for j := 1; j < 100; j++ {
|
||||||
@ -171,7 +193,7 @@ func (sys *System) ListForums() ([]forum.Forum, error) {
|
|||||||
for _, i := range resp.Communities {
|
for _, i := range resp.Communities {
|
||||||
models = append(models, forum.Forum{
|
models = append(models, forum.Forum{
|
||||||
ID: strconv.Itoa(i.Community.ID),
|
ID: strconv.Itoa(i.Community.ID),
|
||||||
Name: i.Community.Name,
|
Name: communityFullname(i.Community),
|
||||||
|
|
||||||
Info: i.Community.Description.ValueOr(i.Community.Title),
|
Info: i.Community.Description.ValueOr(i.Community.Title),
|
||||||
|
|
||||||
@ -246,7 +268,7 @@ func (sys *System) ListPosts(forumID string) ([]post.Post, error) {
|
|||||||
|
|
||||||
Forum: forum.Forum{
|
Forum: forum.Forum{
|
||||||
ID: strconv.Itoa(i.Post.CommunityID),
|
ID: strconv.Itoa(i.Post.CommunityID),
|
||||||
Name: i.Community.Name,
|
Name: communityFullname(i.Community),
|
||||||
|
|
||||||
SysIDX: sys.ID,
|
SysIDX: sys.ID,
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user