Don't upload Libreddit releases in pull requests

Upgrade to v0.11.2
WIP: Various subreddit & post fixes (#215 )
2021-05-09 18:13:24 -07:00 · 2021-05-09 08:51:01 -07:00 · 2021-05-09 15:40:49 +00:00 · 2021-05-08 22:09:47 -07:00 · 2021-05-09 01:22:26 +00:00 · 2021-05-06 12:31:59 -07:00
13 changed files with 265 additions and 96 deletions
--- a/.github/workflows/docker-arm.yml
+++ b/.github/workflows/docker-arm.yml
@ -30,7 +30,7 @@ jobs:
        uses: docker/build-push-action@v2
        with:
          context: .
-          file: ./Dockerfile.arm64
+          file: ./Dockerfile.arm
          platforms: linux/arm64
          push: true
          tags: spikecodes/libreddit:arm
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -32,13 +32,14 @@ jobs:
        id: version
        run: |
          echo "::set-output name=version::$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')"
-          echo "::set-output name=tag::${GITHUB_REF#refs/*/}"
+          echo "::set-output name=tag::$(git describe --tags)"
          
      - name: Calculate SHA512 checksum
        run: sha512sum target/release/libreddit > libreddit.sha512
        
      - name: Release
        uses: softprops/action-gh-release@v1
+        if: github.base_ref != 'master'
        with:
          tag_name: ${{ steps.version.outputs.version }}
          name: ${{ steps.version.outputs.version }} - NAME
@ -47,7 +48,7 @@ jobs:
            target/release/libreddit
            libreddit.sha512
          body: |
-            - CHANGES
+            - ${{ github.event.head_commit.message }} ${{ github.sha }} 

            See full list of changes [here](https://github.com/spikecodes/libreddit/compare/${{ steps.version.outputs.tag }}...${{ steps.version.outputs.version }}).
        env:
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
 "memchr",
 ]
@ -78,9 +80,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.48"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
 dependencies = [
 "proc-macro2",
 "quote",
@ -194,9 +196,9 @@ dependencies = [

 [[package]]
 name = "const_fn"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28"
+checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec"

 [[package]]
 name = "cookie"
@ -282,9 +284,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"

 [[package]]
 name = "fastrand"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb"
 dependencies = [
 "instant",
 ]
@ -313,9 +315,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"

 [[package]]
 name = "futures"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
+checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -328,9 +330,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -338,15 +340,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"

 [[package]]
 name = "futures-executor"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
+checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
 dependencies = [
 "futures-core",
 "futures-task",
@ -355,9 +357,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"

 [[package]]
 name = "futures-lite"
@ -376,9 +378,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
+checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
 dependencies = [
 "proc-macro-hack",
 "proc-macro2",
@ -388,21 +390,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"

 [[package]]
 name = "futures-task"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"

 [[package]]
 name = "futures-util"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -420,9 +422,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
+checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
 dependencies = [
 "bytes",
 "fnv",
@ -465,9 +467,9 @@ dependencies = [

 [[package]]
 name = "http-body"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
 dependencies = [
 "bytes",
 "http",
@ -476,21 +478,21 @@ dependencies = [

 [[package]]
 name = "httparse"
-version = "1.3.6"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589"
+checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"

 [[package]]
 name = "httpdate"
-version = "0.3.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9"

 [[package]]
 name = "hyper"
-version = "0.14.5"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
+checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54"
 dependencies = [
 "bytes",
 "futures-channel",
@ -535,9 +537,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "idna"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
 "matches",
 "unicode-bidi",
@ -586,9 +588,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "lexical-core"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
 "arrayvec",
 "bitflags",
@ -599,13 +601,13 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"

 [[package]]
 name = "libreddit"
-version = "0.10.3"
+version = "0.11.2"
 dependencies = [
 "askama",
 "async-recursion",
@ -626,9 +628,9 @@ dependencies = [

 [[package]]
 name = "lock_api"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
 "scopeguard",
 ]
@ -650,9 +652,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"

 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"

 [[package]]
 name = "mio"
@ -759,18 +761,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

 [[package]]
 name = "pin-project"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
+checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
 dependencies = [
 "pin-project-internal",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
+checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -827,18 +829,18 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"

 [[package]]
 name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
 dependencies = [
 "bitflags",
 ]

 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -847,9 +849,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.23"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

 [[package]]
 name = "ring"
@ -883,9 +885,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
 "base64",
 "log",
@ -930,9 +932,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "sct"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
 "ring",
 "untrusted",
@ -1024,9 +1026,9 @@ dependencies = [

 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"

 [[package]]
 name = "smallvec"
@ -1122,9 +1124,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"

 [[package]]
 name = "syn"
-version = "1.0.69"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1243,9 +1245,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f"
+checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
 dependencies = [
 "bytes",
 "futures-core",
@ -1263,9 +1265,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"

 [[package]]
 name = "tracing"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
 "cfg-if",
 "pin-project-lite",
@ -1274,9 +1276,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
 "lazy_static",
 ]
@ -1313,9 +1315,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"

 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

 [[package]]
 name = "untrusted"
@ -1325,9 +1327,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

 [[package]]
 name = "url"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
 "form_urlencoded",
 "idna",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,7 +3,7 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.10.3"
+version = "0.11.2"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"

@ -12,14 +12,14 @@ askama = { version = "0.10.5", default-features = false }
 async-recursion = "0.3.2"
 cached = "0.23.0"
 clap = { version = "2.33.3", default-features = false }
-regex = "1.4.5"
+regex = "1.5.4"
 serde = { version = "1.0.125", features = ["derive"] }
 cookie = "0.15.0"
 futures-lite = "1.11.3"
-hyper = { version = "0.14.5", features = ["full"] }
+hyper = { version = "0.14.7", features = ["full"] }
 hyper-rustls = "0.22.1"
 route-recognizer = "0.3.0"
 serde_json = "1.0.64"
 tokio = { version = "1.5.0", features = ["full"] }
 time = "0.2.26"
-url = "2.2.1"
+url = "2.2.2"
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
--- a/README.md
+++ b/README.md
@ -31,17 +31,19 @@ Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new)
 | [libreddit.spike.codes](https://libreddit.spike.codes) (official) | 🇺🇸 US |  |
 | [libreddit.dothq.co](https://libreddit.dothq.co) | 🇺🇸 US |  |
 | [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN | ✅ |
-| [libreddit.himiko.cloud](https://libreddit.himiko.cloud) | 🇫🇮 FI |  |
 | [libreddit.bcow.xyz](https://libreddit.bcow.xyz) | 🇺🇸 US |  |
 | [libreddit.40two.app](https://libreddit.40two.app) | 🇳🇱 NL |  |
 | [reddit.invak.id](https://reddit.invak.id) | 🇧🇬 BG |  |
 | [reddit.phii.me](https://reddit.phii.me) | 🇺🇸 US |  |
+| [lr.riverside.rocks](https://lr.riverside.rocks) | 🇺🇸 US |  |
 | [libreddit.silkky.cloud](https://libreddit.silkky.cloud) | 🇫🇮 FI |  |
 | [libreddit.database.red](https://libreddit.database.red) | 🇺🇸 US | ✅ |
+| [libreddit.exonip.de](https://libreddit.exonip.de) | 🇩🇪 DE  |  |
+| [libreddit.domain.glass](https://libreddit.domain.glass) | 🇺🇸 US | ✅ |
 | [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN  |  |
 | [fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion](http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion) | 🇩🇪 DE  |  |
-| [libreddit.himiko7xl2skojc6odi7hykl626gt4qki3vxdbv33u2u3af76d6k32ad.onion](http://libreddit.himiko7xl2skojc6odi7hykl626gt4qki3vxdbv33u2u3af76d6k32ad.onion) | 🇫🇮 FI |  |
 | [dflv6yjt7il3n3tggf4qhcmkzbti2ppytqx3o7pjrzwgntutpewscyid.onion](http://dflv6yjt7il3n3tggf4qhcmkzbti2ppytqx3o7pjrzwgntutpewscyid.onion/) | 🇺🇸 US |  |
+| [kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion](http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion/) | 🇳🇱 NL |  |

 A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare). The checkmark will not be listed for a site which uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website.

@ -69,7 +71,7 @@ Teddit is another awesome open source project designed to provide an alternative

 If you are looking to compare, the biggest differences I have noticed are:
 - Libreddit is themed around Reddit's redesign whereas Teddit appears to stick much closer to Reddit's old design. This may suit some users better as design is always subjective.
- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Actix Web](https://actix.rs), which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
+- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Hyper](https://hyper.rs), a speedy and lightweight HTTP server/client implementation.

 ---

--- a/src/search.rs
+++ b/src/search.rs
@ -1,5 +1,5 @@
 // CRATES
-use crate::utils::{cookie, error, format_num, format_url, param, template, val, Post, Preferences};
+use crate::utils::{catch_random, cookie, error, format_num, format_url, param, template, val, Post, Preferences};
 use crate::{client::json, RequestExt};
 use askama::Template;
 use hyper::{Body, Request, Response};
@ -38,6 +38,10 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 	let nsfw_results = if cookie(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
 	let path = format!("{}.json?{}{}", req.uri().path(), req.uri().query().unwrap_or_default(), nsfw_results);
 	let sub = req.param("sub").unwrap_or_default();
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/find").await {
+		return Ok(random);
+	}
 	let query = param(&path, "q");

 	let sort = if param(&path, "sort").is_empty() {
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@ -1,6 +1,6 @@
 // CRATES
 use crate::esc;
-use crate::utils::{cookie, error, format_num, format_url, param, redirect, rewrite_urls, template, val, Post, Preferences, Subreddit};
+use crate::utils::{catch_random, cookie, error, format_num, format_url, param, redirect, rewrite_urls, template, val, Post, Preferences, Subreddit};
 use crate::{client::json, server::ResponseExt, RequestExt};
 use askama::Template;
 use cookie::Cookie;
@ -45,6 +45,11 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 		front_page.to_owned()
 	});

+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "").await {
+		return Ok(random);
+	}
+
 	if req.param("sub").is_some() && sub.starts_with("u_") {
 		return Ok(redirect(["/user/", &sub[2..]].concat()));
 	}
@ -94,13 +99,42 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 // Sub or unsub by setting subscription cookie using response "Set-Cookie" header
 pub async fn subscriptions(req: Request<Body>) -> Result<Response<Body>, String> {
 	let sub = req.param("sub").unwrap_or_default();
+	// Handle random subreddits
+	if sub == "random" || sub == "randnsfw" {
+		return Err("Can't subscribe to random subreddit!".to_string());
+	}
+
 	let query = req.uri().query().unwrap_or_default().to_string();
 	let action: Vec<String> = req.uri().path().split('/').map(String::from).collect();

 	let mut sub_list = Preferences::new(req).subscriptions;

+	// Retrieve list of posts for these subreddits to extract display names
+	let display = json(format!("/r/{}/hot.json?raw_json=1", sub)).await?;
+	let display_lookup: Vec<(String, &str)> = display["data"]["children"]
+		.as_array()
+		.unwrap()
+		.iter()
+		.map(|post| {
+			let display_name = post["data"]["subreddit"].as_str().unwrap();
+			(display_name.to_lowercase(), display_name)
+		})
+		.collect();
+
 	// Find each subreddit name (separated by '+') in sub parameter
 	for part in sub.split('+') {
+		// Retrieve display name for the subreddit
+		let display;
+		let part = if let Some(&(_, display)) = display_lookup.iter().find(|x| x.0 == part.to_lowercase()) {
+			// This is already known, doesn't require seperate request
+			display
+		} else {
+			// This subreddit display name isn't known, retrieve it
+			let path: String = format!("/r/{}/about.json?raw_json=1", part);
+			display = json(path).await?;
+			display["data"]["display_name"].as_str().ok_or_else(|| "Failed to query subreddit name".to_string())?
+		};
+
 		// Modify sub list based on action
 		if action.contains(&"subscribe".to_string()) && !sub_list.contains(&part.to_owned()) {
 			// Add each sub name to the subscribed list
@ -142,13 +176,18 @@ pub async fn subscriptions(req: Request<Body>) -> Result<Response<Body>, String>

 pub async fn wiki(req: Request<Body>) -> Result<Response<Body>, String> {
 	let sub = req.param("sub").unwrap_or_else(|| "reddit.com".to_string());
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/wiki").await {
+		return Ok(random);
+	}
+
 	let page = req.param("page").unwrap_or_else(|| "index".to_string());
 	let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page);

 	match json(path).await {
 		Ok(response) => template(WikiTemplate {
 			sub,
-			wiki: rewrite_urls(response["data"]["content_html"].as_str().unwrap_or_default()),
+			wiki: rewrite_urls(response["data"]["content_html"].as_str().unwrap_or("<h3>Wiki not found</h3>")),
 			page,
 			prefs: Preferences::new(req),
 		}),
@ -158,6 +197,10 @@ pub async fn wiki(req: Request<Body>) -> Result<Response<Body>, String> {

 pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 	let sub = req.param("sub").unwrap_or_else(|| "reddit.com".to_string());
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/about/sidebar").await {
+		return Ok(random);
+	}

 	// Build the Reddit JSON API url
 	let path: String = format!("/r/{}/about.json?raw_json=1", sub);
@ -166,8 +209,12 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 	match json(path).await {
 		// If success, receive JSON in response
 		Ok(response) => template(WikiTemplate {
+			wiki: format!(
+				"{}<hr><h1>Moderators</h1><br><ul>{}</ul>",
+				rewrite_urls(&val(&response, "description_html").replace("\\", "")),
+				moderators(&sub).await?.join(""),
+			),
 			sub,
-			wiki: rewrite_urls(&val(&response, "description_html").replace("\\", "")),
 			page: "Sidebar".to_string(),
 			prefs: Preferences::new(req),
 		}),
@ -175,6 +222,36 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 	}
 }

+pub async fn moderators(sub: &str) -> Result<Vec<String>, String> {
+	// Retrieve and format the html for the moderators list
+	Ok(
+		moderators_list(sub)
+			.await?
+			.iter()
+			.map(|m| format!("<li><a style=\"color: var(--accent)\" href=\"/u/{name}\">{name}</a></li>", name = m))
+			.collect(),
+	)
+}
+
+async fn moderators_list(sub: &str) -> Result<Vec<String>, String> {
+	// Build the moderator list URL
+	let path: String = format!("/r/{}/about/moderators.json?raw_json=1", sub);
+
+	// Retrieve response
+	let response = json(path).await?["data"]["children"].clone();
+	Ok(if let Some(response) = response.as_array() {
+		// Traverse json tree and format into list of strings
+		response
+			.iter()
+			.map(|m| m["name"].as_str().unwrap_or(""))
+			.filter(|m| !m.is_empty())
+			.map(std::string::ToString::to_string)
+			.collect::<Vec<_>>()
+	} else {
+		vec![]
+	})
+}
+
 // SUBREDDIT
 async fn subreddit(sub: &str) -> Result<Subreddit, String> {
 	// Build the Reddit JSON API url
@ -189,7 +266,7 @@ async fn subreddit(sub: &str) -> Result<Subreddit, String> {
 			let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;

 			// Fetch subreddit icon either from the community_icon or icon_img value
-			let community_icon: &str = res["data"]["community_icon"].as_str().map_or("", |s| s.split('?').collect::<Vec<&str>>()[0]);
+			let community_icon: &str = res["data"]["community_icon"].as_str().unwrap();
 			let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };

 			let sub = Subreddit {
@ -197,6 +274,7 @@ async fn subreddit(sub: &str) -> Result<Subreddit, String> {
 				title: esc!(&res, "title"),
 				description: esc!(&res, "public_description"),
 				info: rewrite_urls(&val(&res, "description_html").replace("\\", "")),
+				moderators: moderators_list(sub).await?,
 				icon: format_url(&icon),
 				members: format_num(members),
 				active: format_num(active),
--- a/src/utils.rs
+++ b/src/utils.rs
@ -341,6 +341,7 @@ pub struct Subreddit {
 	pub title: String,
 	pub description: String,
 	pub info: String,
+	pub moderators: Vec<String>,
 	pub icon: String,
 	pub members: (String, String),
 	pub active: (String, String),
@ -403,6 +404,19 @@ pub fn cookie(req: &Request<Body>, name: &str) -> String {
 	cookie.value().to_string()
 }

+// Detect and redirect in the event of a random subreddit
+pub async fn catch_random(sub: &str, additional: &str) -> Result<Response<Body>, String> {
+	if (sub == "random" || sub == "randnsfw") && !sub.contains('+') {
+		let new_sub = json(format!("/r/{}/about.json?raw_json=1", sub)).await?["data"]["display_name"]
+			.as_str()
+			.unwrap_or_default()
+			.to_string();
+		return Ok(redirect(format!("/r/{}{}", new_sub, additional)));
+	} else {
+		return Err("No redirect needed".to_string());
+	}
+}
+
 // Direct urls to proxy if proxy is enabled
 pub fn format_url(url: &str) -> String {
 	if url.is_empty() || url == "self" || url == "default" || url == "nsfw" || url == "spoiler" {
@ -444,9 +458,21 @@ pub fn format_url(url: &str) -> String {
 }

 // Rewrite Reddit links to Libreddit in body of text
-pub fn rewrite_urls(text: &str) -> String {
-	match Regex::new(r#"href="(https|http|)://(www.|old.|np.|amp.|)(reddit).(com)/"#) {
-		Ok(re) => re.replace_all(text, r#"href="/"#).to_string(),
+pub fn rewrite_urls(input_text: &str) -> String {
+	let text1 = match Regex::new(r#"href="(https|http|)://(www.|old.|np.|amp.|)(reddit).(com)/"#) {
+		Ok(re) => re.replace_all(input_text, r#"href="/"#).to_string(),
+		Err(_) => String::new(),
+	};
+
+	// Rewrite external media previews to Libreddit
+	match Regex::new(r"https://external-preview\.redd\.it(.*)[^?]") {
+		Ok(re) => {
+			if re.is_match(&text1) {
+				re.replace_all(&text1, format_url(re.find(&text1).unwrap().as_str())).to_string()
+			} else {
+				text1
+			}
+		}
 		Err(_) => String::new(),
 	}
 }
--- a/static/style.css
+++ b/static/style.css
@ -92,6 +92,49 @@
 	--highlighted: #3b4252;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
+
+/* Laserwave theme setting */
+.laserwave {
+	--accent: #eb64b9;
+	--green: #74dfc4;
+	--text: #e0dfe1;
+	--foreground: #302a36;
+	--background: #27212e;
+	--outside: #3e3647;
+	--post: #3e3647;
+	--panel-border: 2px solid #2f2738;
+	--highlighted: #302a36;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+/* Violet theme setting */
+.violet {
+	--accent: #7c71dd;
+	--green: #5cff85;
+	--text: white;
+	--foreground: #1F2347;
+	--background: #12152b;
+	--outside: #181c3a;
+	--post: #181c3a;
+	--panel-border: 1px solid #1F2347;
+	--highlighted: #1F2347;
+	--shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+}
+
+/* Gold theme setting */
+.gold {
+	--accent: #f2aa4c;
+	--green: #5cff85;
+	--text: white;
+	--foreground: #234;
+	--background: #101820;
+	--outside: #1b2936;
+	--post: #1b2936;
+	--panel-border: 0px solid black;
+	--highlighted: #234;
+	--shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+}
+
 /* General */

 ::selection {
@ -1129,6 +1172,8 @@ input[type="submit"] {

 .md table {
 	margin: 5px;
+	display: block;
+	overflow-x: auto;
 }

 .md code {
--- a/templates/settings.html
+++ b/templates/settings.html
@ -15,7 +15,7 @@
 			<div id="theme">
 				<label for="theme">Theme:</label>
 				<select name="theme"> 
-					{% call utils::options(prefs.theme, ["system", "light", "dark", "black", "dracula", "nord"], "system") %}
+					{% call utils::options(prefs.theme, ["system", "light", "dark", "black", "dracula", "nord", "laserwave", "violet", "gold"], "system") %}
 				</select>
 			</div>
 			<p>Interface</p>
--- a/templates/subreddit.html
+++ b/templates/subreddit.html
@ -99,7 +99,17 @@
 			</div>
 			<details class="panel" id="sidebar">
 				<summary id="sidebar_label">Sidebar</summary>
-				<div id="sidebar_contents">{{ sub.info }}</div>
+				<div id="sidebar_contents">
+                                  {{ sub.info }}
+                                  <hr>
+                                  <h2>Moderators</h2>
+                                  <br>
+                                  <ul>
+                                  {% for moderator in sub.moderators %}
+                                  <li><a style="color: var(--accent)" href="/u/{{ moderator }}">{{ moderator }}</a></li>
+                                  {% endfor %}
+                                  </ul>
+                                </div>
 			</details>
 		</aside>
 		{% endif %}
--- a/templates/utils.html
+++ b/templates/utils.html
@ -74,7 +74,8 @@
 		{% if post.flair.flair_parts.len() > 0 %}
 			<a href="/r/{{ post.community }}/search?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
 				class="post_flair"
-				style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};">{% call render_flair(post.flair.flair_parts) %}</a>
+				style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};"
+				dir="ltr">{% call render_flair(post.flair.flair_parts) %}</a>
 		{% endif %}
 		<a href="{{ post.permalink }}">{{ post.title }}</a>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
 	</p>
Author	SHA1	Message	Date
spikecodes	dc9fbc1a05	Don't upload Libreddit releases in pull requests	2021-05-09 18:13:24 -07:00
spikecodes	7ae7a88eed	Upgrade to v0.11.2	2021-05-09 08:51:01 -07:00
curlpipe	536a766960	WIP: Various subreddit & post fixes (#215 ) * Fixed random subreddit issue * Fixed large subreddit icon rendering * Formatting fix * Fix dodgy HTML rendering issues * Revert "Fix dodgy HTML rendering issues" This reverts commit 58be5f449b72f271d2b3c046870b652d1e715289.	2021-05-09 15:40:49 +00:00
spikecodes	e34329cfee	Upgrade to v0.11.1	2021-05-08 22:09:47 -07:00
imabritishcow	97a0680bd0	Support GIFs in comments (#217 ) * Support GIFs in comments * Fix removing Giphy links so it only removes Giphy links * Remove removing link to Giphy	2021-05-09 01:22:26 +00:00
spikecodes	c1560f4eba	Upgrade to v0.11.0	2021-05-06 12:31:59 -07:00
curlpipe	242ffab0da	Fix bug with subreddit subscription case & RTL languages (#214 ) * Fixed subreddit subscription case issues * Fixed formatting * Fixed flair RTL language issue (#132) * Convert display_lookup to Vec Co-authored-by: spikecodes <19519553+spikecodes@users.noreply.github.com>	2021-05-06 19:11:25 +00:00
curlpipe	1211d781d0	Add list of moderators to sidebar (#213 ) * Added list of moderators to sidebar & added wiki not found message * Improved code formatting	2021-05-04 17:30:54 +00:00
curlpipe	9e4066658c	Added 2 new themes: violet & gold (#212 ) * Added 2 new themes: violet & gold * Increased contrast in Violet theme * Changed accent colour on violet theme	2021-05-03 16:48:21 +00:00
Josiah	560de4e91f	removed himiko.cloud instances (#211 )	2021-05-02 19:26:13 +00:00
Spike	bd1c890961	Update to v0.10.6	2021-04-30 16:35:41 +00:00
Ben Smith	6f799b2617	Added laserwave theme (#210 )	2021-04-30 16:26:49 +00:00
RiversideRocks	38e176f59f	Add riverside.rocks instance (#209 )	2021-04-30 16:25:50 +00:00
Spike	8248eca95c	Correct Actix → Hyper in Readme	2021-04-27 18:54:38 +00:00
Spike	ffc3bfe72d	Add libreddit.domain.glass instance	2021-04-22 19:26:42 +00:00
tirz	d713746407	doc: add new self-hosted hidden service => http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion/ (#203 )	2021-04-22 19:14:11 +00:00
Spike	21b45760eb	Add exonip.de instance. Closes #200	2021-04-20 16:41:29 +00:00
spikecodes	e3fb93946a	Revert ARM builds to only arm64	2021-04-17 21:32:48 -07:00
spikecodes	b6134a39d0	Specify build platform for Docker ARM builds	2021-04-17 21:11:33 -07:00
spikecodes	c844655c98	Use rust:latest as base Docker image for arm tag	2021-04-17 20:56:12 -07:00
spikecodes	cac83493da	Add arm/v7 platform for Docker builds	2021-04-17 18:58:18 -07:00
spikecodes	b47cfd1ba5	Only scroll overflowing tables in Wikis	2021-04-16 14:47:42 -07:00
spikecodes	28ca3589ed	Add scrollbar to overflowing wikipages. Fixes #192	2021-04-15 15:56:48 -07:00