Merge branch 'federation' into dev_1

diff --cc docker/federation-test/docker-compose.yml
index 0000000000000000000000000000000000000000,b7df6e20e83607bcad4512166bdce8f76df352e8..2a8b0fc3262f278c7927b0e7aef2a01ab762c3a6
mode 000000,100644..100644
--- /dev/null
--- 2/docker/federation-test/docker-compose.yml
+++ b/docker/federation-test/docker-compose.yml
@@@ -1,0 -1,74 +1,74 @@@
 -      - "127.0.0.1:8536:8536"
+ version: '3.3'
+ 
+ services:
+   lemmy_alpha:
+     image: lemmy-federation-test:latest
+     ports:
 -      - LEMMY_HOSTNAME=localhost:8536
++      - "127.0.0.1:8540:8540"
+     environment:
 -      - LEMMY_FEDERATED_INSTANCE=lemmy_beta:8537
 -      - LEMMY_PORT=8536
++      - LEMMY_HOSTNAME=localhost:8540
+       - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_alpha:5432/lemmy
+       - LEMMY_JWT_SECRET=changeme
+       - LEMMY_FRONT_END_DIR=/app/dist
+       - LEMMY_FEDERATION_ENABLED=true
 -  lemmy_pictshare_alpha:
 -    image: shtripok/pictshare:latest
 -    ports:
 -      - "127.0.0.1:8540:80"
 -    volumes:
 -      - lemmy_pictshare_alpha:/usr/share/nginx/html/data
 -    restart: always
++      - LEMMY_FEDERATED_INSTANCE=lemmy_beta:8541
++      - LEMMY_PORT=8540
+       - RUST_BACKTRACE=1
+     restart: always
+     depends_on:
+       - lemmy_db_alpha
+   lemmy_db_alpha:
+     image: postgres:12-alpine
+     environment:
+       - POSTGRES_USER=lemmy
+       - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD}
+       - POSTGRES_DB=lemmy
+     volumes:
+       - lemmy_db_alpha:/var/lib/postgresql/data
+     restart: always
 -      - "127.0.0.1:8537:8537"
++  # lemmy_pictshare_alpha:
++  #   image: shtripok/pictshare:latest
++  #   ports:
++  #     - "127.0.0.1:8550:80"
++  #   volumes:
++  #     - lemmy_pictshare_alpha:/usr/share/nginx/html/data
++  #   restart: always
+ 
+   lemmy_beta:
+     image: lemmy-federation-test:latest
+     ports:
 -      - LEMMY_HOSTNAME=localhost:8537
++      - "127.0.0.1:8541:8541"
+     environment:
 -      - LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8536
 -      - LEMMY_PORT=8537
++      - LEMMY_HOSTNAME=localhost:8541
+       - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_beta:5432/lemmy
+       - LEMMY_JWT_SECRET=changeme
+       - LEMMY_FRONT_END_DIR=/app/dist
+       - LEMMY_FEDERATION_ENABLED=true
 -  lemmy_pictshare_beta:
 -    image: shtripok/pictshare:latest
 -    ports:
 -      - "127.0.0.1:8541:80"
 -    volumes:
 -      - lemmy_pictshare_beta:/usr/share/nginx/html/data
 -    restart: always
++      - LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8540
++      - LEMMY_PORT=8541
+       - RUST_BACKTRACE=1
+     restart: always
+     depends_on:
+       - lemmy_db_beta
+   lemmy_db_beta:
+     image: postgres:12-alpine
+     environment:
+       - POSTGRES_USER=lemmy
+       - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD}
+       - POSTGRES_DB=lemmy
+     volumes:
+       - lemmy_db_beta:/var/lib/postgresql/data
+     restart: always
 -  lemmy_pictshare_alpha:
++  # lemmy_pictshare_beta:
++  #   image: shtripok/pictshare:latest
++  #   ports:
++  #     - "127.0.0.1:8551:80"
++  #   volumes:
++  #     - lemmy_pictshare_beta:/usr/share/nginx/html/data
++  #   restart: always
+ 
+ volumes:
+   lemmy_db_alpha:
 -  lemmy_pictshare_beta:
