X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.cpp;h=0f0be89a60dae4bfa10aa6018f9e336b718cd416;hp=f1654a4d1169fc015149d0b58cb360fd17429558;hb=c351c94e52a01571c34a18ddb5947b9e1f771d8c;hpb=393ac8b4bca9db98f297cb4756ef2e79364bf6f0

diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index f1654a4d..0f0be89a 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -213,6 +213,14 @@ void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QStrin
   emit putCmd("MODE", serverEncode(params));
 }
 
+void CoreUserInputHandler::handleDehalfop(const BufferInfo &bufferInfo, const QString &msg) {
+  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
+  QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'h';
+  QStringList params;
+  params << bufferInfo.bufferName() << m << nicks;
+  emit putCmd("MODE", serverEncode(params));
+}
+
 void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) {
   QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
   QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v';
@@ -370,6 +378,14 @@ void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QStr
   emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self);
 }
 
+void CoreUserInputHandler::handleHalfop(const BufferInfo &bufferInfo, const QString &msg) {
+  QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
+  QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'h';
+  QStringList params;
+  params << bufferInfo.bufferName() << m << nicks;
+  emit putCmd("MODE", serverEncode(params));
+}
+
 void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) {
   QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
   QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o';
@@ -491,6 +507,44 @@ void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QStr
 #endif
 }
 
+void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QString &msg) {
+#ifdef HAVE_QCA2
+  if(!bufferInfo.isValid())
+    return;
+
+  if(!Cipher::neededFeaturesAvailable())
+    return;
+
+  QStringList parms = msg.split(' ', QString::SkipEmptyParts);
+
+  if(parms.isEmpty() && !bufferInfo.bufferName().isEmpty())
+    parms.prepend(bufferInfo.bufferName());
+
+  if(parms.isEmpty()) {
+    emit displayMsg(Message::Info, bufferInfo.bufferName(), "",
+                    tr("[usage] /showkey <nick|channel> shows the encryption key for nick or channel or just /showkey when in a channel or query."));
+    return;
+  }
+
+  QString target = parms.at(0);
+  QByteArray key = network()->cipherKey(target);
+
+  if(key.isEmpty()) {
+    emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target));
+    return;
+  }
+
+  emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 is %2").arg(target).arg(QString(key)));
+
+#else
+  Q_UNUSED(msg)
+  emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built "
+                                                                  "with support for the Qt Cryptographic Architecture (QCA2) library. "
+                                                                  "Contact your distributor about a Quassel package with QCA2 "
+                                                                  "support, or rebuild Quassel with QCA2 present."));
+#endif
+}
+
 void CoreUserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) {
   if(bufferInfo.bufferName().isEmpty())
     return;