Merge branch 'master' of ssh://github.com/Nheko-Reborn/nheko

4 files changed, 10 insertions, 6 deletions

diff --git a/README.md b/README.md

index 1f17d4a3..71e486bb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 nheko
 ----
-[![Build Status](https://travis-ci.org/Nheko-Reborn/nheko.svg?branch=master)](https://travis-ci.org/Nheko-Reborn/nheko)
+[![Build Status](https://nheko.im/nheko-reborn/nheko/badges/master/pipeline.svg)](https://nheko.im/nheko-reborn/nheko/-/pipelines/latest)
 [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master)
 [![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.7.2)
 [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://matrix-static.neko.dev/room/!TshDrgpBNBDmfDeEGN:neko.dev/)
@@ -56,6 +56,7 @@ can be found in the [Github releases](https://github.com/Nheko-Reborn/nheko/rele
 [![Packaging status](https://repology.org/badge/tiny-repos/nheko.svg)](https://repology.org/project/nheko/versions)
 
 #### Arch Linux
+
 ```bash
 pacaur -S nheko # nheko-git
 ```
diff --git a/src/Olm.cpp b/src/Olm.cpp

index 808279a3..1f58758c 100644
--- a/src/Olm.cpp
+++ b/src/Olm.cpp
@@ -602,8 +602,9 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e,
                                e.content.session_id);
 
         mtx::events::msg::KeyRequest request;
-        request.action = !cancel ? mtx::events::msg::RequestAction::Request
-                                 : mtx::events::msg::RequestAction::Cancellation;
+        request.action = cancel ? mtx::events::msg::RequestAction::Cancellation
+                                : mtx::events::msg::RequestAction::Request;
+
         request.algorithm            = MEGOLM_ALGO;
         request.room_id              = e.room_id;
         request.sender_key           = e.content.sender_key;
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp

index 26a66ab7..44ad7a3d 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -405,7 +405,9 @@ void
 RegisterPage::onRegisterButtonClicked()
 {
         if (!checkFields()) {
-                showError(error_label_, tr("One or more fields have invalid inputs. Please correct those issues and try again."));
+                showError(error_label_,
+                          tr("One or more fields have invalid inputs. Please correct those issues "
+                             "and try again."));
                 return;
         } else {
                 auto username = username_input_->text().toStdString();
diff --git a/src/Utils.cpp b/src/Utils.cpp

index 463c8af3..7fcaf5e2 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -638,8 +638,8 @@ utils::luminance(const QColor &col)
         qreal lumRgb[3];
 
         for (int i = 0; i < 3; i++) {
-                qreal v                  = colRgb[i] / 255.0;
-                v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4);
+                qreal v   = colRgb[i] / 255.0;
+                lumRgb[i] = v <= 0.03928 ? v / 12.92 : qPow((v + 0.055) / 1.055, 2.4);
         }
 
         auto lum = lumRgb[0] * 0.2126 + lumRgb[1] * 0.7152 + lumRgb[2] * 0.0722;