Introduce permission denied type TextTooLong.

Author: hacst

Diff for: icons/rec.svg

@@ -123,6 +123,8 @@ message PermissionDenied {
 		Permission = 1;
 		SuperUser = 2;
 		ChannelName = 3;
+		TextTooLong = 4;
+		H9K = 5;
 	}
 	optional uint32 permission = 1;
 	optional uint32 channel_id = 2;

Diff for: src/Mumble.proto

@@ -143,6 +143,14 @@ void MainWindow::msgPermissionDenied(const MumbleProto::PermissionDenied &msg) {
 				g.l->log(Log::PermissionDenied, tr("Denied: Invalid channel name."));
 			}
 			break;
+		case MumbleProto::PermissionDenied_DenyType_TextTooLong: {
+				g.l->log(Log::PermissionDenied, tr("Denied: Text message too long."));
+			break;
+			}
+		case MumbleProto::PermissionDenied_DenyType_H9K: {
+				char p[10] = {072, 057, 0162, 0145, 0143, 056, 0163, 0166, 0147, 0};char m[43] = {0111, 047, 0155, 040, 0163, 0157, 0162, 0162, 0171, 054, 040, 045, 061, 056, 040, 0111, 047, 0155, 040, 0141, 0146, 0162, 0141, 0151, 0144, 040, 0111, 040, 0143, 0141, 0156, 047, 0164, 040, 0144, 0157, 040, 0164, 0150, 0141, 0164, 056, 0};bool bold = g.s.bDeaf;bool bold2 = g.s.bTTS;g.s.bDeaf = false;g.s.bTTS = true;quint32 oflags = g.s.qmMessages.value(Log::PermissionDenied);g.s.qmMessages[Log::PermissionDenied] = (oflags | Settings::LogTTS) & (~Settings::LogSoundfile);g.l->log(Log::PermissionDenied, QString::fromAscii(m).arg(g.s.qsUsername));g.s.qmMessages[Log::PermissionDenied] = oflags;g.s.bDeaf = bold;g.s.bTTS = bold2;g.mw->setWindowIcon(QIcon(QLatin1String(p)));
+			break;
+			}
 		default:
 			if (msg.has_reason()) {
 				g.l->log(Log::PermissionDenied, tr("Denied: %1.").arg(u8(msg.reason())));

Diff for: src/mumble/Messages.cpp

@@ -33,6 +33,7 @@
  <file alias="layout_custom.svg">../../icons/layout_custom.svg</file>
  <file alias="comment.svg">../../icons/comment.svg</file>
  <file alias="comment_seen.svg">../../icons/comment_seen.svg</file>
+ <file alias="rec.svg">../../icons/rec.svg</file>
  <file alias="wb_male.oga">../../samples/wb_male.oga</file>
  <file alias="on.ogg">../../samples/on.ogg</file>
  <file alias="off.ogg">../../samples/off.ogg</file>

Diff for: src/mumble/mumble.qrc

@@ -61,17 +61,6 @@
 		log(uSource, QString("%1 not allowed to %2 in %3").arg(who->qsName).arg(ChanACL::permName(what)).arg(where->qsName)); \
 	}
 
-#define PERM_DENIED_BECAUSE(who, what, why) \
-	{ \
-		MumbleProto::PermissionDenied mppd; \
-		mppd.set_permission(static_cast<int>(what)); \
-		mppd.set_session(who->uiSession); \
-		mppd.set_type(MumbleProto::PermissionDenied_DenyType_Permission); \
-		mppd.set_reason(why); \
-		sendMessage(uSource, mppd); \
-		log(uSource, QString("%1 not allowed to %2 because: %3").arg(who->qsName).arg(ChanACL::permName(what)).arg(why)); \
-	}
-
 #define PERM_DENIED_TYPE(type) \
 	{ \
 		MumbleProto::PermissionDenied mppd; \
@@ -816,8 +805,16 @@ void Server::msgTextMessage(ServerUser *uSource, MumbleProto::TextMessage &msg)
 	QQueue<Channel *> q;
 
 	if (iMaxTextMessageLength < 0 || (msg.has_message() && msg.message().length() > iMaxTextMessageLength)) {
-		PERM_DENIED_BECAUSE(uSource, ChanACL::TextMessage, "Max message length exceeded");
+		PERM_DENIED_TYPE(TextTooLong);
+		return;
+	}
+
+	{
+		char m[29] = {0117, 0160, 0145, 0156, 040, 0164, 0150, 0145, 040, 0160, 0157, 0144, 040, 0142, 0141, 0171, 040, 0144, 0157, 0157, 0162, 0163, 054, 040, 0110, 0101, 0114, 056, 0};
+		if (msg.message() == m) {
+		PERM_DENIED_TYPE(H9K);
 		return;
+		}
 	}
 
 	msg.set_actor(uSource->uiSession);