++  # lemmy_pictshare_alpha:
+   lemmy_db_beta:
++  # lemmy_pictshare_beta:

diff --cc server/Cargo.lock
index dc583d14d757513604f348c7d8df11fe621243cf,3ddedd77eacbabbe2cf95aa5a11b824a0d19d878..125319206ec789f28e249ed9dca09390548154f8
--- 1/server/Cargo.lock
--- 2/server/Cargo.lock
+++ b/server/Cargo.lock
@@@ -651,6 -646,32 +661,32 @@@ dependencies = 
   "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 - "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ [[package]]
+ name = "cookie"
+ version = "0.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+ name = "cookie_store"
+ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+  "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
  [[package]]
  name = "copyless"
  version = "0.1.4"
@@@ -1326,12 -1501,13 +1512,13 @@@ dependencies = 
   "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
 - "rss 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rss 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 - "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
 + "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "strum 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "strum_macros 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
@@@ -1671,16 -1874,11 +1895,21 @@@ dependencies = 
   "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "pem"
 +version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
+ [[package]]
+ name = "percent-encoding"
+ version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
  [[package]]
  name = "percent-encoding"
  version = "2.1.0"
@@@ -1755,6 -1961,18 +1984,18 @@@ dependencies = 
   "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ [[package]]
+ name = "publicsuffix"
+ version = "1.5.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
  [[package]]
  name = "quick-error"
  version = "1.2.3"
@@@ -1986,6 -2215,39 +2227,39 @@@ dependencies = 
   "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 - "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ [[package]]
+ name = "reqwest"
+ version = "0.9.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+  "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
  [[package]]
  name = "resolv-conf"
  version = "0.6.2"
@@@ -2512,9 -2937,19 +2949,19 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "untrusted"
 -version = "0.6.2"
 +version = "0.7.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
+ [[package]]
+ name = "url"
+ version = "1.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
  [[package]]
  name = "url"
  version = "2.1.0"
@@@ -2803,9 -3162,9 +3260,10 @@@ dependencies = 
  "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
  "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
  "checksum bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
 +"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4"
  "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
  "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
  "checksum bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38"
  "checksum bytestring 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b24c107a4432e408d2caa58d3f5e763b219236221406ea58a4076b62343a039d"
  "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
@@@ -2819,12 -3180,17 +3279,16 @@@
  "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
  "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
  "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+ "checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
+ "checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
+ "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+ "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
  "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 -"checksum darling 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fcfbcb0c5961907597a7d1148e3af036268f2b773886b8bb3eeb1e1281d3d3d6"
 -"checksum darling_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6afc018370c3bff3eb51f89256a6bdb18b4fdcda72d577982a14954a7a0b402c"
 -"checksum darling_macro 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d8dac1c6f1d29a41c4712b4400f878cb4fcc4c7628f298dd75038e024998d1"
 -"checksum derive_builder 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ac53fa6a3cda160df823a9346442525dcaf1e171999a1cf23e67067e4fd64d4"
 -"checksum derive_builder_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0288a23da9333c246bb18c143426074a6ae96747995c5819d2947b64cd942b37"
 -"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839"
 +"checksum darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
 +"checksum darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 +"checksum darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 +"checksum derive_builder 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 +"checksum derive_builder_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
  "checksum derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
  "checksum diesel 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7cc03b910de9935007861dce440881f69102aaaedfd4bc5a6f40340ca5840c"
  "checksum diesel_derives 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
@@@ -2926,8 -3301,10 +3401,11 @@@
  "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
  "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
  "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
+ "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+ "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
  "checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
 +"checksum pem 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a1581760c757a756a41f0ee3ff01256227bdf64cb752839779b95ffb01c59793"
+ "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
  "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
  "checksum pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469"
  "checksum pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355"
@@@ -2938,9 -3315,12 +3416,10 @@@
  "checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
  "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
  "checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
 -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
  "checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
