Compare commits
No commits in common. "develop" and "custom-css-config" have entirely different histories.
develop
...
custom-css
48 changed files with 211 additions and 1093 deletions
|
|
@ -1 +1,2 @@
|
||||||
Dockerfile
|
Dockerfile
|
||||||
|
.git
|
||||||
|
|
|
||||||
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
|
|
@ -2,4 +2,4 @@
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
- [ ] I have signed the [CLA](https://todo.musing.studio/L1)
|
- [ ] I have signed the [CLA](https://phabricator.write.as/L1)
|
||||||
|
|
|
||||||
9
.github/workflows/docker-publish.yml
vendored
9
.github/workflows/docker-publish.yml
vendored
|
|
@ -30,14 +30,6 @@ jobs:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
# Set up QEMU for cross-building
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3.0.0
|
|
||||||
|
|
||||||
# Set up Docker Buildx
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3.0.0
|
|
||||||
|
|
||||||
# Login against a Docker registry except on PR
|
# Login against a Docker registry except on PR
|
||||||
# https://github.com/docker/login-action
|
# https://github.com/docker/login-action
|
||||||
- name: Log into registry ${{ env.REGISTRY }}
|
- name: Log into registry ${{ env.REGISTRY }}
|
||||||
|
|
@ -64,7 +56,6 @@ jobs:
|
||||||
uses: docker/build-push-action@v5.0.0
|
uses: docker/build-push-action@v5.0.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,11 @@ First, you'll want to clone the WriteFreely repo, install development dependenci
|
||||||
|
|
||||||
### Starting development
|
### Starting development
|
||||||
|
|
||||||
Next, [join our forum](https://discuss.write.as) so you can discuss development with the team. Then take a look at [our roadmap on Phabricator](https://todo.musing.studio/tag/writefreely/) to see where the project is today and where it's headed.
|
Next, [join our forum](https://discuss.write.as) so you can discuss development with the team. Then take a look at [our roadmap on Phabricator](https://phabricator.write.as/tag/write_freely/) to see where the project is today and where it's headed.
|
||||||
|
|
||||||
When you find something you want to work on, start a new topic on the forum or jump into an existing discussion, if there is one. The team will respond and continue the conversation there.
|
When you find something you want to work on, start a new topic on the forum or jump into an existing discussion, if there is one. The team will respond and continue the conversation there.
|
||||||
|
|
||||||
Lastly, **before submitting any code**, please sign our [contributor's agreement](https://todo.musing.studio/L1) so we can accept your contributions. It is substantially similar to the _Apache Individual Contributor License Agreement_. If you'd like to know about the rationale behind this requirement, you can [read more about that here](https://todo.musing.studio/w/writefreely/cla/).
|
Lastly, **before submitting any code**, please sign our [contributor's agreement](https://phabricator.write.as/L1) so we can accept your contributions. It is substantially similar to the _Apache Individual Contributor License Agreement_. If you'd like to know about the rationale behind this requirement, you can [read more about that here](https://phabricator.write.as/w/writefreely/cla/).
|
||||||
|
|
||||||
### Branching
|
### Branching
|
||||||
|
|
||||||
|
|
|
||||||
26
Dockerfile
26
Dockerfile
|
|
@ -1,14 +1,13 @@
|
||||||
# Build image
|
# Build image
|
||||||
FROM golang:1.21-alpine3.18 as build
|
FROM golang:1.19-alpine as build
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source="https://github.com/writefreely/writefreely"
|
LABEL org.opencontainers.image.source=https://github.com/writefreely/writefreely
|
||||||
LABEL org.opencontainers.image.description="WriteFreely is a clean, minimalist publishing platform made for writers. Start a blog, share knowledge within your organization, or build a community around the shared act of writing."
|
LABEL org.opencontainers.image.description="WriteFreely is a clean, minimalist publishing platform made for writers. Start a blog, share knowledge within your organization, or build a community around the shared act of writing."
|
||||||
|
|
||||||
RUN apk -U upgrade \
|
RUN apk add --update nodejs npm make g++ git
|
||||||
&& apk add --no-cache nodejs npm make g++ git \
|
RUN npm install -g less less-plugin-clean-css
|
||||||
&& npm install -g less less-plugin-clean-css \
|
|
||||||
&& mkdir -p /go/src/github.com/writefreely/writefreely
|
|
||||||
|
|
||||||
|
RUN mkdir -p /go/src/github.com/writefreely/writefreely
|
||||||
WORKDIR /go/src/github.com/writefreely/writefreely
|
WORKDIR /go/src/github.com/writefreely/writefreely
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
@ -19,9 +18,9 @@ ENV GO111MODULE=on
|
||||||
ENV NODE_OPTIONS=--openssl-legacy-provider
|
ENV NODE_OPTIONS=--openssl-legacy-provider
|
||||||
|
|
||||||
RUN make build \
|
RUN make build \
|
||||||
&& make ui \
|
&& make ui
|
||||||
&& mkdir /stage \
|
RUN mkdir /stage && \
|
||||||
&& cp -R /go/bin \
|
cp -R /go/bin \
|
||||||
/go/src/github.com/writefreely/writefreely/templates \
|
/go/src/github.com/writefreely/writefreely/templates \
|
||||||
/go/src/github.com/writefreely/writefreely/static \
|
/go/src/github.com/writefreely/writefreely/static \
|
||||||
/go/src/github.com/writefreely/writefreely/pages \
|
/go/src/github.com/writefreely/writefreely/pages \
|
||||||
|
|
@ -30,11 +29,9 @@ RUN make build \
|
||||||
/stage
|
/stage
|
||||||
|
|
||||||
# Final image
|
# Final image
|
||||||
FROM alpine:3.18.4
|
FROM alpine:3
|
||||||
|
|
||||||
RUN apk -U upgrade \
|
|
||||||
&& apk add --no-cache openssl ca-certificates
|
|
||||||
|
|
||||||
|
RUN apk add --no-cache openssl ca-certificates
|
||||||
COPY --from=build --chown=daemon:daemon /stage /go
|
COPY --from=build --chown=daemon:daemon /stage /go
|
||||||
|
|
||||||
WORKDIR /go
|
WORKDIR /go
|
||||||
|
|
@ -43,6 +40,3 @@ EXPOSE 8080
|
||||||
USER daemon
|
USER daemon
|
||||||
|
|
||||||
ENTRYPOINT ["cmd/writefreely/writefreely"]
|
ENTRYPOINT ["cmd/writefreely/writefreely"]
|
||||||
|
|
||||||
HEALTHCHECK --start-period=5s --interval=15s --timeout=5s \
|
|
||||||
CMD wget --no-verbose --tries=1 --spider http://localhost:8080/ || exit 1
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
FROM golang:alpine AS build
|
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source="https://github.com/writefreely/writefreely"
|
|
||||||
LABEL org.opencontainers.image.description="WriteFreely is a clean, minimalist publishing platform made for writers. Start a blog, share knowledge within your organization, or build a community around the shared act of writing."
|
|
||||||
|
|
||||||
RUN apk update --no-cache && \
|
|
||||||
apk upgrade --no-cache && \
|
|
||||||
apk add --no-cache nodejs npm make g++ git sqlite-dev patch && \
|
|
||||||
npm install -g less less-plugin-clean-css && \
|
|
||||||
mkdir -p /go/src/github.com/writefreely/writefreely
|
|
||||||
|
|
||||||
COPY . /go/src/github.com/writefreely/writefreely
|
|
||||||
WORKDIR /go/src/github.com/writefreely/writefreely
|
|
||||||
ENV NODE_OPTIONS=--openssl-legacy-provider
|
|
||||||
RUN cat ossl_legacy.cnf >> /etc/ssl/openssl.cnf && \
|
|
||||||
make build && \
|
|
||||||
make ui
|
|
||||||
|
|
||||||
FROM alpine
|
|
||||||
|
|
||||||
RUN apk update --no-cache && \
|
|
||||||
apk upgrade --no-cache && \
|
|
||||||
apk add --no-cache openssl ca-certificates && \
|
|
||||||
mkdir /usr/share/writefreely
|
|
||||||
|
|
||||||
COPY --from=build /go/src/github.com/writefreely/writefreely/cmd/writefreely/writefreely /usr/bin
|
|
||||||
COPY --from=build /go/src/github.com/writefreely/writefreely/pages /usr/share/writefreely/pages
|
|
||||||
COPY --from=build /go/src/github.com/writefreely/writefreely/static /usr/share/writefreely/static
|
|
||||||
COPY --from=build /go/src/github.com/writefreely/writefreely/templates /usr/share/writefreely/templates
|
|
||||||
|
|
||||||
ENV WRITEFREELY_DOCKER=True
|
|
||||||
ENV HOME=/data
|
|
||||||
WORKDIR /data
|
|
||||||
CMD ["/usr/bin/writefreely"]
|
|
||||||
30
Makefile
30
Makefile
|
|
@ -1,5 +1,5 @@
|
||||||
GITREV=`git describe | cut -c 2-`
|
GITREV=`git describe | cut -c 2-`
|
||||||
LDFLAGS=-ldflags="-s -w -X 'github.com/writefreely/writefreely.softwareVer=$(GITREV)' -extldflags '-static'"
|
LDFLAGS=-ldflags="-s -w -X 'github.com/writefreely/writefreely.softwareVer=$(GITREV)'"
|
||||||
|
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
GOINSTALL=$(GOCMD) install $(LDFLAGS)
|
GOINSTALL=$(GOCMD) install $(LDFLAGS)
|
||||||
|
|
@ -27,43 +27,37 @@ build-linux: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=linux/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=linux/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-windows: deps
|
build-windows: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=windows/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=windows/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-darwin: deps
|
build-darwin: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-darwin-arm64: deps
|
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
|
||||||
fi
|
|
||||||
xgo --targets=darwin/arm64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
|
||||||
|
|
||||||
build-arm6: deps
|
build-arm6: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=linux/arm-6, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=linux/arm-6, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-arm7: deps
|
build-arm7: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=linux/arm-7, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=linux/arm-7, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-arm64: deps
|
build-arm64: deps
|
||||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
$(GOCMD) install src.techknowlogick.com/xgo@latest; \
|
||||||
fi
|
fi
|
||||||
xgo --targets=linux/arm64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.21.x -out writefreely -pkg ./cmd/writefreely .
|
xgo --targets=linux/arm64, -dest build/ $(LDFLAGS) -tags='netgo sqlite' -go go-1.19.x -out writefreely -pkg ./cmd/writefreely .
|
||||||
|
|
||||||
build-docker :
|
build-docker :
|
||||||
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) .
|
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) .
|
||||||
|
|
@ -89,9 +83,9 @@ install : build
|
||||||
|
|
||||||
release : clean ui
|
release : clean ui
|
||||||
mkdir -p $(BUILDPATH)
|
mkdir -p $(BUILDPATH)
|
||||||
rsync -av --exclude=".*" templates $(BUILDPATH)
|
cp -r templates $(BUILDPATH)
|
||||||
rsync -av --exclude=".*" pages $(BUILDPATH)
|
cp -r pages $(BUILDPATH)
|
||||||
rsync -av --exclude=".*" static $(BUILDPATH)
|
cp -r static $(BUILDPATH)
|
||||||
rm -r $(BUILDPATH)/static/local
|
rm -r $(BUILDPATH)/static/local
|
||||||
scripts/invalidate-css.sh $(BUILDPATH)
|
scripts/invalidate-css.sh $(BUILDPATH)
|
||||||
mkdir $(BUILDPATH)/keys
|
mkdir $(BUILDPATH)/keys
|
||||||
|
|
@ -115,10 +109,6 @@ release : clean ui
|
||||||
mv build/$(BINARY_NAME)-darwin-10.12-amd64 $(BUILDPATH)/$(BINARY_NAME)
|
mv build/$(BINARY_NAME)-darwin-10.12-amd64 $(BUILDPATH)/$(BINARY_NAME)
|
||||||
tar -cvzf $(BINARY_NAME)_$(GITREV)_macos_amd64.tar.gz -C build $(BINARY_NAME)
|
tar -cvzf $(BINARY_NAME)_$(GITREV)_macos_amd64.tar.gz -C build $(BINARY_NAME)
|
||||||
rm $(BUILDPATH)/$(BINARY_NAME)
|
rm $(BUILDPATH)/$(BINARY_NAME)
|
||||||
$(MAKE) build-darwin-arm64
|
|
||||||
mv build/$(BINARY_NAME)-darwin-arm64 $(BUILDPATH)/$(BINARY_NAME)
|
|
||||||
tar -cvzf $(BINARY_NAME)_$(GITREV)_macos_arm64.tar.gz -C build $(BINARY_NAME)
|
|
||||||
rm $(BUILDPATH)/$(BINARY_NAME)
|
|
||||||
$(MAKE) build-windows
|
$(MAKE) build-windows
|
||||||
mv build/$(BINARY_NAME)-windows-4.0-amd64.exe $(BUILDPATH)/$(BINARY_NAME).exe
|
mv build/$(BINARY_NAME)-windows-4.0-amd64.exe $(BUILDPATH)/$(BINARY_NAME).exe
|
||||||
cd build; zip -r ../$(BINARY_NAME)_$(GITREV)_windows_amd64.zip ./$(BINARY_NAME)
|
cd build; zip -r ../$(BINARY_NAME)_$(GITREV)_windows_amd64.zip ./$(BINARY_NAME)
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,6 @@ For common platforms, start with our [pre-built binaries](https://github.com/wri
|
||||||
You can also find WriteFreely in these package repositories, thanks to our wonderful community!
|
You can also find WriteFreely in these package repositories, thanks to our wonderful community!
|
||||||
|
|
||||||
* [Arch User Repository](https://aur.archlinux.org/packages/writefreely/)
|
* [Arch User Repository](https://aur.archlinux.org/packages/writefreely/)
|
||||||
* [Nanos Repository](https://repo.ops.city/v2/packages/eyberg/writefreely/show)
|
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
|
|
@ -87,4 +86,4 @@ Before contributing anything, please read our [Contributing Guide](https://githu
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Copyright © 2018-2025 [Musing Studio LLC](https://musing.studio) and contributing authors. Licensed under the [AGPL](https://github.com/writefreely/writefreely/blob/develop/LICENSE).
|
Copyright © 2018-2022 [Musing Studio LLC](https://musing.studio) and contributing authors. Licensed under the [AGPL](https://github.com/writefreely/writefreely/blob/develop/LICENSE).
|
||||||
|
|
|
||||||
33
account.go
33
account.go
|
|
@ -13,7 +13,7 @@ package writefreely
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/writefreely/writefreely/mailer"
|
"github.com/mailgun/mailgun-go"
|
||||||
"github.com/writefreely/writefreely/spam"
|
"github.com/writefreely/writefreely/spam"
|
||||||
"html/template"
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
@ -1378,19 +1378,13 @@ func handleResetPasswordInit(app *App, w http.ResponseWriter, r *http.Request) e
|
||||||
|
|
||||||
func emailPasswordReset(app *App, toEmail, token string) error {
|
func emailPasswordReset(app *App, toEmail, token string) error {
|
||||||
// Send email
|
// Send email
|
||||||
mlr, err := mailer.New(app.cfg.Email)
|
gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
footerPara := "Didn't request this password reset? Your account is still safe, and you can safely ignore this email."
|
footerPara := "Didn't request this password reset? Your account is still safe, and you can safely ignore this email."
|
||||||
|
|
||||||
plainMsg := fmt.Sprintf("We received a request to reset your password on %s. Please click the following link to continue (or copy and paste it into your browser): %s/reset?t=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara)
|
plainMsg := fmt.Sprintf("We received a request to reset your password on %s. Please click the following link to continue (or copy and paste it into your browser): %s/reset?t=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara)
|
||||||
m, err := mlr.NewMessage(app.cfg.App.SiteName+" <noreply-password@"+app.cfg.Email.Domain+">", "Reset Your "+app.cfg.App.SiteName+" Password", plainMsg, fmt.Sprintf("<%s>", toEmail))
|
m := mailgun.NewMessage(app.cfg.App.SiteName+" <noreply-password@"+app.cfg.Email.Domain+">", "Reset Your "+app.cfg.App.SiteName+" Password", plainMsg, fmt.Sprintf("<%s>", toEmail))
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
m.AddTag("Password Reset")
|
m.AddTag("Password Reset")
|
||||||
m.SetHTML(fmt.Sprintf(`<html>
|
m.SetHtml(fmt.Sprintf(`<html>
|
||||||
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
||||||
<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
|
<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
|
||||||
<h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
|
<h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
|
||||||
|
|
@ -1400,7 +1394,8 @@ func emailPasswordReset(app *App, toEmail, token string) error {
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara))
|
</html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.SiteName, app.cfg.App.Host, token, footerPara))
|
||||||
return mlr.Send(m)
|
_, _, err := gun.Send(m)
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func loginViaEmail(app *App, alias, redirectTo string) error {
|
func loginViaEmail(app *App, alias, redirectTo string) error {
|
||||||
|
|
@ -1429,21 +1424,15 @@ func loginViaEmail(app *App, alias, redirectTo string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send email
|
// Send email
|
||||||
mlr, err := mailer.New(app.cfg.Email)
|
gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
toEmail := u.EmailClear(app.keys)
|
toEmail := u.EmailClear(app.keys)
|
||||||
footerPara := "This link will only work once and expires in 15 minutes. Didn't ask us to log in? You can safely ignore this email."
|
footerPara := "This link will only work once and expires in 15 minutes. Didn't ask us to log in? You can safely ignore this email."
|
||||||
|
|
||||||
plainMsg := fmt.Sprintf("Log in to %s here: %s/login?to=%s&with=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, footerPara)
|
plainMsg := fmt.Sprintf("Log in to %s here: %s/login?to=%s&with=%s\n\n%s", app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, footerPara)
|
||||||
m, err := mlr.NewMessage(app.cfg.App.SiteName+" <noreply-login@"+app.cfg.Email.Domain+">", "Log in to "+app.cfg.App.SiteName, plainMsg, fmt.Sprintf("<%s>", toEmail))
|
m := mailgun.NewMessage(app.cfg.App.SiteName+" <noreply-login@"+app.cfg.Email.Domain+">", "Log in to "+app.cfg.App.SiteName, plainMsg, fmt.Sprintf("<%s>", toEmail))
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
m.AddTag("Email Login")
|
m.AddTag("Email Login")
|
||||||
|
|
||||||
m.SetHTML(fmt.Sprintf(`<html>
|
m.SetHtml(fmt.Sprintf(`<html>
|
||||||
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
||||||
<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
|
<div style="margin:0 auto; max-width: 40em; font-size: 1.2em;">
|
||||||
<h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
|
<h1 style="font-size:1.75em"><a style="text-decoration:none;color:#000;" href="%s">%s</a></h1>
|
||||||
|
|
@ -1452,7 +1441,9 @@ func loginViaEmail(app *App, alias, redirectTo string) error {
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, app.cfg.App.SiteName, footerPara))
|
</html>`, app.cfg.App.Host, app.cfg.App.SiteName, app.cfg.App.Host, redirectTo, t, app.cfg.App.SiteName, footerPara))
|
||||||
return mlr.Send(m)
|
_, _, err = gun.Send(m)
|
||||||
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func saveTempInfo(app *App, key, val string, r *http.Request, w http.ResponseWriter) error {
|
func saveTempInfo(app *App, key, val string, r *http.Request, w http.ResponseWriter) error {
|
||||||
|
|
|
||||||
226
activitypub.go
226
activitypub.go
|
|
@ -22,7 +22,6 @@ import (
|
||||||
"net/http/httputil"
|
"net/http/httputil"
|
||||||
"net/url"
|
"net/url"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -46,11 +45,6 @@ const (
|
||||||
apCacheTime = time.Minute
|
apCacheTime = time.Minute
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
|
||||||
apCollectionPostIRIRegex = regexp.MustCompile("/api/collections/([a-z0-9\\-]+)/posts/([a-z0-9\\-]+)$")
|
|
||||||
apDraftPostIRIRegex = regexp.MustCompile("/api/posts/([a-z0-9\\-]+)$")
|
|
||||||
)
|
|
||||||
|
|
||||||
var instanceColl *Collection
|
var instanceColl *Collection
|
||||||
|
|
||||||
func initActivityPub(app *App) {
|
func initActivityPub(app *App) {
|
||||||
|
|
@ -201,7 +195,7 @@ func handleFetchCollectionOutbox(app *App, w http.ResponseWriter, r *http.Reques
|
||||||
ocp := activitystreams.NewOrderedCollectionPage(accountRoot, "outbox", res.TotalPosts, p)
|
ocp := activitystreams.NewOrderedCollectionPage(accountRoot, "outbox", res.TotalPosts, p)
|
||||||
ocp.OrderedItems = []interface{}{}
|
ocp.OrderedItems = []interface{}{}
|
||||||
|
|
||||||
posts, err := app.db.GetPosts(app.cfg, c, p, false, true, false, "")
|
posts, err := app.db.GetPosts(app.cfg, c, p, false, true, false)
|
||||||
for _, pp := range *posts {
|
for _, pp := range *posts {
|
||||||
pp.Collection = res
|
pp.Collection = res
|
||||||
o := pp.ActivityObject(app)
|
o := pp.ActivityObject(app)
|
||||||
|
|
@ -357,60 +351,11 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
a := streams.NewAccept()
|
a := streams.NewAccept()
|
||||||
p := c.PersonObject()
|
p := c.PersonObject()
|
||||||
var to *url.URL
|
var to *url.URL
|
||||||
var isFollow, isUnfollow, isLike, isUnlike bool
|
var isFollow, isUnfollow bool
|
||||||
var likePostID, unlikePostID string
|
|
||||||
fullActor := &activitystreams.Person{}
|
fullActor := &activitystreams.Person{}
|
||||||
var remoteUser *RemoteUser
|
var remoteUser *RemoteUser
|
||||||
|
|
||||||
res := &streams.Resolver{
|
res := &streams.Resolver{
|
||||||
LikeCallback: func(l *streams.Like) error {
|
|
||||||
isLike = true
|
|
||||||
|
|
||||||
// 1) Use the Like concrete type here
|
|
||||||
// 2) Errors are propagated to res.Deserialize call below
|
|
||||||
m["@context"] = []string{activitystreams.Namespace}
|
|
||||||
b, _ := json.Marshal(m)
|
|
||||||
if debugging {
|
|
||||||
log.Info("Like: %s", b)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, likeID := l.GetId()
|
|
||||||
if likeID == nil {
|
|
||||||
log.Error("Didn't resolve Like ID")
|
|
||||||
}
|
|
||||||
if p := l.HasObject(0); p == streams.NoPresence {
|
|
||||||
return fmt.Errorf("no object for Like activity at index 0")
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := l.Raw().GetObjectIRI(0)
|
|
||||||
/*
|
|
||||||
// TODO: handle this more robustly
|
|
||||||
l.ResolveObject(&streams.Resolver{
|
|
||||||
LinkCallback: func(link *streams.Link) error {
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}, 0)
|
|
||||||
*/
|
|
||||||
|
|
||||||
if obj == nil {
|
|
||||||
return fmt.Errorf("didn't get ObjectIRI to Like")
|
|
||||||
}
|
|
||||||
likePostID, err = parsePostIDFromURL(app, obj)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, get actor information
|
|
||||||
_, from := l.GetActor(0)
|
|
||||||
if from == nil {
|
|
||||||
return fmt.Errorf("No valid actor string")
|
|
||||||
}
|
|
||||||
fullActor, remoteUser, err = getActor(app, from.String())
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
FollowCallback: func(f *streams.Follow) error {
|
FollowCallback: func(f *streams.Follow) error {
|
||||||
isFollow = true
|
isFollow = true
|
||||||
|
|
||||||
|
|
@ -436,17 +381,6 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
a.AppendObject(f.Raw())
|
a.AppendObject(f.Raw())
|
||||||
_, to = f.GetActor(0)
|
_, to = f.GetActor(0)
|
||||||
obj := f.Raw().GetObjectIRI(0)
|
obj := f.Raw().GetObjectIRI(0)
|
||||||
if obj == nil {
|
|
||||||
if debugging {
|
|
||||||
log.Error("GetObjectIRI on Follow for actor is empty; trying object")
|
|
||||||
}
|
|
||||||
ao := f.Raw().GetObject(0)
|
|
||||||
if ao == nil {
|
|
||||||
log.Error("Fell back to GetObject and none parsed, so no actor ID! Follow request probably FAILED!")
|
|
||||||
} else {
|
|
||||||
obj = ao.GetId()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a.AppendActor(obj)
|
a.AppendActor(obj)
|
||||||
|
|
||||||
// First get actor information
|
// First get actor information
|
||||||
|
|
@ -460,6 +394,8 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
return impart.RenderActivityJSON(w, m, http.StatusOK)
|
return impart.RenderActivityJSON(w, m, http.StatusOK)
|
||||||
},
|
},
|
||||||
UndoCallback: func(u *streams.Undo) error {
|
UndoCallback: func(u *streams.Undo) error {
|
||||||
|
isUnfollow = true
|
||||||
|
|
||||||
m["@context"] = []string{activitystreams.Namespace}
|
m["@context"] = []string{activitystreams.Namespace}
|
||||||
b, _ := json.Marshal(m)
|
b, _ := json.Marshal(m)
|
||||||
if debugging {
|
if debugging {
|
||||||
|
|
@ -467,37 +403,6 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
}
|
}
|
||||||
|
|
||||||
a.AppendObject(u.Raw())
|
a.AppendObject(u.Raw())
|
||||||
|
|
||||||
// Check type -- we handle Undo:Like and Undo:Follow
|
|
||||||
_, err := u.ResolveObject(&streams.Resolver{
|
|
||||||
LikeCallback: func(like *streams.Like) error {
|
|
||||||
isUnlike = true
|
|
||||||
|
|
||||||
_, from := like.GetActor(0)
|
|
||||||
obj := like.Raw().GetObjectIRI(0)
|
|
||||||
if obj == nil {
|
|
||||||
return fmt.Errorf("didn't get ObjectIRI for Undo Like")
|
|
||||||
}
|
|
||||||
unlikePostID, err = parsePostIDFromURL(app, obj)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
fullActor, remoteUser, err = getActor(app, from.String())
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
// TODO: add FollowCallback for more robust handling
|
|
||||||
}, 0)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if isUnlike {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
isUnfollow = true
|
|
||||||
_, to = u.GetActor(0)
|
_, to = u.GetActor(0)
|
||||||
// TODO: get actor from object.object, not object
|
// TODO: get actor from object.object, not object
|
||||||
obj := u.Raw().GetObjectIRI(0)
|
obj := u.Raw().GetObjectIRI(0)
|
||||||
|
|
@ -530,81 +435,6 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle synchronous activities
|
|
||||||
if isLike {
|
|
||||||
t, err := app.db.Begin()
|
|
||||||
if err != nil {
|
|
||||||
log.Error("Unable to start transaction: %v", err)
|
|
||||||
return fmt.Errorf("unable to start transaction: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var remoteUserID int64
|
|
||||||
if remoteUser != nil {
|
|
||||||
remoteUserID = remoteUser.ID
|
|
||||||
} else {
|
|
||||||
remoteUserID, err = apAddRemoteUser(app, t, fullActor)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add like
|
|
||||||
_, err = t.Exec("INSERT INTO remote_likes (post_id, remote_user_id, created) VALUES (?, ?, "+app.db.now()+")", likePostID, remoteUserID)
|
|
||||||
if err != nil {
|
|
||||||
if !app.db.isDuplicateKeyErr(err) {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Couldn't add like in DB: %v\n", err)
|
|
||||||
return fmt.Errorf("Couldn't add like in DB: %v", err)
|
|
||||||
} else {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Couldn't add like in DB: %v\n", err)
|
|
||||||
return fmt.Errorf("Couldn't add like in DB: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
err = t.Commit()
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Rolling back after Commit(): %v\n", err)
|
|
||||||
return fmt.Errorf("Rolling back after Commit(): %v\n", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if debugging {
|
|
||||||
log.Info("Successfully liked post %s by remote user %s", likePostID, remoteUser.URL)
|
|
||||||
}
|
|
||||||
return impart.RenderActivityJSON(w, "", http.StatusOK)
|
|
||||||
} else if isUnlike {
|
|
||||||
t, err := app.db.Begin()
|
|
||||||
if err != nil {
|
|
||||||
log.Error("Unable to start transaction: %v", err)
|
|
||||||
return fmt.Errorf("unable to start transaction: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var remoteUserID int64
|
|
||||||
if remoteUser != nil {
|
|
||||||
remoteUserID = remoteUser.ID
|
|
||||||
} else {
|
|
||||||
remoteUserID, err = apAddRemoteUser(app, t, fullActor)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove like
|
|
||||||
_, err = t.Exec("DELETE FROM remote_likes WHERE post_id = ? AND remote_user_id = ?", unlikePostID, remoteUserID)
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Couldn't delete Like from DB: %v\n", err)
|
|
||||||
return fmt.Errorf("Couldn't delete Like from DB: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = t.Commit()
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Rolling back after Commit(): %v\n", err)
|
|
||||||
return fmt.Errorf("Rolling back after Commit(): %v\n", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if debugging {
|
|
||||||
log.Info("Successfully un-liked post %s by remote user %s", unlikePostID, remoteUser.URL)
|
|
||||||
}
|
|
||||||
return impart.RenderActivityJSON(w, "", http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if to == nil {
|
if to == nil {
|
||||||
if debugging {
|
if debugging {
|
||||||
|
|
@ -639,7 +469,6 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
|
||||||
if remoteUser != nil {
|
if remoteUser != nil {
|
||||||
followerID = remoteUser.ID
|
followerID = remoteUser.ID
|
||||||
} else {
|
} else {
|
||||||
// TODO: use apAddRemoteUser() here, instead!
|
|
||||||
// Add follower locally, since it wasn't found before
|
// Add follower locally, since it wasn't found before
|
||||||
res, err := t.Exec("INSERT INTO remoteusers (actor_id, inbox, shared_inbox, url) VALUES (?, ?, ?, ?)", fullActor.ID, fullActor.Inbox, fullActor.Endpoints.SharedInbox, fullActor.URL)
|
res, err := t.Exec("INSERT INTO remoteusers (actor_id, inbox, shared_inbox, url) VALUES (?, ?, ?, ?)", fullActor.ID, fullActor.Inbox, fullActor.Endpoints.SharedInbox, fullActor.URL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -993,28 +822,13 @@ func getActor(app *App, actorIRI string) (*activitystreams.Person, *RemoteUser,
|
||||||
log.Info("Not found; fetching actor %s remotely", actorIRI)
|
log.Info("Not found; fetching actor %s remotely", actorIRI)
|
||||||
actorResp, err := resolveIRI(app.cfg.App.Host, actorIRI)
|
actorResp, err := resolveIRI(app.cfg.App.Host, actorIRI)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Unable to get base actor! %v", err)
|
log.Error("Unable to get actor! %v", err)
|
||||||
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't fetch actor."}
|
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't fetch actor."}
|
||||||
}
|
}
|
||||||
if err := unmarshalActor(actorResp, actor); err != nil {
|
if err := unmarshalActor(actorResp, actor); err != nil {
|
||||||
log.Error("Unable to unmarshal base actor! %v", err)
|
log.Error("Unable to unmarshal actor! %v", err)
|
||||||
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't parse actor."}
|
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't parse actor."}
|
||||||
}
|
}
|
||||||
baseActor := &activitystreams.Person{}
|
|
||||||
if err := unmarshalActor(actorResp, baseActor); err != nil {
|
|
||||||
log.Error("Unable to unmarshal actual actor! %v", err)
|
|
||||||
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't parse actual actor."}
|
|
||||||
}
|
|
||||||
// Fetch the actual actor using the owner field from the publicKey object
|
|
||||||
actualActorResp, err := resolveIRI(app.cfg.App.Host, baseActor.PublicKey.Owner)
|
|
||||||
if err != nil {
|
|
||||||
log.Error("Unable to get actual actor! %v", err)
|
|
||||||
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't fetch actual actor."}
|
|
||||||
}
|
|
||||||
if err := unmarshalActor(actualActorResp, actor); err != nil {
|
|
||||||
log.Error("Unable to unmarshal actual actor! %v", err)
|
|
||||||
return nil, nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't parse actual actor."}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -1135,34 +949,6 @@ func unmarshalActor(actorResp []byte, actor *activitystreams.Person) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parsePostIDFromURL(app *App, u *url.URL) (string, error) {
|
|
||||||
// Get post ID from URL
|
|
||||||
var collAlias, slug, postID string
|
|
||||||
if m := apCollectionPostIRIRegex.FindStringSubmatch(u.String()); len(m) == 3 {
|
|
||||||
collAlias = m[1]
|
|
||||||
slug = m[2]
|
|
||||||
} else if m = apDraftPostIRIRegex.FindStringSubmatch(u.String()); len(m) == 2 {
|
|
||||||
postID = m[1]
|
|
||||||
} else {
|
|
||||||
return "", fmt.Errorf("unable to match objectIRI: %s", u)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get postID if all we have is collection and slug
|
|
||||||
if collAlias != "" && slug != "" {
|
|
||||||
c, err := app.db.GetCollection(collAlias)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
p, err := app.db.GetPost(slug, c.ID)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
postID = p.ID
|
|
||||||
}
|
|
||||||
|
|
||||||
return postID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func setCacheControl(w http.ResponseWriter, ttl time.Duration) {
|
func setCacheControl(w http.ResponseWriter, ttl time.Duration) {
|
||||||
w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", ttl.Seconds()))
|
w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%.0f", ttl.Seconds()))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
admin.go
2
admin.go
|
|
@ -208,7 +208,7 @@ func handleViewAdminUsers(app *App, u *User, w http.ResponseWriter, r *http.Requ
|
||||||
|
|
||||||
p.Flashes, _ = getSessionFlashes(app, w, r, nil)
|
p.Flashes, _ = getSessionFlashes(app, w, r, nil)
|
||||||
p.TotalUsers = app.db.GetAllUsersCount()
|
p.TotalUsers = app.db.GetAllUsersCount()
|
||||||
ttlPages := (p.TotalUsers - 1) / adminUsersPerPage + 1
|
ttlPages := p.TotalUsers / adminUsersPerPage
|
||||||
p.TotalPages = []int{}
|
p.TotalPages = []int{}
|
||||||
for i := 1; i <= int(ttlPages); i++ {
|
for i := 1; i <= int(ttlPages); i++ {
|
||||||
p.TotalPages = append(p.TotalPages, i)
|
p.TotalPages = append(p.TotalPages, i)
|
||||||
|
|
|
||||||
17
app.go
17
app.go
|
|
@ -49,7 +49,6 @@ const (
|
||||||
staticDir = "static"
|
staticDir = "static"
|
||||||
assumedTitleLen = 80
|
assumedTitleLen = 80
|
||||||
postsPerPage = 10
|
postsPerPage = 10
|
||||||
postsPerArchPage = 40
|
|
||||||
|
|
||||||
serverSoftware = "WriteFreely"
|
serverSoftware = "WriteFreely"
|
||||||
softwareURL = "https://writefreely.org"
|
softwareURL = "https://writefreely.org"
|
||||||
|
|
@ -59,7 +58,7 @@ var (
|
||||||
debugging bool
|
debugging bool
|
||||||
|
|
||||||
// Software version can be set from git env using -ldflags
|
// Software version can be set from git env using -ldflags
|
||||||
softwareVer = "0.15.1"
|
softwareVer = "0.14.0"
|
||||||
|
|
||||||
// DEPRECATED VARS
|
// DEPRECATED VARS
|
||||||
isSingleUser bool
|
isSingleUser bool
|
||||||
|
|
@ -429,11 +428,15 @@ func Initialize(apper Apper, debug bool) (*App, error) {
|
||||||
|
|
||||||
initActivityPub(apper.App())
|
initActivityPub(apper.App())
|
||||||
|
|
||||||
if apper.App().cfg.Email.Enabled() {
|
if apper.App().cfg.Email.Domain != "" || apper.App().cfg.Email.MailgunPrivate != "" {
|
||||||
|
if apper.App().cfg.Email.Domain == "" {
|
||||||
|
log.Error("[FAILED] Starting publish jobs queue: no [letters]domain config value set.")
|
||||||
|
} else if apper.App().cfg.Email.MailgunPrivate == "" {
|
||||||
|
log.Error("[FAILED] Starting publish jobs queue: no [letters]mailgun_private config value set.")
|
||||||
|
} else {
|
||||||
log.Info("Starting publish jobs queue...")
|
log.Info("Starting publish jobs queue...")
|
||||||
go startPublishJobsQueue(apper.App())
|
go startPublishJobsQueue(apper.App())
|
||||||
} else {
|
}
|
||||||
log.Error("[FAILED] Starting publish jobs queue: no email provider is configured.")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle local timeline, if enabled
|
// Handle local timeline, if enabled
|
||||||
|
|
@ -889,12 +892,12 @@ func CreateUser(apper Apper, username, password string, isAdmin bool) error {
|
||||||
if isAdmin {
|
if isAdmin {
|
||||||
// Abort if trying to create admin user, but one already exists
|
// Abort if trying to create admin user, but one already exists
|
||||||
if firstUser != nil {
|
if firstUser != nil {
|
||||||
return fmt.Errorf("Admin user already exists (%s). Create a regular user with: writefreely user create [USER]:[PASSWORD]", firstUser.Username)
|
return fmt.Errorf("Admin user already exists (%s). Create a regular user with: writefreely --create-user", firstUser.Username)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Abort if trying to create regular user, but no admin exists yet
|
// Abort if trying to create regular user, but no admin exists yet
|
||||||
if firstUser == nil {
|
if firstUser == nil {
|
||||||
return fmt.Errorf("No admin user exists yet. Create an admin first with: writefreely user create --admin [USER]:[PASSWORD]")
|
return fmt.Errorf("No admin user exists yet. Create an admin first with: writefreely --create-admin")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -114,9 +114,9 @@ type (
|
||||||
Alias *string `schema:"alias" json:"alias"`
|
Alias *string `schema:"alias" json:"alias"`
|
||||||
Title *string `schema:"title" json:"title"`
|
Title *string `schema:"title" json:"title"`
|
||||||
Description *string `schema:"description" json:"description"`
|
Description *string `schema:"description" json:"description"`
|
||||||
StyleSheet *string `schema:"style_sheet" json:"style_sheet"`
|
StyleSheet *sql.NullString `schema:"style_sheet" json:"style_sheet"`
|
||||||
Script *string `schema:"script" json:"script"`
|
Script *sql.NullString `schema:"script" json:"script"`
|
||||||
Signature *string `schema:"signature" json:"signature"`
|
Signature *sql.NullString `schema:"signature" json:"signature"`
|
||||||
Monetization *string `schema:"monetization_pointer" json:"monetization_pointer"`
|
Monetization *string `schema:"monetization_pointer" json:"monetization_pointer"`
|
||||||
Verification *string `schema:"verification_link" json:"verification_link"`
|
Verification *string `schema:"verification_link" json:"verification_link"`
|
||||||
LetterReply *string `schema:"letter_reply" json:"letter_reply"`
|
LetterReply *string `schema:"letter_reply" json:"letter_reply"`
|
||||||
|
|
@ -608,7 +608,7 @@ func fetchCollectionPosts(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ps, err := app.db.GetPosts(app.cfg, c, page, isCollOwner, false, false, "")
|
ps, err := app.db.GetPosts(app.cfg, c, page, isCollOwner, false, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
@ -828,18 +828,15 @@ func checkUserForCollection(app *App, cr *collectionReq, r *http.Request, isPost
|
||||||
return u, nil
|
return u, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func newDisplayCollection(c *Collection, cr *collectionReq, page int) (*DisplayCollection, error) {
|
func newDisplayCollection(c *Collection, cr *collectionReq, page int) *DisplayCollection {
|
||||||
coll := &DisplayCollection{
|
coll := &DisplayCollection{
|
||||||
CollectionObj: NewCollectionObj(c),
|
CollectionObj: NewCollectionObj(c),
|
||||||
CurrentPage: page,
|
CurrentPage: page,
|
||||||
Prefix: cr.prefix,
|
Prefix: cr.prefix,
|
||||||
IsTopLevel: isSingleUser,
|
IsTopLevel: isSingleUser,
|
||||||
}
|
}
|
||||||
err := c.db.GetPostsCount(coll.CollectionObj, cr.isCollOwner)
|
c.db.GetPostsCount(coll.CollectionObj, cr.isCollOwner)
|
||||||
if err != nil {
|
return coll
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return coll, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// getCollectionPage returns the collection page as an int. If the parsed page value is not
|
// getCollectionPage returns the collection page as an int. If the parsed page value is not
|
||||||
|
|
@ -884,29 +881,16 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
// Serve ActivityStreams data now, if requested
|
// Serve ActivityStreams data now, if requested
|
||||||
if IsActivityPubRequest(r) {
|
if IsActivityPubRequest(r) {
|
||||||
ac := c.PersonObject()
|
ac := c.PersonObject()
|
||||||
|
ac.Context = []interface{}{activitystreams.Namespace}
|
||||||
setCacheControl(w, apCacheTime)
|
setCacheControl(w, apCacheTime)
|
||||||
return impart.RenderActivityJSON(w, ac, http.StatusOK)
|
return impart.RenderActivityJSON(w, ac, http.StatusOK)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch extra data about the Collection
|
// Fetch extra data about the Collection
|
||||||
// TODO: refactor out this logic, shared in collection.go:fetchCollection()
|
// TODO: refactor out this logic, shared in collection.go:fetchCollection()
|
||||||
coll, err := newDisplayCollection(c, cr, page)
|
coll := newDisplayCollection(c, cr, page)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var ct PostType
|
coll.TotalPages = int(math.Ceil(float64(coll.TotalPosts) / float64(coll.Format.PostsPerPage())))
|
||||||
if isArchiveView(r) {
|
|
||||||
ct = postArch
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME: this number will be off when user has pinned posts but isn't a Pro user
|
|
||||||
ppp := coll.Format.PostsPerPage()
|
|
||||||
if ct == postArch {
|
|
||||||
ppp = postsPerArchPage
|
|
||||||
}
|
|
||||||
|
|
||||||
coll.TotalPages = int(math.Ceil(float64(coll.TotalPosts) / float64(ppp)))
|
|
||||||
if coll.TotalPages > 0 && page > coll.TotalPages {
|
if coll.TotalPages > 0 && page > coll.TotalPages {
|
||||||
redirURL := fmt.Sprintf("/page/%d", coll.TotalPages)
|
redirURL := fmt.Sprintf("/page/%d", coll.TotalPages)
|
||||||
if !app.cfg.App.SingleUser {
|
if !app.cfg.App.SingleUser {
|
||||||
|
|
@ -915,7 +899,7 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
return impart.HTTPError{http.StatusFound, redirURL}
|
return impart.HTTPError{http.StatusFound, redirURL}
|
||||||
}
|
}
|
||||||
|
|
||||||
coll.Posts, _ = app.db.GetPosts(app.cfg, c, page, cr.isCollOwner, false, false, "")
|
coll.Posts, _ = app.db.GetPosts(app.cfg, c, page, cr.isCollOwner, false, false)
|
||||||
|
|
||||||
// Serve collection
|
// Serve collection
|
||||||
displayPage := CollectionPage{
|
displayPage := CollectionPage{
|
||||||
|
|
@ -974,9 +958,6 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
collTmpl := "collection"
|
collTmpl := "collection"
|
||||||
if app.cfg.App.Chorus {
|
if app.cfg.App.Chorus {
|
||||||
collTmpl = "chorus-collection"
|
collTmpl = "chorus-collection"
|
||||||
} else if isArchiveView(r) {
|
|
||||||
displayPage.NavSuffix = "/archive/"
|
|
||||||
collTmpl = "collection-archive"
|
|
||||||
}
|
}
|
||||||
err = templates[collTmpl].ExecuteTemplate(w, "collection", displayPage)
|
err = templates[collTmpl].ExecuteTemplate(w, "collection", displayPage)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -1003,10 +984,6 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func isArchiveView(r *http.Request) bool {
|
|
||||||
return strings.HasSuffix(r.RequestURI, "/archive/") || mux.Vars(r)["archive"] == "archive"
|
|
||||||
}
|
|
||||||
|
|
||||||
func handleViewMention(app *App, w http.ResponseWriter, r *http.Request) error {
|
func handleViewMention(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
handle := vars["handle"]
|
handle := vars["handle"]
|
||||||
|
|
@ -1042,7 +1019,7 @@ func handleViewCollectionTag(app *App, w http.ResponseWriter, r *http.Request) e
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
coll, _ := newDisplayCollection(c, cr, page)
|
coll := newDisplayCollection(c, cr, page)
|
||||||
|
|
||||||
taggedPostIDs, err := app.db.GetAllPostsTaggedIDs(c, tag, cr.isCollOwner)
|
taggedPostIDs, err := app.db.GetAllPostsTaggedIDs(c, tag, cr.isCollOwner)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -1140,7 +1117,7 @@ func handleViewCollectionLang(app *App, w http.ResponseWriter, r *http.Request)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
coll, _ := newDisplayCollection(c, cr, page)
|
coll := newDisplayCollection(c, cr, page)
|
||||||
coll.Language = lang
|
coll.Language = lang
|
||||||
coll.NavSuffix = fmt.Sprintf("/lang:%s", lang)
|
coll.NavSuffix = fmt.Sprintf("/lang:%s", lang)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -171,17 +171,8 @@ type (
|
||||||
}
|
}
|
||||||
|
|
||||||
EmailCfg struct {
|
EmailCfg struct {
|
||||||
// SMTP configuration values
|
|
||||||
Host string `ini:"smtp_host"`
|
|
||||||
Port int `ini:"smtp_port"`
|
|
||||||
Username string `ini:"smtp_username"`
|
|
||||||
Password string `ini:"smtp_password"`
|
|
||||||
EnableStartTLS bool `ini:"smtp_enable_start_tls"`
|
|
||||||
|
|
||||||
// Mailgun configuration values
|
|
||||||
Domain string `ini:"domain"`
|
Domain string `ini:"domain"`
|
||||||
MailgunPrivate string `ini:"mailgun_private"`
|
MailgunPrivate string `ini:"mailgun_private"`
|
||||||
MailgunEurope bool `ini:"mailgun_europe"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Config holds the complete configuration for running a writefreely instance
|
// Config holds the complete configuration for running a writefreely instance
|
||||||
|
|
@ -251,8 +242,7 @@ func (ac *AppCfg) LandingPath() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (lc EmailCfg) Enabled() bool {
|
func (lc EmailCfg) Enabled() bool {
|
||||||
return (lc.Domain != "" && lc.MailgunPrivate != "") ||
|
return lc.Domain != "" && lc.MailgunPrivate != ""
|
||||||
lc.Username != "" && lc.Password != "" && lc.Host != "" && lc.Port > 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ac AppCfg) SignupPath() string {
|
func (ac AppCfg) SignupPath() string {
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,12 @@ package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/manifoldco/promptui"
|
"github.com/manifoldco/promptui"
|
||||||
"github.com/mitchellh/go-wordwrap"
|
"github.com/mitchellh/go-wordwrap"
|
||||||
"github.com/writeas/web-core/auth"
|
"github.com/writeas/web-core/auth"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SetupData struct {
|
type SetupData struct {
|
||||||
|
|
@ -82,8 +80,6 @@ func Configure(fname string, configSections string) (*SetupData, error) {
|
||||||
isDevEnv := envType == "Development"
|
isDevEnv := envType == "Development"
|
||||||
isStandalone := envType == "Production, standalone"
|
isStandalone := envType == "Production, standalone"
|
||||||
|
|
||||||
_, isDocker := os.LookupEnv("WRITEFREELY_DOCKER")
|
|
||||||
|
|
||||||
data.Config.Server.Dev = isDevEnv
|
data.Config.Server.Dev = isDevEnv
|
||||||
|
|
||||||
if isDevEnv || !isStandalone {
|
if isDevEnv || !isStandalone {
|
||||||
|
|
@ -154,16 +150,6 @@ func Configure(fname string, configSections string) (*SetupData, error) {
|
||||||
data.Config.Server.TLSKeyPath = ""
|
data.Config.Server.TLSKeyPath = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// If running in docker:
|
|
||||||
// 1. always bind to 0.0.0.0 instead of localhost
|
|
||||||
// 2. set paths of static files in UNIX manners
|
|
||||||
if !isDevEnv && isDocker {
|
|
||||||
data.Config.Server.TemplatesParentDir = "/usr/share/writefreely"
|
|
||||||
data.Config.Server.StaticParentDir = "/usr/share/writefreely"
|
|
||||||
data.Config.Server.PagesParentDir = "/usr/share/writefreely"
|
|
||||||
data.Config.Server.Bind = "0.0.0.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
62
database.go
62
database.go
|
|
@ -14,17 +14,14 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
|
||||||
"net/url"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/writeas/monday"
|
|
||||||
|
|
||||||
"github.com/go-sql-driver/mysql"
|
"github.com/go-sql-driver/mysql"
|
||||||
"github.com/writeas/web-core/silobridge"
|
"github.com/writeas/web-core/silobridge"
|
||||||
wf_db "github.com/writefreely/writefreely/db"
|
wf_db "github.com/writefreely/writefreely/db"
|
||||||
"github.com/writefreely/writefreely/parse"
|
"github.com/writefreely/writefreely/parse"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/guregu/null"
|
"github.com/guregu/null"
|
||||||
"github.com/guregu/null/zero"
|
"github.com/guregu/null/zero"
|
||||||
|
|
@ -117,9 +114,8 @@ type writestore interface {
|
||||||
DispersePosts(userID int64, postIDs []string) (*[]ClaimPostResult, error)
|
DispersePosts(userID int64, postIDs []string) (*[]ClaimPostResult, error)
|
||||||
ClaimPosts(cfg *config.Config, userID int64, collAlias string, posts *[]ClaimPostRequest) (*[]ClaimPostResult, error)
|
ClaimPosts(cfg *config.Config, userID int64, collAlias string, posts *[]ClaimPostRequest) (*[]ClaimPostResult, error)
|
||||||
|
|
||||||
GetPostLikeCounts(postID string) (int64, error)
|
GetPostsCount(c *CollectionObj, includeFuture bool)
|
||||||
GetPostsCount(c *CollectionObj, includeFuture bool) error
|
GetPosts(cfg *config.Config, c *Collection, page int, includeFuture, forceRecentFirst, includePinned bool) (*[]PublicPost, error)
|
||||||
GetPosts(cfg *config.Config, c *Collection, page int, includeFuture, forceRecentFirst, includePinned bool, contentType PostType) (*[]PublicPost, error)
|
|
||||||
GetAllPostsTaggedIDs(c *Collection, tag string, includeFuture bool) ([]string, error)
|
GetAllPostsTaggedIDs(c *Collection, tag string, includeFuture bool) ([]string, error)
|
||||||
GetPostsTagged(cfg *config.Config, c *Collection, tag string, page int, includeFuture bool) (*[]PublicPost, error)
|
GetPostsTagged(cfg *config.Config, c *Collection, tag string, page int, includeFuture bool) (*[]PublicPost, error)
|
||||||
|
|
||||||
|
|
@ -909,9 +905,9 @@ func (db *datastore) UpdateCollection(app *App, c *SubmittedCollection, alias st
|
||||||
q := query.NewUpdate().
|
q := query.NewUpdate().
|
||||||
SetStringPtr(c.Title, "title").
|
SetStringPtr(c.Title, "title").
|
||||||
SetStringPtr(c.Description, "description").
|
SetStringPtr(c.Description, "description").
|
||||||
SetStringPtr(c.StyleSheet, "style_sheet").
|
SetNullString(c.StyleSheet, "style_sheet").
|
||||||
SetStringPtr(c.Script, "script").
|
SetNullString(c.Script, "script").
|
||||||
SetStringPtr(c.Signature, "post_signature")
|
SetNullString(c.Signature, "post_signature")
|
||||||
|
|
||||||
if c.Format != nil {
|
if c.Format != nil {
|
||||||
cf := &CollectionFormat{Format: c.Format.String}
|
cf := &CollectionFormat{Format: c.Format.String}
|
||||||
|
|
@ -1177,12 +1173,6 @@ func (db *datastore) GetPost(id string, collectionID int64) (*PublicPost, error)
|
||||||
return nil, ErrPostUnpublished
|
return nil, ErrPostUnpublished
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get additional information needed before processing post data
|
|
||||||
p.LikeCount, err = db.GetPostLikeCounts(p.ID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
res := p.processPost()
|
res := p.processPost()
|
||||||
if ownerName.Valid {
|
if ownerName.Valid {
|
||||||
res.Owner = &PublicUser{Username: ownerName.String}
|
res.Owner = &PublicUser{Username: ownerName.String}
|
||||||
|
|
@ -1245,22 +1235,10 @@ func (db *datastore) GetPostProperty(id string, collectionID int64, property str
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *datastore) GetPostLikeCounts(postID string) (int64, error) {
|
|
||||||
var count int64
|
|
||||||
err := db.QueryRow("SELECT COUNT(*) FROM remote_likes WHERE post_id = ?", postID).Scan(&count)
|
|
||||||
switch {
|
|
||||||
case err == sql.ErrNoRows:
|
|
||||||
count = 0
|
|
||||||
case err != nil:
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
return count, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPostsCount modifies the CollectionObj to include the correct number of
|
// GetPostsCount modifies the CollectionObj to include the correct number of
|
||||||
// standard (non-pinned) posts. It will return future posts if `includeFuture`
|
// standard (non-pinned) posts. It will return future posts if `includeFuture`
|
||||||
// is true.
|
// is true.
|
||||||
func (db *datastore) GetPostsCount(c *CollectionObj, includeFuture bool) error {
|
func (db *datastore) GetPostsCount(c *CollectionObj, includeFuture bool) {
|
||||||
var count int64
|
var count int64
|
||||||
timeCondition := ""
|
timeCondition := ""
|
||||||
if !includeFuture {
|
if !includeFuture {
|
||||||
|
|
@ -1273,18 +1251,16 @@ func (db *datastore) GetPostsCount(c *CollectionObj, includeFuture bool) error {
|
||||||
case err != nil:
|
case err != nil:
|
||||||
log.Error("Failed selecting from collections: %v", err)
|
log.Error("Failed selecting from collections: %v", err)
|
||||||
c.TotalPosts = 0
|
c.TotalPosts = 0
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c.TotalPosts = int(count)
|
c.TotalPosts = int(count)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPosts retrieves all posts for the given Collection.
|
// GetPosts retrieves all posts for the given Collection.
|
||||||
// It will return future posts if `includeFuture` is true.
|
// It will return future posts if `includeFuture` is true.
|
||||||
// It will include only standard (non-pinned) posts unless `includePinned` is true.
|
// It will include only standard (non-pinned) posts unless `includePinned` is true.
|
||||||
// TODO: change includeFuture to isOwner, since that's how it's used
|
// TODO: change includeFuture to isOwner, since that's how it's used
|
||||||
func (db *datastore) GetPosts(cfg *config.Config, c *Collection, page int, includeFuture, forceRecentFirst, includePinned bool, contentType PostType) (*[]PublicPost, error) {
|
func (db *datastore) GetPosts(cfg *config.Config, c *Collection, page int, includeFuture, forceRecentFirst, includePinned bool) (*[]PublicPost, error) {
|
||||||
collID := c.ID
|
collID := c.ID
|
||||||
|
|
||||||
cf := c.NewFormat()
|
cf := c.NewFormat()
|
||||||
|
|
@ -1298,9 +1274,6 @@ func (db *datastore) GetPosts(cfg *config.Config, c *Collection, page int, inclu
|
||||||
if page == 0 {
|
if page == 0 {
|
||||||
start = 0
|
start = 0
|
||||||
pagePosts = 1000
|
pagePosts = 1000
|
||||||
} else if contentType == postArch {
|
|
||||||
pagePosts = postsPerArchPage
|
|
||||||
start = page*pagePosts - pagePosts
|
|
||||||
}
|
}
|
||||||
|
|
||||||
limitStr := ""
|
limitStr := ""
|
||||||
|
|
@ -1315,7 +1288,6 @@ func (db *datastore) GetPosts(cfg *config.Config, c *Collection, page int, inclu
|
||||||
if !includePinned {
|
if !includePinned {
|
||||||
pinnedCondition = "AND pinned_position IS NULL"
|
pinnedCondition = "AND pinned_position IS NULL"
|
||||||
}
|
}
|
||||||
// FUTURE: handle different post contentType's here
|
|
||||||
rows, err := db.Query("SELECT "+postCols+" FROM posts WHERE collection_id = ? "+pinnedCondition+" "+timeCondition+" ORDER BY created "+order+limitStr, collID)
|
rows, err := db.Query("SELECT "+postCols+" FROM posts WHERE collection_id = ? "+pinnedCondition+" "+timeCondition+" ORDER BY created "+order+limitStr, collID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed selecting from posts: %v", err)
|
log.Error("Failed selecting from posts: %v", err)
|
||||||
|
|
@ -1336,13 +1308,7 @@ func (db *datastore) GetPosts(cfg *config.Config, c *Collection, page int, inclu
|
||||||
p.augmentContent(c)
|
p.augmentContent(c)
|
||||||
p.formatContent(cfg, c, includeFuture, false)
|
p.formatContent(cfg, c, includeFuture, false)
|
||||||
|
|
||||||
pubPost := p.processPost()
|
posts = append(posts, p.processPost())
|
||||||
if contentType == postArch {
|
|
||||||
// Overwrite DisplayDate with special Archive page version
|
|
||||||
loc := monday.FuzzyLocale(pubPost.Language.String)
|
|
||||||
pubPost.DisplayDate = monday.Format(pubPost.Created, monday.LongNoYrFormatsByLocale[loc], loc)
|
|
||||||
}
|
|
||||||
posts = append(posts, pubPost)
|
|
||||||
}
|
}
|
||||||
err = rows.Err()
|
err = rows.Err()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -1531,7 +1497,7 @@ ORDER BY created `+order+limitStr, collID, lang)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *datastore) GetAPFollowers(c *Collection) (*[]RemoteUser, error) {
|
func (db *datastore) GetAPFollowers(c *Collection) (*[]RemoteUser, error) {
|
||||||
rows, err := db.Query("SELECT actor_id, inbox, shared_inbox, f.created FROM remotefollows f INNER JOIN remoteusers u ON f.remote_user_id = u.id WHERE collection_id = ?", c.ID)
|
rows, err := db.Query("SELECT actor_id, inbox, shared_inbox FROM remotefollows f INNER JOIN remoteusers u ON f.remote_user_id = u.id WHERE collection_id = ?", c.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed selecting from followers: %v", err)
|
log.Error("Failed selecting from followers: %v", err)
|
||||||
return nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't retrieve followers."}
|
return nil, impart.HTTPError{http.StatusInternalServerError, "Couldn't retrieve followers."}
|
||||||
|
|
@ -1541,7 +1507,7 @@ func (db *datastore) GetAPFollowers(c *Collection) (*[]RemoteUser, error) {
|
||||||
followers := []RemoteUser{}
|
followers := []RemoteUser{}
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
f := RemoteUser{}
|
f := RemoteUser{}
|
||||||
err = rows.Scan(&f.ActorID, &f.Inbox, &f.SharedInbox, &f.Created)
|
err = rows.Scan(&f.ActorID, &f.Inbox, &f.SharedInbox)
|
||||||
followers = append(followers, f)
|
followers = append(followers, f)
|
||||||
}
|
}
|
||||||
return &followers, nil
|
return &followers, nil
|
||||||
|
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2024 Musing Studio 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
|
|
||||||
|
|
||||||
import (
|
|
||||||
"database/sql"
|
|
||||||
"fmt"
|
|
||||||
"github.com/writeas/web-core/activitystreams"
|
|
||||||
"github.com/writeas/web-core/log"
|
|
||||||
)
|
|
||||||
|
|
||||||
func apAddRemoteUser(app *App, t *sql.Tx, fullActor *activitystreams.Person) (int64, error) {
|
|
||||||
// Add remote user locally, since it wasn't found before
|
|
||||||
res, err := t.Exec("INSERT INTO remoteusers (actor_id, inbox, shared_inbox, url) VALUES (?, ?, ?, ?)", fullActor.ID, fullActor.Inbox, fullActor.Endpoints.SharedInbox, fullActor.URL)
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
return -1, fmt.Errorf("couldn't add new remoteuser in DB: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
remoteUserID, err := res.LastInsertId()
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
return -1, fmt.Errorf("no lastinsertid for followers, rolling back: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add in key
|
|
||||||
_, err = t.Exec("INSERT INTO remoteuserkeys (id, remote_user_id, public_key) VALUES (?, ?, ?)", fullActor.PublicKey.ID, remoteUserID, fullActor.PublicKey.PublicKeyPEM)
|
|
||||||
if err != nil {
|
|
||||||
if !app.db.isDuplicateKeyErr(err) {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Couldn't add follower keys in DB: %v\n", err)
|
|
||||||
return -1, fmt.Errorf("couldn't add follower keys in DB: %v", err)
|
|
||||||
} else {
|
|
||||||
t.Rollback()
|
|
||||||
log.Error("Couldn't add follower keys in DB: %v\n", err)
|
|
||||||
return -1, fmt.Errorf("couldn't add follower keys in DB: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return remoteUserID, nil
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
services:
|
|
||||||
app:
|
|
||||||
image: writefreely
|
|
||||||
container_name: writefreely
|
|
||||||
volumes:
|
|
||||||
- ./data:/data
|
|
||||||
ports:
|
|
||||||
- 127.0.0.1:8080:8080
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
db:
|
|
||||||
image: lscr.io/linuxserver/mariadb
|
|
||||||
container_name: writefreely-mariadb
|
|
||||||
volumes:
|
|
||||||
- ./db:/config
|
|
||||||
environment:
|
|
||||||
- PUID=65534
|
|
||||||
- PGID=65534
|
|
||||||
- TZ=Etc/UTC
|
|
||||||
- MYSQL_DATABASE=writefreely
|
|
||||||
- MYSQL_USER=writefreely
|
|
||||||
- MYSQL_PASSWORD=P@ssw0rd
|
|
||||||
restart: unless-stopped
|
|
||||||
37
email.go
37
email.go
|
|
@ -14,7 +14,6 @@ import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/writefreely/writefreely/mailer"
|
|
||||||
"html/template"
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
@ -22,6 +21,7 @@ import (
|
||||||
|
|
||||||
"github.com/aymerick/douceur/inliner"
|
"github.com/aymerick/douceur/inliner"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
"github.com/mailgun/mailgun-go"
|
||||||
stripmd "github.com/writeas/go-strip-markdown/v2"
|
stripmd "github.com/writeas/go-strip-markdown/v2"
|
||||||
"github.com/writeas/impart"
|
"github.com/writeas/impart"
|
||||||
"github.com/writeas/web-core/data"
|
"github.com/writeas/web-core/data"
|
||||||
|
|
@ -307,14 +307,8 @@ Originally published on ` + p.Collection.DisplayTitle() + ` (` + p.Collection.Ca
|
||||||
|
|
||||||
Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/unsubscribe/%recipient.id%?t=%recipient.token%`
|
Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/unsubscribe/%recipient.id%?t=%recipient.token%`
|
||||||
|
|
||||||
mlr, err := mailer.New(app.cfg.Email)
|
gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
|
||||||
if err != nil {
|
m := mailgun.NewMessage(p.Collection.DisplayTitle()+" <"+p.Collection.Alias+"@"+app.cfg.Email.Domain+">", stripmd.Strip(p.DisplayTitle()), plainMsg)
|
||||||
return err
|
|
||||||
}
|
|
||||||
m, err := mlr.NewMessage(p.Collection.DisplayTitle()+" <"+p.Collection.Alias+"@"+app.cfg.Email.Domain+">", stripmd.Strip(p.DisplayTitle()), plainMsg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
replyTo := app.db.GetCollectionAttribute(collID, collAttrLetterReplyTo)
|
replyTo := app.db.GetCollectionAttribute(collID, collAttrLetterReplyTo)
|
||||||
if replyTo != "" {
|
if replyTo != "" {
|
||||||
m.SetReplyTo(replyTo)
|
m.SetReplyTo(replyTo)
|
||||||
|
|
@ -411,13 +405,13 @@ Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/un
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
m.SetHTML(html)
|
m.SetHtml(html)
|
||||||
|
|
||||||
log.Info("[email] Adding %d recipient(s)", len(subs))
|
log.Info("[email] Adding %d recipient(s)", len(subs))
|
||||||
for _, s := range subs {
|
for _, s := range subs {
|
||||||
e := s.FinalEmail(app.keys)
|
e := s.FinalEmail(app.keys)
|
||||||
log.Info("[email] Adding %s", e)
|
log.Info("[email] Adding %s", e)
|
||||||
err = m.AddRecipientAndVariables(e, map[string]string{
|
err = m.AddRecipientAndVariables(e, map[string]interface{}{
|
||||||
"id": s.ID,
|
"id": s.ID,
|
||||||
"to": e,
|
"to": e,
|
||||||
"token": s.Token,
|
"token": s.Token,
|
||||||
|
|
@ -427,8 +421,8 @@ Sent to %recipient.to%. Unsubscribe: ` + p.Collection.CanonicalURL() + `email/un
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = mlr.Send(m)
|
res, _, err := gun.Send(m)
|
||||||
log.Info("[email] Email sent")
|
log.Info("[email] Send result: %s", res)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Unable to send post email: %v", err)
|
log.Error("Unable to send post email: %v", err)
|
||||||
return err
|
return err
|
||||||
|
|
@ -443,23 +437,17 @@ func sendSubConfirmEmail(app *App, c *Collection, email, subID, token string) er
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send email
|
// Send email
|
||||||
mlr, err := mailer.New(app.cfg.Email)
|
gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
plainMsg := "Confirm your subscription to " + c.DisplayTitle() + ` (` + c.CanonicalURL() + `) to start receiving future posts. Simply click the following link (or copy and paste it into your browser):
|
plainMsg := "Confirm your subscription to " + c.DisplayTitle() + ` (` + c.CanonicalURL() + `) to start receiving future posts. Simply click the following link (or copy and paste it into your browser):
|
||||||
|
|
||||||
` + c.CanonicalURL() + "email/confirm/" + subID + "?t=" + token + `
|
` + c.CanonicalURL() + "email/confirm/" + subID + "?t=" + token + `
|
||||||
|
|
||||||
If you didn't subscribe to this site or you're not sure why you're getting this email, you can delete it. You won't be subscribed or receive any future emails.`
|
If you didn't subscribe to this site or you're not sure why you're getting this email, you can delete it. You won't be subscribed or receive any future emails.`
|
||||||
m, err := mlr.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email))
|
m := mailgun.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email))
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
m.AddTag("Email Verification")
|
m.AddTag("Email Verification")
|
||||||
|
|
||||||
m.SetHTML(`<html>
|
m.SetHtml(`<html>
|
||||||
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
|
||||||
<div style="font-size: 1.2em;">
|
<div style="font-size: 1.2em;">
|
||||||
<p>Confirm your subscription to <a href="` + c.CanonicalURL() + `">` + c.DisplayTitle() + `</a> to start receiving future posts:</p>
|
<p>Confirm your subscription to <a href="` + c.CanonicalURL() + `">` + c.DisplayTitle() + `</a> to start receiving future posts:</p>
|
||||||
|
|
@ -468,10 +456,7 @@ If you didn't subscribe to this site or you're not sure why you're getting this
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>`)
|
</html>`)
|
||||||
err = mlr.Send(m)
|
gun.Send(m)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ func compileFullExport(app *App, u *User) *ExportUser {
|
||||||
var collObjs []CollectionObj
|
var collObjs []CollectionObj
|
||||||
for _, c := range *colls {
|
for _, c := range *colls {
|
||||||
co := &CollectionObj{Collection: c}
|
co := &CollectionObj{Collection: c}
|
||||||
co.Posts, err = app.db.GetPosts(app.cfg, &c, 0, true, false, true, "")
|
co.Posts, err = app.db.GetPosts(app.cfg, &c, 0, true, false, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("unable to get collection posts: %v", err)
|
log.Error("unable to get collection posts: %v", err)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
feed.go
2
feed.go
|
|
@ -67,7 +67,7 @@ func ViewFeed(app *App, w http.ResponseWriter, req *http.Request) error {
|
||||||
if tag != "" {
|
if tag != "" {
|
||||||
coll.Posts, _ = app.db.GetPostsTagged(app.cfg, c, tag, 1, false)
|
coll.Posts, _ = app.db.GetPostsTagged(app.cfg, c, tag, 1, false)
|
||||||
} else {
|
} else {
|
||||||
coll.Posts, _ = app.db.GetPosts(app.cfg, c, 1, false, true, false, "")
|
coll.Posts, _ = app.db.GetPosts(app.cfg, c, 1, false, true, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
author := ""
|
author := ""
|
||||||
|
|
|
||||||
52
go.mod
52
go.mod
|
|
@ -8,26 +8,25 @@ require (
|
||||||
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
|
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
|
||||||
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
||||||
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
|
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
|
||||||
github.com/fatih/color v1.17.0
|
github.com/fatih/color v1.15.0
|
||||||
github.com/go-ini/ini v1.67.0
|
github.com/go-ini/ini v1.67.0
|
||||||
github.com/go-sql-driver/mysql v1.8.1
|
github.com/go-sql-driver/mysql v1.7.1
|
||||||
github.com/go-test/deep v1.0.1 // indirect
|
github.com/go-test/deep v1.0.1 // indirect
|
||||||
github.com/gobuffalo/envy v1.9.0 // indirect
|
github.com/gobuffalo/envy v1.9.0 // indirect
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
|
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
|
||||||
github.com/gorilla/csrf v1.7.2
|
github.com/gorilla/csrf v1.7.1
|
||||||
github.com/gorilla/feeds v1.1.2
|
github.com/gorilla/feeds v1.1.1
|
||||||
github.com/gorilla/mux v1.8.1
|
github.com/gorilla/mux v1.8.0
|
||||||
github.com/gorilla/schema v1.4.1
|
github.com/gorilla/schema v1.2.0
|
||||||
github.com/gorilla/sessions v1.3.0
|
github.com/gorilla/sessions v1.2.1
|
||||||
github.com/gosimple/slug v1.14.0
|
|
||||||
github.com/guregu/null v4.0.0+incompatible
|
github.com/guregu/null v4.0.0+incompatible
|
||||||
github.com/hashicorp/go-multierror v1.1.1
|
github.com/hashicorp/go-multierror v1.1.1
|
||||||
github.com/ikeikeikeike/go-sitemap-generator/v2 v2.0.2
|
github.com/ikeikeikeike/go-sitemap-generator/v2 v2.0.2
|
||||||
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec
|
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec
|
||||||
github.com/mailgun/mailgun-go v2.0.0+incompatible
|
github.com/mailgun/mailgun-go v2.0.0+incompatible
|
||||||
github.com/manifoldco/promptui v0.9.0
|
github.com/manifoldco/promptui v0.9.0
|
||||||
github.com/mattn/go-sqlite3 v1.14.21
|
github.com/mattn/go-sqlite3 v1.14.17
|
||||||
github.com/microcosm-cc/bluemonday v1.0.27
|
github.com/microcosm-cc/bluemonday v1.0.26
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1
|
github.com/mitchellh/go-wordwrap v1.0.1
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
|
||||||
github.com/onsi/ginkgo v1.16.4 // indirect
|
github.com/onsi/ginkgo v1.16.4 // indirect
|
||||||
|
|
@ -35,8 +34,8 @@ require (
|
||||||
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
|
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
|
||||||
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
|
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
|
||||||
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
|
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
|
||||||
github.com/stretchr/testify v1.9.0
|
github.com/stretchr/testify v1.8.4
|
||||||
github.com/urfave/cli/v2 v2.27.4
|
github.com/urfave/cli/v2 v2.25.7
|
||||||
github.com/writeas/activity v0.1.2
|
github.com/writeas/activity v0.1.2
|
||||||
github.com/writeas/activityserve v0.0.0-20230428180247-dc13a4f4d835
|
github.com/writeas/activityserve v0.0.0-20230428180247-dc13a4f4d835
|
||||||
github.com/writeas/go-strip-markdown/v2 v2.1.1
|
github.com/writeas/go-strip-markdown/v2 v2.1.1
|
||||||
|
|
@ -46,53 +45,48 @@ require (
|
||||||
github.com/writeas/import v0.2.1
|
github.com/writeas/import v0.2.1
|
||||||
github.com/writeas/monday v1.3.0
|
github.com/writeas/monday v1.3.0
|
||||||
github.com/writeas/saturday v1.7.2-0.20200427193424-392b95a03320
|
github.com/writeas/saturday v1.7.2-0.20200427193424-392b95a03320
|
||||||
|
github.com/writeas/slug v1.2.0
|
||||||
github.com/writeas/web-core v1.6.1-0.20231003013047-d81124d45431
|
github.com/writeas/web-core v1.6.1-0.20231003013047-d81124d45431
|
||||||
github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b
|
github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b
|
||||||
github.com/writefreely/go-nodeinfo v1.2.0
|
github.com/writefreely/go-nodeinfo v1.2.0
|
||||||
golang.org/x/crypto v0.28.0
|
golang.org/x/crypto v0.14.0
|
||||||
golang.org/x/net v0.30.0
|
golang.org/x/net v0.17.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require github.com/xhit/go-simple-mail/v2 v2.16.0
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
code.as/core/socks v1.0.0 // indirect
|
code.as/core/socks v1.0.0 // indirect
|
||||||
filippo.io/edwards25519 v1.1.0 // indirect
|
|
||||||
github.com/andybalholm/cascadia v1.3.2 // indirect
|
github.com/andybalholm/cascadia v1.3.2 // indirect
|
||||||
github.com/beevik/etree v1.1.0 // indirect
|
github.com/beevik/etree v1.1.0 // indirect
|
||||||
github.com/captncraig/cors v0.0.0-20190703115713-e80254a89df1 // indirect
|
github.com/captncraig/cors v0.0.0-20190703115713-e80254a89df1 // indirect
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 // indirect
|
github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 // indirect
|
||||||
github.com/fatih/structs v1.1.0 // indirect
|
github.com/fatih/structs v1.1.0 // indirect
|
||||||
github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe // indirect
|
github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe // indirect
|
||||||
github.com/gofrs/uuid v3.3.0+incompatible // indirect
|
github.com/gofrs/uuid v3.3.0+incompatible // indirect
|
||||||
github.com/gologme/log v1.2.0 // indirect
|
github.com/gologme/log v1.2.0 // indirect
|
||||||
github.com/gorilla/css v1.0.1 // indirect
|
github.com/gorilla/css v1.0.0 // indirect
|
||||||
github.com/gorilla/securecookie v1.1.2 // indirect
|
github.com/gorilla/securecookie v1.1.1 // indirect
|
||||||
github.com/gosimple/unidecode v1.0.1 // indirect
|
|
||||||
github.com/hashicorp/errwrap v1.0.0 // indirect
|
github.com/hashicorp/errwrap v1.0.0 // indirect
|
||||||
github.com/joho/godotenv v1.3.0 // indirect
|
github.com/joho/godotenv v1.3.0 // indirect
|
||||||
github.com/jtolds/gls v4.2.1+incompatible // indirect
|
github.com/jtolds/gls v4.2.1+incompatible // indirect
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.17 // indirect
|
||||||
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
|
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/rogpeppe/go-internal v1.9.0 // indirect
|
github.com/rogpeppe/go-internal v1.3.2 // indirect
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||||
github.com/sasha-s/go-deadlock v0.3.1 // indirect
|
github.com/sasha-s/go-deadlock v0.3.1 // indirect
|
||||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
|
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
|
||||||
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect
|
|
||||||
github.com/writeas/go-writeas/v2 v2.0.2 // indirect
|
github.com/writeas/go-writeas/v2 v2.0.2 // indirect
|
||||||
github.com/writeas/openssl-go v1.0.0 // indirect
|
github.com/writeas/openssl-go v1.0.0 // indirect
|
||||||
github.com/writeas/slug v1.2.0 // indirect
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
|
golang.org/x/sys v0.13.0 // indirect
|
||||||
golang.org/x/sys v0.26.0 // indirect
|
golang.org/x/text v0.13.0 // indirect
|
||||||
golang.org/x/text v0.19.0 // indirect
|
|
||||||
gopkg.in/ini.v1 v1.62.0 // indirect
|
gopkg.in/ini.v1 v1.62.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
go 1.21
|
go 1.19
|
||||||
|
|
|
||||||
100
go.sum
100
go.sum
|
|
@ -1,7 +1,5 @@
|
||||||
code.as/core/socks v1.0.0 h1:SPQXNp4SbEwjOAP9VzUahLHak8SDqy5n+9cm9tpjZOs=
|
code.as/core/socks v1.0.0 h1:SPQXNp4SbEwjOAP9VzUahLHak8SDqy5n+9cm9tpjZOs=
|
||||||
code.as/core/socks v1.0.0/go.mod h1:BAXBy5O9s2gmw6UxLqNJcVbWY7C/UPs+801CcSsfWOY=
|
code.as/core/socks v1.0.0/go.mod h1:BAXBy5O9s2gmw6UxLqNJcVbWY7C/UPs+801CcSsfWOY=
|
||||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
|
||||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
|
||||||
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
|
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
|
||||||
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
|
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
|
||||||
github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
|
github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
|
||||||
|
|
@ -22,8 +20,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
|
||||||
github.com/clbanning/mxj v1.8.3/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
|
github.com/clbanning/mxj v1.8.3/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
|
||||||
github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
|
github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
|
||||||
github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
|
github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
|
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
|
@ -37,8 +35,8 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt
|
||||||
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
|
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
|
||||||
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=
|
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=
|
||||||
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
|
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
|
||||||
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
|
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
|
||||||
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
|
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
|
||||||
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
|
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
|
||||||
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
|
|
@ -49,8 +47,8 @@ github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe h1:U71giCx5NjRn4L
|
||||||
github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe/go.mod h1:T56HUNYZUQ1AGUzhAYPugZfp36sKApVnGBgKlIY+aIE=
|
github.com/go-fed/httpsig v0.1.1-0.20200204213531-0ef28562fabe/go.mod h1:T56HUNYZUQ1AGUzhAYPugZfp36sKApVnGBgKlIY+aIE=
|
||||||
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
|
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
|
||||||
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
|
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
|
||||||
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
|
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
|
||||||
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
|
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
||||||
github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
|
github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
|
||||||
github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
||||||
|
|
@ -73,30 +71,23 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
|
|
||||||
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
|
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||||
github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI=
|
github.com/gorilla/csrf v1.7.1 h1:Ir3o2c1/Uzj6FBxMlAUB6SivgVMy1ONXwYgXn+/aHPE=
|
||||||
github.com/gorilla/csrf v1.7.2/go.mod h1:F1Fj3KG23WYHE6gozCmBAezKookxbIvUJT+121wTuLk=
|
github.com/gorilla/csrf v1.7.1/go.mod h1:+a/4tCmqhG6/w4oafeAZ9pEa3/NZOWYVbD9fV0FwIQA=
|
||||||
|
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
|
||||||
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
|
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
|
||||||
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
|
github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
|
||||||
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
|
github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
|
||||||
github.com/gorilla/feeds v1.1.2 h1:pxzZ5PD3RJdhFH2FsJJ4x6PqMqbgFk1+Vez4XWBW8Iw=
|
|
||||||
github.com/gorilla/feeds v1.1.2/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
|
|
||||||
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
|
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
|
||||||
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
|
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
|
||||||
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
|
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
|
||||||
github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
|
github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
|
||||||
github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
|
github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
|
||||||
github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
|
github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
|
||||||
github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
|
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
||||||
github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg=
|
github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
|
||||||
github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
|
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
|
||||||
github.com/gosimple/slug v1.14.0 h1:RtTL/71mJNDfpUbCOmnf/XFkzKRtD6wL6Uy+3akm4Es=
|
|
||||||
github.com/gosimple/slug v1.14.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
|
|
||||||
github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
|
|
||||||
github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
|
|
||||||
github.com/guregu/null v4.0.0+incompatible h1:4zw0ckM7ECd6FNNddc3Fu4aty9nTlpkkzH7dPn4/4Gw=
|
github.com/guregu/null v4.0.0+incompatible h1:4zw0ckM7ECd6FNNddc3Fu4aty9nTlpkkzH7dPn4/4Gw=
|
||||||
github.com/guregu/null v4.0.0+incompatible/go.mod h1:ePGpQaN9cw0tj45IR5E5ehMvsFlLlQZAkkOXZurJ3NM=
|
github.com/guregu/null v4.0.0+incompatible/go.mod h1:ePGpQaN9cw0tj45IR5E5ehMvsFlLlQZAkkOXZurJ3NM=
|
||||||
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
|
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
|
||||||
|
|
@ -112,13 +103,11 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx
|
||||||
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
|
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
|
||||||
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
|
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
|
||||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
|
||||||
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI=
|
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI=
|
||||||
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g=
|
github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g=
|
||||||
github.com/mailgun/mailgun-go v2.0.0+incompatible h1:0FoRHWwMUctnd8KIR3vtZbqdfjpIMxOZgcSa51s8F8o=
|
github.com/mailgun/mailgun-go v2.0.0+incompatible h1:0FoRHWwMUctnd8KIR3vtZbqdfjpIMxOZgcSa51s8F8o=
|
||||||
|
|
@ -128,13 +117,13 @@ github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GW
|
||||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mattn/go-sqlite3 v1.14.21 h1:IXocQLOykluc3xPE0Lvy8FtggMz1G+U3mEjg+0zGizc=
|
github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
|
||||||
github.com/mattn/go-sqlite3 v1.14.21/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
||||||
github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
|
github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
|
||||||
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
|
github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
|
||||||
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
|
github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
|
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
|
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
|
||||||
|
|
@ -159,9 +148,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
|
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
|
||||||
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
|
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
|
||||||
|
github.com/rogpeppe/go-internal v1.3.2 h1:XU784Pr0wdahMY2bYcyK6N1KuaRAdLtqD4qd8D18Bfs=
|
||||||
github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
|
github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
|
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
|
||||||
|
|
@ -176,12 +164,10 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjMdEfbuOBNXSVF2cMFGgQTPdKCbwM=
|
github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
|
||||||
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
|
github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
|
||||||
github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
|
|
||||||
github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
|
|
||||||
github.com/writeas/activity v0.1.2 h1:Y12B5lIrabfqKE7e7HFCWiXrlfXljr9tlkFm2mp7DgY=
|
github.com/writeas/activity v0.1.2 h1:Y12B5lIrabfqKE7e7HFCWiXrlfXljr9tlkFm2mp7DgY=
|
||||||
github.com/writeas/activity v0.1.2/go.mod h1:mYYgiewmEM+8tlifirK/vl6tmB2EbjYaxwb+ndUw5T0=
|
github.com/writeas/activity v0.1.2/go.mod h1:mYYgiewmEM+8tlifirK/vl6tmB2EbjYaxwb+ndUw5T0=
|
||||||
github.com/writeas/activityserve v0.0.0-20230428180247-dc13a4f4d835 h1:bm/7gYo6y3GxtTa1qyUFyCk29CTnBAKt7z4D2MASYrw=
|
github.com/writeas/activityserve v0.0.0-20230428180247-dc13a4f4d835 h1:bm/7gYo6y3GxtTa1qyUFyCk29CTnBAKt7z4D2MASYrw=
|
||||||
|
|
@ -215,10 +201,8 @@ github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b h1:h3NzB8OZ5
|
||||||
github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b/go.mod h1:T2UVVzt+R5KSSZe2xRSytnwc2M9AoDegi7foeIsik+M=
|
github.com/writefreely/go-gopher v0.0.0-20220429181814-40127126f83b/go.mod h1:T2UVVzt+R5KSSZe2xRSytnwc2M9AoDegi7foeIsik+M=
|
||||||
github.com/writefreely/go-nodeinfo v1.2.0 h1:La+YbTCvmpTwFhBSlebWDDL81N88Qf/SCAvRLR7F8ss=
|
github.com/writefreely/go-nodeinfo v1.2.0 h1:La+YbTCvmpTwFhBSlebWDDL81N88Qf/SCAvRLR7F8ss=
|
||||||
github.com/writefreely/go-nodeinfo v1.2.0/go.mod h1:UTvE78KpcjYOlRHupZIiSEFcXHioTXuacCbHU+CAcPg=
|
github.com/writefreely/go-nodeinfo v1.2.0/go.mod h1:UTvE78KpcjYOlRHupZIiSEFcXHioTXuacCbHU+CAcPg=
|
||||||
github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
||||||
github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
|
|
||||||
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
|
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||||
|
|
@ -227,8 +211,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
|
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
|
||||||
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
|
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
||||||
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
|
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
|
|
@ -247,8 +231,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||||
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
||||||
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
|
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
||||||
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
|
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
|
@ -275,8 +259,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
|
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||||
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
|
|
@ -291,8 +275,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
|
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
||||||
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ func handleGopherCollection(app *App, w gopher.ResponseWriter, r *gopher.Request
|
||||||
w.WriteInfo(c.Description)
|
w.WriteInfo(c.Description)
|
||||||
}
|
}
|
||||||
|
|
||||||
posts, err := app.db.GetPosts(app.cfg, c, 0, false, false, false, "")
|
posts, err := app.db.GetPosts(app.cfg, c, 0, false, false, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -672,26 +672,6 @@ body#collection article, body#subpage article {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#wrapper.archive {
|
|
||||||
h1 {
|
|
||||||
margin: 0 !important;
|
|
||||||
}
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
|
|
||||||
li {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
line-height: 1.4;
|
|
||||||
margin: 0.5em 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.year {
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 1.5em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
body#post article {
|
body#post article {
|
||||||
p.badge {
|
p.badge {
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ body {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
article, pre, .hljs, #wrapper.archive ul {
|
article, pre, .hljs {
|
||||||
padding: 0.5em 2rem 1.5em;
|
padding: 0.5em 2rem 1.5em;
|
||||||
}
|
}
|
||||||
body#post article, pre, .hljs {
|
body#post article, pre, .hljs {
|
||||||
|
|
|
||||||
181
mailer/mailer.go
181
mailer/mailer.go
|
|
@ -1,181 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2024 Musing Studio 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 mailer
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"github.com/mailgun/mailgun-go"
|
|
||||||
"github.com/writeas/web-core/log"
|
|
||||||
"github.com/writefreely/writefreely/config"
|
|
||||||
mail "github.com/xhit/go-simple-mail/v2"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
type (
|
|
||||||
// Mailer holds configurations for the preferred mailing provider.
|
|
||||||
Mailer struct {
|
|
||||||
smtp *mail.SMTPServer
|
|
||||||
mailGun *mailgun.MailgunImpl
|
|
||||||
}
|
|
||||||
|
|
||||||
// Message holds the email contents and metadata for the preferred mailing provider.
|
|
||||||
Message struct {
|
|
||||||
mgMsg *mailgun.Message
|
|
||||||
smtpMsg *SmtpMessage
|
|
||||||
}
|
|
||||||
|
|
||||||
SmtpMessage struct {
|
|
||||||
from string
|
|
||||||
replyTo string
|
|
||||||
subject string
|
|
||||||
recipients []Recipient
|
|
||||||
html string
|
|
||||||
text string
|
|
||||||
}
|
|
||||||
|
|
||||||
Recipient struct {
|
|
||||||
email string
|
|
||||||
vars map[string]string
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// New creates a new Mailer from the instance's config.EmailCfg, returning an error if not properly configured.
|
|
||||||
func New(eCfg config.EmailCfg) (*Mailer, error) {
|
|
||||||
m := &Mailer{}
|
|
||||||
if eCfg.Domain != "" && eCfg.MailgunPrivate != "" {
|
|
||||||
m.mailGun = mailgun.NewMailgun(eCfg.Domain, eCfg.MailgunPrivate)
|
|
||||||
if eCfg.MailgunEurope {
|
|
||||||
m.mailGun.SetAPIBase("https://api.eu.mailgun.net/v3")
|
|
||||||
}
|
|
||||||
} else if eCfg.Username != "" && eCfg.Password != "" && eCfg.Host != "" && eCfg.Port > 0 {
|
|
||||||
m.smtp = mail.NewSMTPClient()
|
|
||||||
m.smtp.Host = eCfg.Host
|
|
||||||
m.smtp.Port = eCfg.Port
|
|
||||||
m.smtp.Username = eCfg.Username
|
|
||||||
m.smtp.Password = eCfg.Password
|
|
||||||
if eCfg.EnableStartTLS {
|
|
||||||
m.smtp.Encryption = mail.EncryptionSTARTTLS
|
|
||||||
}
|
|
||||||
// To allow sending multiple email
|
|
||||||
m.smtp.KeepAlive = true
|
|
||||||
} else {
|
|
||||||
return nil, fmt.Errorf("no email provider is configured")
|
|
||||||
}
|
|
||||||
|
|
||||||
return m, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMessage creates a new Message from the given parameters.
|
|
||||||
func (m *Mailer) NewMessage(from, subject, text string, to ...string) (*Message, error) {
|
|
||||||
msg := &Message{}
|
|
||||||
if m.mailGun != nil {
|
|
||||||
msg.mgMsg = m.mailGun.NewMessage(from, subject, text, to...)
|
|
||||||
} else if m.smtp != nil {
|
|
||||||
msg.smtpMsg = &SmtpMessage{
|
|
||||||
from: from,
|
|
||||||
replyTo: "",
|
|
||||||
subject: subject,
|
|
||||||
recipients: make([]Recipient, len(to)),
|
|
||||||
html: "",
|
|
||||||
text: text,
|
|
||||||
}
|
|
||||||
for _, r := range to {
|
|
||||||
msg.smtpMsg.recipients = append(msg.smtpMsg.recipients, Recipient{r, make(map[string]string)})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return msg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetHTML sets the body of the message.
|
|
||||||
func (m *Message) SetHTML(html string) {
|
|
||||||
if m.smtpMsg != nil {
|
|
||||||
m.smtpMsg.html = html
|
|
||||||
} else if m.mgMsg != nil {
|
|
||||||
m.mgMsg.SetHtml(html)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Message) SetReplyTo(replyTo string) {
|
|
||||||
if m.smtpMsg != nil {
|
|
||||||
m.smtpMsg.replyTo = replyTo
|
|
||||||
} else {
|
|
||||||
m.mgMsg.SetReplyTo(replyTo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddTag attaches a tag to the Message for providers that support it.
|
|
||||||
func (m *Message) AddTag(tag string) {
|
|
||||||
if m.mgMsg != nil {
|
|
||||||
m.mgMsg.AddTag(tag)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Message) AddRecipientAndVariables(r string, vars map[string]string) error {
|
|
||||||
if m.smtpMsg != nil {
|
|
||||||
m.smtpMsg.recipients = append(m.smtpMsg.recipients, Recipient{r, vars})
|
|
||||||
return nil
|
|
||||||
} else {
|
|
||||||
varsInterfaces := make(map[string]interface{}, len(vars))
|
|
||||||
for k, v := range vars {
|
|
||||||
varsInterfaces[k] = v
|
|
||||||
}
|
|
||||||
return m.mgMsg.AddRecipientAndVariables(r, varsInterfaces)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send sends the given message via the preferred provider.
|
|
||||||
func (m *Mailer) Send(msg *Message) error {
|
|
||||||
if m.smtp != nil {
|
|
||||||
client, err := m.smtp.Connect()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
emailSent := false
|
|
||||||
for _, r := range msg.smtpMsg.recipients {
|
|
||||||
customMsg := mail.NewMSG()
|
|
||||||
customMsg.SetFrom(msg.smtpMsg.from)
|
|
||||||
if msg.smtpMsg.replyTo != "" {
|
|
||||||
customMsg.SetReplyTo(msg.smtpMsg.replyTo)
|
|
||||||
}
|
|
||||||
customMsg.SetSubject(msg.smtpMsg.subject)
|
|
||||||
customMsg.AddTo(r.email)
|
|
||||||
cText := msg.smtpMsg.text
|
|
||||||
cHtml := msg.smtpMsg.html
|
|
||||||
for v, value := range r.vars {
|
|
||||||
placeHolder := fmt.Sprintf("%%recipient.%s%%", v)
|
|
||||||
cText = strings.ReplaceAll(cText, placeHolder, value)
|
|
||||||
cHtml = strings.ReplaceAll(cHtml, placeHolder, value)
|
|
||||||
}
|
|
||||||
customMsg.SetBody(mail.TextHTML, cHtml)
|
|
||||||
customMsg.AddAlternative(mail.TextPlain, cText)
|
|
||||||
e := customMsg.Error
|
|
||||||
if e == nil {
|
|
||||||
e = customMsg.Send(client)
|
|
||||||
}
|
|
||||||
if e == nil {
|
|
||||||
emailSent = true
|
|
||||||
} else {
|
|
||||||
log.Error("Unable to send email to %s: %v", r.email, e)
|
|
||||||
err = e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !emailSent {
|
|
||||||
// only send an error if no email could be sent (to avoid retry of successfully sent emails)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else if m.mailGun != nil {
|
|
||||||
_, _, err := m.mailGun.Send(msg.mgMsg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
@ -71,7 +71,6 @@ var migrations = []Migration{
|
||||||
New("support newsletters", supportLetters), // V12 -> V13
|
New("support newsletters", supportLetters), // V12 -> V13
|
||||||
New("support password resetting", supportPassReset), // V13 -> V14
|
New("support password resetting", supportPassReset), // V13 -> V14
|
||||||
New("speed up blog post retrieval", addPostRetrievalIndex), // V14 -> V15
|
New("speed up blog post retrieval", addPostRetrievalIndex), // V14 -> V15
|
||||||
New("support ActivityPub likes", supportRemoteLikes), // V15 -> V16 (v0.16.0)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CurrentVer returns the current migration version the application is on
|
// CurrentVer returns the current migration version the application is on
|
||||||
|
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2024 Musing Studio 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
|
|
||||||
|
|
||||||
func supportRemoteLikes(db *datastore) error {
|
|
||||||
t, err := db.Begin()
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = t.Exec(`CREATE TABLE remote_likes (
|
|
||||||
post_id ` + db.typeChar(16) + ` NOT NULL,
|
|
||||||
remote_user_id ` + db.typeInt() + ` NOT NULL,
|
|
||||||
created ` + db.typeDateTime() + ` NOT NULL,
|
|
||||||
PRIMARY KEY (post_id,remote_user_id)
|
|
||||||
)`)
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = t.Commit()
|
|
||||||
if err != nil {
|
|
||||||
t.Rollback()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
@ -46,7 +46,7 @@ func nodeInfoConfig(db *datastore, cfg *config.Config) *nodeinfo.Config {
|
||||||
Software: nodeinfo.SoftwareMeta{
|
Software: nodeinfo.SoftwareMeta{
|
||||||
HomePage: softwareURL,
|
HomePage: softwareURL,
|
||||||
GitHub: "https://github.com/writefreely/writefreely",
|
GitHub: "https://github.com/writefreely/writefreely",
|
||||||
Follow: "https://writing.exchange/@writefreely",
|
Follow: "https://writing.exchange/@write_as",
|
||||||
},
|
},
|
||||||
MaxBlogs: cfg.App.MaxBlogs,
|
MaxBlogs: cfg.App.MaxBlogs,
|
||||||
PublicReader: cfg.App.LocalTimeline,
|
PublicReader: cfg.App.LocalTimeline,
|
||||||
|
|
|
||||||
|
|
@ -70,8 +70,6 @@ func (c genericOauthClient) buildLoginURL(state string) (string, error) {
|
||||||
|
|
||||||
func (c genericOauthClient) exchangeOauthCode(ctx context.Context, code string) (*TokenResponse, error) {
|
func (c genericOauthClient) exchangeOauthCode(ctx context.Context, code string) (*TokenResponse, error) {
|
||||||
form := url.Values{}
|
form := url.Values{}
|
||||||
form.Add("client_id", c.ClientID)
|
|
||||||
form.Add("client_secret", c.ClientSecret)
|
|
||||||
form.Add("grant_type", "authorization_code")
|
form.Add("grant_type", "authorization_code")
|
||||||
form.Add("redirect_uri", c.CallbackLocation)
|
form.Add("redirect_uri", c.CallbackLocation)
|
||||||
form.Add("scope", c.Scope)
|
form.Add("scope", c.Scope)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ package writefreely
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/gosimple/slug"
|
"github.com/writeas/slug"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
|
||||||
36
posts.go
36
posts.go
|
|
@ -23,7 +23,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gosimple/slug"
|
|
||||||
"github.com/guregu/null"
|
"github.com/guregu/null"
|
||||||
"github.com/guregu/null/zero"
|
"github.com/guregu/null/zero"
|
||||||
"github.com/kylemcc/twitter-text-go/extract"
|
"github.com/kylemcc/twitter-text-go/extract"
|
||||||
|
|
@ -31,6 +30,7 @@ import (
|
||||||
stripmd "github.com/writeas/go-strip-markdown/v2"
|
stripmd "github.com/writeas/go-strip-markdown/v2"
|
||||||
"github.com/writeas/impart"
|
"github.com/writeas/impart"
|
||||||
"github.com/writeas/monday"
|
"github.com/writeas/monday"
|
||||||
|
"github.com/writeas/slug"
|
||||||
"github.com/writeas/web-core/activitystreams"
|
"github.com/writeas/web-core/activitystreams"
|
||||||
"github.com/writeas/web-core/bots"
|
"github.com/writeas/web-core/bots"
|
||||||
"github.com/writeas/web-core/converter"
|
"github.com/writeas/web-core/converter"
|
||||||
|
|
@ -49,12 +49,6 @@ const (
|
||||||
postIDLen = 10
|
postIDLen = 10
|
||||||
|
|
||||||
postMetaDateFormat = "2006-01-02 15:04:05"
|
postMetaDateFormat = "2006-01-02 15:04:05"
|
||||||
)
|
|
||||||
|
|
||||||
type PostType string
|
|
||||||
|
|
||||||
const (
|
|
||||||
postArch PostType = "archive"
|
|
||||||
|
|
||||||
shortCodePaid = "<!--paid-->"
|
shortCodePaid = "<!--paid-->"
|
||||||
)
|
)
|
||||||
|
|
@ -111,7 +105,6 @@ type (
|
||||||
Created time.Time `db:"created" json:"created"`
|
Created time.Time `db:"created" json:"created"`
|
||||||
Updated time.Time `db:"updated" json:"updated"`
|
Updated time.Time `db:"updated" json:"updated"`
|
||||||
ViewCount int64 `db:"view_count" json:"-"`
|
ViewCount int64 `db:"view_count" json:"-"`
|
||||||
LikeCount int64 `db:"like_count" json:"likes"`
|
|
||||||
Title zero.String `db:"title" json:"title"`
|
Title zero.String `db:"title" json:"title"`
|
||||||
HTMLTitle template.HTML `db:"title" json:"-"`
|
HTMLTitle template.HTML `db:"title" json:"-"`
|
||||||
Content string `db:"content" json:"body"`
|
Content string `db:"content" json:"body"`
|
||||||
|
|
@ -134,7 +127,6 @@ type (
|
||||||
IsTopLevel bool `json:"-"`
|
IsTopLevel bool `json:"-"`
|
||||||
DisplayDate string `json:"-"`
|
DisplayDate string `json:"-"`
|
||||||
Views int64 `json:"views"`
|
Views int64 `json:"views"`
|
||||||
Likes int64 `json:"likes"`
|
|
||||||
Owner *PublicUser `json:"-"`
|
Owner *PublicUser `json:"-"`
|
||||||
IsOwner bool `json:"-"`
|
IsOwner bool `json:"-"`
|
||||||
URL string `json:"url,omitempty"`
|
URL string `json:"url,omitempty"`
|
||||||
|
|
@ -322,8 +314,6 @@ func handleViewPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
// Display reserved page if that is requested resource
|
// Display reserved page if that is requested resource
|
||||||
if t, ok := pages[r.URL.Path[1:]+".tmpl"]; ok {
|
if t, ok := pages[r.URL.Path[1:]+".tmpl"]; ok {
|
||||||
return handleTemplatedPage(app, w, r, t)
|
return handleTemplatedPage(app, w, r, t)
|
||||||
} else if r.URL.Path == "/sitemap.xml" && !app.cfg.App.SingleUser {
|
|
||||||
return impart.HTTPError{Status: http.StatusNotFound, Message: "Page not found."}
|
|
||||||
} else if (strings.Contains(r.URL.Path, ".") && !isRaw && !isMarkdown) || r.URL.Path == "/robots.txt" || r.URL.Path == "/manifest.json" {
|
} else if (strings.Contains(r.URL.Path, ".") && !isRaw && !isMarkdown) || r.URL.Path == "/robots.txt" || r.URL.Path == "/manifest.json" {
|
||||||
// Serve static file
|
// Serve static file
|
||||||
app.shttp.ServeHTTP(w, r)
|
app.shttp.ServeHTTP(w, r)
|
||||||
|
|
@ -351,7 +341,6 @@ func handleViewPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
var ownerID sql.NullInt64
|
var ownerID sql.NullInt64
|
||||||
var collectionID sql.NullInt64
|
|
||||||
var title string
|
var title string
|
||||||
var content string
|
var content string
|
||||||
var font string
|
var font string
|
||||||
|
|
@ -367,7 +356,7 @@ func handleViewPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
return impart.HTTPError{http.StatusFound, fmt.Sprintf("/%s%s", fixedID, ext)}
|
return impart.HTTPError{http.StatusFound, fmt.Sprintf("/%s%s", fixedID, ext)}
|
||||||
}
|
}
|
||||||
|
|
||||||
err := app.db.QueryRow("SELECT owner_id, collection_id, title, content, text_appearance, view_count, language, rtl FROM posts WHERE id = ?", friendlyID).Scan(&ownerID, &collectionID, &title, &content, &font, &views, &language, &rtl)
|
err := app.db.QueryRow("SELECT owner_id, title, content, text_appearance, view_count, language, rtl FROM posts WHERE id = ?", friendlyID).Scan(&ownerID, &title, &content, &font, &views, &language, &rtl)
|
||||||
switch {
|
switch {
|
||||||
case err == sql.ErrNoRows:
|
case err == sql.ErrNoRows:
|
||||||
found = false
|
found = false
|
||||||
|
|
@ -437,16 +426,6 @@ func handleViewPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var protectDraft bool
|
|
||||||
if found && collectionID.Valid {
|
|
||||||
collection, err := app.db.GetCollectionByID(collectionID.Int64)
|
|
||||||
if err != nil {
|
|
||||||
log.Error("view post: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
protectDraft = collection.IsPrivate() || collection.IsProtected()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if post has been unpublished
|
// Check if post has been unpublished
|
||||||
if title == "" && content == "" {
|
if title == "" && content == "" {
|
||||||
gone = true
|
gone = true
|
||||||
|
|
@ -511,10 +490,6 @@ func handleViewPost(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
if !page.IsOwner && silenced {
|
if !page.IsOwner && silenced {
|
||||||
return ErrPostNotFound
|
return ErrPostNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
if !page.IsOwner && protectDraft {
|
|
||||||
return ErrPostNotFound
|
|
||||||
}
|
|
||||||
page.Silenced = silenced
|
page.Silenced = silenced
|
||||||
err = templates["post"].ExecuteTemplate(w, "post", page)
|
err = templates["post"].ExecuteTemplate(w, "post", page)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -1192,7 +1167,6 @@ func fetchPostProperty(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
func (p *Post) processPost() PublicPost {
|
func (p *Post) processPost() PublicPost {
|
||||||
res := &PublicPost{Post: p, Views: 0}
|
res := &PublicPost{Post: p, Views: 0}
|
||||||
res.Views = p.ViewCount
|
res.Views = p.ViewCount
|
||||||
res.Likes = p.LikeCount
|
|
||||||
// TODO: move to own function
|
// TODO: move to own function
|
||||||
loc := monday.FuzzyLocale(p.Language.String)
|
loc := monday.FuzzyLocale(p.Language.String)
|
||||||
res.DisplayDate = monday.Format(p.Created, monday.LongFormatsByLocale[loc], loc)
|
res.DisplayDate = monday.Format(p.Created, monday.LongFormatsByLocale[loc], loc)
|
||||||
|
|
@ -1516,10 +1490,6 @@ func viewCollectionPost(app *App, w http.ResponseWriter, r *http.Request) error
|
||||||
// User tried to access blog feed without a trailing slash, and
|
// User tried to access blog feed without a trailing slash, and
|
||||||
// there's no post with a slug "feed"
|
// there's no post with a slug "feed"
|
||||||
return impart.HTTPError{http.StatusFound, c.CanonicalURL() + "feed/"}
|
return impart.HTTPError{http.StatusFound, c.CanonicalURL() + "feed/"}
|
||||||
} else if slug == "archive" {
|
|
||||||
// User tried to access blog Archive without a trailing slash, and
|
|
||||||
// there's no post with a slug "archive"
|
|
||||||
return impart.HTTPError{http.StatusFound, c.CanonicalURL() + "archive/"}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
po := &Post{
|
po := &Post{
|
||||||
|
|
@ -1684,7 +1654,7 @@ func (rp *RawPost) Updated8601() string {
|
||||||
return rp.Updated.Format("2006-01-02T15:04:05Z")
|
return rp.Updated.Format("2006-01-02T15:04:05Z")
|
||||||
}
|
}
|
||||||
|
|
||||||
var imageURLRegex = regexp.MustCompile(`(?i)[^ ]+\.(gif|png|jpg|jpeg|avif|avifs|webp|jxl|image)$`)
|
var imageURLRegex = regexp.MustCompile(`(?i)[^ ]+\.(gif|png|jpg|jpeg|image)$`)
|
||||||
|
|
||||||
func (p *Post) extractImages() {
|
func (p *Post) extractImages() {
|
||||||
p.Images = extractImages(p.Content)
|
p.Images = extractImages(p.Content)
|
||||||
|
|
|
||||||
2
read.go
2
read.go
|
|
@ -229,9 +229,11 @@ func showLocalTimeline(app *App, w http.ResponseWriter, r *http.Request, page in
|
||||||
TotalPages: ttlPages,
|
TotalPages: ttlPages,
|
||||||
SelTopic: tag,
|
SelTopic: tag,
|
||||||
}
|
}
|
||||||
|
if app.cfg.App.Chorus {
|
||||||
u := getUserSession(app, r)
|
u := getUserSession(app, r)
|
||||||
d.IsAdmin = u != nil && u.IsAdmin()
|
d.IsAdmin = u != nil && u.IsAdmin()
|
||||||
d.CanInvite = canUserInvite(app.cfg, d.IsAdmin)
|
d.CanInvite = canUserInvite(app.cfg, d.IsAdmin)
|
||||||
|
}
|
||||||
c, err := getReaderSection(app)
|
c, err := getReaderSection(app)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
10
routes.go
10
routes.go
|
|
@ -159,12 +159,12 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router {
|
||||||
// Handle posts
|
// Handle posts
|
||||||
write.HandleFunc("/api/posts", handler.All(newPost)).Methods("POST")
|
write.HandleFunc("/api/posts", handler.All(newPost)).Methods("POST")
|
||||||
posts := write.PathPrefix("/api/posts/").Subrouter()
|
posts := write.PathPrefix("/api/posts/").Subrouter()
|
||||||
|
posts.HandleFunc("/{post:[a-zA-Z0-9]{10}}", handler.AllReader(fetchPost)).Methods("GET")
|
||||||
|
posts.HandleFunc("/{post:[a-zA-Z0-9]{10}}", handler.All(existingPost)).Methods("POST", "PUT")
|
||||||
|
posts.HandleFunc("/{post:[a-zA-Z0-9]{10}}", handler.All(deletePost)).Methods("DELETE")
|
||||||
|
posts.HandleFunc("/{post:[a-zA-Z0-9]{10}}/{property}", handler.AllReader(fetchPostProperty)).Methods("GET")
|
||||||
posts.HandleFunc("/claim", handler.All(addPost)).Methods("POST")
|
posts.HandleFunc("/claim", handler.All(addPost)).Methods("POST")
|
||||||
posts.HandleFunc("/disperse", handler.All(dispersePost)).Methods("POST")
|
posts.HandleFunc("/disperse", handler.All(dispersePost)).Methods("POST")
|
||||||
posts.HandleFunc("/{post:[a-zA-Z0-9]+}", handler.AllReader(fetchPost)).Methods("GET")
|
|
||||||
posts.HandleFunc("/{post:[a-zA-Z0-9]+}", handler.All(existingPost)).Methods("POST", "PUT")
|
|
||||||
posts.HandleFunc("/{post:[a-zA-Z0-9]+}", handler.All(deletePost)).Methods("DELETE")
|
|
||||||
posts.HandleFunc("/{post:[a-zA-Z0-9]+}/{property}", handler.AllReader(fetchPostProperty)).Methods("GET")
|
|
||||||
|
|
||||||
write.HandleFunc("/auth/signup", handler.Web(handleWebSignup, UserLevelNoneRequired)).Methods("POST")
|
write.HandleFunc("/auth/signup", handler.Web(handleWebSignup, UserLevelNoneRequired)).Methods("POST")
|
||||||
write.HandleFunc("/auth/login", handler.Web(webLogin, UserLevelNoneRequired)).Methods("POST")
|
write.HandleFunc("/auth/login", handler.Web(webLogin, UserLevelNoneRequired)).Methods("POST")
|
||||||
|
|
@ -221,8 +221,6 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router {
|
||||||
func RouteCollections(handler *Handler, r *mux.Router) {
|
func RouteCollections(handler *Handler, r *mux.Router) {
|
||||||
r.HandleFunc("/logout", handler.Web(handleLogOutCollection, UserLevelOptional))
|
r.HandleFunc("/logout", handler.Web(handleLogOutCollection, UserLevelOptional))
|
||||||
r.HandleFunc("/page/{page:[0-9]+}", handler.Web(handleViewCollection, UserLevelReader))
|
r.HandleFunc("/page/{page:[0-9]+}", handler.Web(handleViewCollection, UserLevelReader))
|
||||||
r.HandleFunc("/archive/", handler.Web(handleViewCollection, UserLevelReader))
|
|
||||||
r.HandleFunc("/{archive:archive}/page/{page:[0-9]+}", handler.Web(handleViewCollection, UserLevelReader))
|
|
||||||
r.HandleFunc("/lang:{lang:[a-z]{2}}", handler.Web(handleViewCollectionLang, UserLevelOptional))
|
r.HandleFunc("/lang:{lang:[a-z]{2}}", handler.Web(handleViewCollectionLang, UserLevelOptional))
|
||||||
r.HandleFunc("/lang:{lang:[a-z]{2}}/page/{page:[0-9]+}", handler.Web(handleViewCollectionLang, UserLevelOptional))
|
r.HandleFunc("/lang:{lang:[a-z]{2}}/page/{page:[0-9]+}", handler.Web(handleViewCollectionLang, UserLevelOptional))
|
||||||
r.HandleFunc("/tag:{tag}", handler.Web(handleViewCollectionTag, UserLevelReader))
|
r.HandleFunc("/tag:{tag}", handler.Web(handleViewCollectionTag, UserLevelReader))
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ func handleViewSitemap(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
host = c.CanonicalURL()
|
host = c.CanonicalURL()
|
||||||
|
|
||||||
sm := buildSitemap(host, pre)
|
sm := buildSitemap(host, pre)
|
||||||
posts, err := app.db.GetPosts(app.cfg, c, 0, false, false, false, "")
|
posts, err := app.db.GetPosts(app.cfg, c, 0, false, false, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Error getting posts: %v", err)
|
log.Error("Error getting posts: %v", err)
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
|
|
@ -188,22 +188,21 @@ var movePostHTML = function(postID) {
|
||||||
}
|
}
|
||||||
return $tmpl.innerHTML.replace(/POST_ID/g, postID);
|
return $tmpl.innerHTML.replace(/POST_ID/g, postID);
|
||||||
}
|
}
|
||||||
var createPostEl = function(post, owned, singleUser) {
|
var createPostEl = function(post, owned) {
|
||||||
var $post = document.createElement('div');
|
var $post = document.createElement('div');
|
||||||
let p = H.createPost(post.id, "", post.body)
|
let p = H.createPost(post.id, "", post.body)
|
||||||
var title = (post.title || p.title || post.id);
|
var title = (post.title || p.title || post.id);
|
||||||
title = title.replace(/</g, "<");
|
title = title.replace(/</g, "<");
|
||||||
var postLink = (singleUser ? '/d/' : '/') + post.id
|
|
||||||
$post.id = 'post-' + post.id;
|
$post.id = 'post-' + post.id;
|
||||||
$post.className = 'post';
|
$post.className = 'post';
|
||||||
$post.innerHTML = '<h3><a href="' + postLink + '">' + title + '</a></h3>';
|
$post.innerHTML = '<h3><a href="/' + post.id + '">' + title + '</a></h3>';
|
||||||
|
|
||||||
var posted = "";
|
var posted = "";
|
||||||
if (post.created) {
|
if (post.created) {
|
||||||
posted = getFormattedDate(new Date(post.created))
|
posted = getFormattedDate(new Date(post.created))
|
||||||
}
|
}
|
||||||
var hasDraft = H.exists('draft' + post.id);
|
var hasDraft = H.exists('draft' + post.id);
|
||||||
$post.innerHTML += '<h4><date>' + posted + '</date> <a class="action" href="' + postLink + '/edit">edit' + (hasDraft ? 'ed' : '') + '</a> <a class="delete action" href="/' + post.id + '" onclick="delPost(event, \'' + post.id + '\'' + (owned === true ? ', true' : '') + ')">delete</a> '+movePostHTML(post.id)+'</h4>';
|
$post.innerHTML += '<h4><date>' + posted + '</date> <a class="action" href="/pad/' + post.id + '">edit' + (hasDraft ? 'ed' : '') + '</a> <a class="delete action" href="/' + post.id + '" onclick="delPost(event, \'' + post.id + '\'' + (owned === true ? ', true' : '') + ')">delete</a> '+movePostHTML(post.id)+'</h4>';
|
||||||
|
|
||||||
if (post.error) {
|
if (post.error) {
|
||||||
$post.innerHTML += '<p class="error"><strong>Sync error:</strong> ' + post.error + ' <nav><a href="#" onclick="localPosts.dismissError(event, this)">dismiss</a> <a href="#" onclick="localPosts.deletePost(event, this, \''+post.id+'\')">remove post</a></nav></p>';
|
$post.innerHTML += '<p class="error"><strong>Sync error:</strong> ' + post.error + ' <nav><a href="#" onclick="localPosts.dismissError(event, this)">dismiss</a> <a href="#" onclick="localPosts.deletePost(event, this, \''+post.id+'\')">remove post</a></nav></p>';
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"html/template"
|
"html/template"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
|
"net/http"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
|
@ -70,14 +70,14 @@ func initTemplate(parentDir, name string) {
|
||||||
filepath.Join(parentDir, templatesDir, "base.tmpl"),
|
filepath.Join(parentDir, templatesDir, "base.tmpl"),
|
||||||
filepath.Join(parentDir, templatesDir, "user", "include", "silenced.tmpl"),
|
filepath.Join(parentDir, templatesDir, "user", "include", "silenced.tmpl"),
|
||||||
}
|
}
|
||||||
if name == "collection" || name == "collection-tags" || name == "collection-archive" || name == "chorus-collection" || name == "read" {
|
if name == "collection" || name == "collection-tags" || name == "chorus-collection" || name == "read" {
|
||||||
// These pages list out collection posts, so we also parse templatesDir + "include/posts.tmpl"
|
// These pages list out collection posts, so we also parse templatesDir + "include/posts.tmpl"
|
||||||
files = append(files, filepath.Join(parentDir, templatesDir, "include", "posts.tmpl"))
|
files = append(files, filepath.Join(parentDir, templatesDir, "include", "posts.tmpl"))
|
||||||
}
|
}
|
||||||
if name == "chorus-collection" || name == "chorus-collection-post" {
|
if name == "chorus-collection" || name == "chorus-collection-post" {
|
||||||
files = append(files, filepath.Join(parentDir, templatesDir, "user", "include", "header.tmpl"))
|
files = append(files, filepath.Join(parentDir, templatesDir, "user", "include", "header.tmpl"))
|
||||||
}
|
}
|
||||||
if name == "collection" || name == "collection-tags" || name == "collection-archive" || name == "collection-post" || name == "post" || name == "chorus-collection" || name == "chorus-collection-post" {
|
if name == "collection" || name == "collection-tags" || name == "collection-post" || name == "post" || name == "chorus-collection" || name == "chorus-collection-post" {
|
||||||
files = append(files, filepath.Join(parentDir, templatesDir, "include", "post-render.tmpl"))
|
files = append(files, filepath.Join(parentDir, templatesDir, "include", "post-render.tmpl"))
|
||||||
}
|
}
|
||||||
templates[name] = template.Must(template.New("").Funcs(funcMap).ParseFiles(files...))
|
templates[name] = template.Must(template.New("").Funcs(funcMap).ParseFiles(files...))
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<div id="overlay"></div>
|
<div id="overlay"></div>
|
||||||
|
|
||||||
<textarea dir="auto" id="writer" placeholder="Write..." class="{{.Post.Font}}" autofocus>{{if .Post.Title}}# {{.Post.Title}}
|
<textarea id="writer" placeholder="Write..." class="{{.Post.Font}}" autofocus>{{if .Post.Title}}# {{.Post.Title}}
|
||||||
|
|
||||||
{{end}}{{.Post.Content}}</textarea>
|
{{end}}{{.Post.Content}}</textarea>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@
|
||||||
<ul><li class="has-submenu"><a>{{.Username}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" /><ul>
|
<ul><li class="has-submenu"><a>{{.Username}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" /><ul>
|
||||||
{{if .IsAdmin}}<li><a href="/admin">Admin dashboard</a></li>{{end}}
|
{{if .IsAdmin}}<li><a href="/admin">Admin dashboard</a></li>{{end}}
|
||||||
<li><a href="/me/settings">Account settings</a></li>
|
<li><a href="/me/settings">Account settings</a></li>
|
||||||
<li><a href="/me/import">Import posts</a></li>
|
|
||||||
<li><a href="/me/export">Export</a></li>
|
<li><a href="/me/export">Export</a></li>
|
||||||
{{if .CanInvite}}<li><a href="/me/invites">Invite people</a></li>{{end}}
|
{{if .CanInvite}}<li><a href="/me/invites">Invite people</a></li>{{end}}
|
||||||
<li class="separator"><hr /></li>
|
<li class="separator"><hr /></li>
|
||||||
|
|
|
||||||
|
|
@ -1,118 +0,0 @@
|
||||||
{{define "collection"}}<!DOCTYPE HTML>
|
|
||||||
<html>
|
|
||||||
<head prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
|
|
||||||
<title>Archive — {{.Collection.DisplayTitle}}</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="/css/write.css" />
|
|
||||||
{{if .CustomCSS}}<link rel="stylesheet" type="text/css" href="/local/custom.css" />{{end}}
|
|
||||||
<link rel="shortcut icon" href="/favicon.ico" />
|
|
||||||
<link rel="canonical" href="{{.CanonicalURL}}">
|
|
||||||
{{if gt .CurrentPage 1}}<link rel="prev" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
|
|
||||||
{{if lt .CurrentPage .TotalPages}}<link rel="next" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{end}}
|
|
||||||
{{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} » Feed" href="{{.CanonicalURL}}feed/" />{{end}}
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
|
|
||||||
<meta name="generator" content="WriteFreely">
|
|
||||||
<meta name="description" content="{{.PlainDescription}}">
|
|
||||||
<meta itemprop="name" content="{{.DisplayTitle}}">
|
|
||||||
<meta itemprop="description" content="{{.PlainDescription}}">
|
|
||||||
<meta name="twitter:card" content="summary">
|
|
||||||
<meta name="twitter:title" content="{{.DisplayTitle}}">
|
|
||||||
<meta name="twitter:image" content="{{.AvatarURL}}">
|
|
||||||
<meta name="twitter:description" content="{{.PlainDescription}}">
|
|
||||||
<meta property="og:title" content="{{.DisplayTitle}}" />
|
|
||||||
<meta property="og:site_name" content="{{.DisplayTitle}}" />
|
|
||||||
<meta property="og:type" content="article" />
|
|
||||||
<meta property="og:url" content="{{.CanonicalURL}}" />
|
|
||||||
<meta property="og:description" content="{{.PlainDescription}}" />
|
|
||||||
<meta property="og:image" content="{{.AvatarURL}}">
|
|
||||||
{{template "collection-meta" .}}
|
|
||||||
{{if .StyleSheet}}<style type="text/css">{{.StyleSheetDisplay}}</style>{{end}}
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body id="subpage">
|
|
||||||
|
|
||||||
<div id="overlay"></div>
|
|
||||||
|
|
||||||
<header>
|
|
||||||
<h1 dir="{{.Direction}}" id="blog-title"><a href="{{if .IsTopLevel}}/{{else}}/{{.Collection.Alias}}/{{end}}" class="h-card p-author">{{.Collection.DisplayTitle}}</a></h1>
|
|
||||||
<nav>
|
|
||||||
{{if .PinnedPosts}}
|
|
||||||
{{range .PinnedPosts}}<a class="pinned" href="{{if $.IsOwner}}/{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL}}{{end}}">{{.DisplayTitle}}</a>{{end}}
|
|
||||||
{{end}}
|
|
||||||
</nav>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
{{if .Posts -}}
|
|
||||||
<section id="wrapper" class="archive" itemscope itemtype="http://schema.org/Blog">
|
|
||||||
{{- else -}}
|
|
||||||
<div id="wrapper" class="archive">
|
|
||||||
{{- end}}
|
|
||||||
|
|
||||||
<h1>Archive</h1>
|
|
||||||
|
|
||||||
{{if .Flash}}
|
|
||||||
<div class="alert success flash">
|
|
||||||
<p>{{.Flash}}</p>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
{{ $curYear := 0 }}
|
|
||||||
{{ range $el := .Posts }}
|
|
||||||
{{if ne $curYear .Created.Year}}<li class="year">{{.Created.Year}}</li>{{ $curYear = .Created.Year }}{{end}}
|
|
||||||
<li>
|
|
||||||
{{if .HasTitleLink -}}
|
|
||||||
{{.HTMLTitleArrow}}
|
|
||||||
{{- else -}}
|
|
||||||
<a href="{{if $.SingleUser}}/{{else}}/{{$.Alias}}/{{end}}{{.Slug.String}}" itemprop="url" class="u-url">
|
|
||||||
{{- if .DisplayTitle -}}
|
|
||||||
{{- .DisplayTitle -}}
|
|
||||||
{{- else -}}
|
|
||||||
(Untitled)
|
|
||||||
{{end}}
|
|
||||||
</a>
|
|
||||||
{{- end}}
|
|
||||||
{{if .IsScheduled}}[Scheduled]{{end}}
|
|
||||||
{{if $.Format.ShowDates -}}
|
|
||||||
<time class="dt-published" datetime="{{.Created8601}}" pubdate itemprop="datePublished" content="{{.Created}}">
|
|
||||||
{{- if .HasTitleLink -}}
|
|
||||||
<a href="{{if $.SingleUser}}/{{else}}/{{$.Alias}}/{{end}}{{.Slug.String}}" itemprop="url">
|
|
||||||
{{- end -}}
|
|
||||||
{{.DisplayDate}}
|
|
||||||
{{- if .HasTitleLink -}}
|
|
||||||
{{- if .IsPaid}}{{template "paid-badge" (dict "CDNHost" $.CDNHost)}}{{end -}}</a>
|
|
||||||
{{- end -}}
|
|
||||||
</time>
|
|
||||||
{{- else -}}
|
|
||||||
{{- if .HasTitleLink -}}
|
|
||||||
<a href="{{if $.SingleUser}}/{{else}}/{{$.Alias}}/{{end}}{{.Slug.String}}" itemprop="url">view</a>
|
|
||||||
{{- end -}}
|
|
||||||
{{- end}}
|
|
||||||
</li>
|
|
||||||
{{end}}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{{template "paging" .}}
|
|
||||||
|
|
||||||
{{if .Posts}}</section>{{else}}</div>{{end}}
|
|
||||||
|
|
||||||
{{if .ShowFooterBranding }}
|
|
||||||
<footer>
|
|
||||||
<hr />
|
|
||||||
<nav dir="ltr">
|
|
||||||
{{if not .SingleUser}}<a class="home pubd" href="/">{{.SiteName}}</a> · {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
|
|
||||||
</nav>
|
|
||||||
</footer>
|
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
{{if .CanShowScript}}
|
|
||||||
{{range .ExternalScripts}}<script type="text/javascript" src="{{.}}" async></script>{{end}}
|
|
||||||
{{if .Collection.Script}}<script type="text/javascript">{{.ScriptDisplay}}</script>{{end}}
|
|
||||||
{{end}}
|
|
||||||
<script src="/js/localdate.js"></script>
|
|
||||||
</html>{{end}}
|
|
||||||
|
|
@ -55,8 +55,7 @@
|
||||||
{{range .PinnedPosts}}<a class="pinned{{if eq .Slug.String $.Slug.String}} selected{{end}}" href="{{if not $.SingleUser}}/{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.PlainDisplayTitle}}</a>{{end}}
|
{{range .PinnedPosts}}<a class="pinned{{if eq .Slug.String $.Slug.String}} selected{{end}}" href="{{if not $.SingleUser}}/{{$.Collection.Alias}}/{{.Slug.String}}{{else}}{{.CanonicalURL $.Host}}{{end}}">{{.PlainDisplayTitle}}</a>{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{ if and .IsOwner .IsFound }}<span class="views" dir="ltr"><strong>{{largeNumFmt .Views}}</strong> {{pluralize "view" "views" .Views}}</span>
|
{{ if and .IsOwner .IsFound }}<span class="views" dir="ltr"><strong>{{largeNumFmt .Views}}</strong> {{pluralize "view" "views" .Views}}</span>
|
||||||
{{if .Likes}}<span class="views" dir="ltr"><strong>{{largeNumFmt .Likes}}</strong> {{pluralize "like" "likes" .Likes}}</span>{{end}}
|
<a class="xtra-feature" href="/{{if not .SingleUser}}{{.Collection.Alias}}/{{end}}{{.Slug.String}}/edit" dir="{{.Direction}}">Edit</a>
|
||||||
<a href="/{{if not .SingleUser}}{{.Collection.Alias}}/{{end}}{{.Slug.String}}/edit" dir="{{.Direction}}">Edit</a>
|
|
||||||
{{if .IsPinned}}<a class="xtra-feature unpin" href="/{{.Collection.Alias}}/{{.Slug.String}}/unpin" dir="{{.Direction}}" onclick="unpinPost(event, '{{.ID}}')">Unpin</a>{{end}}
|
{{if .IsPinned}}<a class="xtra-feature unpin" href="/{{.Collection.Alias}}/{{.Slug.String}}/unpin" dir="{{.Direction}}" onclick="unpinPost(event, '{{.ID}}')">Unpin</a>{{end}}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
<a href="/about">about</a>
|
<a href="/about">about</a>
|
||||||
{{if and .LocalTimeline .CanViewReader}}<a href="/read">reader</a>{{end}}
|
{{if and .LocalTimeline .CanViewReader}}<a href="/read">reader</a>{{end}}
|
||||||
{{if .Username}}<a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a>{{end}}
|
{{if .Username}}<a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a>{{end}}
|
||||||
<a href="/contact">contact</a>
|
|
||||||
<a href="/privacy">privacy</a>
|
<a href="/privacy">privacy</a>
|
||||||
<p style="font-size: 0.9em">powered by <a href="https://writefreely.org">writefreely</a></p>
|
<p style="font-size: 0.9em">powered by <a href="https://writefreely.org">writefreely</a></p>
|
||||||
{{else}}
|
{{else}}
|
||||||
|
|
@ -26,7 +25,6 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="/about">about</a></li>
|
<li><a href="/about">about</a></li>
|
||||||
{{if and (and (not .SingleUser) .LocalTimeline) .CanViewReader}}<a href="/read">reader</a>{{end}}
|
{{if and (and (not .SingleUser) .LocalTimeline) .CanViewReader}}<a href="/read">reader</a>{{end}}
|
||||||
<li><a href="/contact">contact</a></li>
|
|
||||||
<li><a href="/privacy">privacy</a></li>
|
<li><a href="/privacy">privacy</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -62,15 +62,3 @@
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{define "paid-badge"}}<img class="paid" alt="Paid article" src="/img/paidarticle.svg" /> {{end}}
|
{{define "paid-badge"}}<img class="paid" alt="Paid article" src="/img/paidarticle.svg" /> {{end}}
|
||||||
|
|
||||||
{{define "paging"}}
|
|
||||||
{{if gt .TotalPages 1}}<nav id="paging" class="content-container clearfix">
|
|
||||||
{{if or (and .Format.Ascending (le .CurrentPage .TotalPages)) (isRTL .Direction)}}
|
|
||||||
{{if gt .CurrentPage 1}}<a href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">⇠ {{if and .Format.Ascending (le .CurrentPage .TotalPages)}}Previous{{else}}Newer{{end}}</a>{{end}}
|
|
||||||
{{if lt .CurrentPage .TotalPages}}<a style="float:right;" href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">{{if and .Format.Ascending (lt .CurrentPage .TotalPages)}}Next{{else}}Older{{end}} ⇢</a>{{end}}
|
|
||||||
{{else}}
|
|
||||||
{{if lt .CurrentPage .TotalPages}}<a href="{{.NextPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">⇠ Older</a>{{end}}
|
|
||||||
{{if gt .CurrentPage 1}}<a style="float:right;" href="{{.PrevPageURL .Prefix .NavSuffix .CurrentPage .IsTopLevel}}">Newer ⇢</a>{{end}}
|
|
||||||
{{end}}
|
|
||||||
</nav>{{end}}
|
|
||||||
{{end}}
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<div id="overlay"></div>
|
<div id="overlay"></div>
|
||||||
|
|
||||||
<textarea dir="auto" id="writer" placeholder="Write..." class="{{.Post.Font}}" autofocus>{{if .Post.Title}}# {{.Post.Title}}
|
<textarea id="writer" placeholder="Write..." class="{{.Post.Font}}" autofocus>{{if .Post.Title}}# {{.Post.Title}}
|
||||||
|
|
||||||
{{end}}{{.Post.Content}}</textarea>
|
{{end}}{{.Post.Content}}</textarea>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -202,9 +202,8 @@ function loadMorePosts() {
|
||||||
if (http.readyState == 4) {
|
if (http.readyState == 4) {
|
||||||
if (http.status == 200) {
|
if (http.status == 200) {
|
||||||
var data = JSON.parse(http.responseText);
|
var data = JSON.parse(http.responseText);
|
||||||
var singleUser = {{ .SingleUser }};
|
|
||||||
for (var i=0; i<data.data.length; i++) {
|
for (var i=0; i<data.data.length; i++) {
|
||||||
$posts.el.appendChild(createPostEl(data.data[i], true, singleUser));
|
$posts.el.appendChild(createPostEl(data.data[i], true));
|
||||||
}
|
}
|
||||||
if (data.data.length < 10) {
|
if (data.data.length < 10) {
|
||||||
$loadMore.el.parentNode.removeChild($loadMore.el);
|
$loadMore.el.parentNode.removeChild($loadMore.el);
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
{{if not .SingleUser}}<a href="/about">about</a>{{end}}
|
{{if not .SingleUser}}<a href="/about">about</a>{{end}}
|
||||||
{{if and (not .SingleUser) .LocalTimeline}}<a href="/read">reader</a>{{end}}
|
{{if and (not .SingleUser) .LocalTimeline}}<a href="/read">reader</a>{{end}}
|
||||||
<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>
|
||||||
{{if not .SingleUser}}<a href="/contact">contact</a>{{end}}
|
|
||||||
{{if not .SingleUser}}<a href="/privacy">privacy</a>{{end}}
|
{{if not .SingleUser}}<a href="/privacy">privacy</a>{{end}}
|
||||||
{{if .WFModesty}}
|
{{if .WFModesty}}
|
||||||
<p style="font-size: 0.9em">powered by <a href="https://writefreely.org">writefreely</a></p>
|
<p style="font-size: 0.9em">powered by <a href="https://writefreely.org">writefreely</a></p>
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,11 @@ td.none {
|
||||||
<th>Post</th>
|
<th>Post</th>
|
||||||
{{if not .Collection}}<th>Blog</th>{{end}}
|
{{if not .Collection}}<th>Blog</th>{{end}}
|
||||||
<th class="num">Total Views</th>
|
<th class="num">Total Views</th>
|
||||||
{{if .Federation}}<th class="num">Likes</th>{{end}}
|
|
||||||
</tr>
|
</tr>
|
||||||
{{range .TopPosts}}<tr>
|
{{range .TopPosts}}<tr>
|
||||||
<td style="word-break: break-all;"><a href="{{if .Collection}}{{.Collection.CanonicalURL}}{{.Slug.String}}{{else}}/{{.ID}}{{end}}">{{if ne .DisplayTitle ""}}{{.DisplayTitle}}{{else}}<em>{{.ID}}</em>{{end}}</a></td>
|
<td style="word-break: break-all;"><a href="{{if .Collection}}{{.Collection.CanonicalURL}}{{.Slug.String}}{{else}}/{{.ID}}{{end}}">{{if ne .DisplayTitle ""}}{{.DisplayTitle}}{{else}}<em>{{.ID}}</em>{{end}}</a></td>
|
||||||
{{ if not $.Collection }}<td>{{if .Collection}}<a href="{{.Collection.CanonicalURL}}">{{.Collection.Title}}</a>{{else}}<em>Draft</em>{{end}}</td>{{ end }}
|
{{ if not $.Collection }}<td>{{if .Collection}}<a href="{{.Collection.CanonicalURL}}">{{.Collection.Title}}</a>{{else}}<em>Draft</em>{{end}}</td>{{ end }}
|
||||||
<td class="num">{{.ViewCount}}</td>
|
<td class="num">{{.ViewCount}}</td>
|
||||||
{{if $.Federation}}<td class="num">{{.LikeCount}}</td>{{end}}
|
|
||||||
</tr>{{end}}
|
</tr>{{end}}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue