| Name | +Members | +Created | +
|---|---|---|
| {{ $group.Name }} | +{{ $group.MemberCount }} | +{{ date $group.CreatedAt }} | +
+ Browse existing groups listed in the Group Directory. +
To send a message to a group, make sure the group's inbox is a recipient of the activity. The easy way
to do this is to include the group's network identifier (like @tavern-updates@tavern.town)
diff --git a/web/command.go b/web/command.go
index df923d0..7ea198d 100644
--- a/web/command.go
+++ b/web/command.go
@@ -79,6 +79,7 @@ var Command = cli.Command{
&config.AllowAutoAcceptGroupFollowersFlag,
&config.AllowRemoteFollowersFlag,
&config.DefaultGroupMemberRoleFlag,
+ &config.DefaultDirectoryOptInFlag,
},
Action: serverCommandAction,
}
@@ -400,6 +401,8 @@ func serverCommandAction(cliCtx *cli.Context) error {
authenticated.GET("/utilities", h.utilities)
authenticated.POST("/utilities/webfinger", h.utilitiesWebfinger)
authenticated.POST("/utilities/crawl", h.utilitiesCrawl)
+
+ authenticated.GET("/directory/groups", h.groupDirectory)
}
var group run.Group
diff --git a/web/handler_directory.go b/web/handler_directory.go
new file mode 100644
index 0000000..442a937
--- /dev/null
+++ b/web/handler_directory.go
@@ -0,0 +1,88 @@
+package web
+
+import (
+ "net/http"
+ "time"
+
+ "github.com/gin-contrib/sessions"
+ "github.com/gin-gonic/gin"
+ "github.com/gofrs/uuid"
+
+ "github.com/ngerakines/tavern/storage"
+)
+
+type groupDirectorySummary struct {
+ Name string
+ ActorID string
+ MemberCount int
+ CreatedAt time.Time
+}
+
+func (h handler) groupDirectory(c *gin.Context) {
+ session := sessions.Default(c)
+ ctx := c.Request.Context()
+ trans, transOK := c.Get("trans")
+ if !transOK {
+ panic("trans not found in context")
+ }
+ data := gin.H{
+ "flashes": getFlashes(session),
+ "Trans": trans,
+ }
+
+ var total int
+ var groups []groupDirectorySummary
+
+ page := intParam(c, "page", 1)
+ limit := 20
+
+ txErr := storage.TransactionalStorage(ctx, h.storage, func(tx storage.Storage) error {
+ var err error
+ total, err = tx.RowCount(ctx, `SELECT COUNT(*) FROM groups WHERE directory_opt_in = $1`, true)
+ if err != nil {
+ return err
+ }
+
+ paginatedGroups, err := tx.ListGroupsPaginated(ctx, limit, (page-1)*limit)
+ if err != nil {
+ return err
+ }
+
+ if len(paginatedGroups) > 0 {
+ groupActorRowIDs := make([]uuid.UUID, len(paginatedGroups))
+ for i, pg := range paginatedGroups {
+ groupActorRowIDs[i] = pg.ID
+ }
+
+ groupCounts, err := tx.CountGroupsMembers(ctx, groupActorRowIDs)
+ if err != nil {
+ return err
+ }
+ keyedGroupCounts := storage.CountMap(groupCounts)
+
+ for _, pg := range paginatedGroups {
+ groups = append(groups, groupDirectorySummary{
+ Name: pg.Name,
+ ActorID: pg.ActorID,
+ MemberCount: keyedGroupCounts[pg.ID.String()],
+ CreatedAt: pg.CreatedAt,
+ })
+ }
+ }
+
+ return nil
+ })
+ if txErr != nil {
+ h.hardFail(c, txErr)
+ return
+ }
+
+ data["groups"] = groups
+
+ paged, err := createPaged(limit, page, total, h.url("group_directory"))
+ if err == nil {
+ data["paged"] = paged
+ }
+
+ c.HTML(http.StatusOK, "group_directory", data)
+}
diff --git a/web/handler_group.go b/web/handler_group.go
index 04ce9af..1e14054 100644
--- a/web/handler_group.go
+++ b/web/handler_group.go
@@ -132,6 +132,10 @@ func (h handler) dashboardGroupsCreate(c *gin.Context) {
if err != nil {
return err
}
+ err = tx.UpdateGroupDirectoryOptIn(ctx, groupRowID, h.groupConfig.DefaultDirectoryOptIn)
+ if err != nil {
+ return err
+ }
err = tx.RecordActorKey(ctx, actorRowID, groupKeyID, publicKey)
if err != nil {
diff --git a/web/handler_group_profile.go b/web/handler_group_profile.go
index dd0f151..e4dc157 100644
--- a/web/handler_group_profile.go
+++ b/web/handler_group_profile.go
@@ -171,6 +171,15 @@ func (h handler) configureGroup(c *gin.Context) {
h.flashErrorOrFail(c, h.url("group", group.Name), txErr)
return
}
+ case "update_directory":
+ txErr := storage.TransactionalStorage(ctx, h.storage, func(tx storage.Storage) error {
+ directoryOptIn, _ := strconv.ParseBool(c.PostForm("directory"))
+ return tx.UpdateGroupDirectoryOptIn(ctx, group.ID, directoryOptIn)
+ })
+ if txErr != nil {
+ h.flashErrorOrFail(c, h.url("group", group.Name), txErr)
+ return
+ }
}
c.Redirect(http.StatusFound, h.url("group", group.Name))
diff --git a/web/view.go b/web/view.go
index 66c93aa..0289706 100644
--- a/web/view.go
+++ b/web/view.go
@@ -140,6 +140,9 @@ func tmplUrlGen(siteBase string) func(parts ...interface{}) string {
case "group_manage":
return fmt.Sprintf("%s/groups/%s/manage", siteBase, parts[1])
+ case "group_directory":
+ return fmt.Sprintf("%s/directory/groups", siteBase)
+
case "groups":
return fmt.Sprintf("%s/manage/groups", siteBase)
case "groups_create":