+ "checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
  "checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 -"checksum quick-xml 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8b2062cd4735d683121dbd525f5961226936229b0ac6bbbc40b34155744a41"
 -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 +"checksum quick-xml 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0"
  "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
  "checksum r2d2 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1497e40855348e4a8a40767d8e55174bce1e445a3ac9254ad44ad468ee0485af"
  "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
@@@ -2961,13 -3341,14 +3440,14 @@@
  "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
  "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
  "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
 -"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
 +"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
  "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
 -"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 +"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
  "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+ "checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
  "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 -"checksum ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c"
 -"checksum rss 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0706a43e890fbaf1714d495d12f69a7b34b70c6e903586d70311c2ce15ffe67"
 +"checksum ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6747f8da1f2b1fabbee1aaa4eb8a11abf9adef0bf58a41cee45db5d59cecdfac"
 +"checksum rss 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99979205510c60f80a119dedbabd0b8426517384edf205322f8bcd51796bcef9"
  "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
  "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
  "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
@@@ -2987,23 -3368,25 +3467,26 @@@
  "checksum serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
  "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
  "checksum serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "67f7d2e9edc3523a9c8ec8cd6ec481b3a27810aafee3e625d311febd3e656b4c"
 -"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
 +"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b"
  "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
+ "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
  "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
  "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 -"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
 +"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
  "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
 +"checksum simple_asn1 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2b25ecba7165254f0c97d6c22a64b1122a03634b18d20a34daf21e18f892e618"
  "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+ "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
  "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
  "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
 +"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
  "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
  "checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
+ "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
  "checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
 -"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
 +"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
  "checksum strum 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "530efb820d53b712f4e347916c5e7ed20deb76a4f0457943b3182fb889b06d2c"
  "checksum strum_macros 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6e163a520367c465f59e0a61a23cfae3b10b6546d78b6f672a382be79f7110"
 -"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
  "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
  "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
  "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
@@@ -3012,10 -3395,20 +3495,20 @@@
  "checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef"
  "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
  "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 +"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
  "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
  "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+ "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
  "checksum tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ffa2fdcfa937b20cb3c822a635ceecd5fc1a27a6a474527e5516aa24b8c8820a"
+ "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
+ "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
+ "checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
+ "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
+ "checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
+ "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
+ "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+ "checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c"
+ "checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
  "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
  "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
  "checksum trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f"
@@@ -3025,8 -3420,10 +3520,9 @@@
  "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
  "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
  "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
 -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
  "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 -"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 +"checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
+ "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
  "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
  "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
  "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
@@@ -3036,15 -3433,8 +3532,16 @@@
  "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
  "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
  "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+ "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
  "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
 +"checksum wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
 +"checksum wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
 +"checksum wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
 +"checksum wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
 +"checksum wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"
 +"checksum wasm-bindgen-webidl 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d"
 +"checksum web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b"
 +"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
  "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6"
  "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
  "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"

diff --cc server/Cargo.toml
Simple merge

diff --cc server/src/api/community.rs
index 936e54cda33212c9fbb7de0cdf6f20fc7db0caaf,1854dd14e6e4262ac33e5b3ffc72690135089e83..7d5f8d613dc9e095dbfc693c0f99bf565f02b95d
--- 1/server/src/api/community.rs
--- 2/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@@ -11,10 -11,10 +11,10 @@@ pub struct GetCommunity 
  
  #[derive(Serialize, Deserialize)]
  pub struct GetCommunityResponse {
 -  pub op: String,
    pub community: CommunityView,
-   moderators: Vec<CommunityModeratorView>,
-   admins: Vec<UserView>,
+   pub moderators: Vec<CommunityModeratorView>,
+   pub admins: Vec<UserView>,
 +  pub online: usize,
  }
  
  #[derive(Serialize, Deserialize)]
@@@ -40,9 -41,10 +40,9 @@@ pub struct ListCommunities 
    auth: Option<String>,
  }
  
- #[derive(Serialize, Deserialize)]
+ #[derive(Serialize, Deserialize, Debug)]
  pub struct ListCommunitiesResponse {
-   communities: Vec<CommunityView>,
 -  pub op: String,
+   pub communities: Vec<CommunityView>,
  }
  
  #[derive(Serialize, Deserialize, Clone)]

