Merge remote-tracking branch 'origin/lotus' into read-me-update

.gitea/workflows/ci.yml

@@ -30,13 +30,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.node-version'
+          cache: npm
 
-      # No npm / node_modules cache: the act_runner's internal cache server is
-      # unreachable from job containers (`getCacheEntry failed: connect ETIMEDOUT
-      # 172.17.0.2`), so every cache restore hangs ~5 min and then fails — pure
-      # cost, zero benefit. `cache: npm` was removed from Setup Node above for the
-      # same reason. Re-enable both (setup-node `cache: npm` + an actions/cache
-      # node_modules step) once the runner's cache server is reachable from jobs.
       - name: Install dependencies
         # Harden against transient registry network failures (ECONNRESET etc.):
         # raise npm's built-in fetch retries/timeouts and retry `npm ci` up to
@@ -57,36 +52,37 @@ jobs:
             sleep $((attempt * 15))
           done
 
-      # ── Quality gates run BEFORE the slow build so a format/lint/type/test
-      # error fails in seconds instead of after the ~minutes-long build. All are
-      # hard gates — any failure fails the job and blocks the deploy. The tree is
-      # held clean (prettier formatted, eslint 0 errors, typecheck 0), so these
-      # gate real regressions. NOTE: the lotus-build.sh upstream-merge path can
-      # deploy without CI; a later normal push surfaces any introduced issue here
-      # — fix forward (or briefly re-soften a gate) rather than deploy broken.
-      # eslint gates on errors only (existing no-explicit-any warnings stay
-      # informational — check:eslint has no --max-warnings).
-      - name: Prettier
-        run: npm run check:prettier
-
-      - name: ESLint
-        run: npm run check:eslint
-
-      - name: TypeScript
-        run: npm run typecheck
-
-      # Deterministic pure-logic tests on Node's built-in runner via tsx (no
-      # vitest — Vite 8 is ahead of vitest's range). A failure blocks the deploy.
-      - name: Unit tests
-        run: npm test
-
-      # ── Critical gate — if this fails, nothing deploys. Produces dist/. ──
+      # ── Critical gate — if this fails, nothing deploys ──────────────────
       - name: Build
         run: npm run build
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
           VITE_APP_VERSION: ${{ github.sha }}
 
+      # Unit tests are a hard gate too — deterministic pure-logic tests on Node's
+      # built-in runner via tsx (no vitest — Vite 8 is ahead of vitest's range).
+      # A failure blocks the deploy.
+      - name: Unit tests
+        run: npm test
+
+      # ── Quality gates (hard — a failure fails the job and blocks deploy) ──
+      # The tree is held clean (typecheck 0, eslint 0 errors, prettier
+      # formatted), so these gate real regressions instead of relying on local
+      # runs. NOTE: an upstream-stable merge (the lotus-build.sh path) could
+      # introduce upstream type/lint/format issues; that path deploys without
+      # CI, but a subsequent normal push would surface the failure here — fix
+      # forward (or briefly re-soften a gate) rather than let it deploy broken.
+      # eslint gates on errors only (existing `no-explicit-any` warnings stay
+      # informational — `check:eslint` has no --max-warnings).
+      - name: TypeScript
+        run: npm run typecheck
+
+      - name: ESLint
+        run: npm run check:eslint
+
+      - name: Prettier
+        run: npm run check:prettier
+
       # ── Security (informational — findings shouldn't block a deploy) ─────
       - name: Audit (high/critical)
         run: npm audit --audit-level=high --omit=dev

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,27 +0,0 @@
----
-name: Bug Report
-about: Report something that isn't working in Lotus Chat
-title: ''
-labels: bug
----
-
-**Describe the bug**
-A clear and concise description of what went wrong.
-
-**Steps to reproduce**
-
-1. Go to '...'
-2. Click on '...'
-3. See error
-
-**Expected behavior**
-What you expected to happen instead.
-
-**Client info**
-
-- Lotus Chat version (Settings → Help & About):
-- Platform: Web / Desktop (Windows / macOS / Linux)
-- Browser + version (if web):
-
-**Screenshots / logs**
-If applicable, add screenshots or the browser devtools console output.

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
+contact_links:
+  - name: Features, Bug Reports, Questions
+    url: https://github.com/cinnyapp/cinny/discussions/new/choose
+    about: Our preferred starting point if you have any questions or suggestions about features or behavior.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,15 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea or improvement for Lotus Chat
-title: ''
-labels: enhancement
----
-
-**What would you like?**
-A clear and concise description of the feature or change.
-
-**Why / use case**
-What problem does it solve, or what does it make better?
-
-**Alternatives considered**
-Any workarounds or other approaches you've thought about.

.github/ISSUE_TEMPLATE/preapproved.md

@@ -0,0 +1,9 @@
+---
+name: Pre-Discussed and Approved Topics
+about: |-
+  Only for topics already discussed and approved in the GitHub Discussions section.
+---
+
+**DO NOT OPEN A NEW ISSUE. PLEASE USE THE DISCUSSIONS SECTION.**
+
+**I DIDN'T READ THE ABOVE LINE. PLEASE CLOSE THIS ISSUE.**

.husky/pre-commit

@@ -1 +1,3 @@
-npx lint-staged
+# These are commented until we enable lint and typecheck
+# npx tsc -p tsconfig.json --noEmit
+# npx lint-staged

README.md

@@ -13,7 +13,38 @@ The source code is licensed under [AGPLv3](LICENSE), the same license as the ups
 The Lotus Chat logo (`public/res/Lotus.png`) is a derivative work based on the original Cinny logo by Ajay Bura and contributors, used under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/). The modified logo is © Lotus Guild and is also made available under CC BY 4.0.
 
 ---
-
+## Development Environment Setup
+#### Getting correct Node version
+- Ensure you have the correct version of node installed, specified in `.node-version`
+- Use this command from the terminal to install nvm 
+```bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+``` 
+- Reload your terminal shell using (for Ubuntu):
+```bash
+source ~/.bashrc
+```
+- Install the specified Node version 
+```bash
+NODE_VERSION="$(tr -d '[:space:]' < .node-version)"
+nvm install "$NODE_VERSION"
+nvm use "$NODE_VERSION"
+```
+- verify the correct version was installed by running
+```bash
+node --version
+```
+and comparing the output to what is listed in `.node-version`
+#### Install npm packages
+- To install the npm packages listed in `package.json` run: 
+```bash
+ npm i 
+ ```
+### Start Development Server
+```bash
+npm run start
+```
+You should now have an active development server at `localhost:8080`, where you can make changes to the code and see the UI update in real time
 ## Features
 
 ### Messaging

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -70,6 +70,10 @@ import {
   THREAD_NOTIFICATIONS_FALLBACK_BEHAVIOR,
 } from '../../utils/threadNotifications';
 
+const LogoSVG = withOriginBaseUrl(getOriginBaseUrl(), '/lotus.png');
+const LogoUnreadSVG = withOriginBaseUrl(getOriginBaseUrl(), '/lotus-unread.png');
+const LogoHighlightSVG = withOriginBaseUrl(getOriginBaseUrl(), '/lotus-highlight.png');
+
 // Grace period after the initial sync settles before invite notifications arm, so
 // the async invite-atom population lands first and isn't mistaken for new invites.
 const LogoSVG = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus.png');

vite.config.js

@@ -246,7 +246,7 @@ const vendorChunks = (id) => {
 
 export default defineConfig({
   appType: 'spa',
-  publicDir: false,
+  publicDir: './public/res',
   base: buildConfig.base,
   server: {
     port: 8080,