mirror
/
writefreely
mirror of https://github.com/writeas/writefreely
2
0
Fork 0
Code Issues Releases Wiki Activity

Update repo URL to writefreely org

Browse Source 
From the writeas org on GitHub.
pull/451/head
Matt Baer 4 years ago
parent 0c7aba1f53
commit 484d2736ce
41 changed files with 135 additions and 112 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      CONTRIBUTING.md
  2. 14
      Dockerfile
  3. 2
      Makefile
  4. 16
      README.md
  5. 9
      account.go
  6. 6
      admin.go
  7. 10
      app.go
  8. 4
      author/author.go
  9. 5
      cmd/writefreely/config.go
  10. 5
      cmd/writefreely/db.go
  11. 5
      cmd/writefreely/keys.go
  12. 7
      cmd/writefreely/main.go
  13. 5
      cmd/writefreely/user.go
  14. 7
      cmd/writefreely/web.go
  15. 8
      collections.go
  16. 10
      database.go
  17. 2
      go.mod
  18. 8
      handle.go
  19. 4
      invites.go
  20. 4
      keys.go
  21. 4
      migrations/v4.go
  22. 4
      migrations/v5.go
  23. 12
      migrations/v7.go
  24. 4
      migrations/v8.go
  25. 6
      nodeinfo.go
  26. 4
      oauth.go
  27. 4
      oauth_signup.go
  28. 12
      oauth_test.go
  29. 4
      pad.go
  30. 4
      page/page.go
  31. 4
      pages.go
  32. 2
      pages/500.tmpl
  33. 6
      postrender.go
  34. 6
      posts.go
  35. 12
      posts_test.go
  36. 4
      read.go
  37. 2
      static/js/README.md
  38. 4
      templates.go
  39. 4
      templates/include/footer.tmpl
  40. 4
      users.go
  41. 2
      webfinger.go

8
CONTRIBUTING.md
Unescape View File

