Bump version to 0.2.3

.gitignore

@@ -17,6 +17,9 @@ Thumbs.db
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
+# Android
+.idea
+
 # Generated assets
 static/favicon.ico
 static/pwa-64x64.png

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.2.2
+
+* Fix bug with sending messages
+
 # 0.2.1
 
 * Improve performance, as well as scrolling and loading

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "social.flotilla"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "0.2.2"
+        versionCode 2
+        versionName "0.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flotilla",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flotilla",
-      "version": "0.2.2",
+      "version": "0.2.3",
       "dependencies": {
         "@capacitor/android": "^6.1.2",
         "@capacitor/cli": "^6.1.2",
@@ -30,16 +30,16 @@
         "@types/qrcode": "^1.5.5",
         "@vite-pwa/assets-generator": "^0.2.6",
         "@vite-pwa/sveltekit": "^0.6.6",
-        "@welshman/app": "~0.0.36",
+        "@welshman/app": "~0.0.37",
         "@welshman/content": "~0.0.15",
         "@welshman/dvm": "~0.0.13",
-        "@welshman/editor": "~0.0.4",
+        "@welshman/editor": "~0.0.6",
         "@welshman/feeds": "~0.0.30",
         "@welshman/lib": "~0.0.37",
         "@welshman/net": "~0.0.45",
         "@welshman/signer": "~0.0.19",
         "@welshman/store": "~0.0.15",
-        "@welshman/util": "~0.0.55",
+        "@welshman/util": "~0.0.57",
         "daisyui": "^4.12.10",
         "date-picker-svelte": "^2.13.0",
         "dotenv": "^16.4.5",
@@ -4843,14 +4843,14 @@
       }
     },
     "node_modules/@welshman/app": {
-      "version": "0.0.36",
-      "resolved": "https://registry.npmjs.org/@welshman/app/-/app-0.0.36.tgz",
-      "integrity": "sha512-ECUaBiDE896P6LXdE3yN49z0I2MCvjA0lO6FOd2BCRfmnmdbTnC+FLcoPGTS262/uDuJz+rr3utBjq8DylugaQ==",
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@welshman/app/-/app-0.0.37.tgz",
+      "integrity": "sha512-EhhLx10PE6r/soiuaR0GF+NSH9H3ilTaXwmfx2cHHR1PE2LXXvf1oWMJl0ZPFmYe0VWfNiu98SLbTLYwe1Y4dQ==",
       "license": "MIT",
       "dependencies": {
         "@types/throttle-debounce": "^5.0.2",
         "@welshman/dvm": "~0.0.13",
-        "@welshman/feeds": "~0.0.29",
+        "@welshman/feeds": "~0.0.30",
         "@welshman/lib": "~0.0.37",
         "@welshman/net": "~0.0.45",
         "@welshman/signer": "~0.0.19",
@@ -4902,9 +4902,9 @@
       }
     },
     "node_modules/@welshman/editor": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@welshman/editor/-/editor-0.0.4.tgz",
