Remove experimental IRC support (#5547)
This commit is contained in:
@@ -511,7 +511,6 @@ public:
|
||||
#ifdef Q_OS_LINUX
|
||||
BoolSetting useKeyring = {"/misc/useKeyring", true};
|
||||
#endif
|
||||
BoolSetting enableExperimentalIrc = {"/misc/experimentalIrc", false};
|
||||
|
||||
IntSetting startUpNotification = {"/misc/startUpNotification", 0};
|
||||
QStringSetting currentVersion = {"/misc/currentVersion", ""};
|
||||
@@ -548,14 +547,7 @@ public:
|
||||
true};
|
||||
BoolSetting lockNotebookLayout = {"/misc/lockNotebookLayout", false};
|
||||
|
||||
/// Debug
|
||||
BoolSetting showUnhandledIrcMessages = {"/debug/showUnhandledIrcMessages",
|
||||
false};
|
||||
|
||||
/// UI
|
||||
// Purely QOL settings are here (like last item in a list).
|
||||
IntSetting lastSelectChannelTab = {"/ui/lastSelectChannelTab", 0};
|
||||
IntSetting lastSelectIrcConn = {"/ui/lastSelectIrcConn", 0};
|
||||
|
||||
BoolSetting showSendButton = {"/ui/showSendButton", false};
|
||||
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
#include "common/QLogging.hpp"
|
||||
#include "debug/AssertInGuiThread.hpp"
|
||||
#include "messages/MessageElement.hpp"
|
||||
#include "providers/irc/Irc2.hpp"
|
||||
#include "providers/irc/IrcChannel2.hpp"
|
||||
#include "providers/irc/IrcServer.hpp"
|
||||
#include "providers/twitch/TwitchIrcServer.hpp"
|
||||
#include "singletons/Paths.hpp"
|
||||
#include "singletons/Settings.hpp"
|
||||
@@ -643,19 +640,6 @@ void WindowManager::encodeChannel(IndirectChannel channel, QJsonObject &obj)
|
||||
obj.insert("type", "live");
|
||||
}
|
||||
break;
|
||||
case Channel::Type::Irc: {
|
||||
if (auto *ircChannel =
|
||||
dynamic_cast<IrcChannel *>(channel.get().get()))
|
||||
{
|
||||
obj.insert("type", "irc");
|
||||
if (ircChannel->server())
|
||||
{
|
||||
obj.insert("server", ircChannel->server()->id());
|
||||
}
|
||||
obj.insert("channel", ircChannel->getName());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Channel::Type::Misc: {
|
||||
obj.insert("type", "misc");
|
||||
obj.insert("name", channel.get()->getName());
|
||||
@@ -705,11 +689,6 @@ IndirectChannel WindowManager::decodeChannel(const SplitDescriptor &descriptor)
|
||||
{
|
||||
return getApp()->getTwitch()->getAutomodChannel();
|
||||
}
|
||||
else if (descriptor.type_ == "irc")
|
||||
{
|
||||
return Irc::instance().getOrAddChannel(descriptor.server_,
|
||||
descriptor.channelName_);
|
||||
}
|
||||
else if (descriptor.type_ == "misc")
|
||||
{
|
||||
return getApp()->getTwitchAbstract()->getChannelOrEmpty(
|
||||
|
||||
Reference in New Issue
Block a user