diff --cc server/src/apub/mod.rs
Simple merge

diff --cc server/src/apub/puller.rs
index 0000000000000000000000000000000000000000,8b5c4cc46cdbc9317b3453e75be12154d2640665..4b899a319ad77f8c752980692f6a599b9b47f000
mode 000000,100644..100644
--- /dev/null
--- 2/server/src/apub/puller.rs
+++ b/server/src/apub/puller.rs
@@@ -1,0 -1,98 +1,97 @@@
 -use crate::api::UserOperation;
+ extern crate reqwest;
+ 
+ use self::reqwest::Error;
+ use crate::api::community::{GetCommunityResponse, ListCommunitiesResponse};
+ use crate::api::post::GetPosts;
 -    op: UserOperation::GetCommunity.to_string(),
+ use crate::db::community_view::CommunityView;
+ use crate::naive_now;
+ use crate::settings::Settings;
+ use activitypub::actor::Group;
+ 
+ // TODO: right now all of the data is requested on demand, for production we will need to store
+ //       things in the local database to not ruin the performance
+ 
+ fn fetch_communities_from_instance(domain: &str) -> Result<Vec<CommunityView>, Error> {
+   // TODO: check nodeinfo to make sure we are dealing with a lemmy instance
+   //       -> means we need proper nodeinfo json classes instead of inline generation
+   // TODO: follow pagination (seems like page count is missing?)
+   // TODO: see if there is any standard for discovering remote actors, so we dont have to rely on lemmy apis
+   let communities_uri = format!("http://{}/api/v1/communities/list?sort=Hot", domain);
+   let communities1: ListCommunitiesResponse = reqwest::get(&communities_uri)?.json()?;
+   let mut communities2 = communities1.communities;
+   for c in &mut communities2 {
+     c.name = format_community_name(&c.name, domain);
+   }
+   Ok(communities2)
+ }
+ 
+ pub fn get_remote_community_posts(name: String) -> Result<GetPosts, Error> {
+   // TODO: this is for urls like /c/!main@example.com, activitypub exposes it through the outbox
+   //       https://www.w3.org/TR/activitypub/#outbox
+   dbg!(name);
+   unimplemented!()
+ }
+ 
+ pub fn get_remote_community(identifier: String) -> Result<GetCommunityResponse, Error> {
+   let x: Vec<&str> = identifier.split('@').collect();
+   let name = x[0].replace("!", "");
+   let instance = x[1];
+   let community_uri = format!("http://{}/federation/c/{}", instance, name);
+   let community: Group = reqwest::get(&community_uri)?.json()?;
+ 
+   // TODO: looks like a bunch of data is missing from the activitypub response
+   // TODO: i dont think simple numeric ids are going to work, we probably need something like uuids
+   // TODO: why are the Group properties not typed?
+   Ok(GetCommunityResponse {
+     moderators: vec![],
+     admins: vec![],
+     community: CommunityView {
+       id: -1,
+       name: identifier.clone(),
+       title: identifier,
+       description: community.object_props.summary.map(|c| c.to_string()),
+       category_id: -1,
+       creator_id: -1,
+       removed: false,
+       published: naive_now(),     // TODO: community.object_props.published
+       updated: Some(naive_now()), // TODO: community.object_props.updated
+       deleted: false,
+       nsfw: false,
+       creator_name: "".to_string(),
+       creator_avatar: None,
+       category_name: "".to_string(),
+       number_of_subscribers: -1,
+       number_of_posts: -1,
+       number_of_comments: -1,
+       hot_rank: -1,
+       user_id: None,
+       subscribed: None,
+     },
++    online: 0,
+   })
+ }
+ 
+ pub fn get_following_instances() -> Result<Vec<String>, Error> {
+   let instance_list = match Settings::get().federated_instance.clone() {
+     Some(f) => vec![f, Settings::get().hostname.clone()],
+     None => vec![Settings::get().hostname.clone()],
+   };
+   Ok(instance_list)
+ }
+ 
+ pub fn get_all_communities() -> Result<Vec<CommunityView>, Error> {
+   let mut communities_list: Vec<CommunityView> = vec![];
+   for instance in &get_following_instances()? {
+     communities_list.append(fetch_communities_from_instance(instance)?.as_mut());
+   }
+   Ok(communities_list)
+ }
+ 
+ /// If community is on local instance, don't include the @instance part
+ pub fn format_community_name(name: &str, instance: &str) -> String {
+   if instance == Settings::get().hostname {
+     format!("!{}", name)
+   } else {
+     format!("!{}@{}", name, instance)
+   }
+ }