-      "integrity": "sha512-tcMwLuBaBtT2JgON5f+Fd4Cg9oM7QMnXW9voGP+RqH1gJt0W6rjjQCtpqEcgdVtHhmaSL1P+tM4ORmOinoCv+A==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@welshman/editor/-/editor-0.0.6.tgz",
+      "integrity": "sha512-7ZnjrsBX/5Z2OiHStCSBqNlspX/weURcP8yrH9CTcOEqJZfPx5UWfeYmzsbXttvCPBph+Cv9jfHkeVreyLkeKQ==",
       "peerDependencies": {
         "@tiptap/core": "^2.9.1",
         "@tiptap/extension-code": "^2.9.1",
@@ -5004,9 +5004,9 @@
       }
     },
     "node_modules/@welshman/util": {
-      "version": "0.0.55",
-      "resolved": "https://registry.npmjs.org/@welshman/util/-/util-0.0.55.tgz",
-      "integrity": "sha512-eqb2522Y/9oPaf+qd+qnsqZh4tDT8TZj29G/XvXCsGuFxXBpOzJ2uOuEVclXD4AeFdy0CgMRKe7kZ7741ZRCgg==",
+      "version": "0.0.57",
+      "resolved": "https://registry.npmjs.org/@welshman/util/-/util-0.0.57.tgz",
+      "integrity": "sha512-YflD6sfqdhIfHioJVlLydvyKOgACFL0dAcWHymlDz/FszIAl2k0XQXKgAjf0lT2uoXfrCdPsfSZwMTW7qUAY6Q==",
       "license": "MIT",
       "dependencies": {
         "@types/ws": "^8.5.13",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flotilla",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "private": true,
   "scripts": {
     "dev": "vite dev",
@@ -59,16 +59,16 @@
     "@types/qrcode": "^1.5.5",
     "@vite-pwa/assets-generator": "^0.2.6",
     "@vite-pwa/sveltekit": "^0.6.6",
-    "@welshman/app": "~0.0.36",
+    "@welshman/app": "~0.0.37",
     "@welshman/content": "~0.0.15",
     "@welshman/dvm": "~0.0.13",
-    "@welshman/editor": "~0.0.4",
+    "@welshman/editor": "~0.0.6",
     "@welshman/feeds": "~0.0.30",
     "@welshman/lib": "~0.0.37",
     "@welshman/net": "~0.0.45",
     "@welshman/signer": "~0.0.19",
     "@welshman/store": "~0.0.15",
-    "@welshman/util": "~0.0.55",
+    "@welshman/util": "~0.0.57",
     "daisyui": "^4.12.10",
     "date-picker-svelte": "^2.13.0",
     "dotenv": "^16.4.5",

src/app.css

@@ -40,15 +40,14 @@
 
 :root {
   font-family: Lato;
-}
-
-[data-theme] {
   --base-100: oklch(var(--b1));
   --base-200: oklch(var(--b2));
   --base-300: oklch(var(--b3));
   --base-content: oklch(var(--bc));
   --primary: oklch(var(--p));
+  --primary-content: oklch(var(--pc));
   --secondary: oklch(var(--s));
+  --secondary-content: oklch(var(--sc));
 }
 
 .bg-alt,
@@ -120,6 +119,16 @@
   @apply overflow-hidden text-ellipsis;
 }
 
+[data-tip]::before {
+  @apply ellipsize;
+}
+
+@media (max-width: 639px) {
+  [data-tip]::before {
+    display: none;
+  }
+}
+
 .content-padding-x {
   @apply px-4 sm:px-8 md:px-12;
 }
@@ -239,3 +248,19 @@ emoji-picker {
   --input-font-color: var(--base-content);
   --outline-color: var(--base-100);
 }
+
+/* tiptap */
+
+.tiptap {
+  --tiptap-object-bg: var(--base-100);
+  --tiptap-object-fg: var(--base-content);
+  --tiptap-active-bg: var(--primary);
+  --tiptap-active-fg: var(--primary-content);
+}
+
+.tiptap-suggestions {
+  --tiptap-object-bg: var(--base-100);
+  --tiptap-object-fg: var(--base-content);
+  --tiptap-active-bg: var(--base-300);
+  --tiptap-active-fg: var(--base-content);
+}

src/app/commands.ts

@@ -2,6 +2,7 @@ import {get} from "svelte/store"
 import {ctx, sample, uniq, sleep, chunk, equals} from "@welshman/lib"
 import {
   DELETE,
+  REPORT,
   PROFILE,
   INBOX_RELAYS,
   RELAYS,
@@ -376,7 +377,6 @@ export const checkRelayAuth = async (url: string, timeout = 3000) => {
 
 export const attemptRelayAccess = async (url: string, claim = "") => {
   const checks = [
-    () => checkRelayProfile(url),
     () => checkRelayConnection(url),
     () => checkRelayAccess(url, claim),
     () => checkRelayAuth(url),
@@ -430,6 +430,29 @@ export const makeDelete = ({event}: {event: TrustedEvent}) => {
 export const publishDelete = ({relays, event}: {relays: string[]; event: TrustedEvent}) =>
   publishThunk({event: makeDelete({event}), relays})
 
+export type ReportParams = {
+  event: TrustedEvent
+  content: string
+  reason: string
+}
+
+export const makeReport = ({event, reason, content}: ReportParams) => {
+  const tags = [
+    ["p", event.pubkey],
+    ["e", event.id, reason],
+  ]
+
+  return createEvent(REPORT, {content, tags})
+}
+
+export const publishReport = ({
+  relays,
+  event,
+  reason,
+  content,
+}: ReportParams & {relays: string[]}) =>
+  publishThunk({event: makeReport({event, reason, content}), relays})
+
 export type ReactionParams = {
   event: TrustedEvent
   content: string

src/app/components/ChannelCompose.svelte

@@ -19,16 +19,18 @@
   const submit = () => {
     if ($uploading) return
 
-    onSubmit({
-      content: $editor!.getText({blockSeparator: "\n"}).trim(),
-      tags: $editor!.storage.nostr.getEditorTags(),
-    })
+    const content = $editor!.getText({blockSeparator: "\n"}).trim()
+    const tags = $editor!.storage.nostr.getEditorTags()
+
+    if (!content) return
+
+    onSubmit({content, tags})
 
     $editor!.chain().clearContent().run()
   }
 
   onMount(() => {
-    editor = getEditor({autofocus: !isMobile, aggressive: true, element, submit, uploading})
+    editor = getEditor({autofocus: !isMobile, element, submit, uploading})
 
     $editor!.chain().setContent(content).run()
   })
@@ -51,4 +53,11 @@
   <div class="chat-editor flex-grow overflow-hidden">
     <div bind:this={element} />
   </div>
+  <Button
+    data-tip="{window.navigator.platform.includes('Mac') ? 'cmd' : 'ctrl'}+enter to send"
+    class="center tooltip tooltip-left absolute right-4 h-10 w-10 min-w-10 rounded-full"
+    disabled={$uploading}
+    on:click={submit}>
+    <Icon icon="plain" />
+  </Button>
 </form>

src/app/components/ChannelMessage.svelte

@@ -82,7 +82,7 @@
     </div>
   </div>
   <div class="row-2 ml-10 mt-1">
-    <ReactionSummary relays={[url]} {event} {onReactionClick} reactionClass="tooltip-right" />
+    <ReactionSummary {url} {event} {onReactionClick} reactionClass="tooltip-right" />
   </div>
   <button
     class="join absolute right-1 top-1 border border-solid border-neutral text-xs opacity-0 transition-all"

src/app/components/ChannelMessageMenu.svelte

@@ -3,6 +3,7 @@
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
+  import EventReport from "@app/components/EventReport.svelte"
   import ConfirmDelete from "@app/components/ConfirmDelete.svelte"
   import {pushModal} from "@app/modal"
 
@@ -10,6 +11,11 @@
   export let event
   export let onClick
 
+  const report = () => {
+    onClick()
+    pushModal(EventReport, {url, event})
+  }
+
   const showInfo = () => {
     onClick()
     pushModal(EventInfo, {event})
@@ -35,5 +41,12 @@
         Delete Message
       </Button>
     </li>
+  {:else}
+    <li>
+      <Button class="text-error" on:click={report}>
+        <Icon size={4} icon="danger" />
+        Report Content
+      </Button>
+    </li>
   {/if}
 </ul>

src/app/components/ChatEnable.svelte

@@ -41,10 +41,10 @@
 <form class="column gap-4" on:submit|preventDefault={submit}>
   <ModalHeader>
     <div slot="title">Enable Messages</div>
-    <div slot="info">Do you want to enable notes and direct messages?</div>
+    <div slot="info">Do you want to enable direct messages?</div>
   </ModalHeader>
   <p>
-    By default, notes and direct messages are disabled, since loading them requires
+    By default, direct messages are disabled, since loading them requires
     {PLATFORM_NAME} to download and decrypt a lot of data.
   </p>
   <p>

src/app/components/ChatMenuMobile.svelte

@@ -0,0 +1,25 @@
+<script lang="ts">
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import ChatStart from "@app/components/ChatStart.svelte"
+  import {setChecked} from "@app/notifications"
+  import {pushModal} from "@app/modal"
+
+  const startChat = () => pushModal(ChatStart, {}, {replaceState: true})
+
+  const markAsRead = () => {
+    setChecked("/chat/*")
+    history.back()
+  }
+</script>
+
+<div class="col-2">
+  <Button class="btn btn-primary" on:click={startChat}>
+    <Icon size={4} icon="add-circle" />
+    Start chat
+  </Button>
+  <Button class="btn btn-neutral" on:click={markAsRead}>
+    <Icon size={4} icon="check-circle" />
+    Mark all read
+  </Button>
+</div>

src/app/components/ContentLinkBlock.svelte

@@ -22,7 +22,7 @@
   const expand = () => pushModal(ContentLinkDetail, {url}, {fullscreen: true})
 </script>
 
-<Link external href={url} class="my-2 inline-block">
+<Link external href={url} class="my-2 block">
   <div class="overflow-hidden rounded-box leading-[0]">
     {#if url.match(/\.(mov|webm|mp4)$/)}
       <video controls src={url} class="max-h-96 object-contain object-center">

src/app/components/EventReport.svelte

@@ -0,0 +1,73 @@
+<script lang="ts">
+  import Spinner from "@lib/components/Spinner.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Field from "@lib/components/Field.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import ModalHeader from "@lib/components/ModalHeader.svelte"
+  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import {pushToast} from "@app/toast"
+  import {publishReport} from "@app/commands"
+
+  export let url
+  export let event
+
+  const back = () => history.back()
+
+  const confirm = async () => {
+    if (!reason) {
+      return pushToast({
+        theme: "error",
+        message: "Please select a reason for your report.",
+      })
+    }
+
+    loading = true
+
+    await publishReport({event, reason: reason.toLowerCase(), content, relays: [url]})
+
+    loading = false
+    history.back()
+
+    return pushToast({message: "Your report has been sent!"})
+  }
+
+  let reason = ""
+  let content = ""
+  let loading = false
+</script>
+
+<form class="column gap-4" on:submit|preventDefault={confirm}>
+  <ModalHeader>
+    <div slot="title">Report Content</div>
+    <div slot="info">Flag inappropriate content.</div>
+  </ModalHeader>
+  <Field>
+    <p slot="label">Reason*</p>
+    <select slot="input" class="select select-bordered" bind:value={reason}>
+      <option disabled selected>Choose a reason</option>
+      <option>Nudity</option>
+      <option>Malware</option>
+      <option>Profanity</option>
+      <option>Illegal</option>
+      <option>Spam</option>
+      <option>Impersonation</option>
+      <option>Other</option>
+    </select>
+    <p slot="info">Please select a reason for your report.</p>
+  </Field>
+  <Field>
+    <p slot="label">Details</p>
+    <textarea slot="input" class="textarea textarea-bordered" bind:value={content} />
+    <p slot="info">Please provide any additional details relevant to your report.</p>
+  </Field>
+  <ModalFooter>
+    <Button class="btn btn-link" on:click={back}>
+      <Icon icon="alt-arrow-left" />
+      Go back
+    </Button>
+    <Button type="submit" class="btn btn-primary" disabled={loading}>
+      <Spinner {loading}>Send Report</Spinner>
+      <Icon icon="alt-arrow-right" />
+    </Button>
+  </ModalFooter>
+</form>

src/app/components/EventReportDetails.svelte

@@ -0,0 +1,55 @@
+<script lang="ts">
+  import {getTag, REPORT} from "@welshman/util"
+  import type {TrustedEvent} from "@welshman/util"
+  import {deriveEvents} from "@welshman/store"
+  import {pubkey, repository} from "@welshman/app"
+  import ModalHeader from "@lib/components/ModalHeader.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Profile from "@app/components/Profile.svelte"
+  import {publishDelete} from "@app/commands"
+
+  export let url
+  export let event
+
+  const reports = deriveEvents(repository, {
+    filters: [{kinds: [REPORT], "#e": [event.id]}],
+  })
+
+  const back = () => history.back()
+
+  const deleteReport = (report: TrustedEvent) => {
+    publishDelete({event: report, relays: [url]})
+
+    if ($reports.length === 0) {
+      history.back()
+    }
+  }
+
+  const getReason = (tags: string[][]) => getTag("e", tags)?.[2] || "other"
+</script>
+
+<div class="column gap-4">
+  <ModalHeader>
+    <div slot="title">Report Details</div>
+    <div slot="info">All reports for this event are shown below.</div>
+  </ModalHeader>
+  {#each $reports as report (report.id)}
+    {@const reason = getReason(report.tags)}
+    {@const remove = () => deleteReport(report)}
+    <div class="column gap-2">
+      <div class="flex justify-between">
+        <div>
+          <Profile pubkey={report.pubkey} />
+          <span>Reported this event as "{reason}"</span>
+        </div>
+        {#if report.pubkey === $pubkey}
+          <Button class="btn-default btn" on:click={remove}>Delete Report</Button>
+        {/if}
+      </div>
+      {#if report.content}
+        <p>"{report.content}"</p>
+      {/if}
+    </div>
+  {/each}
+  <Button class="btn btn-primary" on:click={back}>Got it</Button>
+</div>

src/app/components/Landing.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
+  import Link from "@lib/components/Link.svelte"
   import Dialog from "@lib/components/Dialog.svelte"
   import CardButton from "@lib/components/CardButton.svelte"
   import LogIn from "@app/components/LogIn.svelte"
@@ -33,5 +34,10 @@
         <div slot="info">Just a few questions and you'll be on your way.</div>
       </CardButton>
     </Button>
+    <p class="text-center text-xs opacity-75">
+      By using {PLATFORM_NAME}, you consent to our
+      <Link external class="link" href="/terms.html">Terms of Service</Link> and
+      <Link external class="link" href="/privacy.html">Privacy Policy</Link>.
+    </p>
   </div>
 </Dialog>

src/app/components/LogInBunker.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount, onDestroy} from "svelte"
-  import {Nip46Broker, makeSecret} from "@welshman/signer"
+  import {Nip46Broker, getPubkey, makeSecret} from "@welshman/signer"
   import {addSession} from "@welshman/app"
   import {slideAndFade} from "@lib/transition"
   import Spinner from "@lib/components/Spinner.svelte"
@@ -63,6 +63,15 @@
   let input = ""
   let loading = false
 
+  $: {
+    // For testing and for play store reviewers
+    if (input === "reviewkey") {
+      const secret = makeSecret()
+
+      addSession({method: "nip01", secret, pubkey: getPubkey(secret)})
+    }
+  }
+
   onMount(async () => {
     url = await broker.makeNostrconnectUrl({
       perms: NIP46_PERMS,

src/app/components/MenuSpace.svelte

@@ -71,7 +71,7 @@
   <SecondaryNavSection class="max-h-screen">
     <div>
       <SecondaryNavItem class="w-full !justify-between" on:click={openMenu}>
-        <strong>{displayRelayUrl(url)}</strong>
+        <strong class="ellipsize">{displayRelayUrl(url)}</strong>
         <Icon icon="alt-arrow-down" />
       </SecondaryNavItem>
       {#if showMenu}

src/app/components/NoteItem.svelte

@@ -29,7 +29,7 @@
 <NoteCard {event} class="card2 bg-alt">
   <Content {event} expandMode="inline" />
   <div class="flex w-full justify-between gap-2">
-    <ReactionSummary relays={[url]} {event} {onReactionClick} reactionClass="tooltip-right">
+    <ReactionSummary {url} {event} {onReactionClick} reactionClass="tooltip-right">
       <EmojiButton {onEmoji} class="btn btn-neutral btn-xs h-[26px] rounded-box">
         <Icon icon="smile-circle" size={4} />
       </EmojiButton>

src/app/components/PrimaryNav.svelte

@@ -21,8 +21,6 @@
 
   const showSettingsMenu = () => pushModal(MenuSettings)
 
-  const openNotes = () => ($canDecrypt ? goto("/notes") : pushModal(ChatEnable, {next: "/notes"}))
-
   const openChat = () => ($canDecrypt ? goto("/chat") : pushModal(ChatEnable, {next: "/chat"}))
 
   $: spaceUrls = Array.from($userRoomsByUrl.keys())
@@ -58,9 +56,6 @@
         class="tooltip-right">
         <Avatar src={$userProfile?.picture} class="!h-10 !w-10" />
       </PrimaryNavItem>
-      <PrimaryNavItem title="Notes" on:click={openNotes} class="tooltip-right">
-        <Avatar icon="notes-minimalistic" class="!h-10 !w-10" />
-      </PrimaryNavItem>
       <PrimaryNavItem
         title="Messages"
         on:click={openChat}
@@ -81,11 +76,8 @@
   class="border-top fixed bottom-0 left-0 right-0 z-nav h-14 border border-base-200 bg-base-100 md:hidden">
   <div class="content-padding-x content-sizing flex justify-between px-2">
     <div class="flex gap-2 sm:gap-8">
-      <PrimaryNavItem title="Search" href="/people">
-        <Avatar icon="magnifer" class="!h-10 !w-10" />
-      </PrimaryNavItem>
-      <PrimaryNavItem title="Notes" on:click={openNotes}>
-        <Avatar icon="notes-minimalistic" class="!h-10 !w-10" />
+      <PrimaryNavItem title="Home" href="/home">
+        <Avatar icon="home-smile" class="!h-10 !w-10" />
       </PrimaryNavItem>
       <PrimaryNavItem
         title="Messages"
@@ -98,7 +90,7 @@
       </PrimaryNavItem>
     </div>
     <PrimaryNavItem title="Settings" on:click={showSettingsMenu}>
-      <Avatar src={$userProfile?.picture} class="!h-10 !w-10" />
+      <Avatar icon="settings" src={$userProfile?.picture} class="!h-10 !w-10" />
     </PrimaryNavItem>
   </div>
 </div>

src/app/components/ProfileMultiSelect.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import type {SvelteComponent} from "svelte"
+  import {derived} from "svelte/store"
   import {type Instance} from "tippy.js"
   import {append, remove, uniq} from "@welshman/lib"
   import {profileSearch} from "@welshman/app"
@@ -20,6 +21,8 @@
   let popover: Instance
   let instance: SvelteComponent
 
+  const search = derived(profileSearch, $profileSearch => $profileSearch.searchValues)
+
   const selectPubkey = (pubkey: string) => {
     term = ""
     popover.hide()
@@ -76,8 +79,8 @@
     component={Suggestions}
     props={{
       term,
+      search,
       select: selectPubkey,
-      search: profileSearch,
       component: ProfileSuggestion,
       class: "rounded-box",
       style: `left: 4px; width: ${input?.clientWidth + 12}px`,

src/app/components/ReactionSummary.svelte

@@ -1,24 +1,35 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {groupBy, uniqBy, batch} from "@welshman/lib"
-  import {REACTION, DELETE} from "@welshman/util"
+  import {groupBy, uniq, uniqBy, batch} from "@welshman/lib"
+  import {REACTION, getTag, REPORT, DELETE} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
   import {deriveEvents} from "@welshman/store"
   import {pubkey, repository, load, displayProfileByPubkey} from "@welshman/app"
   import {displayList} from "@lib/util"
   import {isMobile} from "@lib/html"
+  import Icon from "@lib/components/Icon.svelte"
+  import EventReportDetails from "@app/components/EventReportDetails.svelte"
   import {displayReaction} from "@app/state"
+  import {pushModal} from "@app/modal"
 
   export let event
   export let onReactionClick
-  export let relays: string[] = []
+  export let url = ""
   export let reactionClass = ""
   export let noTooltip = false
 
+  const reports = deriveEvents(repository, {
+    filters: [{kinds: [REPORT], "#e": [event.id]}],
+  })
+
   const reactions = deriveEvents(repository, {
     filters: [{kinds: [REACTION], "#e": [event.id]}],
   })
 
+  const onReportClick = () => pushModal(EventReportDetails, {url, event})
+
+  $: reportReasons = uniq($reports.map(e => getTag("e", e.tags)?.[2]))
+
   $: groupedReactions = groupBy(
     e => e.content,
     uniqBy(e => e.pubkey + e.content, $reactions),
@@ -26,11 +37,11 @@
 
   onMount(() => {
     load({
-      relays,
-      filters: [{kinds: [REACTION, DELETE], "#e": [event.id]}],
+      relays: [url],
+      filters: [{kinds: [REACTION, REPORT, DELETE], "#e": [event.id]}],
       onEvent: batch(300, (events: TrustedEvent[]) => {
         load({
-          relays,
+          relays: [url],
           filters: [{kinds: [DELETE], "#e": events.map(e => e.id)}],
         })
       }),
@@ -38,8 +49,19 @@
   })
 </script>
 
-{#if $reactions.length > 0}
+{#if $reactions.length > 0 || $reports.length > 0}
   <div class="flex min-w-0 flex-wrap gap-2">
+    {#if url && $reports.length > 0}
+      <button
+        type="button"
+        data-tip="{`This content has been reported as "${displayList(reportReasons)}".`}}"
+        class="btn btn-error btn-xs tooltip-right flex items-center gap-1 rounded-full"
+        class:tooltip={!noTooltip && !isMobile}
+        on:click|preventDefault|stopPropagation={onReportClick}>
+        <Icon icon="danger" />
+        <span>{$reports.length}</span>
+      </button>
+    {/if}
     {#each groupedReactions.entries() as [content, events]}
       {@const pubkeys = events.map(e => e.pubkey)}
       {@const isOwn = $pubkey && pubkeys.includes($pubkey)}

src/app/components/ThreadActions.svelte

@@ -56,7 +56,7 @@
 
 <div class="flex flex-wrap items-center justify-between gap-2">
   <div class="flex flex-grow flex-wrap justify-end gap-2">
-    <ReactionSummary relays={[url]} {event} {onReactionClick} reactionClass="tooltip-left" />
+    <ReactionSummary {url} {event} {onReactionClick} reactionClass="tooltip-left" />
     {#if $deleted}
       <div class="btn btn-error btn-xs rounded-full">Deleted</div>
     {:else if thunk}

src/app/components/ThreadMenu.svelte

@@ -4,6 +4,7 @@
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
+  import EventReport from "@app/components/EventReport.svelte"
   import ThreadShare from "@app/components/ThreadShare.svelte"
   import ConfirmDelete from "@app/components/ConfirmDelete.svelte"
   import {pushModal} from "@app/modal"
@@ -14,6 +15,11 @@
 
   const isRoot = event.kind !== COMMENT
 
+  const report = () => {
+    onClick()
+    pushModal(EventReport, {url, event})
+  }
+
   const showInfo = () => {
     onClick()
     pushModal(EventInfo, {event})
@@ -52,5 +58,12 @@
         Delete Message
       </Button>
     </li>
+  {:else}
+    <li>
+      <Button class="text-error" on:click={report}>
+        <Icon size={4} icon="danger" />
+        Report Content
+      </Button>
+    </li>
   {/if}
 </ul>

src/app/components/ThunkStatus.svelte

@@ -42,9 +42,9 @@
   }
 </script>
 
-<div class="flex justify-end px-1 text-xs {$$props.class}">
-  {#if isFailure && failure}
-    {@const [url, {message, status}] = failure}
+{#if isFailure && failure}
+  {@const [url, {message, status}] = failure}
+  <div class="flex justify-end px-1 text-xs {$$props.class}">
     <Tippy
       class="flex items-center {$$props.class}"
       component={ThunkStatusDetail}
@@ -55,7 +55,9 @@
         <span>Failed to send!</span>
       </span>
     </Tippy>
-  {:else if canCancel || isPending}
+  </div>
+{:else if canCancel || isPending}
+  <div class="flex justify-end px-1 text-xs {$$props.class}">
     <span class="flex items-center gap-1 {$$props.class}">
       <span class="loading loading-spinner mx-1 h-3 w-3 translate-y-px" />
       <span class="opacity-50">Sending...</span>
@@ -63,5 +65,5 @@
         <Button class="link" on:click={abort}>Cancel</Button>
       {/if}
     </span>
-  {/if}
-</div>
+  </div>
+{/if}

src/app/editor/index.ts

@@ -26,7 +26,6 @@ export const signWithAssert = async (template: StampedEvent) => {
 }
 
 export const getEditor = ({
-  aggressive = false,
   autofocus = false,
   charCount,
   content = "",
@@ -36,7 +35,6 @@ export const getEditor = ({
   uploading,
   wordCount,
 }: {
-  aggressive?: boolean
   autofocus?: boolean
   charCount?: Writable<number>
   content?: string
@@ -62,11 +60,6 @@ export const getEditor = ({
               placeholder,
             },
           },
-          breakOrSubmit: {
-            config: {
-              aggressive,
-            },
-          },
           fileUpload: {
             config: {
               onDrop() {

src/app/notifications.ts

@@ -1,9 +1,9 @@
 import {derived} from "svelte/store"
 import {synced, throttled} from "@welshman/store"
 import {pubkey} from "@welshman/app"
-import {prop, identity, now} from "@welshman/lib"
+import {prop, spec, identity, now, groupBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
-import {MESSAGE} from "@welshman/util"
+import {MESSAGE, COMMENT, getTagValue} from "@welshman/util"
 import {makeSpacePath, makeChatPath, makeThreadPath, makeRoomPath} from "@app/routes"
 import {
   THREAD_FILTER,
@@ -36,7 +36,10 @@ export const notifications = derived(
       }
 
       for (const [entryPath, ts] of Object.entries($checked)) {
-        const isMatch = entryPath === "*" || entryPath.startsWith(path)
+        const isMatch =
+          entryPath === "*" ||
+          entryPath.startsWith(path) ||
+          (entryPath === "/chat/*" && path.startsWith("/chat/"))
 
         if (isMatch && ts > latestEvent.created_at) {
           return false
@@ -63,13 +66,26 @@ export const notifications = derived(
     for (const [url, rooms] of $userRoomsByUrl.entries()) {
       const spacePath = makeSpacePath(url)
       const threadPath = makeThreadPath(url)
-      const latestEvent = allThreadEvents.find(e => $getUrlsForEvent(e.id).includes(url))
+      const threadEvents = allThreadEvents.filter(e => $getUrlsForEvent(e.id).includes(url))
 
-      if (hasNotification(threadPath, latestEvent)) {
+      if (hasNotification(threadPath, threadEvents[0])) {
         paths.add(spacePath)
         paths.add(threadPath)
       }
 
+      const commentsByThreadId = groupBy(
+        e => getTagValue("E", e.tags),
+        threadEvents.filter(spec({kind: COMMENT})),
+      )
+
+      for (const [threadId, [comment]] of commentsByThreadId.entries()) {
+        const threadItemPath = makeThreadPath(url, threadId)
+
+        if (hasNotification(threadItemPath, comment)) {
+          paths.add(threadItemPath)
+        }
+      }
+
       for (const room of rooms) {
         const roomPath = makeRoomPath(url, room)
         const latestEvent = allMessageEvents.find(

src/app/requests.ts

@@ -50,7 +50,7 @@ export const listenForNotifications = () => {
         filters: [
           {kinds: [THREAD], since: now()},
           {kinds: [COMMENT], "#K": [String(THREAD)], since: now()},
-          {kinds: [MESSAGE], "#h": Array.from(rooms), since: now()},
+          ...Array.from(rooms).map(room => ({kinds: [MESSAGE], "#h": [room], since: now()})),
         ],
       }),
     )

src/lib/components/Avatar.svelte

@@ -1,20 +1,32 @@
 <script lang="ts">
-  import cx from "classnames"
+  import {onMount} from "svelte"
   import Icon from "@lib/components/Icon.svelte"
 
   export let src = ""
   export let size = 7
   export let icon = "user-rounded"
+
+  let element: HTMLElement
+
+  $: rem = size * 4
+
+  onMount(() => {
+    if (src) {
+      const image = new Image()
+
+      image.addEventListener("error", () => {
+        element.querySelector(".hidden")?.classList.remove("hidden")
+      })
+
+      image.src = src
+    }
+  })
 </script>
 
-{#if src}
-  <div
-    class={cx($$props.class, "shrink-0 overflow-hidden rounded-full bg-cover bg-center")}
-    style={`width: ${size * 4}px; height: ${size * 4}px; min-width: ${size * 4}px; background-image: url(${src}); ${$$props.style || ""}`} />
-{:else}
-  <div
-    class={cx($$props.class, "center !flex rounded-full")}
-    style={`width: ${size * 4}px; height: ${size * 4}px; min-width: ${size * 4}px; ${$$props.style || ""}`}>
-    <Icon {icon} size={Math.round(size * 0.8)} />
-  </div>
-{/if}
+<div
+  bind:this={element}
+  class="{$$props.class} relative !flex shrink-0 items-center justify-center overflow-hidden rounded-full bg-cover bg-center"
+  style="width: {rem}px; height: {rem}px; min-width: {rem}px; background-image: url({src}); {$$props.style ||
+    ''}">
+  <Icon {icon} class={src ? "hidden" : ""} size={Math.round(size * 0.8)} />
+</div>

src/routes/+layout.svelte

@@ -85,7 +85,7 @@
       setupTracking()
       setupAnalytics()
 
-      ready = initStorage("flotilla", 4, {
+      ready = initStorage("flotilla", 5, {
         relays: storageAdapters.fromCollectionStore("url", relays, {throttle: 3000}),
         handles: storageAdapters.fromCollectionStore("nip05", handles, {throttle: 3000}),
         freshness: storageAdapters.fromObjectStore(freshness, {
@@ -100,7 +100,7 @@
           throttle: 3000,
           migrate: (data: {key: string; value: number}[]) => data.slice(0, 10_000),
         }),
-        events: storageAdapters.fromRepositoryAndTracker(repository, tracker, {
+        events2: storageAdapters.fromRepositoryAndTracker(repository, tracker, {
           throttle: 3000,
           migrate: (events: TrustedEvent[]) => {
             if (events.length < 15_000) {

src/routes/chat/+page.svelte

@@ -6,6 +6,7 @@
   import ContentSearch from "@lib/components/ContentSearch.svelte"
   import ChatItem from "@app/components/ChatItem.svelte"
   import ChatStart from "@app/components/ChatStart.svelte"
+  import ChatMenuMobile from "@app/components/ChatMenuMobile.svelte"
   import {chatSearch} from "@app/state"
   import {pushModal} from "@app/modal"
   import {setChecked} from "@app/notifications"
@@ -14,6 +15,8 @@
 
   const startChat = () => pushModal(ChatStart)
 
+  const openMenu = () => pushModal(ChatMenuMobile)
+
   $: chats = $chatSearch.searchOptions(term).filter(c => c.pubkeys.length > 1)
 
   onDestroy(() => {
@@ -41,8 +44,8 @@
       <Icon icon="magnifer" />
       <input bind:value={term} class="grow" type="text" placeholder="Search for conversations..." />
     </label>
-    <Button class="btn btn-primary" on:click={startChat}>
-      <Icon icon="add-circle" />
+    <Button class="btn btn-primary" on:click={openMenu}>
+      <Icon icon="menu-dots" />
     </Button>
   </div>
   <div slot="content" class="col-2">

src/routes/notes/+page.svelte

@@ -1,16 +0,0 @@
-<script lang="ts">
-  import {pubkey} from "@welshman/app"
-  import Page from "@lib/components/Page.svelte"
-  import Chat from "@app/components/Chat.svelte"
-
-  $: id = $pubkey!
-</script>
-
-<Page>
-  <Chat {id}>
-    <p slot="info" class="px-4">
-      This is a place for your notes. Everything you write here is encrypted and stored on the nostr
-      network.
-    </p>
-  </Chat>
-</Page>

src/routes/spaces/[relay]/+layout.svelte

@@ -64,8 +64,8 @@
     // Load recent messages for user rooms to help with a quick page transition
     pullConservatively({relays, filters: rooms.map(r => ({kinds: [MESSAGE], "#h": [r], since}))})
 
-    // Listen for deletes that would apply to messages we already have
-    const sub = subscribe({relays, filters: [{kinds: [DELETE], since}]})
+    // Listen for deletes that would apply to messages we already have, and new groups
+    const sub = subscribe({relays, filters: [{kinds: [DELETE, GROUPS], since}]})
 
     return () => {
       sub.close()

src/routes/spaces/[relay]/+page.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {page} from "$app/stores"
   import type {TrustedEvent} from "@welshman/util"
+  import {displayRelayUrl} from "@welshman/util"
   import {deriveRelay} from "@welshman/app"
   import {fade} from "@lib/transition"
   import Icon from "@lib/components/Icon.svelte"
@@ -79,11 +80,11 @@
             </div>
           </div>
         </div>
-        <div>
+        <div class="min-w-0">
           <h2 class="ellipsize whitespace-nowrap text-xl">
             <RelayName {url} />
           </h2>
-          <p class="text-sm opacity-75">{url}</p>
+          <p class="ellipsize text-sm opacity-75">{displayRelayUrl(url)}</p>
         </div>
       </div>
       <RelayDescription {url} />
@@ -157,9 +158,9 @@
           </div>
         </Link>
       {/each}
-      <Button on:click={addRoom} class="btn btn-neutral">
+      <Button on:click={addRoom} class="btn btn-neutral whitespace-nowrap">
         <Icon icon="add-circle" />
-        Create Room
+        Create
       </Button>
     </div>
     {#if pubkey}

static/privacy.html

@@ -0,0 +1,49 @@
+<h1>Privacy Policy for Flotilla</h1>
+<p>At Flotilla, accessible from https://flotilla.social, one of our main priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by Flotilla and how we use it.</p>
+<p>This Privacy Policy applies only to our online activities and is valid for users of our application with regards to the information that they shared and/or collect in Flotilla. This policy is not applicable to any information collected offline or via channels other than this application.</p>
+<h2>Consent</h2>
+<p>By using our application, you hereby consent to our Privacy Policy and agree to its terms.</p>
+<h2>Information we collect</h2>
+<p>The personal information that you are asked to provide, and the reasons why you are asked to provide it, will be made clear to you at the point we ask you to provide your personal information.</p>
+<p>If you contact us directly, we may receive additional information about you such as your name, email address, phone number, the contents of the message and/or attachments you may send us, and any other information you may choose to provide.</p>
+<p>When you register for an Account, we may ask for your contact information, including items such as name, company name, address, email address, and telephone number.</p>
+<h2>How we use your information</h2>
+<p>We use the information we collect in various ways, including to:</p>
+<ul>
+  <li>Provide, operate, and maintain our application</li>
+  <li>Improve, personalize, and expand our application</li>
+  <li>Understand and analyze how you use our application</li>
+  <li>Develop new products, services, features, and functionality</li>
+  <li>Communicate with you, either directly or through one of our partners, including for customer application, to provide you with updates and other information relating to the application, and for marketing and promotional purposes</li>
+  <li>Send you emails</li>
+  <li>Find and prevent fraud</li>
+</ul>
+<h2>Log Files</h2>
+<p>Flotilla follows a standard procedure of using log files. These files log visitors when they visit websites. All hosting companies do this and a part of hosting services' analytics. The information collected by log files include internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable. The purpose of the information is for analyzing trends, administering the site, tracking users' movement within the application, and gathering demographic information.</p>
+<h2>Cookies and Web Beacons</h2>
+<p>Like any other website, Flotilla uses "cookies". These cookies are used to store information including visitors' preferences, and the pages on the website that the visitor accessed or visited. The information is used to optimize the users' experience by customizing your web page content based on visitors' browser type and/or other information.</p>
+<h2>Third Party Privacy Policies</h2>
+<p>Flotilla's Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the respective Privacy Policies of these third-party ad servers for more detailed information. It may include their practices and instructions about how to opt-out of certain options.</p>
+<p>You can choose to disable cookies through your individual browser options. To know more detailed information about cookie management with specific web browsers, it can be found at the browsers' respective websites.</p>
+<h2>CCPA Privacy Rights (Do Not Sell My Personal Information)</h2>
+<p>Under the CCPA, among other rights, California consumers have the right to:</p>
+<p>Request that a business that collects a consumer's personal data disclose the categories and specific pieces of personal data that a business has collected about consumers.</p>
+<p>Request that a business delete any personal data about the consumer that a business has collected.</p>
+<p>Request that a business that sells a consumer's personal data, not sell the consumer's personal data.</p>
+<p>If you make a request, we have one month to respond to you. If you would like to exercise any of these rights, please contact us.</p>
+<h2>GDPR Data Protection Rights</h2>
+<p>We would like to make sure you are fully aware of all of your data protection rights. Every user is entitled to the following:</p>
+<p>The right to access – You have the right to request copies of your personal data. We may charge you a small fee for this service.</p>
+<p>The right to rectification – You have the right to request that we correct any information you believe is inaccurate. You also have the right to request that we complete the information you believe is incomplete.</p>
+<p>The right to erasure – You have the right to request that we erase your personal data, under certain conditions.</p>
+<p>The right to restrict processing – You have the right to request that we restrict the processing of your personal data, under certain conditions.</p>
+<p>The right to object to processing – You have the right to object to our processing of your personal data, under certain conditions.</p>
+<p>The right to data portability – You have the right to request that we transfer the data that we have collected to another organization, or directly to you, under certain conditions.</p>
+<p>If you make a request, we have one month to respond to you. If you would like to exercise any of these rights, please contact us.</p>
+<h2>Children's Information</h2>
+<p>Another part of our priority is adding protection for children while using the internet. We encourage parents and guardians to observe, participate in, and/or monitor and guide their online activity.</p>
+<p>Flotilla does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you think that your child provided this kind of information on our website, we strongly encourage you to contact us immediately and we will do our best efforts to promptly remove such information from our records.</p>
+<h2>Changes to This Privacy Policy</h2>
+<p>We may update our Privacy Policy from time to time. Thus, we advise you to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately, after they are posted on this page.</p>
+<h2>Contact Us</h2>
+<p>If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us.</p>

static/terms.html

@@ -0,0 +1,82 @@
+<h1>Terms and Conditions</h1>
+<p>Last updated: January 15, 2025</p>
+<p>Please read these terms and conditions carefully before using Our Service.</p>
+<h1>Interpretation and Definitions</h1>
+<h2>Interpretation</h2>
+<p>The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural.</p>
+<h2>Definitions</h2>
+<p>For the purposes of these Terms and Conditions:</p>
+<ul>
+  <li>
+    <p><strong>Affiliate</strong> means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.</p>
+  </li>
+  <li>
+    <p><strong>Country</strong> refers to: Idaho, United States</p>
+  </li>
+  <li>
+    <p><strong>Company</strong> (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Coracle Social LLC.</p>
+  </li>
+  <li>
+    <p><strong>Device</strong> means any device that can access the Service such as a computer, a cellphone or a digital tablet.</p>
+  </li>
+  <li>
+    <p><strong>Service</strong> refers to Flotilla, accessible from <a href="https://flotilla.social" rel="external nofollow noopener" target="_blank">https://flotilla.social</a>, or via native applications released by Company.</p>
+  </li>
+  <li>
+    <p><strong>Terms and Conditions</strong> (also referred as "Terms") mean these Terms and Conditions that form the entire agreement between You and the Company regarding the use of the Service.</p>
+  </li>
+  <li>
+    <p><strong>Third-party Social Media Service</strong> means any services or content (including data, information, products or services) provided by a third-party that may be displayed, included or made available by the Service.</p>
+  </li>
+  <li>
+    <p><strong>You</strong> means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable.</p>
+  </li>
+</ul>
+<h1>Acknowledgment</h1>
+<p>These are the Terms and Conditions governing the use of this Service and the agreement that operates between You and the Company. These Terms and Conditions set out the rights and obligations of all users regarding the use of the Service.</p>
+<p>Your access to and use of the Service is conditioned on Your acceptance of and compliance with these Terms and Conditions. These Terms and Conditions apply to all visitors, users and others who access or use the Service.</p>
+<p>By accessing or using the Service You agree to be bound by these Terms and Conditions. If You disagree with any part of these Terms and Conditions then You may not access the Service.</p>
+<p>You represent that you are over the age of 18. The Company does not permit those under 18 to use the Service.</p>
+<p>Your access to and use of the Service is also conditioned on Your acceptance of and compliance with the Privacy Policy of the Company. Our Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your personal information when You use the Service and tells You about Your privacy rights and how the law protects You. Please read Our Privacy Policy carefully before using Our Service.</p>
+<h1>Links to Other Websites</h1>
+<p>Our Service may contain links and embedded content to third-party web sites, users, or services that are not owned or controlled by the Company.</p>
+<p>The Company has no control over, and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites, users, or services. You further acknowledge and agree that the Company shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with the use of or reliance on any such content, goods or services available on or through any such web sites, users, or services.</p>
+<p>We strongly advise You to read the terms and conditions and privacy policies of any third-party web sites or services that You visit.</p>
+<h1>User-Generated Content</h1>
+<p>Content you produce may be shared with other users. Pornography, graphic violence, and other illegal content is prohibited. You also agree to abide by the terms imposed by third-party administrators whose servers you access through Flotilla.</p>
+<h1>Termination</h1>
+<p>We may terminate or suspend Your access immediately, without prior notice or liability, for any reason whatsoever, including without limitation if You breach these Terms and Conditions.</p>
+<p>Upon termination, Your right to use the Service will cease immediately.</p>
+<h1>Limitation of Liability</h1>
+<p>Notwithstanding any damages that You might incur, the entire liability of the Company and any of its suppliers under any provision of this Terms and Your exclusive remedy for all of the foregoing shall be limited to the amount actually paid by You through the Service or 100 USD if You haven't purchased anything through the Service.</p>
+<p>To the maximum extent permitted by applicable law, in no event shall the Company or its suppliers be liable for any special, incidental, indirect, or consequential damages whatsoever (including, but not limited to, damages for loss of profits, loss of data or other information, for business interruption, for personal injury, loss of privacy arising out of or in any way related to the use of or inability to use the Service, third-party software and/or third-party hardware used with the Service, or otherwise in connection with any provision of this Terms), even if the Company or any supplier has been advised of the possibility of such damages and even if the remedy fails of its essential purpose.</p>
+<p>Some states do not allow the exclusion of implied warranties or limitation of liability for incidental or consequential damages, which means that some of the above limitations may not apply. In these states, each party's liability will be limited to the greatest extent permitted by law.</p>
+<h1>"AS IS" and "AS AVAILABLE" Disclaimer</h1>
+<p>The Service is provided to You "AS IS" and "AS AVAILABLE" and with all faults and defects without warranty of any kind. To the maximum extent permitted under applicable law, the Company, on its own behalf and on behalf of its Affiliates and its and their respective licensors and service providers, expressly disclaims all warranties, whether express, implied, statutory or otherwise, with respect to the Service, including all implied warranties of merchantability, fitness for a particular purpose, title and non-infringement, and warranties that may arise out of course of dealing, course of performance, usage or trade practice. Without limitation to the foregoing, the Company provides no warranty or undertaking, and makes no representation of any kind that the Service will meet Your requirements, achieve any intended results, be compatible or work with any other software, applications, systems or services, operate without interruption, meet any performance or reliability standards or be error free or that any errors or defects can or will be corrected.</p>
+<p>Without limiting the foregoing, neither the Company nor any of the company's provider makes any representation or warranty of any kind, express or implied: (i) as to the operation or availability of the Service, or the information, content, and materials or products included thereon; (ii) that the Service will be uninterrupted or error-free; (iii) as to the accuracy, reliability, or currency of any information or content provided through the Service; or (iv) that the Service, its servers, the content, or e-mails sent from or on behalf of the Company are free of viruses, scripts, trojan horses, worms, malware, timebombs or other harmful components.</p>
+<p>Some jurisdictions do not allow the exclusion of certain types of warranties or limitations on applicable statutory rights of a consumer, so some or all of the above exclusions and limitations may not apply to You. But in such a case the exclusions and limitations set forth in this section shall be applied to the greatest extent enforceable under applicable law.</p>
+<h1>Governing Law</h1>
+<p>The laws of the Country, excluding its conflicts of law rules, shall govern this Terms and Your use of the Service. Your use of the Service may also be subject to other local, state, national, or international laws.</p>
+<h1>Disputes Resolution</h1>
+<p>If You have any concern or dispute about the Service, You agree to first try to resolve the dispute informally by contacting the Company.</p>
+<h1>For European Union (EU) Users</h1>
+<p>If You are a European Union consumer, you will benefit from any mandatory provisions of the law of the country in which you are resident in.</p>
+<h1>United States Legal Compliance</h1>
+<p>You represent and warrant that (i) You are not located in a country that is subject to the United States government embargo, or that has been designated by the United States government as a "terrorist supporting" country, and (ii) You are not listed on any United States government list of prohibited or restricted parties.</p>
+<h1>Severability and Waiver</h1>
+<h2>Severability</h2>
+<p>If any provision of these Terms is held to be unenforceable or invalid, such provision will be changed and interpreted to accomplish the objectives of such provision to the greatest extent possible under applicable law and the remaining provisions will continue in full force and effect.</p>
+<h2>Waiver</h2>
+<p>Except as provided herein, the failure to exercise a right or to require performance of an obligation under these Terms shall not effect a party's ability to exercise such right or require such performance at any time thereafter nor shall the waiver of a breach constitute a waiver of any subsequent breach.</p>
+<h1>Translation Interpretation</h1>
+<p>These Terms and Conditions may have been translated if We have made them available to You on our Service.
+  You agree that the original English text shall prevail in the case of a dispute.
+</p>
+<h1>Changes to These Terms and Conditions</h1>
+<p>We reserve the right, at Our sole discretion, to modify or replace these Terms at any time. If a revision is material We will make reasonable efforts to provide at least 30 days' notice prior to any new terms taking effect. What constitutes a material change will be determined at Our sole discretion.</p>
+<p>By continuing to access or use Our Service after those revisions become effective, You agree to be bound by the revised terms. If You do not agree to the new terms, in whole or in part, please stop using the Service.</p>
+<h1>Contact Us</h1>
+<p>If you have any questions about these Terms and Conditions, You can contact us:</p>
+<ul>
+  <li>By email: hello@coracle.social</li>
+</ul>