ulith/pronounss
1
0
Fork 0
forked from mirrors/pronouns.cc
Code Pull requests Activity

Merge branch 'main' into feature/email

Browse source
This commit is contained in:
sam 2024-02-01 00:47:54 +01:00
commit ae453df77c
No known key found for this signature in database
GPG key ID: B4EF20DDE721CAA1
104 changed files with 1809 additions and 449 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.woodpecker/.backend.yml Normal file
View file

@ -0,0 +1,13 @@
when:
branch:
exclude: stable
steps:
check:
image: golang:alpine
commands:
- apk update && apk add curl vips-dev build-base
- make backend
# Install golangci-lint
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
- golangci-lint run

20
.woodpecker/.frontend.yml Normal file
View file

@ -0,0 +1,20 @@
when:
branch:
exclude: stable
steps:
check:
image: node
directory: frontend
environment: # SvelteKit expects these in the environment during build time.
- PRIVATE_SENTRY_DSN=
- PUBLIC_BASE_URL=http://pronouns.localhost
- PUBLIC_MEDIA_URL=http://pronouns.localhost/media
- PUBLIC_SHORT_BASE=http://prns.localhost
- PUBLIC_HCAPTCHA_SITEKEY=non_existent_sitekey
commands:
- corepack enable
- pnpm install
- pnpm check
- pnpm lint
- pnpm build

2
Makefile
View file

@ -2,7 +2,7 @@ all: generate backend frontend
.PHONY: backend
backend:
go build -v -o pronouns -ldflags="-buildid= -X codeberg.org/pronounscc/pronouns.cc/backend/server.Revision=`git rev-parse --short HEAD` -X codeberg.org/pronounscc/pronouns.cc/backend/server.Tag=`git describe --tags --long`" .
go build -v -o pronouns -ldflags="-buildid= -X codeberg.org/pronounscc/pronouns.cc/backend/server.Revision=`git rev-parse --short HEAD` -X codeberg.org/pronounscc/pronouns.cc/backend/server.Tag=`git describe --tags --long --always`" .
.PHONY: generate
generate:

2
backend/db/export.go
View file

@ -79,7 +79,7 @@ func (db *DB) CreateExport(ctx context.Context, userID xid.ID, filename string,
return de, errors.Wrap(err, "building query")
}
pgxscan.Get(ctx, db, &de, sql, args...)
err = pgxscan.Get(ctx, db, &de, sql, args...)
if err != nil {
return de, errors.Wrap(err, "executing sql")
}

8
backend/db/invites.go
View file

@ -6,6 +6,7 @@ import (
"encoding/base64"
"time"
"codeberg.org/pronounscc/pronouns.cc/backend/log"
"emperror.dev/errors"
"github.com/georgysavva/scany/v2/pgxscan"
"github.com/jackc/pgx/v5"
@ -43,7 +44,12 @@ func (db *DB) CreateInvite(ctx context.Context, userID xid.ID) (i Invite, err er
if err != nil {
return i, errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
var maxInvites, inviteCount int
err = tx.QueryRow(ctx, "SELECT max_invites FROM users WHERE id = $1", userID).Scan(&maxInvites)

8
backend/db/member.go
View file

@ -7,6 +7,7 @@ import (
"time"
"codeberg.org/pronounscc/pronouns.cc/backend/common"
"codeberg.org/pronounscc/pronouns.cc/backend/log"
"emperror.dev/errors"
"github.com/Masterminds/squirrel"
"github.com/georgysavva/scany/v2/pgxscan"
@ -287,7 +288,12 @@ func (db *DB) RerollMemberSID(ctx context.Context, userID, memberID xid.ID) (new
if err != nil {
return "", errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
sql, args, err := sq.Update("members").
Set("sid", squirrel.Expr("find_free_member_sid()")).

3
backend/main.go
View file

@ -26,7 +26,8 @@ var Command = &cli.Command{
func run(c *cli.Context) error {
// initialize sentry
if dsn := os.Getenv("SENTRY_DSN"); dsn != "" {
sentry.Init(sentry.ClientOptions{
// We don't need to check the error here--it's fine if no DSN is set.
_ = sentry.Init(sentry.ClientOptions{
Dsn: dsn,
Debug: os.Getenv("DEBUG") == "true",
Release: server.Tag,

8
backend/routes/v1/auth/discord.go
View file

@ -12,6 +12,7 @@ import (
"emperror.dev/errors"
"github.com/bwmarrin/discordgo"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/mediocregopher/radix/v4"
"github.com/rs/xid"
"golang.org/x/oauth2"
@ -292,7 +293,12 @@ func (s *Server) discordSignup(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
du := new(discordgo.User)
err = s.DB.GetJSON(ctx, "discord:"+req.Ticket, &du)

8
backend/routes/v1/auth/fedi_mastodon.go
View file

@ -12,6 +12,7 @@ import (
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/mediocregopher/radix/v4"
"github.com/rs/xid"
)
@ -320,7 +321,12 @@ func (s *Server) mastodonSignup(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
mu := new(partialMastodonAccount)
err = s.DB.GetJSON(ctx, "mastodon:"+req.Ticket, &mu)

8
backend/routes/v1/auth/fedi_misskey.go
View file

@ -13,6 +13,7 @@ import (
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/mediocregopher/radix/v4"
"github.com/rs/xid"
)
@ -248,7 +249,12 @@ func (s *Server) misskeySignup(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
mu := new(partialMisskeyAccount)
err = s.DB.GetJSON(ctx, "misskey:"+req.Ticket, &mu)

8
backend/routes/v1/auth/google.go
View file

@ -11,6 +11,7 @@ import (
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/mediocregopher/radix/v4"
"github.com/rs/xid"
"golang.org/x/oauth2"
@ -295,7 +296,12 @@ func (s *Server) googleSignup(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
gu := new(partialGoogleUser)
err = s.DB.GetJSON(ctx, "google:"+req.Ticket, &gu)

2
backend/routes/v1/auth/routes.go
View file

@ -185,7 +185,7 @@ func (s *Server) oauthURLs(w http.ResponseWriter, r *http.Request) error {
if googleOAuthConfig.ClientID != "" {
googleCfg := googleOAuthConfig
googleCfg.RedirectURL = req.CallbackDomain + "/auth/login/google"
resp.Google = googleCfg.AuthCodeURL(state)
resp.Google = googleCfg.AuthCodeURL(state) + "&prompt=select_account"
}
render.JSON(w, r, resp)

9
backend/routes/v1/auth/tokens.go
View file

@ -5,9 +5,11 @@ import (
"time"
"codeberg.org/pronounscc/pronouns.cc/backend/db"
"codeberg.org/pronounscc/pronouns.cc/backend/log"
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/rs/xid"
)
@ -63,7 +65,12 @@ func (s *Server) deleteToken(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
err = s.DB.InvalidateAllTokens(ctx, tx, claims.UserID)
if err != nil {

8
backend/routes/v1/auth/tumblr.go
View file

@ -13,6 +13,7 @@ import (
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/mediocregopher/radix/v4"
"github.com/rs/xid"
"golang.org/x/oauth2"
@ -328,7 +329,12 @@ func (s *Server) tumblrSignup(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
tui := new(tumblrUserInfo)
err = s.DB.GetJSON(ctx, "tumblr:"+req.Ticket, &tui)

8
backend/routes/v1/member/create_member.go
View file

@ -11,6 +11,7 @@ import (
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
)
type CreateMemberRequest struct {
@ -119,7 +120,12 @@ func (s *Server) createMember(w http.ResponseWriter, r *http.Request) (err error
if err != nil {
return errors.Wrap(err, "starting transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
m, err := s.DB.CreateMember(ctx, tx, claims.UserID, cmr.Name, cmr.DisplayName, cmr.Bio, cmr.Links)
if err != nil {

8
backend/routes/v1/member/patch_member.go
View file

@ -13,6 +13,7 @@ import (
"emperror.dev/errors"
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/rs/xid"
)
@ -246,7 +247,12 @@ func (s *Server) patchMember(w http.ResponseWriter, r *http.Request) error {
log.Errorf("creating transaction: %v", err)
return errors.Wrap(err, "creating transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
m, err = s.DB.UpdateMember(ctx, tx, m.ID, req.Name, req.DisplayName, req.Bio, req.Unlisted, req.Links, avatarHash)
if err != nil {

8
backend/routes/v1/mod/resolve_report.go
View file

@ -10,6 +10,7 @@ import (
"emperror.dev/errors"
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
)
type resolveReportRequest struct {
@ -43,7 +44,12 @@ func (s *Server) resolveReport(w http.ResponseWriter, r *http.Request) error {
log.Errorf("creating transaction: %v", err)
return errors.Wrap(err, "creating transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
report, err := s.DB.Report(ctx, tx, id)
if err != nil {

9
backend/routes/v1/user/delete_user.go
View file

@ -3,9 +3,11 @@ package user
import (
"net/http"
"codeberg.org/pronounscc/pronouns.cc/backend/log"
"codeberg.org/pronounscc/pronouns.cc/backend/server"
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
)
func (s *Server) deleteUser(w http.ResponseWriter, r *http.Request) error {
@ -20,7 +22,12 @@ func (s *Server) deleteUser(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "creating transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
err = s.DB.DeleteUser(ctx, tx, claims.UserID, true, "")
if err != nil {

15
backend/routes/v1/user/flags.go
View file

@ -13,6 +13,7 @@ import (
"emperror.dev/errors"
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5"
"github.com/rs/xid"
)
@ -80,7 +81,12 @@ func (s *Server) postUserFlag(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "starting transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
flag, err := s.DB.CreateFlag(ctx, tx, claims.UserID, req.Name, req.Description)
if err != nil {
@ -192,7 +198,12 @@ func (s *Server) patchUserFlag(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return errors.Wrap(err, "beginning transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
flag, err = s.DB.EditFlag(ctx, tx, flag.ID, req.Name, req.Description, nil)
if err != nil {

8
backend/routes/v1/user/patch_user.go
View file

@ -12,6 +12,7 @@ import (
"emperror.dev/errors"
"github.com/go-chi/render"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/rs/xid"
)
@ -221,7 +222,12 @@ func (s *Server) patchUser(w http.ResponseWriter, r *http.Request) error {
log.Errorf("creating transaction: %v", err)
return errors.Wrap(err, "creating transaction")
}
defer tx.Rollback(ctx)
defer func() {
err := tx.Rollback(ctx)
if err != nil && !errors.Is(err, pgx.ErrTxClosed) {
log.Error("rolling back transaction:", err)
}
}()
// update username
if req.Username != nil && *req.Username != u.Username {

24
backend/server/server.go
View file

@ -100,23 +100,23 @@ func New() (*Server, error) {
// set scopes
// users
rateLimiter.Scope("GET", "/users/*", 60)
rateLimiter.Scope("PATCH", "/users/@me", 10)
_ = rateLimiter.Scope("GET", "/users/*", 60)
_ = rateLimiter.Scope("PATCH", "/users/@me", 10)
// members
rateLimiter.Scope("GET", "/users/*/members", 60)
rateLimiter.Scope("GET", "/users/*/members/*", 60)
_ = rateLimiter.Scope("GET", "/users/*/members", 60)
_ = rateLimiter.Scope("GET", "/users/*/members/*", 60)
rateLimiter.Scope("POST", "/members", 10)
rateLimiter.Scope("GET", "/members/*", 60)
rateLimiter.Scope("PATCH", "/members/*", 20)
rateLimiter.Scope("DELETE", "/members/*", 5)
_ = rateLimiter.Scope("POST", "/members", 10)
_ = rateLimiter.Scope("GET", "/members/*", 60)
_ = rateLimiter.Scope("PATCH", "/members/*", 20)
_ = rateLimiter.Scope("DELETE", "/members/*", 5)
// auth
rateLimiter.Scope("*", "/auth/*", 20)
rateLimiter.Scope("*", "/auth/tokens", 10)
rateLimiter.Scope("*", "/auth/invites", 10)
rateLimiter.Scope("POST", "/auth/discord/*", 10)
_ = rateLimiter.Scope("*", "/auth/*", 20)
_ = rateLimiter.Scope("*", "/auth/tokens", 10)
_ = rateLimiter.Scope("*", "/auth/invites", 10)
_ = rateLimiter.Scope("POST", "/auth/discord/*", 10)
s.Router.Use(rateLimiter.Handler())

11
frontend/.eslintrc.cjs
View file

@ -17,4 +17,15 @@ module.exports = {
es2017: true,
node: true,
},
rules: {
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{
argsIgnorePattern: "^_",
destructuredArrayIgnorePattern: "^_",
varsIgnorePattern: "^_",
},
],
},
};

27
frontend/package.json
View file

@ -12,11 +12,13 @@
"format": "prettier --plugin-search-dir . --write ."
},
"devDependencies": {
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-node": "^1.2.3",
"@sveltejs/kit": "^1.15.0",
"@types/luxon": "^3.2.2",
"@types/markdown-it": "^12.2.3",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/adapter-node": "^2.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@sveltestrap/sveltestrap": "^6.0.5",
"@types/luxon": "^3.3.7",
"@types/markdown-it": "^13.0.7",
"@types/node": "^18.15.11",
"@types/sanitize-html": "^2.9.0",
"@typescript-eslint/eslint-plugin": "^5.57.1",
@ -25,14 +27,13 @@
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-svelte3": "^4.0.0",
"prettier": "^2.8.7",
"prettier-plugin-svelte": "^2.10.0",
"svelte": "^3.58.0",
"svelte-check": "^3.1.4",
"prettier-plugin-svelte": "^2.10.1",
"svelte": "^4.0.0",
"svelte-check": "^3.4.3",
"svelte-hcaptcha": "^0.1.1",
"sveltestrap": "^5.10.0",
"tslib": "^2.5.0",
"typescript": "^4.9.5",
"vite": "^4.2.1",
"typescript": "^5.0.0",
"vite": "^5.0.0",
"vite-plugin-markdown": "^2.1.0"
},
"type": "module",
@ -41,8 +42,8 @@
"@popperjs/core": "^2.11.7",
"@sentry/node": "^7.46.0",
"base64-arraybuffer": "^1.0.2",
"bootstrap": "5.3.0-alpha1",
"bootstrap-icons": "^1.10.4",
"bootstrap": "^5.3.2",
"bootstrap-icons": "^1.11.2",
"jose": "^4.13.1",
"luxon": "^3.3.0",
"markdown-it": "^13.0.1",

19
frontend/src/app.d.ts vendored
View file

@ -16,23 +16,4 @@ declare global {
}
}
declare module "svelte-hcaptcha" {
import type { SvelteComponent } from "svelte";
export interface HCaptchaProps {
sitekey?: string;
apihost?: string;
hl?: string;
reCaptchaCompat?: boolean;
theme?: CaptchaTheme;
size?: string;
}
declare class HCaptcha extends SvelteComponent {
$$prop_def: HCaptchaProps;
}
export default HCaptcha;
}
export {};

4
frontend/src/hooks.server.ts
View file

@ -2,7 +2,9 @@ import { PRIVATE_SENTRY_DSN } from "$env/static/private";
import * as Sentry from "@sentry/node";
import type { HandleServerError } from "@sveltejs/kit";
Sentry.init({ dsn: PRIVATE_SENTRY_DSN });
if (PRIVATE_SENTRY_DSN) {
Sentry.init({ dsn: PRIVATE_SENTRY_DSN });
}
export const handleError = (({ error, event }) => {
console.log(error);

1
frontend/src/lib/api/entities.ts
View file

@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
import { PUBLIC_BASE_URL, PUBLIC_MEDIA_URL } from "$env/static/public";
export const MAX_MEMBERS = 500;

2
frontend/src/lib/components/ActiveLink.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { NavLink } from "sveltestrap";
import { NavLink } from "@sveltestrap/sveltestrap";
import { page } from "$app/stores";
export let href: string;

2
frontend/src/lib/components/ErrorAlert.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import type { APIError } from "$lib/api/entities";
import { Alert } from "sveltestrap";
import { Alert } from "@sveltestrap/sveltestrap";
export let error: APIError;
</script>

2
frontend/src/lib/components/IconButton.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Button, Icon, Tooltip } from "sveltestrap";
import { Button, Icon, Tooltip } from "@sveltestrap/sveltestrap";
export let icon: string;
export let color: "primary" | "secondary" | "success" | "danger";

6
frontend/src/lib/components/PartialMemberCard.svelte
View file

@ -6,12 +6,12 @@
type User,
type CustomPreferences,
} from "$lib/api/entities";
import { Icon, Tooltip } from "sveltestrap";
import { Icon, Tooltip } from "@sveltestrap/sveltestrap";
import FallbackImage from "./FallbackImage.svelte";
export let user: User;
export let member: PartialMember & {
unlisted?: boolean
unlisted?: boolean;
};
let pronouns: string | undefined;
@ -52,7 +52,7 @@
<a class="text-reset fs-5 text-break" href="/@{user.name}/{member.name}">
{member.display_name ?? member.name}
{#if member.unlisted === true}
<span bind:this={iconElement} tabindex={0}><Icon name="lock"/></span>
<span bind:this={iconElement} tabindex={0}><Icon name="lock" /></span>
<Tooltip target={iconElement} placement="top">This member is hidden</Tooltip>
{/if}
</a>

2
frontend/src/lib/components/StatusIcon.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Icon, Tooltip } from "sveltestrap";
import { Icon, Tooltip } from "@sveltestrap/sveltestrap";
import type { CustomPreference, CustomPreferences } from "$lib/api/entities";
import defaultPreferences from "$lib/api/default_preferences";

2
frontend/src/lib/components/Toast.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Toast } from "sveltestrap";
import { Toast } from "@sveltestrap/sveltestrap";
export let header: string | undefined = undefined;
export let body: string;

2
frontend/src/lib/components/edit/EditableField.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import type { Field, CustomPreferences } from "$lib/api/entities";
import IconButton from "$lib/components/IconButton.svelte";
import { Button, Input, InputGroup } from "sveltestrap";
import { Button, Input, InputGroup } from "@sveltestrap/sveltestrap";
import FieldEntry from "./FieldEntry.svelte";
export let field: Field;

2
frontend/src/lib/components/edit/EditableName.svelte
View file

@ -9,7 +9,7 @@
DropdownToggle,
Icon,
Tooltip,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
export let value: string;
export let status: string;

2
frontend/src/lib/components/edit/EditablePronouns.svelte
View file

@ -12,7 +12,7 @@
InputGroupText,
Popover,
Tooltip,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
export let pronoun: Pronoun;
export let preferences: CustomPreferences;

2
frontend/src/lib/components/edit/FieldEntry.svelte
View file

@ -9,7 +9,7 @@
DropdownToggle,
Icon,
Tooltip,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
export let value: string;
export let status: string;

2
frontend/src/lib/components/edit/FlagButton.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import { flagURL, type PrideFlag } from "$lib/api/entities";
import { Button, Tooltip } from "sveltestrap";
import { Button, Tooltip } from "@sveltestrap/sveltestrap";
export let flag: PrideFlag;
export let tooltip: string;

2
frontend/src/lib/components/edit/MarkdownHelp.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Icon, Modal } from "sveltestrap";
import { Icon, Modal } from "@sveltestrap/sveltestrap";
let isOpen = false;
const toggle = () => (isOpen = !isOpen);

4
frontend/src/routes/+layout.svelte
View file

@ -13,7 +13,7 @@
import { settingsStore } from "$lib/store";
import { toastStore } from "$lib/toast";
import Toast from "$lib/components/Toast.svelte";
import { Alert, Icon } from "sveltestrap";
import { Alert, Icon } from "@sveltestrap/sveltestrap";
import { apiFetchClient } from "$lib/api/fetch";
import type { Settings } from "$lib/api/entities";
import { renderUnsafeMarkdown } from "$lib/utils";
@ -31,6 +31,8 @@
const resp = await apiFetchClient<Settings>(
"/users/@me/settings",
"PATCH",
// If this function is run, notice will always be non-null
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
{ read_global_notice: data.notice!.id },
2,
);

2
frontend/src/routes/+page.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import { PUBLIC_BASE_URL } from "$env/static/public";
import { Button } from "sveltestrap";
import { Button } from "@sveltestrap/sveltestrap";
import { userStore } from "$lib/store";
</script>

2
frontend/src/routes/@[username]/+page.server.ts
View file

@ -11,7 +11,7 @@ export const load = async ({ params }) => {
return resp;
} catch (e) {
if ((e as APIError).code === ErrorCode.UserNotFound) {
throw error(404, e as APIError);
error(404, e as App.Error);
}
throw e;

19
frontend/src/routes/@[username]/+page.svelte
View file

@ -4,7 +4,6 @@
import {
Alert,
Badge,
Button,
ButtonGroup,
Icon,
@ -14,8 +13,8 @@
ModalBody,
ModalFooter,
Tooltip,
} from "sveltestrap";
import { DateTime, Duration, FixedOffsetZone, Zone } from "luxon";
} from "@sveltestrap/sveltestrap";
import { DateTime, FixedOffsetZone } from "luxon";
import FieldCard from "$lib/components/FieldCard.svelte";
import PronounLink from "$lib/components/PronounLink.svelte";
import PartialMemberCard from "$lib/components/PartialMemberCard.svelte";
@ -46,6 +45,7 @@
import ProfileFlag from "./ProfileFlag.svelte";
import IconButton from "$lib/components/IconButton.svelte";
import Badges from "./badges/Badges.svelte";
import PreferencesCheatsheet from "./PreferencesCheatsheet.svelte";
export let data: PageData;
@ -190,14 +190,15 @@
{/if}
{#if data.utc_offset}
<Tooltip target="user-clock" placement="top">Current time</Tooltip>
<Icon id="user-clock" name="clock" aria-label="This user's current time" /> {currentTime} <span class="text-body-secondary">(UTC{timezone})</span>
<Icon id="user-clock" name="clock" aria-label="This user's current time" />
{currentTime} <span class="text-body-secondary">(UTC{timezone})</span>
{/if}
{#if profileEmpty && $userStore?.id === data.id}
<hr />
<p>
<em>
Your profile is empty! You can customize it by going to the <a href="/@{data.name}/edit"
>edit profile</a
Your profile is empty! You can customize it by going to the <a
href="/@{data.name}/edit">edit profile</a
> page.</em
> <span class="text-muted">(only you can see this)</span>
</p>
@ -258,6 +259,12 @@
</div>
{/each}
</div>
<PreferencesCheatsheet
preferences={data.custom_preferences}
names={data.names}
pronouns={data.pronouns}
fields={data.fields}
/>
<div class="row">
<div class="col-md-6">
<InputGroup>

65
frontend/src/routes/@[username]/PreferencesCheatsheet.svelte Normal file
View file

@ -0,0 +1,65 @@
<script lang="ts">
import type {
CustomPreferences,
CustomPreference,
Field,
FieldEntry,
Pronoun,
} from "$lib/api/entities";
import defaultPreferences from "$lib/api/default_preferences";
import StatusIcon from "$lib/components/StatusIcon.svelte";
export let preferences: CustomPreferences;
export let names: FieldEntry[];
export let pronouns: Pronoun[];
export let fields: Field[];
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
// Filter default preferences to the ones the user/member has used
// This is done separately from custom preferences to make the shown list cleaner
let usedDefaultPreferences: Array<{ id: string; preference: CustomPreference }>;
$: usedDefaultPreferences = Object.keys(defaultPreferences)
.filter(
(pref) =>
names.some((entry) => entry.status === pref) ||
pronouns.some((entry) => entry.status === pref) ||
fields.some((field) => field.entries.some((entry) => entry.status === pref)),
)
.map((key) => ({
id: key,
preference: defaultPreferences[key],
}));
// Do the same for custom preferences
let usedCustomPreferences: Array<{ id: string; preference: CustomPreference }>;
$: usedCustomPreferences = Object.keys(preferences)
.filter(
(pref) =>
names.some((entry) => entry.status === pref) ||
pronouns.some((entry) => entry.status === pref) ||
fields.some((field) => field.entries.some((entry) => entry.status === pref)),
)
.map((pref) => ({ id: pref, preference: mergedPreferences[pref] }));
</script>
<div class="text-center">
<ul class="list-inline text-body-secondary">
{#each usedDefaultPreferences as pref (pref.id)}
<li class="list-inline-item mx-2">
<StatusIcon {preferences} status={pref.id} />
{pref.preference.tooltip}
</li>
{/each}
</ul>
{#if usedCustomPreferences}
<ul class="list-inline text-body-secondary">
{#each usedCustomPreferences as pref (pref.id)}
<li class="list-inline-item mx-2">
<StatusIcon {preferences} status={pref.id} />
{pref.preference.tooltip}
</li>
{/each}
</ul>
{/if}
</div>

2
frontend/src/routes/@[username]/ProfileFlag.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import { flagURL, type PrideFlag } from "$lib/api/entities";
import { Tooltip } from "sveltestrap";
import { Tooltip } from "@sveltestrap/sveltestrap";
export let flag: PrideFlag;

2
frontend/src/routes/@[username]/ProfileLink.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Icon } from "sveltestrap";
import { Icon } from "@sveltestrap/sveltestrap";
export let link: string;

2
frontend/src/routes/@[username]/ReportButton.svelte
View file

@ -3,7 +3,7 @@
import { fastFetchClient } from "$lib/api/fetch";
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import { addToast } from "$lib/toast";
import { Button, FormGroup, Icon, Modal, ModalBody, ModalFooter } from "sveltestrap";
import { Button, FormGroup, Icon, Modal, ModalBody, ModalFooter } from "@sveltestrap/sveltestrap";
export let subject: string;
export let reportUrl: string;

4
frontend/src/routes/@[username]/[memberName]/+page.server.ts
View file

@ -14,9 +14,9 @@ export const load = async ({ params }) => {
(e as APIError).code === ErrorCode.UserNotFound ||
(e as APIError).code === ErrorCode.MemberNotFound
) {
throw error(404, e as APIError);
error(404, e as App.Error);
}
throw error(500, e as APIError);
error(500, e as App.Error);
}
};

9
frontend/src/routes/@[username]/[memberName]/+page.svelte
View file

@ -4,7 +4,7 @@
import type { PageData } from "./$types";
import PronounLink from "$lib/components/PronounLink.svelte";
import FallbackImage from "$lib/components/FallbackImage.svelte";
import { Alert, Button, Icon, InputGroup } from "sveltestrap";
import { Alert, Button, Icon, InputGroup } from "@sveltestrap/sveltestrap";
import {
memberAvatars,
pronounDisplay,
@ -22,6 +22,7 @@
import { addToast } from "$lib/toast";
import ProfileFlag from "../ProfileFlag.svelte";
import IconButton from "$lib/components/IconButton.svelte";
import PreferencesCheatsheet from "../PreferencesCheatsheet.svelte";
export let data: PageData;
@ -154,6 +155,12 @@
</div>
{/each}
</div>
<PreferencesCheatsheet
preferences={data.user.custom_preferences}
names={data.names}
pronouns={data.pronouns}
fields={data.fields}
/>
<div class="row">
<div class="col-md-6">
<InputGroup>

10
frontend/src/routes/@[username]/[memberName]/edit/+layout.svelte
View file

@ -5,7 +5,15 @@
import type { LayoutData } from "./$types";
import { addToast, delToast } from "$lib/toast";
import { apiFetchClient, fastFetchClient } from "$lib/api/fetch";
import { Button, ButtonGroup, Modal, ModalBody, ModalFooter, Nav, NavItem } from "sveltestrap";
import {
Button,
ButtonGroup,
Modal,
ModalBody,
ModalFooter,
Nav,
NavItem,
} from "@sveltestrap/sveltestrap";
import { goto } from "$app/navigation";
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import IconButton from "$lib/components/IconButton.svelte";

7
frontend/src/routes/@[username]/[memberName]/edit/+layout.ts
View file

@ -32,7 +32,7 @@ export const load = (async ({ params }) => {
member.user.name !== params.username ||
member.name !== params.memberName
) {
throw redirect(303, `/@${user.name}/${member.name}`);
redirect(303, `/@${user.name}/${member.name}`);
}
return {
@ -41,8 +41,9 @@ export const load = (async ({ params }) => {
pronouns: pronouns.autocomplete,
flags,
};
} catch (e) {
if ("code" in e) throw error(500, e as APIError);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (e: any) {
if ("code" in e) error(500, e as App.Error);
throw e;
}
}) satisfies LayoutLoad;

2
frontend/src/routes/@[username]/[memberName]/edit/+page.svelte
View file

@ -3,7 +3,7 @@
import type { Writable } from "svelte/store";
import prettyBytes from "pretty-bytes";
import { encode } from "base64-arraybuffer";
import { FormGroup, Icon, Input } from "sveltestrap";
import { FormGroup, Icon, Input } from "@sveltestrap/sveltestrap";
import { memberAvatars, type Member } from "$lib/api/entities";
import FallbackImage from "$lib/components/FallbackImage.svelte";
import EditableName from "$lib/components/edit/EditableName.svelte";

2
frontend/src/routes/@[username]/[memberName]/edit/bio/+page.svelte
View file

@ -4,7 +4,7 @@
import { MAX_DESCRIPTION_LENGTH, type Member } from "$lib/api/entities";
import { charCount, renderMarkdown } from "$lib/utils";
import MarkdownHelp from "$lib/components/edit/MarkdownHelp.svelte";
import { Card, CardBody, CardHeader } from "sveltestrap";
import { Card, CardBody, CardHeader } from "@sveltestrap/sveltestrap";
const member = getContext<Writable<Member>>("member");
</script>

6
frontend/src/routes/@[username]/[memberName]/edit/fields/+page.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import { Button, Icon } from "sveltestrap";
import { Button, Icon } from "@sveltestrap/sveltestrap";
import type { Member } from "$lib/api/entities";
import EditableField from "$lib/components/edit/EditableField.svelte";
@ -45,9 +45,7 @@
</div>
</div>
<div>
<Button
on:click={() => ($member.fields = [...$member.fields, { name: null, entries: [] }])}
>
<Button on:click={() => ($member.fields = [...$member.fields, { name: null, entries: [] }])}>
<Icon name="plus" aria-hidden /> Add new field
</Button>
</div>

2
frontend/src/routes/@[username]/[memberName]/edit/flags/+page.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import { Alert, ButtonGroup, Input } from "sveltestrap";
import { Alert, ButtonGroup, Input } from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
import type { Member, PrideFlag } from "$lib/api/entities";

2
frontend/src/routes/@[username]/[memberName]/edit/other/+page.svelte
View file

@ -2,7 +2,7 @@
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import { DateTime } from "luxon";
import { Button, ButtonGroup, Icon } from "sveltestrap";
import { Button, ButtonGroup, Icon } from "@sveltestrap/sveltestrap";
import type { APIError, Member } from "$lib/api/entities";
import { PUBLIC_SHORT_BASE } from "$env/static/public";

2
frontend/src/routes/@[username]/[memberName]/edit/pronouns/+page.svelte
View file

@ -2,7 +2,7 @@
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import type { Member } from "$lib/api/entities";
import { Button, Icon, Popover } from "sveltestrap";
import { Button, Icon, Popover } from "@sveltestrap/sveltestrap";
import EditablePronouns from "$lib/components/edit/EditablePronouns.svelte";
import IconButton from "$lib/components/IconButton.svelte";
import type { PageData } from "./$types";

2
frontend/src/routes/@[username]/badges/Admin.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { Tooltip } from "sveltestrap";
import { Tooltip } from "@sveltestrap/sveltestrap";
let icon: HTMLElement;
</script>

2
frontend/src/routes/@[username]/edit/+layout.svelte
View file

@ -2,7 +2,7 @@
import { setContext } from "svelte";
import { writable } from "svelte/store";
import type { LayoutData } from "./$types";
import { Button, ButtonGroup, Icon, Nav, NavItem } from "sveltestrap";
import { Button, ButtonGroup, Icon, Nav, NavItem } from "@sveltestrap/sveltestrap";
import type { MeUser, APIError } from "$lib/api/entities";
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import { addToast, delToast } from "$lib/toast";

11
frontend/src/routes/@[username]/edit/+layout.ts
View file

@ -1,6 +1,6 @@
import type { PrideFlag, APIError, MeUser, PronounsJson } from "$lib/api/entities";
import type { PrideFlag, MeUser, PronounsJson } from "$lib/api/entities";
import { apiFetchClient } from "$lib/api/fetch";
import { error, redirect, type Redirect } from "@sveltejs/kit";
import { error, redirect } from "@sveltejs/kit";
import pronounsRaw from "$lib/pronouns.json";
const pronouns = pronounsRaw as PronounsJson;
@ -13,7 +13,7 @@ export const load = async ({ params }) => {
const flags = await apiFetchClient<PrideFlag[]>("/users/@me/flags");
if (params.username !== user.name) {
throw redirect(303, `/@${user.name}/edit`);
redirect(303, `/@${user.name}/edit`);
}
return {
@ -21,8 +21,9 @@ export const load = async ({ params }) => {
pronouns: pronouns.autocomplete,
flags,
};
} catch (e) {
if ("code" in e) throw error(500, e as APIError);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (e: any) {
if ("code" in e) error(500, e as App.Error);
throw e;
}
};

2
frontend/src/routes/@[username]/edit/+page.svelte
View file

@ -3,7 +3,7 @@
import type { Writable } from "svelte/store";
import prettyBytes from "pretty-bytes";
import { encode } from "base64-arraybuffer";
import { FormGroup, Icon, Input } from "sveltestrap";
import { FormGroup, Icon, Input } from "@sveltestrap/sveltestrap";
import { userAvatars, type MeUser } from "$lib/api/entities";
import FallbackImage from "$lib/components/FallbackImage.svelte";
import EditableName from "$lib/components/edit/EditableName.svelte";

2
frontend/src/routes/@[username]/edit/bio/+page.svelte
View file

@ -4,7 +4,7 @@
import { MAX_DESCRIPTION_LENGTH, type MeUser } from "$lib/api/entities";
import { charCount, renderMarkdown } from "$lib/utils";
import MarkdownHelp from "$lib/components/edit/MarkdownHelp.svelte";
import { Card, CardBody, CardHeader } from "sveltestrap";
import { Card, CardBody, CardHeader } from "@sveltestrap/sveltestrap";
const user = getContext<Writable<MeUser>>("user");
</script>

2
frontend/src/routes/@[username]/edit/fields/+page.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import { Button, Icon } from "sveltestrap";
import { Button, Icon } from "@sveltestrap/sveltestrap";
import type { MeUser } from "$lib/api/entities";
import EditableField from "$lib/components/edit/EditableField.svelte";

2
frontend/src/routes/@[username]/edit/flags/+page.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import { Alert, ButtonGroup, Input } from "sveltestrap";
import { Alert, ButtonGroup, Input } from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
import type { MeUser, PrideFlag } from "$lib/api/entities";

9
frontend/src/routes/@[username]/edit/other/+page.svelte
View file

@ -4,7 +4,14 @@
import { PreferenceSize, type APIError, type MeUser } from "$lib/api/entities";
import IconButton from "$lib/components/IconButton.svelte";
import { Button, ButtonGroup, FormGroup, Icon, Input, InputGroup } from "sveltestrap";
import {
Button,
ButtonGroup,
FormGroup,
Icon,
Input,
InputGroup,
} from "@sveltestrap/sveltestrap";
import { PUBLIC_SHORT_BASE } from "$env/static/public";
import CustomPreference from "./CustomPreference.svelte";
import { DateTime, FixedOffsetZone } from "luxon";

2
frontend/src/routes/@[username]/edit/other/CustomPreference.svelte
View file

@ -9,7 +9,7 @@
Icon,
InputGroup,
Tooltip,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import IconPicker from "./IconPicker.svelte";
export let preference: CustomPreference;

2
frontend/src/routes/@[username]/edit/other/IconPicker.svelte
View file

@ -7,7 +7,7 @@
Icon,
Input,
Tooltip,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import icons from "../../../../icons";
import IconButton from "$lib/components/IconButton.svelte";

2
frontend/src/routes/@[username]/edit/pronouns/+page.svelte
View file

@ -2,7 +2,7 @@
import { getContext } from "svelte";
import type { Writable } from "svelte/store";
import type { MeUser } from "$lib/api/entities";
import { Button, Icon, Popover } from "sveltestrap";
import { Button, Icon, Popover } from "@sveltestrap/sveltestrap";
import EditablePronouns from "$lib/components/edit/EditablePronouns.svelte";
import IconButton from "$lib/components/IconButton.svelte";
import type { PageData } from "./$types";

4
frontend/src/routes/[username]/+page.server.ts
View file

@ -8,10 +8,10 @@ export const load = async ({ params }) => {
method: "GET",
});
throw redirect(303, `/@${resp.name}`);
redirect(303, `/@${resp.name}`);
} catch (e) {
if ((e as APIError).code === ErrorCode.UserNotFound) {
throw error(404, e as APIError);
error(404, e as App.Error);
}
throw e;

2
frontend/src/routes/auth/login/+page.svelte
View file

@ -15,7 +15,7 @@
Modal,
ModalBody,
ModalFooter,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
export let data: PageData;

10
frontend/src/routes/auth/login/CallbackPage.svelte
View file

@ -19,7 +19,7 @@
Modal,
ModalBody,
ModalFooter,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
export let authType: string;
export let remoteName: string | undefined;
@ -64,8 +64,10 @@
) => Promise<void>;
let captchaToken = "";
// svelte-hcaptcha doesn't have types, so we can't use anything except `any` here.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let captcha: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const captchaSuccess = (token: any) => {
captchaToken = token.detail.token;
};
@ -88,6 +90,8 @@
await fastFetch("/auth/force-delete", {
method: "GET",
headers: {
// We know for sure this value is non-null if this function is run at all
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
"X-Delete-Token": token!,
},
});
@ -105,6 +109,8 @@
await fastFetch("/auth/cancel-delete", {
method: "GET",
headers: {
// We know for sure this value is non-null if this function is run at all
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
"X-Delete-Token": token!,
},
});

2
frontend/src/routes/auth/login/discord/+page.svelte
View file

@ -10,7 +10,7 @@
export let data: PageData;
let callbackPage: any;
let callbackPage: CallbackPage;
const signupForm = async (username: string, invite: string, captchaToken: string) => {
try {

2
frontend/src/routes/auth/login/google/+page.svelte
View file

@ -10,7 +10,7 @@
export let data: PageData;
let callbackPage: any;
let callbackPage: CallbackPage;
const signupForm = async (username: string, invite: string, captchaToken: string) => {
try {

2
frontend/src/routes/auth/login/mastodon/[instance]/+page.svelte
View file

@ -10,7 +10,7 @@
export let data: PageData;
let callbackPage: any;
let callbackPage: CallbackPage;
const signupForm = async (username: string, invite: string, captchaToken: string) => {
try {

2
frontend/src/routes/auth/login/misskey/[instance]/+page.svelte
View file

@ -10,7 +10,7 @@
export let data: PageData;
let callbackPage: any;
let callbackPage: CallbackPage;
const signupForm = async (username: string, invite: string, captchaToken: string) => {
try {

2
frontend/src/routes/auth/login/tumblr/+page.svelte
View file

@ -10,7 +10,7 @@
export let data: PageData;
let callbackPage: any;
let callbackPage: CallbackPage;
const signupForm = async (username: string, invite: string, captchaToken: string) => {
try {

4
frontend/src/routes/edit/member/[id]/+page.ts
View file

@ -16,14 +16,14 @@ export const load = async ({ params }) => {
} as APIError;
}
throw redirect(303, `/@${user.name}/${member.name}/edit`);
redirect(303, `/@${user.name}/${member.name}/edit`);
} catch (e) {
if (
(e as APIError).code === ErrorCode.Forbidden ||
(e as APIError).code === ErrorCode.InvalidToken ||
(e as APIError).code === ErrorCode.NotOwnMember
) {
throw error(403, e as APIError);
error(403, e as App.Error);
}
throw e;

4
frontend/src/routes/edit/profile/+page.ts
View file

@ -8,13 +8,13 @@ export const load = async () => {
try {
const resp = await apiFetchClient<MeUser>(`/users/@me`);
throw redirect(303, `/@${resp.name}/edit`);
redirect(303, `/@${resp.name}/edit`);
} catch (e) {
if (
(e as APIError).code === ErrorCode.Forbidden ||
(e as APIError).code === ErrorCode.InvalidToken
) {
throw error(403, e as APIError);
error(403, e as App.Error);
}
throw e;

2
frontend/src/routes/nav/Navigation.svelte
View file

@ -14,7 +14,7 @@
NavbarToggler,
NavItem,
NavLink,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import Logo from "./Logo.svelte";
import { userStore, themeStore, CURRENT_CHANGELOG, settingsStore } from "$lib/store";

3
frontend/src/routes/page/about/+page.svelte
View file

@ -1,4 +1,7 @@
<script lang="ts">
// Ignoring the TS error here, because this file imports fine, typescript just chokes on markdown files
// eslint-disable-next-line
//@ts-ignore
import { html } from "./about.md";
</script>

3
frontend/src/routes/page/changelog/+page.svelte
View file

@ -1,5 +1,8 @@
<script lang="ts">
import { onMount } from "svelte";
// Ignoring the TS error here, because this file imports fine, typescript just chokes on markdown files
// eslint-disable-next-line
//@ts-ignore
import { html } from "./changelog.md";
import { CURRENT_CHANGELOG } from "$lib/store";

3
frontend/src/routes/page/privacy/+page.svelte
View file

@ -1,4 +1,7 @@
<script lang="ts">
// Ignoring the TS error here, because this file imports fine, typescript just chokes on markdown files
// eslint-disable-next-line
//@ts-ignore
import { html } from "./privacy.md";
</script>

3
frontend/src/routes/page/terms/+page.svelte
View file

@ -1,4 +1,7 @@
<script lang="ts">
// Ignoring the TS error here, because this file imports fine, typescript just chokes on markdown files
// eslint-disable-next-line
//@ts-ignore
import { html } from "./terms.md";
</script>

2
frontend/src/routes/pronouns/[...pronouns]/+page.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import { PUBLIC_BASE_URL } from "$env/static/public";
import type { PageData } from "../../$types";
import type { PageData } from "./$types";
export let data: PageData;

4
frontend/src/routes/pronouns/[...pronouns]/+page.ts
View file

@ -10,7 +10,7 @@ export const load = (async ({ params }) => {
const arr = param.split("/");
if (arr.length === 0 || params.pronouns === "") {
throw error(404, { code: ErrorCode.NotFound, message: "Pronouns not found" });
error(404, { code: ErrorCode.NotFound, message: "Pronouns not found" });
}
if (arr.length === 5) {
@ -46,5 +46,5 @@ export const load = (async ({ params }) => {
};
}
throw error(404, { code: ErrorCode.NotFound, message: "Pronouns not found" });
error(404, { code: ErrorCode.NotFound, message: "Pronouns not found" });
}) satisfies PageLoad;

9
frontend/src/routes/reports/+page.svelte
View file

@ -3,7 +3,14 @@
import { fastFetchClient } from "$lib/api/fetch";
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import { addToast } from "$lib/toast";
import { Button, ButtonGroup, FormGroup, Modal, ModalBody, ModalFooter } from "sveltestrap";
import {
Button,
ButtonGroup,
FormGroup,
Modal,
ModalBody,
ModalFooter,
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
import ReportCard from "./ReportCard.svelte";

2
frontend/src/routes/reports/ReportCard.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import type { Report } from "$lib/api/entities";
import { DateTime } from "luxon";
import { Card, CardBody, CardFooter, CardHeader } from "sveltestrap";
import { Card, CardBody, CardFooter, CardHeader } from "@sveltestrap/sveltestrap";
export let report: Report;
</script>

2
frontend/src/routes/settings/+layout.svelte
View file

@ -9,7 +9,7 @@
Modal,
ModalBody,
ModalFooter,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import { userStore } from "$lib/store";
import { goto } from "$app/navigation";
import { addToast } from "$lib/toast";

2
frontend/src/routes/settings/+layout.ts
View file

@ -40,7 +40,7 @@ export const load = (async ({ parent }) => {
};
} catch (e) {
if ((e as APIError).code !== ErrorCode.InternalServerError) {
throw redirect(303, "/auth/login");
redirect(303, "/auth/login");
}
throw e;
}

3
frontend/src/routes/settings/+page.svelte
View file

@ -23,9 +23,8 @@
ModalFooter,
ModalHeader,
Table,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
import { onMount } from "svelte";
import { DateTime } from "luxon";
export let data: PageData;

2
frontend/src/routes/settings/auth/+page.svelte
View file

@ -13,7 +13,7 @@
Modal,
ModalBody,
ModalFooter,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
export let data: PageData;

2
frontend/src/routes/settings/export/+page.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import type { PageData } from "./$types";
import { DateTime, Duration } from "luxon";
import { Alert, Button } from "sveltestrap";
import { Alert, Button } from "@sveltestrap/sveltestrap";
import { PUBLIC_MEDIA_URL } from "$env/static/public";
import { fastFetchClient } from "$lib/api/fetch";
import type { APIError } from "$lib/api/entities";

2
frontend/src/routes/settings/export/+page.ts
View file

@ -10,6 +10,6 @@ export const load = async () => {
} catch (e) {
if ((e as APIError).code === ErrorCode.NotFound) return { exportData: null };
throw error(500, e as APIError);
error(500, e as App.Error);
}
};

10
frontend/src/routes/settings/flags/+page.svelte
View file

@ -1,6 +1,14 @@
<script lang="ts">
import { MAX_FLAGS, type APIError, type PrideFlag } from "$lib/api/entities";
import { Button, Icon, Input, Modal, ModalBody, ModalFooter, ModalHeader } from "sveltestrap";
import {
Button,
Icon,
Input,
Modal,
ModalBody,
ModalFooter,
ModalHeader,
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
import Flag from "./Flag.svelte";
import prettyBytes from "pretty-bytes";

9
frontend/src/routes/settings/flags/Flag.svelte
View file

@ -2,7 +2,14 @@
import { flagURL, type APIError, type PrideFlag } from "$lib/api/entities";
import { apiFetchClient } from "$lib/api/fetch";
import { addToast } from "$lib/toast";
import { Button, Input, Modal, ModalBody, ModalFooter, ModalHeader } from "sveltestrap";
import {
Button,
Input,
Modal,
ModalBody,
ModalFooter,
ModalHeader,
} from "@sveltestrap/sveltestrap";
export let flag: PrideFlag;
export let deleteFlag: (id: string) => Promise<void>;

2
frontend/src/routes/settings/invites/+page.svelte
View file

@ -3,7 +3,7 @@
import { apiFetchClient } from "$lib/api/fetch";
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import { DateTime } from "luxon";
import { Button, Modal, Table } from "sveltestrap";
import { Button, Modal, Table } from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
export let data: PageData;

2
frontend/src/routes/settings/members/+page.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import type { Member } from "$lib/api/entities";
import { Alert, ListGroup, ListGroupItem } from "sveltestrap";
import { Alert, ListGroup, ListGroupItem } from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
export let data: PageData;

2
frontend/src/routes/settings/tokens/+page.svelte
View file

@ -12,7 +12,7 @@
ModalBody,
ModalFooter,
ModalHeader,
} from "sveltestrap";
} from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
interface Token {

2
frontend/src/routes/settings/warnings/+page.svelte
View file

@ -4,7 +4,7 @@
import ErrorAlert from "$lib/components/ErrorAlert.svelte";
import { addToast } from "$lib/toast";
import { DateTime } from "luxon";
import { Button, Card, CardBody, CardFooter, CardHeader } from "sveltestrap";
import { Button, Card, CardBody, CardFooter, CardHeader } from "@sveltestrap/sveltestrap";
import type { PageData } from "./$types";
export let data: PageData;

18
frontend/src/svelte-hcaptcha.d.ts vendored Normal file
View file

@ -0,0 +1,18 @@
declare module "svelte-hcaptcha" {
import type { SvelteComponent } from "svelte";
export interface HCaptchaProps {
sitekey?: string;
apihost?: string;
hl?: string;
reCaptchaCompat?: boolean;
theme?: CaptchaTheme;
size?: string;
}
declare class HCaptcha extends SvelteComponent {
$$prop_def: HCaptchaProps;
}
export default HCaptcha;
}

4
frontend/svelte.config.js
View file

@ -1,5 +1,5 @@
import adapter from "@sveltejs/adapter-node";
import { vitePreprocess } from "@sveltejs/kit/vite";
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
import * as child_process from "node:child_process";
/** @type {import('@sveltejs/kit').Config} */
@ -11,7 +11,7 @@ const config = {
kit: {
adapter: adapter(),
version: {
name: child_process.execSync("git describe --tags --long").toString().trim(),
name: child_process.execSync("git describe --tags --long --always").toString().trim(),
},
},
};

Some files were not shown because too many files have changed in this diff Show more