Merge remote-tracking branch 'origin/main'

.air.toml

@@ -6,7 +6,7 @@ tmp_dir = "tmp"
   bin = "./tmp/main"
   cmd = "go build -o ./tmp/main ."
   delay = 1000
-  exclude_dir = ["docs", "frontend", "prns", "pronounslib", "tmp", "target"]
+  exclude_dir = ["docs", "frontend", "prns", "pronounslib", "tmp", "target", "node_modules"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false

README.md

@@ -33,8 +33,9 @@ Requirements:
 1. Create a PostgreSQL user and database (the user should own the database).
    For example: `create user pronouns with password 'password'; create database pronouns with owner pronouns;`
 2. Copy `.env.example` in the repository root to a new file named `.env` and fill out the required options.
-3. Run `go run -v . database migrate` to initialize the database, then optionally `go run -v . database seed` to insert a test user.
-4. Run `pnpm dev`. Alternatively, if you don't want the backend to live reload, run `go run -v . web`,
+3. Copy `frontend/.env.example` to `frontend/env` and fill out the required options.
+4. Run `go run -v . database migrate` to initialize the database, then optionally `go run -v . database seed` to insert a test user.
+5. Run `pnpm dev`. Alternatively, if you don't want the backend to live reload, run `go run -v . web`,
    then change to the `frontend/` directory and run `pnpm dev`.
 
 See [`docs/production.md`](/docs/production.md#configuration) for more information about keys in the backend and frontend `.env` files.

backend/db/field.go

@@ -43,7 +43,10 @@ func (f Field) Validate(custom CustomPreferences) string {
 		}
 
 		if !entry.Status.Valid(custom) {
-			return fmt.Sprintf("entries.%d: status is invalid", i)
+			if entry.Status == "missing" {
+				return fmt.Sprintf("didn't select a status for entries.%d. make sure to select it to the right of the field", i)
+			}
+			return fmt.Sprintf("entries.%d status: '%s' is invalid", i, entry.Status)
 		}
 	}
 

backend/routes/v1/auth/fediverse.go

@@ -65,6 +65,9 @@ func (s *Server) noAppFediverseURL(ctx context.Context, w http.ResponseWriter, r
 	}
 
 	switch softwareName {
+	case "iceshrimp":
+		softwareName = "firefish"
+		fallthrough
 	case "misskey", "foundkey", "calckey", "firefish":
 		return s.noAppMisskeyURL(ctx, w, r, softwareName, instance)
 	case "mastodon", "pleroma", "akkoma", "incestoma", "pixelfed", "gotosocial":

backend/routes/v1/meta/meta.go

@@ -49,7 +49,7 @@ func (s *Server) meta(w http.ResponseWriter, r *http.Request) error {
 
 	var notice *MetaNotice
 	if n, err := s.DB.CurrentNotice(ctx); err != nil {
-		if err == db.ErrNoNotice {
+		if err != db.ErrNoNotice {
 			log.Errorf("getting notice: %v", err)
 		}
 	} else {

frontend/.env.example

@@ -1,4 +1,4 @@
-# Base of frontend URLs
+# Base of frontend URLs (required)
 PUBLIC_BASE_URL=http://localhost:5173
 
 # Base of media URLs, required for avatars, pride flags, and data exports

frontend/.eslintrc.cjs

@@ -1,20 +1,20 @@
 module.exports = {
   root: true,
-	parser: '@typescript-eslint/parser',
-	extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
-	plugins: ['svelte3', '@typescript-eslint'],
-	ignorePatterns: ['*.cjs'],
-	overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
+  parser: "@typescript-eslint/parser",
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  plugins: ["svelte3", "@typescript-eslint"],
+  ignorePatterns: ["*.cjs"],
+  overrides: [{ files: ["*.svelte"], processor: "svelte3/svelte3" }],
   settings: {
-		'svelte3/typescript': () => require('typescript')
+    "svelte3/typescript": () => require("typescript"),
   },
   parserOptions: {
-		sourceType: 'module',
-		ecmaVersion: 2020
+    sourceType: "module",
+    ecmaVersion: 2020,
   },
   env: {
     browser: true,
     es2017: true,
-		node: true
-	}
+    node: true,
+  },
 };

frontend/src/lib/api/entities.ts

@@ -69,7 +69,7 @@ export interface Settings {
 }
 
 export interface Field {
-  name: string;
+  name: string | null;
   entries: FieldEntry[];
 }
 

frontend/src/lib/components/StatusIcon.svelte

@@ -15,10 +15,11 @@
   $: currentPreference =
     status in mergedPreferences ? mergedPreferences[status] : defaultPreferences.missing;
 
-  let iconElement: HTMLElement;
+  let iconElement: HTMLSpanElement;
 </script>
 
-<span bind:this={iconElement} tabindex={0}
-  ><Icon name={currentPreference.icon} class={className} /></span
->
-<Tooltip target={iconElement} placement="top">{currentPreference.tooltip}</Tooltip>
+<span bind:this={iconElement} aria-hidden>
+  <Icon name={currentPreference.icon} class={className} />
+</span>
+<span class="visually-hidden">{currentPreference.tooltip}:</span>
+<Tooltip aria-hidden target={iconElement} placement="top">{currentPreference.tooltip}</Tooltip>

frontend/src/lib/components/edit/EditableField.svelte

@@ -36,7 +36,7 @@
 </script>
 
 <div class="p-3">
-  <h5>{field.name}</h5>
+  <h5>{field.name ? field.name : "New field"}</h5>
   <InputGroup class="m-1">
     <IconButton
       color="secondary"
@@ -50,7 +50,7 @@
       tooltip="Move field right"
       click={() => moveField(false)}
     />
-    <Input bind:value={field.name} />
+    <Input placeholder="New field" bind:value={field.name} />
     <Button color="danger" on:click={() => deleteField()}>Delete field</Button>
   </InputGroup>
   <hr />
@@ -65,7 +65,7 @@
     />
   {/each}
 
-  <form class="input-group m-1" on:submit={addEntry}>
+  <form class="m-1 input-group" on:submit={addEntry}>
     <input type="text" class="form-control" placeholder="New entry" bind:value={newEntry} />
     <IconButton color="success" icon="plus" tooltip="Add entry" />
   </form>

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

@@ -46,7 +46,7 @@
 </div>
 <div>
   <Button
-    on:click={() => ($member.fields = [...$member.fields, { name: "New field", entries: [] }])}
+    on:click={() => ($member.fields = [...$member.fields, { name: null, entries: [] }])}
   >
     <Icon name="plus" aria-hidden /> Add new field
   </Button>

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

@@ -45,7 +45,7 @@
   </div>
 </div>
 <div>
-  <Button on:click={() => ($user.fields = [...$user.fields, { name: "New field", entries: [] }])}>
+  <Button on:click={() => ($user.fields = [...$user.fields, { name: null, entries: [] }])}>
     <Icon name="plus" aria-hidden /> Add new field
   </Button>
 </div>

frontend/src/routes/auth/login/+page.svelte

@@ -34,7 +34,9 @@
     }
   });
 
-  const fediLogin = async () => {
+  const fediLogin = async (e: Event) => {
+    e.preventDefault();
+
     fediDisabled = true;
     try {
       const resp = await apiFetch<{ url: string }>(
@@ -71,12 +73,13 @@
         {/if}
       </ListGroup>
       <Modal header="Pick an instance" isOpen={modalOpen} toggle={toggleModal}>
+        <form on:submit={(e) => fediLogin(e)}>
           <ModalBody>
             <Input placeholder="Instance (e.g. mastodon.social)" bind:value={instance} />
             <p class="text-muted mt-2">
-            <Icon name="info-circle-fill" aria-label="Info" /> This should be the domain you use to access
-            posts. For example, if your username is <code>@timmie@mastodon.example</code>, but your
-            user <em>page</em> is at
+              <Icon name="info-circle-fill" aria-label="Info" /> This should be the domain you use to
+              access posts. For example, if your username is <code>@timmie@mastodon.example</code>,
+              but your user <em>page</em> is at
               <code>social.mastodon.example/timmie</code>, you should fill in
               <code>social.mastodon.example</code>.
             </p>
@@ -87,10 +90,11 @@
             {/if}
           </ModalBody>
           <ModalFooter>
-          <Button color="primary" disabled={fediDisabled || instance === ""} on:click={fediLogin}
+            <Button type="submit" color="primary" disabled={fediDisabled || instance === ""}
               >Log in</Button
             >
           </ModalFooter>
+        </form>
       </Modal>
       <p class="text-muted mt-2 mx-1">
         <Icon name="info-circle-fill" aria-hidden /> By signing in, you consent to pronouns.cc storing

frontend/src/routes/settings/auth/+page.svelte

@@ -44,7 +44,9 @@
   let googleUnlinkModalOpen = false;
   let toggleGoogleUnlinkModal = () => (googleUnlinkModalOpen = !googleUnlinkModalOpen);
 
-  const fediLogin = async () => {
+  const fediLogin = async (e: Event) => {
+    e.preventDefault();
+
     fediDisabled = true;
     try {
       const resp = await apiFetch<{ url: string }>(
@@ -205,6 +207,7 @@
       </div>
     {/if}
     <Modal header="Pick an instance" isOpen={fediLinkModalOpen} toggle={toggleFediLinkModal}>
+      <form on:submit={(e) => fediLogin(e)}>
         <ModalBody>
           <Input placeholder="Instance (e.g. mastodon.social)" bind:value={instance} />
           {#if error}
@@ -214,10 +217,11 @@
           {/if}
         </ModalBody>
         <ModalFooter>
-        <Button color="primary" disabled={fediDisabled || instance === ""} on:click={fediLogin}
+          <Button type="submit" color="primary" disabled={fediDisabled || instance === ""}
             >Log in</Button
           >
         </ModalFooter>
+      </form>
     </Modal>
 
     <Modal