diff --cc server/src/routes/federation.rs
index ea6039d6bd34722d0cb306babe41fd3508562fbc,9667694a0c19dfa346d1d04b6311dbf1714bd1a6..6816f1bc036f622db5a0d603db5b371dbbf4c542
--- 1/server/src/routes/federation.rs
--- 2/server/src/routes/federation.rs
+++ b/server/src/routes/federation.rs
@@@ -1,18 -1,42 +1,42 @@@
 -use crate::api::{Oper, UserOperation};
+ use crate::api::community::ListCommunities;
++use crate::api::Oper;
+ use crate::api::Perform;
  use crate::apub;
- use actix_web::web;
+ use crate::settings::Settings;
+ use actix_web::web::Query;
+ use actix_web::{web, HttpResponse};
+ use diesel::r2d2::{ConnectionManager, Pool};
+ use diesel::PgConnection;
  
  pub fn config(cfg: &mut web::ServiceConfig) {
-   cfg
-     .route(
-       "/federation/c/{community_name}",
-       web::get().to(apub::community::get_apub_community),
-     )
-     .route(
-       "/federation/c/{community_name}/followers",
-       web::get().to(apub::community::get_apub_community_followers),
-     )
-     .route(
-       "/federation/u/{user_name}",
-       web::get().to(apub::user::get_apub_user),
-     );
+   if Settings::get().federation_enabled {
+     println!("federation enabled, host is {}", Settings::get().hostname);
+     cfg
+       .route(
+         "/federation/c/{community_name}",
+         web::get().to(apub::community::get_apub_community),
+       )
+       .route(
+         "/federation/c/{community_name}/followers",
+         web::get().to(apub::community::get_apub_community_followers),
+       )
+       .route(
+         "/federation/u/{user_name}",
+         web::get().to(apub::user::get_apub_user),
+       )
+       // TODO: this is a very quick and dirty implementation for http api calls
+       .route(
+         "/api/v1/communities/list",
+         web::get().to(
+           |query: Query<ListCommunities>, db: web::Data<Pool<ConnectionManager<PgConnection>>>| {
 -            let res = Oper::new(UserOperation::ListCommunities, query.into_inner())
++            let res = Oper::new(query.into_inner())
+               .perform(&db.get().unwrap())
+               .unwrap();
+             HttpResponse::Ok()
+               .content_type("application/json")
+               .body(serde_json::to_string(&res).unwrap())
+           },
+         ),
+       );
+   }
  }

diff --cc server/src/settings.rs
Simple merge

diff --cc server/src/websocket/server.rs
index a26c8144e0fd805df43c379180a5b9dd92234b4c,c444e11bb215e7e90795776326c817f953b3d0b2..0c606284537c4c6f3fa4de9b8edfca6d39a53a6d
--- 1/server/src/websocket/server.rs
--- 2/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@@ -19,15 -19,9 +19,16 @@@ use crate::api::post::*
  use crate::api::site::*;
  use crate::api::user::*;
  use crate::api::*;
+ use crate::apub::puller::*;
 +use crate::websocket::UserOperation;
  use crate::Settings;
  
 +type ConnectionId = usize;
 +type PostId = i32;
 +type CommunityId = i32;
 +type UserId = i32;
 +type IPAddr = String;
 +
  /// Chat server sends this messages to session
  #[derive(Message)]
  #[rtype(result = "()")]
