fix missing collection hostname
GetCollections and GetPublishableCollections now take a hostname parameter to allow setting the collecion hostname. All collections used in memory now have their hostname set.
This commit is contained in:
parent
8557119451
commit
ca957c4b6d
21
account.go
21
account.go
|
@ -13,6 +13,13 @@ package writefreely
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"html/template"
|
||||||
|
"net/http"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
"github.com/guregu/null/zero"
|
"github.com/guregu/null/zero"
|
||||||
|
@ -22,12 +29,6 @@ import (
|
||||||
"github.com/writeas/web-core/log"
|
"github.com/writeas/web-core/log"
|
||||||
"github.com/writeas/writefreely/author"
|
"github.com/writeas/writefreely/author"
|
||||||
"github.com/writeas/writefreely/page"
|
"github.com/writeas/writefreely/page"
|
||||||
"html/template"
|
|
||||||
"net/http"
|
|
||||||
"regexp"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
@ -546,7 +547,7 @@ func getVerboseAuthUser(app *App, token string, u *User, verbose bool) *AuthUser
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Login: Unable to get user posts: %v", err)
|
log.Error("Login: Unable to get user posts: %v", err)
|
||||||
}
|
}
|
||||||
colls, err := app.db.GetCollections(u)
|
colls, err := app.db.GetCollections(u, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Login: Unable to get user collections: %v", err)
|
log.Error("Login: Unable to get user collections: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -716,7 +717,7 @@ func viewMyCollectionsAPI(app *App, u *User, w http.ResponseWriter, r *http.Requ
|
||||||
return ErrBadRequestedType
|
return ErrBadRequestedType
|
||||||
}
|
}
|
||||||
|
|
||||||
p, err := app.db.GetCollections(u)
|
p, err := app.db.GetCollections(u, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -739,7 +740,7 @@ func viewArticles(app *App, u *User, w http.ResponseWriter, r *http.Request) err
|
||||||
log.Error("unable to fetch flashes: %v", err)
|
log.Error("unable to fetch flashes: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
c, err := app.db.GetPublishableCollections(u)
|
c, err := app.db.GetPublishableCollections(u, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to fetch collections: %v", err)
|
log.Error("unable to fetch collections: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -762,7 +763,7 @@ func viewArticles(app *App, u *User, w http.ResponseWriter, r *http.Request) err
|
||||||
}
|
}
|
||||||
|
|
||||||
func viewCollections(app *App, u *User, w http.ResponseWriter, r *http.Request) error {
|
func viewCollections(app *App, u *User, w http.ResponseWriter, r *http.Request) error {
|
||||||
c, err := app.db.GetCollections(u)
|
c, err := app.db.GetCollections(u, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to fetch collections: %v", err)
|
log.Error("unable to fetch collections: %v", err)
|
||||||
return fmt.Errorf("No collections")
|
return fmt.Errorf("No collections")
|
||||||
|
|
11
admin.go
11
admin.go
|
@ -13,16 +13,17 @@ package writefreely
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"runtime"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gogits/gogs/pkg/tool"
|
"github.com/gogits/gogs/pkg/tool"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/writeas/impart"
|
"github.com/writeas/impart"
|
||||||
"github.com/writeas/web-core/auth"
|
"github.com/writeas/web-core/auth"
|
||||||
"github.com/writeas/web-core/log"
|
"github.com/writeas/web-core/log"
|
||||||
"github.com/writeas/writefreely/config"
|
"github.com/writeas/writefreely/config"
|
||||||
"net/http"
|
|
||||||
"runtime"
|
|
||||||
"strconv"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -195,7 +196,7 @@ func handleViewAdminUser(app *App, u *User, w http.ResponseWriter, r *http.Reque
|
||||||
p.LastPost = lp.Format("January 2, 2006, 3:04 PM")
|
p.LastPost = lp.Format("January 2, 2006, 3:04 PM")
|
||||||
}
|
}
|
||||||
|
|
||||||
colls, err := app.db.GetCollections(p.User)
|
colls, err := app.db.GetCollections(p.User, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return impart.HTTPError{http.StatusInternalServerError, fmt.Sprintf("Could not get user's collections: %v", err)}
|
return impart.HTTPError{http.StatusInternalServerError, fmt.Sprintf("Could not get user's collections: %v", err)}
|
||||||
}
|
}
|
||||||
|
|
|
@ -724,6 +724,8 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
c.hostName = app.cfg.App.Host
|
||||||
|
|
||||||
// Serve ActivityStreams data now, if requested
|
// Serve ActivityStreams data now, if requested
|
||||||
if strings.Contains(r.Header.Get("Accept"), "application/activity+json") {
|
if strings.Contains(r.Header.Get("Accept"), "application/activity+json") {
|
||||||
ac := c.PersonObject()
|
ac := c.PersonObject()
|
||||||
|
@ -762,7 +764,7 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
owner = u
|
owner = u
|
||||||
displayPage.CanPin = true
|
displayPage.CanPin = true
|
||||||
|
|
||||||
pubColls, err := app.db.GetPublishableCollections(owner)
|
pubColls, err := app.db.GetPublishableCollections(owner, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to fetch collections: %v", err)
|
log.Error("unable to fetch collections: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -859,7 +861,7 @@ func handleViewCollectionTag(app *App, w http.ResponseWriter, r *http.Request) e
|
||||||
owner = u
|
owner = u
|
||||||
displayPage.CanPin = true
|
displayPage.CanPin = true
|
||||||
|
|
||||||
pubColls, err := app.db.GetPublishableCollections(owner)
|
pubColls, err := app.db.GetPublishableCollections(owner, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to fetch collections: %v", err)
|
log.Error("unable to fetch collections: %v", err)
|
||||||
}
|
}
|
||||||
|
|
11
database.go
11
database.go
|
@ -65,8 +65,8 @@ type writestore interface {
|
||||||
ChangeSettings(app *App, u *User, s *userSettings) error
|
ChangeSettings(app *App, u *User, s *userSettings) error
|
||||||
ChangePassphrase(userID int64, sudo bool, curPass string, hashedPass []byte) error
|
ChangePassphrase(userID int64, sudo bool, curPass string, hashedPass []byte) error
|
||||||
|
|
||||||
GetCollections(u *User) (*[]Collection, error)
|
GetCollections(u *User, hostName string) (*[]Collection, error)
|
||||||
GetPublishableCollections(u *User) (*[]Collection, error)
|
GetPublishableCollections(u *User, hostName string) (*[]Collection, error)
|
||||||
GetMeStats(u *User) userMeStats
|
GetMeStats(u *User) userMeStats
|
||||||
GetTotalCollections() (int64, error)
|
GetTotalCollections() (int64, error)
|
||||||
GetTotalPosts() (int64, error)
|
GetTotalPosts() (int64, error)
|
||||||
|
@ -1559,7 +1559,7 @@ func (db *datastore) GetPinnedPosts(coll *CollectionObj) (*[]PublicPost, error)
|
||||||
return &posts, nil
|
return &posts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *datastore) GetCollections(u *User) (*[]Collection, error) {
|
func (db *datastore) GetCollections(u *User, hostName string) (*[]Collection, error) {
|
||||||
rows, err := db.Query("SELECT id, alias, title, description, privacy, view_count FROM collections WHERE owner_id = ? ORDER BY id ASC", u.ID)
|
rows, err := db.Query("SELECT id, alias, title, description, privacy, view_count FROM collections WHERE owner_id = ? ORDER BY id ASC", u.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed selecting from collections: %v", err)
|
log.Error("Failed selecting from collections: %v", err)
|
||||||
|
@ -1575,6 +1575,7 @@ func (db *datastore) GetCollections(u *User) (*[]Collection, error) {
|
||||||
log.Error("Failed scanning row: %v", err)
|
log.Error("Failed scanning row: %v", err)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
c.hostName = hostName
|
||||||
c.URL = c.CanonicalURL()
|
c.URL = c.CanonicalURL()
|
||||||
c.Public = c.IsPublic()
|
c.Public = c.IsPublic()
|
||||||
|
|
||||||
|
@ -1588,8 +1589,8 @@ func (db *datastore) GetCollections(u *User) (*[]Collection, error) {
|
||||||
return &colls, nil
|
return &colls, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *datastore) GetPublishableCollections(u *User) (*[]Collection, error) {
|
func (db *datastore) GetPublishableCollections(u *User, hostName string) (*[]Collection, error) {
|
||||||
c, err := db.GetCollections(u)
|
c, err := db.GetCollections(u, hostName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,7 +104,7 @@ func compileFullExport(app *App, u *User) *ExportUser {
|
||||||
User: u,
|
User: u,
|
||||||
}
|
}
|
||||||
|
|
||||||
colls, err := app.db.GetCollections(u)
|
colls, err := app.db.GetCollections(u, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to fetch collections: %v", err)
|
log.Error("unable to fetch collections: %v", err)
|
||||||
}
|
}
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -63,7 +63,7 @@ require (
|
||||||
github.com/writeas/slug v1.2.0
|
github.com/writeas/slug v1.2.0
|
||||||
github.com/writeas/web-core v1.0.0
|
github.com/writeas/web-core v1.0.0
|
||||||
github.com/writefreely/go-nodeinfo v1.2.0
|
github.com/writefreely/go-nodeinfo v1.2.0
|
||||||
golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f // indirect
|
golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f
|
||||||
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect
|
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect
|
||||||
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 // indirect
|
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 // indirect
|
||||||
golang.org/x/sys v0.0.0-20190209173611-3b5209105503 // indirect
|
golang.org/x/sys v0.0.0-20190209173611-3b5209105503 // indirect
|
||||||
|
|
7
pad.go
7
pad.go
|
@ -11,12 +11,13 @@
|
||||||
package writefreely
|
package writefreely
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/writeas/impart"
|
"github.com/writeas/impart"
|
||||||
"github.com/writeas/web-core/log"
|
"github.com/writeas/web-core/log"
|
||||||
"github.com/writeas/writefreely/page"
|
"github.com/writeas/writefreely/page"
|
||||||
"net/http"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func handleViewPad(app *App, w http.ResponseWriter, r *http.Request) error {
|
func handleViewPad(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
|
@ -47,7 +48,7 @@ func handleViewPad(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
}
|
}
|
||||||
var err error
|
var err error
|
||||||
if appData.User != nil {
|
if appData.User != nil {
|
||||||
appData.Blogs, err = app.db.GetPublishableCollections(appData.User)
|
appData.Blogs, err = app.db.GetPublishableCollections(appData.User, app.cfg.App.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Unable to get user's blogs for Pad: %v", err)
|
log.Error("Unable to get user's blogs for Pad: %v", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,17 +12,18 @@ package writefreely
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/microcosm-cc/bluemonday"
|
|
||||||
stripmd "github.com/writeas/go-strip-markdown"
|
|
||||||
"github.com/writeas/saturday"
|
|
||||||
"github.com/writeas/web-core/stringmanip"
|
|
||||||
"github.com/writeas/writefreely/parse"
|
|
||||||
"html"
|
"html"
|
||||||
"html/template"
|
"html/template"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"unicode"
|
"unicode"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
|
|
||||||
|
"github.com/microcosm-cc/bluemonday"
|
||||||
|
stripmd "github.com/writeas/go-strip-markdown"
|
||||||
|
blackfriday "github.com/writeas/saturday"
|
||||||
|
"github.com/writeas/web-core/stringmanip"
|
||||||
|
"github.com/writeas/writefreely/parse"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -36,6 +37,7 @@ var (
|
||||||
|
|
||||||
func (p *Post) formatContent(c *Collection, isOwner bool) {
|
func (p *Post) formatContent(c *Collection, isOwner bool) {
|
||||||
baseURL := c.CanonicalURL()
|
baseURL := c.CanonicalURL()
|
||||||
|
// TODO: redundant
|
||||||
if !isSingleUser {
|
if !isSingleUser {
|
||||||
baseURL = "/" + c.Alias + "/"
|
baseURL = "/" + c.Alias + "/"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue