diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 0000000..906335f --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,196 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'matrix-client.cabal' +# +# To regenerate the script (for example after adjusting tested-with) run +# +# haskell-ci regenerate +# +# For more information, see https://github.com/haskell-CI/haskell-ci +# +# version: 0.19.20250115 +# +# REGENDATA ("0.19.20250115",["github","matrix-client.cabal"]) +# +name: Haskell-CI +on: + - push + - pull_request +jobs: + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-20.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:jammy + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-9.6.6 + compilerKind: ghc + compilerVersion: 9.6.6 + setup-method: ghcup + allow-failure: false + fail-fast: false + steps: + - name: apt-get install + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + - name: Install GHCup + run: | + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + - name: Install cabal-install + run: | + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + - name: Install GHC (GHCup) + if: matrix.setup-method == 'ghcup' + run: | + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: Set PATH and environment variables + run: | + echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "LANG=C.UTF-8" >> "$GITHUB_ENV" + echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" + echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" + HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') + echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" + echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" + echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: env + run: | + env + - name: write cabal config + run: | + mkdir -p $CABAL_DIR + cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz + echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - + xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan + rm -f cabal-plan.xz + chmod a+x $HOME/.cabal/bin/cabal-plan + cabal-plan --version + - name: checkout + uses: actions/checkout@v4 + with: + path: source + - name: initial cabal.project for sdist + run: | + touch cabal.project + echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project + cat cabal.project + - name: sdist + run: | + mkdir -p sdist + $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist + - name: unpack + run: | + mkdir -p unpacked + find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; + - name: generate cabal.project + run: | + PKGDIR_matrix_client="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/matrix-client-[0-9.]*')" + echo "PKGDIR_matrix_client=${PKGDIR_matrix_client}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_matrix_client}" >> cabal.project + echo "package matrix-client" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + cat >> cabal.project <> cabal.project.local + cat cabal.project + cat cabal.project.local + - name: dump install plan + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all + cabal-plan + - name: restore cache + uses: actions/cache/restore@v4 + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store + restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- + - name: install dependencies + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all + - name: build w/o tests + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: build + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always + - name: tests + run: | + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + - name: cabal check + run: | + cd ${PKGDIR_matrix_client} || false + ${CABAL} -vnormal check + - name: haddock + run: | + $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + - name: unconstrained build + run: | + rm -f cabal.project.local + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: save cache + if: always() + uses: actions/cache/save@v4 + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index de79b2c..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: CI -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -jobs: - cabal: - runs-on: ubuntu-latest - strategy: - matrix: - ghc: ['8.10', '9.2'] - name: Haskell GHC ${{ matrix.ghc }} - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: haskell/actions/setup@v1 - with: - ghc-version: ${{ matrix.ghc }} - - uses: actions/cache@v2 - with: - path: | - ~/.cabal - dist-newstyle - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal','**/cabal.project') }} - restore-keys: | - ${{ runner.os }}-${{ matrix.ghc }}- - ${{ runner.os }}- - - run: cabal update - - run: cabal build --enable-tests --flags=ci all - - run: cabal test --enable-tests --flags=ci --test-show-details=direct all - - run: cabal haddock all - - run: cabal sdist all - - run: cd matrix-client; cabal check -# - run: cd matrix-bot; cabal check - - run: cabal install --installdir=/tmp --overwrite-policy=always --lib all diff --git a/matrix-client/CHANGELOG.md b/CHANGELOG.md similarity index 97% rename from matrix-client/CHANGELOG.md rename to CHANGELOG.md index e77e886..f88b131 100644 --- a/matrix-client/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.1.6.0 + +- Support base64-1.0 + ## 0.1.5.0 - Convert userDisplayName into a Maybe value [#30](https://github.com/softwarefactory-project/matrix-client-haskell/issues/30) diff --git a/matrix-bot/LICENSE b/LICENSE similarity index 100% rename from matrix-bot/LICENSE rename to LICENSE diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 50663b3..0000000 --- a/cabal.project +++ /dev/null @@ -1 +0,0 @@ -packages: ./matrix-client/ ./matrix-bot/ diff --git a/flake.lock b/flake.lock index 99d1689..d60ebf4 100644 --- a/flake.lock +++ b/flake.lock @@ -17,17 +17,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1659891956, - "narHash": "sha256-ymyDKkXQs5Z9+ezMutHmnDqztYmDTFZEsFuaPeBzkMI=", + "lastModified": 1735908276, + "narHash": "sha256-U19gzGJFlGtyNonhg3jhhamQUex5ri3MgR1QKz6w/qg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d73d5385b63e868bd11282fb775f6fe4921fb5", + "rev": "d3780c92e64472e8f9aa54f7bbb0dd4483b98303", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d73d5385b63e868bd11282fb775f6fe4921fb5", + "rev": "d3780c92e64472e8f9aa54f7bbb0dd4483b98303", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 524151e..b448024 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs = { nixpkgs.url = - "github:NixOS/nixpkgs/00d73d5385b63e868bd11282fb775f6fe4921fb5"; + "github:NixOS/nixpkgs/d3780c92e64472e8f9aa54f7bbb0dd4483b98303"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -15,20 +15,12 @@ flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let config = { }; - compilerVersion = "924"; - compiler = "ghc" + compilerVersion; overlays = [ (final: prev: { - haskell-language-server = prev.haskell-language-server.override { - supportedGhcVersions = [ compilerVersion ]; - }; - - myHaskellPackages = prev.haskell.packages.${compiler}.override { + myHaskellPackages = prev.haskellPackages.override { overrides = hpFinal: hpPrev: { - matrix-client = - hpPrev.callCabal2nix "matrix-client" ./matrix-client/. { }; - matrix-bot = - hpPrev.callCabal2nix "matrix-bot" ./matrix-bot/. { }; + base64 = hpPrev.base64_1_0; + matrix-client = hpPrev.callCabal2nix "matrix-client" ./. { }; }; }; }) @@ -93,7 +85,7 @@ packages = with pkgs.myHaskellPackages; { inherit matrix-client; }; defaultPackage = packages.matrix-client; devShell = pkgs.myHaskellPackages.shellFor { - packages = p: [ p.matrix-client p.matrix-bot ]; + packages = p: [ p.matrix-client ]; buildInputs = with pkgs.myHaskellPackages; [ cabal-install diff --git a/matrix-bot/.gitignore b/matrix-bot/.gitignore deleted file mode 100644 index b44f310..0000000 --- a/matrix-bot/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.env -.cache diff --git a/matrix-bot/README.md b/matrix-bot/README.md deleted file mode 100644 index 3c4da13..0000000 --- a/matrix-bot/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# matrix-bot - -A matrix library - -## Usage - -```Shell -$ export MATRIX_TOKEN= -$ nix develop -c cabal repl -λ> main -``` diff --git a/matrix-bot/matrix-bot.cabal b/matrix-bot/matrix-bot.cabal deleted file mode 100644 index 5c7629e..0000000 --- a/matrix-bot/matrix-bot.cabal +++ /dev/null @@ -1,36 +0,0 @@ -cabal-version: 2.4 -name: matrix-bot -version: 0.1.0.0 -license: Apache-2.0 -author: Tristan Cacqueray -maintainer: tdecacqu@redhat.com -copyright: 2021 Red Hat - -flag dev - description: Use development settings - default: False - manual: True - -common common - default-language: Haskell2010 - if flag(dev) - ghc-options: - -Wall - -Wcompat - -Werror - -Widentities - -Wincomplete-record-updates - -Wincomplete-uni-patterns - -Wpartial-fields - -Wredundant-constraints - else - ghc-options: - -Wall - -library - import: common - build-depends: base < 5 - , matrix-client - hs-source-dirs: src - exposed-modules: MatrixBot.Main - default-language: Haskell2010 diff --git a/matrix-bot/src/MatrixBot/Main.hs b/matrix-bot/src/MatrixBot/Main.hs deleted file mode 100644 index 53aefde..0000000 --- a/matrix-bot/src/MatrixBot/Main.hs +++ /dev/null @@ -1,8 +0,0 @@ --- | The matrix-bot entrypoint -module MatrixBot.Main where - -import qualified Network.Matrix.Client as Matrix - -main :: IO () -main = do - putStrLn "MatrixBot starting..." diff --git a/matrix-client/matrix-client.cabal b/matrix-client.cabal similarity index 96% rename from matrix-client/matrix-client.cabal rename to matrix-client.cabal index 2284704..b60687e 100644 --- a/matrix-client/matrix-client.cabal +++ b/matrix-client.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: matrix-client -version: 0.1.5.0 +version: 0.1.6.0 synopsis: A matrix client library description: Matrix client is a library to interface with https://matrix.org. @@ -22,7 +22,7 @@ category: Network build-type: Simple extra-doc-files: CHANGELOG.md extra-source-files: test/data/*.json -tested-with: GHC == 8.10.7, GHC == 9.2.4 +tested-with: GHC == 9.6.6 source-repository head type: git @@ -48,7 +48,7 @@ common common-options common lib-depends build-depends: SHA ^>= 1.6 - , base64 >= 0.4.2 && < 0.5 + , base64 >= 1.0 , bytestring >= 0.11.3 && < 0.13 , containers >= 0.6.5 && < 0.8 , exceptions >= 0.10.4 && < 0.11 diff --git a/matrix-client/LICENSE b/matrix-client/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/matrix-client/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/matrix-client/src/Network/Matrix/Client.hs b/src/Network/Matrix/Client.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Client.hs rename to src/Network/Matrix/Client.hs diff --git a/matrix-client/src/Network/Matrix/Client/Lens.hs b/src/Network/Matrix/Client/Lens.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Client/Lens.hs rename to src/Network/Matrix/Client/Lens.hs diff --git a/matrix-client/src/Network/Matrix/Events.hs b/src/Network/Matrix/Events.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Events.hs rename to src/Network/Matrix/Events.hs diff --git a/matrix-client/src/Network/Matrix/Identity.hs b/src/Network/Matrix/Identity.hs similarity index 96% rename from matrix-client/src/Network/Matrix/Identity.hs rename to src/Network/Matrix/Identity.hs index 7e42794..03e8f6c 100644 --- a/matrix-client/src/Network/Matrix/Identity.hs +++ b/src/Network/Matrix/Identity.hs @@ -38,8 +38,9 @@ where import Control.Monad (mzero) import Data.Aeson (FromJSON (..), Value (Object, String), encode, object, (.:), (.=)) +import Data.Base64.Types (extractBase64) import Data.ByteString.Lazy (fromStrict) -import Data.ByteString.Lazy.Base64.URL (encodeBase64Unpadded) +import Data.ByteString.Lazy.Base64.URL (encodeBase64) import Data.Digest.Pure.SHA (bytestringDigest, sha256) #if MIN_VERSION_aeson(2,0,0) import qualified Data.Aeson.KeyMap as KeyMap @@ -166,7 +167,7 @@ identitiesLookup session ilr = do -- >>> encodeSHA256 "alice@example.com email matrixrocks" -- "4kenr7N9drpCJ4AfalmlGQVsOn3o2RHjkADUpXJWZUc" encodeSHA256 :: Text -> Text -encodeSHA256 = toStrict . encodeBase64Unpadded . bytestringDigest . sha256 . fromStrict . encodeUtf8 +encodeSHA256 = toStrict . extractBase64 . encodeBase64 . bytestringDigest . sha256 . fromStrict . encodeUtf8 data Identity = Email Text | Msisdn Text deriving (Show, Eq) diff --git a/matrix-client/src/Network/Matrix/Internal.hs b/src/Network/Matrix/Internal.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Internal.hs rename to src/Network/Matrix/Internal.hs diff --git a/matrix-client/src/Network/Matrix/Room.hs b/src/Network/Matrix/Room.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Room.hs rename to src/Network/Matrix/Room.hs diff --git a/matrix-client/src/Network/Matrix/Tutorial.hs b/src/Network/Matrix/Tutorial.hs similarity index 100% rename from matrix-client/src/Network/Matrix/Tutorial.hs rename to src/Network/Matrix/Tutorial.hs diff --git a/matrix-client/test/Spec.hs b/test/Spec.hs similarity index 100% rename from matrix-client/test/Spec.hs rename to test/Spec.hs diff --git a/matrix-client/test/data/message-edit.json b/test/data/message-edit.json similarity index 100% rename from matrix-client/test/data/message-edit.json rename to test/data/message-edit.json diff --git a/matrix-client/test/data/message-reply.json b/test/data/message-reply.json similarity index 100% rename from matrix-client/test/data/message-reply.json rename to test/data/message-reply.json