Error in travis build again.

This reverts commit a2ddf2a90b.

.gitignore

@@ -6,16 +6,17 @@ ansible/passwords/
 # docker build files
 docker/lemmy_mine.hjson
 docker/dev/env_deploy.sh
-docker/federation/volumes
-docker/federation-test/volumes
-docker/dev/volumes
-
-# local build files
-build/
-ui/src/translations
+volumes
 
 # ide config
-.idea/
-.vscode/
+.idea
+.vscode
 
+# local build files
 target
+env_setup.sh
+query_testing/*.json
+query_testing/*.json.old
+
+# API tests
+api_tests/node_modules

server/Cargo.lock → Cargo.lock

@@ -794,6 +794,12 @@ dependencies = [
  "time 0.1.44",
 ]
 
+[[package]]
+name = "cargo-husky"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad"
+
 [[package]]
 name = "cc"
 version = "1.0.59"
@@ -1875,6 +1881,7 @@ dependencies = [
  "base64 0.12.3",
  "bcrypt",
  "captcha",
+ "cargo-husky",
  "chrono",
  "diesel",
  "diesel_migrations",

server/Cargo.toml → Cargo.toml

@@ -59,3 +59,8 @@ anyhow = "1.0.32"
 thiserror = "1.0.20"
 background-jobs = " 0.8.0-alpha.2"
 reqwest = { version = "0.10", features = ["json"] }
+
+[dev-dependencies.cargo-husky]
+version = "1"
+default-features = false # Disable features which are enabled by default
+features = ["precommit-hook", "run-cargo-fmt", "run-cargo-clippy"]

README.md

@@ -11,7 +11,7 @@
 
 <p align="center">
   <a href="https://dev.lemmy.ml/" rel="noopener">
- <img width=200px height=200px src="ui/assets/favicon.svg"></a>
+ <img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-isomorphic-ui/main/src/assets/icons/favicon.svg"></a>
 
  <h3 align="center"><a href="https://dev.lemmy.ml">Lemmy</a></h3>
   <p align="center">
@@ -108,12 +108,15 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
 
 ### Apps
 
+- [lemmy-isomorphic-ui - The official web app for lemmy](https://github.com/LemmyNet/lemmy-isomorphic-ui)
+- [Lemmur - A flutter lemmy app ( under development )](https://github.com/krawieck/lemmur)
 - [Lemmy-mobile (Android / IOS) - React native ( under development )](https://github.com/koredefashokun/lemmy-mobile)
 
 ### Libraries
 
 - [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client)
 - [Kotlin API ( under development )](https://github.com/eiknat/lemmy-client)
+- [Dart API client ( under development )](https://github.com/krawieck/lemmy_api_client)
 
 ## Support / Donate
 

ansible/templates/config.hjson

@@ -13,8 +13,6 @@
   hostname: "{{ domain }}"
   # json web token for authorization between server and client
   jwt_secret: "{{ jwt_password }}"
-  # The location of the frontend
-  front_end_dir: "/app/dist"
   # email sending configuration
   email: {
     # hostname of the smtp server

ansible/templates/nginx.conf

@@ -51,23 +51,41 @@ server {
     # Upload limit for pictrs
     client_max_body_size 20M;
 
+    # lemmy api
+    location /api/v1 {
+      proxy_pass http://0.0.0.0:8536/api/v1;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      # Cuts off the trailing slash on URLs to make them valid
+      rewrite ^(.+)/+$ $1 permanent;
+
+      # WebSocket support
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+
+      # Rate limit
+      limit_req zone=lemmy_ratelimit burst=30 nodelay;
+    }
+
+    # Docs
+    location /docs {
+      proxy_pass http://0.0.0.0:8536/docs;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    # lemmy-isomorphic-ui
     location / {
-        proxy_pass http://0.0.0.0:8536;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        # Cuts off the trailing slash on URLs to make them valid
-        rewrite ^(.+)/+$ $1 permanent;
-
-        # WebSocket support
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
-        # Rate limit
-        limit_req zone=lemmy_ratelimit burst=30 nodelay;
-    }    
+      proxy_pass http://0.0.0.0:1235;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
 
     # Redirect pictshare images to pictrs
     location ~ /pictshare/(.*)$ {

api_tests/jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};

api_tests/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "api_tests",
+  "version": "0.0.1",
+  "description": "API tests for lemmy backend",
+  "main": "index.js",
+  "repository": "https://github.com/LemmyNet/lemmy",
+  "author": "Dessalines",
+  "license": "AGPL-3.0",
+  "scripts": {
+    "api-test": "jest src/ -i --verbose"
+  },
+  "devDependencies": {
+    "@types/jest": "^26.0.13",
+    "jest": "^26.4.2",
+    "lemmy-js-client": "^1.0.11",
+    "node-fetch": "^2.6.1",
+    "ts-jest": "^26.3.0",
+    "typescript": "^4.0.2"
+  }
+}

ui/src/api_tests/comment.spec.ts → api_tests/src/comment.spec.ts

@@ -235,7 +235,7 @@ test('Reply to a comment', async () => {
 
 test('Mention beta', async () => {
   // Create a mention on alpha
-  let mentionContent = 'A test mention of @lemmy_beta@lemmy-beta:8550';
+  let mentionContent = 'A test mention of @lemmy_beta@lemmy-beta:8551';
   let commentRes = await createComment(alpha, postRes.post.id);
   await delay();
   let mentionRes = await createComment(
@@ -275,7 +275,7 @@ test('A and G subscribe to B (center) A posts, G mentions B, it gets announced t
   let gammaPost = search.posts[0];
 
   let commentContent =
-    'A jest test federated comment announce, lets mention @lemmy_beta@lemmy-beta:8550';
+    'A jest test federated comment announce, lets mention @lemmy_beta@lemmy-beta:8551';
   let commentRes = await createComment(
     gamma,
     gammaPost.id,

ui/src/api_tests/community.spec.ts → api_tests/src/community.spec.ts

@@ -1,8 +1,10 @@
+jest.setTimeout(120000);
 import {
   alpha,
   beta,
   setupLogins,
   searchForBetaCommunity,
+  searchForCommunity,
   createCommunity,
   deleteCommunity,
   removeCommunity,
@@ -21,6 +23,17 @@ test('Create community', async () => {
   let prevName = communityRes.community.name;
   let communityRes2 = await createCommunity(alpha, prevName);
   expect(communityRes2['error']).toBe('community_already_exists');
+  await delay();
+
+  // Cache the community on beta, make sure it has the other fields
+  let searchShort = `!${prevName}@lemmy-alpha:8541`;
+  let search = await searchForCommunity(beta, searchShort);
+  let communityOnBeta = search.communities[0];
+  expect(communityOnBeta.name).toBe(communityRes.community.name);
+  expect(communityOnBeta.title).toBe(communityRes.community.title);
+  expect(communityOnBeta.description).toBe(communityRes.community.description);
+  expect(communityOnBeta.icon).toBe(communityRes.community.icon);
+  expect(communityOnBeta.banner).toBe(communityRes.community.banner);
 });
 
 test('Delete community', async () => {

ui/src/api_tests/follow.spec.ts → api_tests/src/follow.spec.ts

@@ -1,3 +1,4 @@
+jest.setTimeout(120000);
 import {
   alpha,
   setupLogins,

ui/src/api_tests/post.spec.ts → api_tests/src/post.spec.ts

@@ -56,6 +56,10 @@ test('Create a post', async () => {
   expect(betaPost.community_local).toBe(true);
   expect(betaPost.creator_local).toBe(false);
   expect(betaPost.score).toBe(1);
+  expect(betaPost.name).toBe(postRes.post.name);
+  expect(betaPost.body).toBe(postRes.post.body);
+  expect(betaPost.url).toBe(postRes.post.url);
+  expect(betaPost.nsfw).toBe(postRes.post.nsfw);
 
   // Delta only follows beta, so it should not see an alpha ap_id
   let searchDelta = await searchPost(delta, postRes.post);

ui/src/api_tests/private_message.spec.ts → api_tests/src/private_message.spec.ts

@@ -1,3 +1,4 @@
+jest.setTimeout(120000);
 import {
   alpha,
   beta,

ui/src/api_tests/shared.ts → api_tests/src/shared.ts

@@ -50,23 +50,23 @@ export interface API {
 }
 
 export let alpha: API = {
-  client: new LemmyHttp('http://localhost:8540/api/v1'),
+  client: new LemmyHttp('http://localhost:8541/api/v1'),
 };
 
 export let beta: API = {
-  client: new LemmyHttp('http://localhost:8550/api/v1'),
+  client: new LemmyHttp('http://localhost:8551/api/v1'),
 };
 
 export let gamma: API = {
-  client: new LemmyHttp('http://localhost:8560/api/v1'),
+  client: new LemmyHttp('http://localhost:8561/api/v1'),
 };
 
 export let delta: API = {
-  client: new LemmyHttp('http://localhost:8570/api/v1'),
+  client: new LemmyHttp('http://localhost:8571/api/v1'),
 };
 
 export let epsilon: API = {
-  client: new LemmyHttp('http://localhost:8580/api/v1'),
+  client: new LemmyHttp('http://localhost:8581/api/v1'),
 };
 
 export async function setupLogins() {
@@ -120,8 +120,12 @@ export async function createPost(
   community_id: number
 ): Promise<PostResponse> {
   let name = 'A jest test post';
+  let body = 'Some body';
+  let url = 'https://google.com/';
   let form: PostForm = {
     name,
+    url,
+    body,
     auth: api.auth,
     community_id,
     nsfw: false,
@@ -232,7 +236,20 @@ export async function searchForBetaCommunity(
   // Make sure lemmy-beta/c/main is cached on lemmy_alpha
   // Use short-hand search url
   let form: SearchForm = {
-    q: '!main@lemmy-beta:8550',
+    q: '!main@lemmy-beta:8551',
+    type_: SearchType.Communities,
+    sort: SortType.TopAll,
+  };
+  return api.client.search(form);
+}
+
+export async function searchForCommunity(
+  api: API,
+  q: string,
+): Promise<SearchResponse> {
+  // Use short-hand search url
+  let form: SearchForm = {
+    q,
     type_: SearchType.Communities,
     sort: SortType.TopAll,
   };
@@ -369,9 +386,15 @@ export async function createCommunity(
   api: API,
   name_: string = randomString(5)
 ): Promise<CommunityResponse> {
+  let description = 'a sample description';
+  let icon = 'https://image.flaticon.com/icons/png/512/35/35896.png';
+  let banner = 'https://image.flaticon.com/icons/png/512/35/35896.png';
   let form: CommunityForm = {
     name: name_,
     title: name_,
+    description,
+    icon,
+    banner,
     category_id: 1,
     nsfw: false,
     auth: api.auth,

ui/src/api_tests/user.spec.ts → api_tests/src/user.spec.ts

@@ -1,3 +1,4 @@
+jest.setTimeout(120000);
 import {
   alpha,
   beta,
@@ -17,7 +18,7 @@ test('Create user', async () => {
 
   let site = await getSite(alpha, auth);
   expect(site.my_user).toBeDefined();
-  apShortname = `@${site.my_user.name}@lemmy-alpha:8540`;
+  apShortname = `@${site.my_user.name}@lemmy-alpha:8541`;
 });
 
 test('Save user settings, check changed bio from beta', async () => {

server/config/defaults.hjson → config/defaults.hjson

@@ -33,8 +33,6 @@
   port: 8536
   # json web token for authorization between server and client
   jwt_secret: "changeme"
-  # The location of the frontend
-  front_end_dir: "../ui/dist"
   # address where pictrs is available
   pictrs_url: "http://pictrs:8080"
   # rate limits for various user actions, by user ip

docker/dev/Dockerfile

@@ -1,15 +1,3 @@
-FROM node:10-jessie as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile
-
-# Build 
-COPY ui /app/ui
-RUN yarn build
-
 FROM ekidd/rust-musl-builder:nightly-2020-05-07 as rust
 
 # Cache deps
@@ -27,22 +15,22 @@ RUN mkdir -p lemmy_db/src/ \
       lemmy
 
 # Copy the cargo tomls
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db/Cargo.toml ./lemmy_db/
-COPY server/lemmy_utils/Cargo.toml ./lemmy_utils/
-COPY server/lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
-COPY server/lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
+COPY Cargo.toml Cargo.lock ./
+COPY lemmy_db/Cargo.toml ./lemmy_db/
+COPY lemmy_utils/Cargo.toml ./lemmy_utils/
+COPY lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
+COPY lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
 
 # Cache the deps
 RUN cargo build-deps
 
 # Copy the src folders
-COPY server/src ./src/
-COPY server/lemmy_db/src ./lemmy_db/src/
-COPY server/lemmy_utils/src/ ./lemmy_utils/src/
-COPY server/lemmy_api_structs/src/ ./lemmy_api_structs/src/
-COPY server/lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
-COPY server/migrations ./migrations/
+COPY src ./src/
+COPY lemmy_db/src ./lemmy_db/src/
+COPY lemmy_utils/src/ ./lemmy_utils/src/
+COPY lemmy_api_structs/src/ ./lemmy_api_structs/src/
+COPY lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
+COPY migrations ./migrations/
 
 # Build for debug
 RUN cargo build
@@ -62,10 +50,9 @@ RUN apk add libpq
 RUN apk add espeak
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
+COPY config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/debug/lemmy_server /app/lemmy
-COPY --from=docs /app/docs/book/ /app/dist/documentation/
-COPY --from=node /app/ui/dist /app/dist
+COPY --from=docs /app/docs/book/ /app/documentation/
 
 RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy

docker/dev/docker-compose.yml

@@ -15,6 +15,17 @@ services:
       - pictrs
       - postgres
       - iframely
+  lemmy-isomorphic-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    # image: lemmy-isomorphic-ui:latest
+    ports:
+      - "1235:1234"
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_EXTERNAL_HOST=localhost:8536
+      - LEMMY_HTTPS=false
+    depends_on: 
+      - lemmy
 
   postgres:
     image: postgres:12-alpine

docker/federation/docker-compose.yml

@@ -28,17 +28,24 @@ services:
     volumes:
       - ./volumes/pictrs_alpha:/mnt
 
+  lemmy-alpha-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy-alpha:8541
+      - LEMMY_EXTERNAL_HOST=localhost:8541
+      - LEMMY_HTTPS=false
+    depends_on:
+      - lemmy-alpha
   lemmy-alpha:
     image: lemmy-federation:latest
     environment:
-      - LEMMY_HOSTNAME=lemmy-alpha:8540
+      - LEMMY_HOSTNAME=lemmy-alpha:8541
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8540
+      - LEMMY_PORT=8541
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-alpha
@@ -49,6 +56,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_alpha
+    ports: 
+      - "8541:8541"
   postgres_alpha:
     image: postgres:12-alpine
     environment:
@@ -58,17 +67,24 @@ services:
     volumes:
       - ./volumes/postgres_alpha:/var/lib/postgresql/data
 
+  lemmy-beta-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy-beta:8551
+      - LEMMY_EXTERNAL_HOST=localhost:8551
+      - LEMMY_HTTPS=false
+    depends_on:
+      - lemmy-beta
   lemmy-beta:
     image: lemmy-federation:latest
     environment:
-      - LEMMY_HOSTNAME=lemmy-beta:8550
+      - LEMMY_HOSTNAME=lemmy-beta:8551
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8550
+      - LEMMY_PORT=8551
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-beta
@@ -79,6 +95,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_beta
+    ports: 
+      - "8551:8551"
   postgres_beta:
     image: postgres:12-alpine
     environment:
@@ -88,17 +106,24 @@ services:
     volumes:
       - ./volumes/postgres_beta:/var/lib/postgresql/data
 
+  lemmy-gamma-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy-gamma:8561
+      - LEMMY_EXTERNAL_HOST=localhost:8561
+      - LEMMY_HTTPS=false
+    depends_on:
+      - lemmy-gamma
   lemmy-gamma:
     image: lemmy-federation:latest
     environment:
-      - LEMMY_HOSTNAME=lemmy-gamma:8560
+      - LEMMY_HOSTNAME=lemmy-gamma:8561
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8560
+      - LEMMY_PORT=8561
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-gamma
@@ -109,6 +134,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_gamma
+    ports: 
+      - "8561:8561"
   postgres_gamma:
     image: postgres:12-alpine
     environment:
@@ -119,17 +146,24 @@ services:
       - ./volumes/postgres_gamma:/var/lib/postgresql/data
 
   # An instance with only an allowlist for beta
+  lemmy-delta-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy-delta:8571
+      - LEMMY_EXTERNAL_HOST=localhost:8571
+      - LEMMY_HTTPS=false
+    depends_on:
+      - lemmy-delta
   lemmy-delta:
     image: lemmy-federation:latest
     environment:
-      - LEMMY_HOSTNAME=lemmy-delta:8570
+      - LEMMY_HOSTNAME=lemmy-delta:8571
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
-      - LEMMY_PORT=8570
+      - LEMMY_PORT=8571
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-delta
@@ -140,6 +174,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_delta
+    ports: 
+      - "8571:8571"
   postgres_delta:
     image: postgres:12-alpine
     environment:
@@ -150,17 +186,24 @@ services:
       - ./volumes/postgres_delta:/var/lib/postgresql/data
 
   # An instance who has a blocklist, with lemmy-alpha blocked
+  lemmy-epsilon-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
+      - LEMMY_EXTERNAL_HOST=localhost:8581
+      - LEMMY_HTTPS=false
+    depends_on:
+      - lemmy-epsilon
   lemmy-epsilon:
     image: lemmy-federation:latest
     environment:
-      - LEMMY_HOSTNAME=lemmy-epsilon:8580
+      - LEMMY_HOSTNAME=lemmy-epsilon:8581
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
-      - LEMMY_PORT=8580
+      - LEMMY_PORT=8581
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
@@ -171,6 +214,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_epsilon
+    ports: 
+      - "8581:8581"
   postgres_epsilon:
     image: postgres:12-alpine
     environment:

docker/federation/nginx.conf

@@ -11,21 +11,21 @@ http {
         # Upload limit for pictshare
         client_max_body_size 50M;
 
+        location /api/v1 {
+            proxy_pass http://lemmy-alpha:8541/api/v1;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
         location / {
-            proxy_pass http://lemmy-alpha:8540;
+            proxy_pass http://lemmy-alpha-ui:1234;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             # Cuts off the trailing slash on URLs to make them valid
             rewrite ^(.+)/+$ $1 permanent;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
         location /iframely/ {
             proxy_pass http://iframely:80/;
             proxy_set_header X-Real-IP $remote_addr;
@@ -42,21 +42,21 @@ http {
         # Upload limit for pictshare
         client_max_body_size 50M;
 
+        location /api/v1 {
+            proxy_pass http://lemmy-beta:8551/api/v1;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
         location / {
-            proxy_pass http://lemmy-beta:8550;
+            proxy_pass http://lemmy-beta-ui:1234;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             # Cuts off the trailing slash on URLs to make them valid
             rewrite ^(.+)/+$ $1 permanent;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
         location /iframely/ {
             proxy_pass http://iframely:80/;
             proxy_set_header X-Real-IP $remote_addr;
@@ -73,21 +73,21 @@ http {
         # Upload limit for pictshare
         client_max_body_size 50M;
 
+        location /api/v1 {
+            proxy_pass http://lemmy-gamma:8561/api/v1;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
         location / {
-            proxy_pass http://lemmy-gamma:8560;
+            proxy_pass http://lemmy-gamma-ui:1234;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             # Cuts off the trailing slash on URLs to make them valid
             rewrite ^(.+)/+$ $1 permanent;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
         location /iframely/ {
             proxy_pass http://iframely:80/;
             proxy_set_header X-Real-IP $remote_addr;
@@ -104,21 +104,21 @@ http {
         # Upload limit for pictshare
         client_max_body_size 50M;
 
+        location /api/v1 {
+            proxy_pass http://lemmy-delta:8571/api/v1;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
         location / {
-            proxy_pass http://lemmy-delta:8570;
+            proxy_pass http://lemmy-delta-ui:1234;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             # Cuts off the trailing slash on URLs to make them valid
             rewrite ^(.+)/+$ $1 permanent;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
         location /iframely/ {
             proxy_pass http://iframely:80/;
             proxy_set_header X-Real-IP $remote_addr;
@@ -135,21 +135,21 @@ http {
         # Upload limit for pictshare
         client_max_body_size 50M;
 
+        location /api/v1 {
+            proxy_pass http://lemmy-epsilon:8581/api/v1;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
         location / {
-            proxy_pass http://lemmy-epsilon:8580;
+            proxy_pass http://lemmy-epsilon-ui:1234;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             # Cuts off the trailing slash on URLs to make them valid
             rewrite ^(.+)/+$ $1 permanent;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
         location /iframely/ {
             proxy_pass http://iframely:80/;
             proxy_set_header X-Real-IP $remote_addr;

docker/federation/run-tests.sh

@@ -15,13 +15,14 @@ sudo chown -R 991:991 volumes/pictrs_alpha
 
 sudo docker-compose up -d
 
-pushd ../../ui
+pushd ../../api_tests
 echo "Waiting for Lemmy to start..."
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8540/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8550/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8560/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8570/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8580/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v1/site')" != "200" ]]; do sleep 1; done
+yarn
 yarn api-test || true
 popd
 

docker/lemmy.hjson

@@ -30,8 +30,6 @@
     # host where postgres is running
     host: "postgres"
   }
-  # The location of the frontend
-  front_end_dir: "/app/dist"
 #  # optional: email sending configuration
 #  email: {
 #    # hostname of the smtp server

docker/prod/Dockerfile

@@ -10,17 +10,17 @@ WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
 WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db ./lemmy_db
-COPY server/lemmy_utils ./lemmy_utils
-COPY server/lemmy_api_structs ./lemmy_api_structs
-COPY server/lemmy_rate_limit ./lemmy_rate_limit
+COPY Cargo.toml Cargo.lock ./
+COPY lemmy_db ./lemmy_db
+COPY lemmy_utils ./lemmy_utils
+COPY lemmy_api_structs ./lemmy_api_structs
+COPY lemmy_rate_limit ./lemmy_rate_limit
 RUN mkdir -p ./src/bin \
    && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 RUN cargo build --release
 RUN find target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR -type f -name "$(echo "lemmy_server" | tr '-' '_')*" -exec touch -t 200001010000 {} +
-COPY server/src ./src/
-COPY server/migrations ./migrations/
+COPY src ./src/
+COPY migrations ./migrations/
 
 # build for release
 # workaround for https://github.com/rust-lang/rust/issues/62896
@@ -36,18 +36,6 @@ WORKDIR /app
 COPY --chown=rust:rust docs ./docs
 RUN mdbook build docs/
 
-FROM node:12-buster as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile --network-timeout 600000
-
-# Build
-COPY ui /app/ui
-RUN yarn build
-
 FROM alpine:3.12 as lemmy
 
 # Install libpq for postgres
@@ -60,10 +48,9 @@ RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
 
 # Copy resources
-COPY --chown=lemmy:lemmy server/config/defaults.hjson /config/defaults.hjson
+COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson
 COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
-COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/dist/documentation/
-COPY --chown=lemmy:lemmy --from=node /app/ui/dist /app/dist
+COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/documentation/
 
 RUN chown lemmy:lemmy /app/lemmy
 USER lemmy

docker/prod/deploy.sh

@@ -13,8 +13,8 @@ third_semver=$(echo $new_tag | cut -d "." -f 3)
 # Setting the version on the front end
 cd ../../
 # Setting the version on the backend
-echo "pub const VERSION: &str = \"$new_tag\";" > "server/src/version.rs"
-git add "server/src/version.rs"
+echo "pub const VERSION: &str = \"$new_tag\";" > "src/version.rs"
+git add "src/version.rs"
 # Setting the version for Ansible
 echo $new_tag > "ansible/VERSION"
 git add "ansible/VERSION"

docker/prod/docker-compose.yml

@@ -25,6 +25,18 @@ services:
       - pictrs
       - iframely
 
+  lemmy-isomorphic-ui:
+    image: dessalines/lemmy-isomorphic-ui:v0.0.7
+    # image: lemmy-isomorphic-ui:latest
+    ports:
+      - "1235:1234"
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_EXTERNAL_HOST=localhost:8536
+      - LEMMY_HTTPS=false
+    depends_on: 
+      - lemmy
+
   pictrs:
     image: asonix/pictrs:v0.1.13-r0
     ports: 

docker/travis/docker-compose.yml

@@ -1,45 +1,16 @@
 version: '3.3'
 
 services:
-  nginx:
-    image: nginx:1.17-alpine
-    ports:
-      - "8540:8540"
-      - "8550:8550"
-      - "8560:8560"
-      - "8570:8570"
-      - "8580:8580"
-    volumes:
-      # Hack to make this work from both docker/federation/ and docker/federation-test/
-      - ../federation/nginx.conf:/etc/nginx/nginx.conf
-    restart: on-failure
-    depends_on:
-      - pictrs
-      - iframely
-      - lemmy-alpha
-      - lemmy-beta
-      - lemmy-gamma
-      - lemmy-delta
-      - lemmy-epsilon
-
-  pictrs:
-    restart: always
-    image: asonix/pictrs:v0.1.13-r0
-    user: 991:991
-    volumes:
-      - ./volumes/pictrs_alpha:/mnt
-
   lemmy-alpha:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-alpha:8540
+      - LEMMY_HOSTNAME=lemmy-alpha:8541
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8540
+      - LEMMY_PORT=8541
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-alpha
@@ -50,6 +21,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_alpha
+    ports: 
+      - "8541:8541"
   postgres_alpha:
     image: postgres:12-alpine
     environment:
@@ -62,14 +35,13 @@ services:
   lemmy-beta:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-beta:8550
+      - LEMMY_HOSTNAME=lemmy-beta:8551
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8550
+      - LEMMY_PORT=8551
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-beta
@@ -80,6 +52,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_beta
+    ports: 
+      - "8551:8551"
   postgres_beta:
     image: postgres:12-alpine
     environment:
@@ -92,14 +66,13 @@ services:
   lemmy-gamma:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-gamma:8560
+      - LEMMY_HOSTNAME=lemmy-gamma:8561
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8560
+      - LEMMY_PORT=8561
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-gamma
@@ -110,6 +83,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_gamma
+    ports: 
+      - "8561:8561"
   postgres_gamma:
     image: postgres:12-alpine
     environment:
@@ -123,14 +98,13 @@ services:
   lemmy-delta:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-delta:8570
+      - LEMMY_HOSTNAME=lemmy-delta:8571
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
-      - LEMMY_PORT=8570
+      - LEMMY_PORT=8571
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-delta
@@ -141,6 +115,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_delta
+    ports: 
+      - "8571:8571"
   postgres_delta:
     image: postgres:12-alpine
     environment:
@@ -154,14 +130,13 @@ services:
   lemmy-epsilon:
     image: dessalines/lemmy:travis
     environment:
-      - LEMMY_HOSTNAME=lemmy-epsilon:8580
+      - LEMMY_HOSTNAME=lemmy-epsilon:8581
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
       - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FRONT_END_DIR=/app/dist
       - LEMMY_FEDERATION__ENABLED=true
       - LEMMY_FEDERATION__TLS_ENABLED=false
       - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
-      - LEMMY_PORT=8580
+      - LEMMY_PORT=8581
       - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
       - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
       - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
@@ -172,6 +147,8 @@ services:
       - RUST_LOG=debug
     depends_on:
       - postgres_epsilon
+    ports: 
+      - "8581:8581"
   postgres_epsilon:
     image: postgres:12-alpine
     environment:
@@ -180,9 +157,3 @@ services:
       - POSTGRES_DB=lemmy
     volumes:
       - ./volumes/postgres_epsilon:/var/lib/postgresql/data
-
-  iframely:
-    image: dogbin/iframely:latest
-    volumes:
-      - ../iframely.config.local.js:/iframely/config.local.js:ro
-    restart: always

docker/travis/run-tests.sh

@@ -12,13 +12,13 @@ sudo docker build ../../ --file ../prod/Dockerfile --tag dessalines/lemmy:travis
 
 sudo docker-compose up -d
 
-pushd ../../ui
+pushd ../../api_tests
 echo "Waiting for Lemmy to start..."
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8540/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8550/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8560/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8570/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8580/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v1/site')" != "200" ]]; do sleep 1; done
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v1/site')" != "200" ]]; do sleep 1; done
 yarn
 yarn api-test
 popd

docs/src/about_features.md

@@ -31,4 +31,5 @@
 - High performance.
   - Server is written in rust.
   - Front end is `~80kB` gzipped.
+  - Front end works without javascript (read-only).
   - Supports arm64 / Raspberry Pi.

docs/src/administration_configuration.md

@@ -1,7 +1,7 @@
 # Configuration
 
 The configuration is based on the file
-[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/server/config/defaults.hjson).
+[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/config/defaults.hjson).
 This file also contains documentation for all the available options. To override the defaults, you
 can copy the options you want to change into your local `config.hjson` file.
 

docs/src/contributing.md

@@ -18,13 +18,14 @@ Check out [Lemmy's Weblate](https://weblate.yerbamate.dev/projects/lemmy/) for t
 ### Front end
 
 - The front end is written in `typescript`, using a react-like framework called [inferno](https://infernojs.org/). All UI elements are reusable `.tsx` components.
-- The main page and routing are in `ui/src/index.tsx`.
-- The components are located in `ui/src/components`.
+- The front end repository is [lemmy-isomorphic-ui](https://github.com/LemmyNet/lemmy-isomorphic-ui).
+- The routes are at `src/shared/routes.ts`.
+- The components are located in `src/shared/components`.