@ -4,7 +4,7 @@ Welcome! We're glad you're interested in contributing to WriteFreely.
For **questions**, **help**, **feature requests**, and **general discussion**, please use [our forum](https://discuss.write.as). For **questions**, **help**, **feature requests**, and **general discussion**, please use [our forum](https://discuss.write.as).
For **bug reports**, please [open a GitHub issue](https://github.com/writeas/writefreely/issues/new). See our guide on [submitting bug reports](https://writefreely.org/contribute#bugs). For **bug reports**, please [open a GitHub issue](https://github.com/writefreely/writefreely/issues/new). See our guide on [submitting bug reports](https://writefreely.org/contribute#bugs).
## Getting Started ## Getting Started
@ -80,9 +80,9 @@ We highly value commit messages that follow established form within the project.
When in doubt, look to our existing git history for examples of good commit messages. Here are a few: When in doubt, look to our existing git history for examples of good commit messages. Here are a few:
* [Rename Suspend status to Silence](https://github.com/writeas/writefreely/commit/7e014ca65958750ab703e317b1ce8cfc4aad2d6e) * [Rename Suspend status to Silence](https://github.com/writefreely/writefreely/commit/7e014ca65958750ab703e317b1ce8cfc4aad2d6e)
* [Show 404 when remote user not found](https://github.com/writeas/writefreely/commit/867eb53b3596bd7b3f2be3c53a3faf857f4cd36d) * [Show 404 when remote user not found](https://github.com/writefreely/writefreely/commit/867eb53b3596bd7b3f2be3c53a3faf857f4cd36d)
* [Fix post deletion on Pleroma](https://github.com/writeas/writefreely/commit/fe82cbb96e3d5c57cfde0db76c28c4ea6dabfe50) * [Fix post deletion on Pleroma](https://github.com/writefreely/writefreely/commit/fe82cbb96e3d5c57cfde0db76c28c4ea6dabfe50)
### Submitting pull requests ### Submitting pull requests

14
Dockerfile
Unescape View File

@ -5,8 +5,8 @@ RUN apk add --update nodejs nodejs-npm make g++ git
RUN npm install -g less less-plugin-clean-css RUN npm install -g less less-plugin-clean-css
RUN go get -u github.com/go-bindata/go-bindata/... RUN go get -u github.com/go-bindata/go-bindata/...
RUN mkdir -p /go/src/github.com/writeas/writefreely RUN mkdir -p /go/src/github.com/writefreely/writefreely
WORKDIR /go/src/github.com/writeas/writefreely WORKDIR /go/src/github.com/writefreely/writefreely
COPY . . COPY . .
@ -16,11 +16,11 @@ RUN make build \
&& make ui && make ui
RUN mkdir /stage && \ RUN mkdir /stage && \
cp -R /go/bin \ cp -R /go/bin \
/go/src/github.com/writeas/writefreely/templates \ /go/src/github.com/writefreely/writefreely/templates \
/go/src/github.com/writeas/writefreely/static \ /go/src/github.com/writefreely/writefreely/static \
/go/src/github.com/writeas/writefreely/pages \ /go/src/github.com/writefreely/writefreely/pages \
/go/src/github.com/writeas/writefreely/keys \ /go/src/github.com/writefreely/writefreely/keys \
/go/src/github.com/writeas/writefreely/cmd \ /go/src/github.com/writefreely/writefreely/cmd \
/stage /stage
# Final image # Final image

2
Makefile
Unescape View File

@ -1,5 +1,5 @@
GITREV=`git describe | cut -c 2-` GITREV=`git describe | cut -c 2-`
LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'" LDFLAGS=-ldflags="-X 'github.com/writefreely/writefreely.softwareVer=$(GITREV)'"
GOCMD=go GOCMD=go
GOINSTALL=$(GOCMD) install $(LDFLAGS) GOINSTALL=$(GOCMD) install $(LDFLAGS)

16
README.md
Unescape View File

@ -4,17 +4,17 @@
</p> </p>
<hr /> <hr />
<p align="center"> <p align="center">
<a href="https://github.com/writeas/writefreely/releases/"> <a href="https://github.com/writefreely/writefreely/releases/">
<img src="https://img.shields.io/github/release/writeas/writefreely.svg" alt="Latest release" /> <img src="https://img.shields.io/github/release/writeas/writefreely.svg" alt="Latest release" />
</a> </a>
<a href="https://travis-ci.org/writeas/writefreely"> <a href="https://travis-ci.org/writeas/writefreely">
<img src="https://travis-ci.org/writeas/writefreely.svg" alt="Build status" /> <img src="https://travis-ci.org/writeas/writefreely.svg" alt="Build status" />
</a> </a>
<a href="https://github.com/writeas/writefreely/releases/latest"> <a href="https://github.com/writefreely/writefreely/releases/latest">
<img src="https://img.shields.io/github/downloads/writeas/writefreely/total.svg" /> <img src="https://img.shields.io/github/downloads/writeas/writefreely/total.svg" />
</a> </a>
<a href="https://goreportcard.com/report/github.com/writeas/writefreely"> <a href="https://goreportcard.com/report/github.com/writefreely/writefreely">
<img src="https://goreportcard.com/badge/github.com/writeas/writefreely" alt="Go Report Card" /> <img src="https://goreportcard.com/badge/github.com/writefreely/writefreely" alt="Go Report Card" />
</a> </a>
<a href="https://hub.docker.com/r/writeas/writefreely/"> <a href="https://hub.docker.com/r/writeas/writefreely/">
<img src="https://img.shields.io/docker/pulls/writeas/writefreely.svg" /> <img src="https://img.shields.io/docker/pulls/writeas/writefreely.svg" />
@ -62,7 +62,7 @@ The quickest way to deploy WriteFreely is with [Write.as](https://write.as/write
WriteFreely deploys as a static binary on any platform and architecture that Go supports. Just use our built-in SQLite support, or add a MySQL database, and you'll be up and running! WriteFreely deploys as a static binary on any platform and architecture that Go supports. Just use our built-in SQLite support, or add a MySQL database, and you'll be up and running!
For common platforms, start with our [pre-built binaries](https://github.com/writeas/writefreely/releases/) and head over to our [installation guide](https://writefreely.org/start) to get started. For common platforms, start with our [pre-built binaries](https://github.com/writefreely/writefreely/releases/) and head over to our [installation guide](https://writefreely.org/start) to get started.
### Packages ### Packages
@ -80,10 +80,10 @@ Start hacking on WriteFreely with our [developer setup guide](https://writefreel
## Contributing ## Contributing
We gladly welcome contributions to WriteFreely, whether in the form of [code](https://github.com/writeas/writefreely/blob/master/CONTRIBUTING.md#contributing-to-writefreely), [bug reports](https://github.com/writeas/writefreely/issues/new?template=bug_report.md), [feature requests](https://discuss.write.as/c/feedback/feature-requests), [translations](https://poeditor.com/join/project/TIZ6HFRFdE), or [documentation](https://github.com/writefreely/documentation) improvements. We gladly welcome contributions to WriteFreely, whether in the form of [code](https://github.com/writefreely/writefreely/blob/master/CONTRIBUTING.md#contributing-to-writefreely), [bug reports](https://github.com/writefreely/writefreely/issues/new?template=bug_report.md), [feature requests](https://discuss.write.as/c/feedback/feature-requests), [translations](https://poeditor.com/join/project/TIZ6HFRFdE), or [documentation](https://github.com/writefreely/documentation) improvements.
Before contributing anything, please read our [Contributing Guide](https://github.com/writeas/writefreely/blob/master/CONTRIBUTING.md#contributing-to-writefreely). It describes the correct channels for submitting contributions and any potential requirements. Before contributing anything, please read our [Contributing Guide](https://github.com/writefreely/writefreely/blob/master/CONTRIBUTING.md#contributing-to-writefreely). It describes the correct channels for submitting contributions and any potential requirements.
## License ## License
Copyright © 2018-2020 [A Bunch Tell LLC](https://abunchtell.com) and contributing authors. Licensed under the [AGPL](https://github.com/writeas/writefreely/blob/develop/LICENSE). Copyright © 2018-2021 [A Bunch Tell LLC](https://abunchtell.com) and contributing authors. Licensed under the [AGPL](https://github.com/writefreely/writefreely/blob/develop/LICENSE).

9
account.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -27,10 +27,9 @@ import (
"github.com/writeas/web-core/auth" "github.com/writeas/web-core/auth"
"github.com/writeas/web-core/data" "github.com/writeas/web-core/data"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writefreely/writefreely/author"
"github.com/writeas/writefreely/author" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/page"
"github.com/writeas/writefreely/page"
) )
type ( type (

6
admin.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -24,8 +24,8 @@ import (
"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/web-core/passgen" "github.com/writeas/web-core/passgen"
"github.com/writeas/writefreely/appstats" "github.com/writefreely/writefreely/appstats"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
) )
var ( var (

10
app.go
Unescape View File

@ -35,11 +35,11 @@ import (
"github.com/writeas/web-core/auth" "github.com/writeas/web-core/auth"
"github.com/writeas/web-core/converter" "github.com/writeas/web-core/converter"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/author" "github.com/writefreely/writefreely/author"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/key" "github.com/writefreely/writefreely/key"
"github.com/writeas/writefreely/migrations" "github.com/writefreely/writefreely/migrations"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"
) )

4
author/author.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -11,7 +11,7 @@
package author package author
import ( import (
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"

5
cmd/writefreely/config.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -11,9 +11,8 @@
package main package main
import ( import (
"github.com/writeas/writefreely"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writefreely/writefreely"
) )
var ( var (

5
cmd/writefreely/db.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -11,9 +11,8 @@
package main package main
import ( import (
"github.com/writeas/writefreely"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writefreely/writefreely"
) )
var ( var (

5
cmd/writefreely/keys.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -11,9 +11,8 @@
package main package main
import ( import (
"github.com/writeas/writefreely"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writefreely/writefreely"
) )
var ( var (

7
cmd/writefreely/main.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -15,11 +15,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/writeas/web-core/log"
"github.com/writeas/writefreely"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writeas/web-core/log"
"github.com/writefreely/writefreely"
) )
func main() { func main() {

5
cmd/writefreely/user.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -13,9 +13,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/writeas/writefreely"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writefreely/writefreely"
) )
var ( var (

7
cmd/writefreely/web.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -11,11 +11,10 @@
package main package main
import ( import (
"github.com/writeas/web-core/log"
"github.com/writeas/writefreely"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/writeas/web-core/log"
"github.com/writefreely/writefreely"
) )
var ( var (

8
collections.go
Unescape View File

@ -30,9 +30,9 @@ import (
"github.com/writeas/web-core/bots" "github.com/writeas/web-core/bots"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
waposts "github.com/writeas/web-core/posts" waposts "github.com/writeas/web-core/posts"
"github.com/writeas/writefreely/author" "github.com/writefreely/writefreely/author"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
) )
type ( type (
@ -240,7 +240,7 @@ func (c *Collection) DisplayCanonicalURL() string {
func (c *Collection) RedirectingCanonicalURL(isRedir bool) string { func (c *Collection) RedirectingCanonicalURL(isRedir bool) string {
if c.hostName == "" { if c.hostName == "" {
// If this is true, the human programmers screwed up. So ask for a bug report and fail, fail, fail // If this is true, the human programmers screwed up. So ask for a bug report and fail, fail, fail
log.Error("[PROGRAMMER ERROR] WARNING: Collection.hostName is empty! Federation and many other things will fail! If you're seeing this in the wild, please report this bug and let us know what you were doing just before this: https://github.com/writeas/writefreely/issues/new?template=bug_report.md") log.Error("[PROGRAMMER ERROR] WARNING: Collection.hostName is empty! Federation and many other things will fail! If you're seeing this in the wild, please report this bug and let us know what you were doing just before this: https://github.com/writefreely/writefreely/issues/new?template=bug_report.md")
} }
if isSingleUser { if isSingleUser {
return c.hostName + "/" return c.hostName + "/"

10
database.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -15,7 +15,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/writeas/web-core/silobridge" "github.com/writeas/web-core/silobridge"
wf_db "github.com/writeas/writefreely/db" wf_db "github.com/writefreely/writefreely/db"
"net/http" "net/http"
"strings" "strings"
"time" "time"
@ -32,9 +32,9 @@ import (
"github.com/writeas/web-core/id" "github.com/writeas/web-core/id"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/web-core/query" "github.com/writeas/web-core/query"
"github.com/writeas/writefreely/author" "github.com/writefreely/writefreely/author"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/key" "github.com/writefreely/writefreely/key"
) )
const ( const (

2
go.mod
Unescape View File

@ -1,4 +1,4 @@
module github.com/writeas/writefreely module github.com/writefreely/writefreely
require ( require (
github.com/clbanning/mxj v1.8.4 // indirect github.com/clbanning/mxj v1.8.4 // indirect

8
handle.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2019 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -24,8 +24,8 @@ import (
"github.com/prologic/go-gopher" "github.com/prologic/go-gopher"
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
) )
// UserLevel represents the required user level for accessing an endpoint // UserLevel represents the required user level for accessing an endpoint
@ -602,7 +602,7 @@ func (h *Handler) AllReader(f handlerFunc) http.HandlerFunc {
}() }()
// Allow any origin, as public endpoints are handled in here // Allow any origin, as public endpoints are handled in here
w.Header().Set("Access-Control-Allow-Origin", "*"); w.Header().Set("Access-Control-Allow-Origin", "*")
if h.app.App().cfg.App.Private { if h.app.App().cfg.App.Private {
// This instance is private, so ensure it's being accessed by a valid user // This instance is private, so ensure it's being accessed by a valid user

4
invites.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2019-2020 A Bunch Tell LLC. * Copyright © 2019-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -21,7 +21,7 @@ import (
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/nerds/store" "github.com/writeas/nerds/store"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
) )
type Invite struct { type Invite struct {

4
keys.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2019 A Bunch Tell LLC. * Copyright © 2018-2019, 2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -12,7 +12,7 @@ package writefreely
import ( import (
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/key" "github.com/writefreely/writefreely/key"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"

4
migrations/v4.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2019-2020 A Bunch Tell LLC. * Copyright © 2019-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -14,7 +14,7 @@ import (
"context" "context"
"database/sql" "database/sql"
wf_db "github.com/writeas/writefreely/db" wf_db "github.com/writefreely/writefreely/db"
) )
func oauth(db *datastore) error { func oauth(db *datastore) error {

4
migrations/v5.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2019-2020 A Bunch Tell LLC. * Copyright © 2019-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -14,7 +14,7 @@ import (
"context" "context"
"database/sql" "database/sql"
wf_db "github.com/writeas/writefreely/db" wf_db "github.com/writefreely/writefreely/db"
) )
func oauthSlack(db *datastore) error { func oauthSlack(db *datastore) error {

12
migrations/v7.go
Unescape View File

@ -1,10 +1,20 @@
/*
* Copyright © 2020-2021 A Bunch Tell LLC.
*
* This file is part of WriteFreely.
*
* WriteFreely is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, included
* in the LICENSE file in this source code package.
*/
package migrations package migrations
import ( import (
"context" "context"
"database/sql" "database/sql"
wf_db "github.com/writeas/writefreely/db" wf_db "github.com/writefreely/writefreely/db"
) )
func oauthAttach(db *datastore) error { func oauthAttach(db *datastore) error {

4
migrations/v8.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -14,7 +14,7 @@ import (
"context" "context"
"database/sql" "database/sql"
wf_db "github.com/writeas/writefreely/db" wf_db "github.com/writefreely/writefreely/db"
) )
func oauthInvites(db *datastore) error { func oauthInvites(db *datastore) error {

6
nodeinfo.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018 A Bunch Tell LLC. * Copyright © 2018-2019, 2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -12,8 +12,8 @@ package writefreely
import ( import (
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/config"
"github.com/writefreely/go-nodeinfo" "github.com/writefreely/go-nodeinfo"
"github.com/writefreely/writefreely/config"
"strings" "strings"
) )
@ -45,7 +45,7 @@ func nodeInfoConfig(db *datastore, cfg *config.Config) *nodeinfo.Config {
Private: cfg.App.Private, Private: cfg.App.Private,
Software: nodeinfo.SoftwareMeta{ Software: nodeinfo.SoftwareMeta{
HomePage: softwareURL, HomePage: softwareURL,
GitHub: "https://github.com/writeas/writefreely", GitHub: "https://github.com/writefreely/writefreely",
Follow: "https://writing.exchange/@write_as", Follow: "https://writing.exchange/@write_as",
}, },
MaxBlogs: cfg.App.MaxBlogs, MaxBlogs: cfg.App.MaxBlogs,

4
oauth.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2019-2020 A Bunch Tell LLC. * Copyright © 2019-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -25,7 +25,7 @@ import (
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
) )
// OAuthButtons holds display information for different OAuth providers we support. // OAuthButtons holds display information for different OAuth providers we support.

4
oauth_signup.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2020 A Bunch Tell LLC. * Copyright © 2020-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -17,7 +17,7 @@ import (
"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/page" "github.com/writefreely/writefreely/page"
"html/template" "html/template"
"net/http" "net/http"
"strings" "strings"

12
oauth_test.go
Unescape View File

@ -1,3 +1,13 @@
/*
* Copyright © 2019-2021 A Bunch Tell LLC.
*
* This file is part of WriteFreely.
*
* WriteFreely is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, included
* in the LICENSE file in this source code package.
*/
package writefreely package writefreely
import ( import (
@ -7,7 +17,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/nerds/store" "github.com/writeas/nerds/store"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"

4
pad.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2019 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -17,7 +17,7 @@ import (
"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/writefreely/writefreely/page"
) )
func handleViewPad(app *App, w http.ResponseWriter, r *http.Request) error { func handleViewPad(app *App, w http.ResponseWriter, r *http.Request) error {

4
page/page.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018 A Bunch Tell LLC. * Copyright © 2018-2019, 2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -12,7 +12,7 @@
package page package page
import ( import (
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"strings" "strings"
) )

4
pages.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2019 A Bunch Tell LLC. * Copyright © 2018-2019, 2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -12,7 +12,7 @@ package writefreely
import ( import (
"database/sql" "database/sql"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"time" "time"
) )

2
pages/500.tmpl
Unescape View File

@ -2,7 +2,7 @@
{{define "content"}} {{define "content"}}
<div class="content-container tight"> <div class="content-container tight">
<h1>Server error &#x1F635;</h1> <h1>Server error &#x1F635;</h1>
<p>Please <a href="https://github.com/writeas/writefreely/issues/new">contact the human authors</a> of this software and remind them of their many shortcomings.</p> <p>Please <a href="https://github.com/writefreely/writefreely/issues/new">contact the human authors</a> of this software and remind them of their many shortcomings.</p>
<p>Be gentle, though. They are fragile mortal beings.</p> <p>Be gentle, though. They are fragile mortal beings.</p>
<p style="margin-top:2em">Also, unlike the AI that will soon replace them, you will need to include an error log from the server in your report. (Utterly <em>primitive</em>, we know.)</p> <p style="margin-top:2em">Also, unlike the AI that will soon replace them, you will need to include an error log from the server in your report. (Utterly <em>primitive</em>, we know.)</p>
<p>&ndash; {{.SiteName}} &#x1F916;</p> <p>&ndash; {{.SiteName}} &#x1F916;</p>

6
postrender.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -28,8 +28,8 @@ import (
blackfriday "github.com/writeas/saturday" blackfriday "github.com/writeas/saturday"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/web-core/stringmanip" "github.com/writeas/web-core/stringmanip"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
"github.com/writeas/writefreely/parse" "github.com/writefreely/writefreely/parse"
) )
var ( var (

6
posts.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -36,8 +36,8 @@ import (
"github.com/writeas/web-core/i18n" "github.com/writeas/web-core/i18n"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/web-core/tags" "github.com/writeas/web-core/tags"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
"github.com/writeas/writefreely/parse" "github.com/writefreely/writefreely/parse"
) )
const ( const (

12
posts_test.go
Unescape View File

@ -1,3 +1,13 @@
/*
* Copyright © 2020-2021 A Bunch Tell LLC.
*
* This file is part of WriteFreely.
*
* WriteFreely is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, included
* in the LICENSE file in this source code package.
*/
package writefreely_test package writefreely_test
import ( import (
@ -5,7 +15,7 @@ import (
"github.com/guregu/null/zero" "github.com/guregu/null/zero"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/writeas/writefreely" "github.com/writefreely/writefreely"
) )
func TestPostSummary(t *testing.T) { func TestPostSummary(t *testing.T) {

4
read.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018-2020 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -25,7 +25,7 @@ import (
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/web-core/memo" "github.com/writeas/web-core/memo"
"github.com/writeas/writefreely/page" "github.com/writefreely/writefreely/page"
) )
const ( const (

2
static/js/README.md
Unescape View File

@ -17,7 +17,7 @@ Then [download an archive](https://github.com/highlightjs/highlight.js/releases)
version=9.13.1 version=9.13.1
cd $GOPATH/src/github.com/writeas/writefreely/static/js/highlightjs cd $GOPATH/src/github.com/writefreely/writefreely/static/js/highlightjs
for f in $(ls ~/Downloads/highlight.js/src/languages); do for f in $(ls ~/Downloads/highlight.js/src/languages); do
# Use minified versions # Use minified versions
f=$(echo $f | sed 's/\.js/.min.js/') f=$(echo $f | sed 's/\.js/.min.js/')

4
templates.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018 A Bunch Tell LLC. * Copyright © 2018-2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -23,7 +23,7 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/writeas/web-core/l10n" "github.com/writeas/web-core/l10n"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
) )
var ( var (

4
templates/include/footer.tmpl
Unescape View File

@ -13,7 +13,7 @@
{{else}} {{else}}
<a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a> <a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a>
<a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a> <a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a>
<a href="https://github.com/writeas/writefreely">source code</a> <a href="https://github.com/writefreely/writefreely">source code</a>
<a href="https://writefreely.org">writefreely {{.Version}}</a> <a href="https://writefreely.org">writefreely {{.Version}}</a>
{{end}} {{end}}
</nav> </nav>
@ -33,7 +33,7 @@
<ul> <ul>
<li><a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a></li> <li><a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a></li>
<li><a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a></li> <li><a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a></li>
<li><a href="https://github.com/writeas/writefreely">source code</a></li> <li><a href="https://github.com/writefreely/writefreely">source code</a></li>
<li style="margin-top:0.8em">{{.Version}}</li> <li style="margin-top:0.8em">{{.Version}}</li>
</ul> </ul>
</div> </div>

4
users.go
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2018 A Bunch Tell LLC. * Copyright © 2018-2019, 2021 A Bunch Tell LLC.
* *
* This file is part of WriteFreely. * This file is part of WriteFreely.
* *
@ -16,7 +16,7 @@ import (
"github.com/guregu/null/zero" "github.com/guregu/null/zero"
"github.com/writeas/web-core/data" "github.com/writeas/web-core/data"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/key" "github.com/writefreely/writefreely/key"
) )
type UserStatus int type UserStatus int

2
webfinger.go
Unescape View File

@ -19,7 +19,7 @@ import (
"github.com/writeas/go-webfinger" "github.com/writeas/go-webfinger"
"github.com/writeas/impart" "github.com/writeas/impart"
"github.com/writeas/web-core/log" "github.com/writeas/web-core/log"
"github.com/writeas/writefreely/config" "github.com/writefreely/writefreely/config"
) )
type wfResolver struct { type wfResolver struct {

Write Preview
Loading…
Cancel
Save