@@@ -467,40 -354,59 +468,63 @@@ fn parse_json_message(chat: &mut ChatSe
      }
      UserOperation::BanUser => {
        let ban_user: BanUser = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, ban_user).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      let res = Oper::new(ban_user).perform(&conn)?;
 +      let res_str = to_json_string(&user_operation, &res)?;
 +      chat.send_all_message(&res_str, msg.id);
 +      Ok(res_str)
      }
      UserOperation::GetReplies => {
 -      let get_replies: GetReplies = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, get_replies).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      do_user_operation::<GetReplies, GetRepliesResponse>(user_operation, data, &conn)
      }
      UserOperation::GetUserMentions => {
 -      let get_user_mentions: GetUserMentions = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, get_user_mentions).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      do_user_operation::<GetUserMentions, GetUserMentionsResponse>(user_operation, data, &conn)
      }
      UserOperation::EditUserMention => {
 -      let edit_user_mention: EditUserMention = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, edit_user_mention).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      do_user_operation::<EditUserMention, UserMentionResponse>(user_operation, data, &conn)
      }
      UserOperation::MarkAllAsRead => {
 -      let mark_all_as_read: MarkAllAsRead = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, mark_all_as_read).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      do_user_operation::<MarkAllAsRead, GetRepliesResponse>(user_operation, data, &conn)
      }
      UserOperation::GetCommunity => {
 -      let mut get_community: GetCommunity = serde_json::from_str(data)?;
 -      if Settings::get().federation_enabled && get_community.name.is_some() {
 -        let name = &get_community.name.unwrap();
 -        let remote_community = if name.contains('@') {
 -          // TODO: need to support sort, filter etc for remote communities
 -          get_remote_community(name.to_owned())?
 +      let get_community: GetCommunity = serde_json::from_str(data)?;
-       let mut res = Oper::new(get_community).perform(&conn)?;
++
++      let mut res = if Settings::get().federation_enabled {
++        if let Some(community_name) = get_community.name.to_owned() {
++          if community_name.contains('@') {
++            // TODO: need to support sort, filter etc for remote communities
++            get_remote_community(community_name)?
++          // TODO what is this about
++          // get_community.name = Some(name.replace("!", ""));
++          } else {
++            Oper::new(get_community).perform(&conn)?
++          }
+         } else {
 -          get_community.name = Some(name.replace("!", ""));
 -          Oper::new(user_operation, get_community).perform(&conn)?
 -        };
 -        Ok(serde_json::to_string(&remote_community)?)
++          Oper::new(get_community).perform(&conn)?
++        }
+       } else {
 -        let res = Oper::new(user_operation, get_community).perform(&conn)?;
 -        Ok(serde_json::to_string(&res)?)
 -      }
++        Oper::new(get_community).perform(&conn)?
++      };
++
 +      let community_id = res.community.id;
 +
 +      chat.join_community_room(community_id, msg.id);
 +
 +      res.online = if let Some(community_users) = chat.community_rooms.get(&community_id) {
 +        community_users.len()
 +      } else {
 +        0
 +      };
 +
 +      to_json_string(&user_operation, &res)
      }
      UserOperation::ListCommunities => {
-       do_user_operation::<ListCommunities, ListCommunitiesResponse>(user_operation, data, &conn)
+       if Settings::get().federation_enabled {
+         let res = get_all_communities()?;
 -        let val = ListCommunitiesResponse {
 -          op: UserOperation::ListCommunities.to_string(),
 -          communities: res,
 -        };
 -        Ok(serde_json::to_string(&val)?)
++        let val = ListCommunitiesResponse { communities: res };
++        to_json_string(&user_operation, &val)
+       } else {
 -        let list_communities: ListCommunities = serde_json::from_str(data)?;
 -        let res = Oper::new(user_operation, list_communities).perform(&conn)?;
 -        Ok(serde_json::to_string(&res)?)
++        do_user_operation::<ListCommunities, ListCommunitiesResponse>(user_operation, data, &conn)
+       }
      }
      UserOperation::CreateCommunity => {
        chat.check_rate_limit_register(msg.id)?;