noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

input of channel names

Browse source
This commit is contained in:
fourtf 2017-01-17 00:15:44 +01:00
parent f227b998a3
commit 91e3976a09
16 changed files with 302 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
channels.cpp
View file

@ -1,37 +1,51 @@
#include "channels.h"
#include "ircmanager.h"
Channel Channels::m_whispers(QString("/whispers"));
Channel Channels::m_mentions(QString("/mentions"));
Channel Channels::m_empty(QString(""));
QMap<QString, std::tuple<Channel *, int>> Channels::m_channels;
Channel *
Channels::addChannel(const QString &channel)
{
auto c = getChannel(channel);
QString c = channel.toLower();
if (c == NULL) {
c = new Channel(channel);
m_channels.insert(channel, std::tuple<Channel *, int>(c, 1));
auto a = m_channels.find(c);
return c;
if (a == m_channels.end()) {
auto _c = new Channel(c);
m_channels.insert(c, std::tuple<Channel *, int>(_c, 1));
IrcManager::joinChannel(c);
return _c;
} else {
std::get<1>(a.value())++;
}
return c;
return std::get<0>(a.value());
}
Channel *
Channels::getChannel(const QString &channel)
{
if (channel == "/whispers") {
return &m_whispers;
QString c = channel.toLower();
if (channel.length() > 1 && channel.at(0) == '/') {
if (c == "/whispers") {
return &m_whispers;
}
if (c == "/mentions") {
return &m_mentions;
}
return &m_empty;
}
if (channel == "/mentions") {
return &m_mentions;
}
auto a = m_channels.find(channel);
auto a = m_channels.find(c);
if (a == m_channels.end()) {
return NULL;
@ -43,7 +57,13 @@ Channels::getChannel(const QString &channel)
void
Channels::removeChannel(const QString &channel)
{
auto a = m_channels.find(channel);
if (channel.length() > 1 && channel.at(0) == '/') {
return;
}
QString c = channel.toLower();
auto a = m_channels.find(c);
if (a == m_channels.end()) {
return;
@ -52,7 +72,8 @@ Channels::removeChannel(const QString &channel)
std::get<1>(a.value())--;
if (std::get<1>(a.value()) == 0) {
m_channels.remove(channel);
IrcManager::partChannel(c);
m_channels.remove(c);
delete std::get<0>(a.value());
}
}

1
channels.h
View file

@ -29,6 +29,7 @@ private:
static Channel m_whispers;
static Channel m_mentions;
static Channel m_empty;
static QMap<QString, std::tuple<Channel *, int>> m_channels;
};

4
chatterino.pro
View file

@ -68,7 +68,7 @@ SOURCES += main.cpp\
chatwidgetheaderbutton.cpp \
chatwidgetheaderbuttonlabel.cpp \
channels.cpp \
textinputform.cpp
textinputdialog.cpp
HEADERS += mainwindow.h \
chatwidget.h \
@ -108,7 +108,7 @@ HEADERS += mainwindow.h \
chatwidgetheaderbutton.h \
chatwidgetheaderbuttonlabel.h \
channels.h \
textinputform.h
textinputdialog.h
PRECOMPILED_HEADER =

56
chatwidget.cpp
View file

@ -1,14 +1,21 @@
#include "chatwidget.h"
#include "QFont"
#include "QFontDatabase"
#include "QPainter"
#include "QVBoxLayout"
#include "channels.h"
#include "colorscheme.h"
#include "textinputdialog.h"
#include <QFont>
#include <QFontDatabase>
#include <QPainter>
#include <QVBoxLayout>
ChatWidget::ChatWidget(QWidget *parent)
: QWidget(parent)
, m_header(this)
, m_channel(NULL)
, m_channelName(QString())
, m_vbox(this)
, m_header(this)
, m_view(this)
, m_input()
{
m_vbox.setSpacing(0);
m_vbox.setMargin(1);
@ -22,6 +29,45 @@ ChatWidget::~ChatWidget()
{
}
void
ChatWidget::setChannelName(const QString &name)
{
QString channel = name.trimmed();
if (QString::compare(channel, m_channelName, Qt::CaseInsensitive) == 0) {
m_channelName = channel;
m_header.updateChannelText();
return;
}
m_channelName = channel;
m_header.updateChannelText();
m_view.layoutMessages();
if (!m_channelName.isEmpty()) {
Channels::removeChannel(m_channelName);
}
if (channel.isEmpty()) {
m_channel = NULL;
} else {
m_channel = Channels::addChannel(channel);
}
}
void
ChatWidget::showChangeChannelPopup()
{
TextInputDialog dialog(this);
dialog.setText(m_channelName);
if (dialog.exec() == QDialog::Accepted) {
setChannelName(dialog.text());
}
}
void
ChatWidget::paintEvent(QPaintEvent *)
{

15
chatwidget.h
View file

@ -29,17 +29,28 @@ public:
return m_channel;
}
const QString &
channelName() const
{
return m_channelName;
}
void setChannelName(const QString &name);
void showChangeChannelPopup();
protected:
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
private:
Channel *m_channel;
QString m_channelName;
QFont m_font;
QVBoxLayout m_vbox;
ChatWidgetHeader m_header;
ChatWidgetView m_view;
ChatWidgetInput m_input;
Channel *m_channel = NULL;
};
#endif // CHATWIDGET_H

64
chatwidgetheader.cpp
View file

@ -22,6 +22,7 @@ ChatWidgetHeader::ChatWidgetHeader(ChatWidget *parent)
setFixedHeight(32);
updateColors();
updateChannelText();
setLayout(&m_hbox);
m_hbox.setMargin(0);
@ -37,36 +38,28 @@ ChatWidgetHeader::ChatWidgetHeader(ChatWidget *parent)
QObject::connect(&m_leftLabel, &ChatWidgetHeaderButton::clicked, this,
&ChatWidgetHeader::leftButtonClicked);
m_leftMenu.addAction("Add new split", this,
SLOT(menuAddSplit()),
QKeySequence(tr("Ctrl+T")));
m_leftMenu.addAction("Close split", this,
SLOT(menuCloseSplit()),
QKeySequence(tr("Ctrl+W")));
m_leftMenu.addAction("Move split", this,
SLOT(menuMoveSplit()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Change channel", this,
SLOT(menuChangeChannel()),
QKeySequence(tr("Ctrl+R")));
m_leftMenu.addAction("Clear chat", this,
SLOT(menuClearChat()));
m_leftMenu.addAction("Open channel", this,
SLOT(menuOpenChannel()));
m_leftMenu.addAction("Open pop-out player", this,
SLOT(menuPopupPlayer()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Reload channel emotes", this,
SLOT(menuReloadChannelEmotes()));
m_leftMenu.addAction("Manual reconnect", this,
SLOT(menuManualReconnect()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Show changelog", this,
SLOT(menuShowChangelog()));
m_leftMenu.addAction("Add new split", this, SLOT(menuAddSplit()),
QKeySequence(tr("Ctrl+T")));
m_leftMenu.addAction("Close split", this, SLOT(menuCloseSplit()),
QKeySequence(tr("Ctrl+W")));
m_leftMenu.addAction("Move split", this, SLOT(menuMoveSplit()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Change channel", this, SLOT(menuChangeChannel()),
QKeySequence(tr("Ctrl+R")));
m_leftMenu.addAction("Clear chat", this, SLOT(menuClearChat()));
m_leftMenu.addAction("Open channel", this, SLOT(menuOpenChannel()));
m_leftMenu.addAction("Open pop-out player", this, SLOT(menuPopupPlayer()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Reload channel emotes", this,
SLOT(menuReloadChannelEmotes()));
m_leftMenu.addAction("Manual reconnect", this, SLOT(menuManualReconnect()));
m_leftMenu.addSeparator();
m_leftMenu.addAction("Show changelog", this, SLOT(menuShowChangelog()));
// middle
m_middleLabel.setAlignment(Qt::AlignCenter);
m_middleLabel.setText("textString");
QObject::connect(&m_middleLabel, &m_middleLabel.mouseDoubleClickEvent, this,
&mouseDoubleClickEvent);
// right
m_rightLabel.setMinimumWidth(height());
@ -85,6 +78,14 @@ ChatWidgetHeader::updateColors()
m_rightLabel.setPalette(palette);
}
void
ChatWidgetHeader::updateChannelText()
{
const QString &c = m_chatWidget->channelName();
m_middleLabel.setText(c.isEmpty() ? "<no channel>" : c);
}
void
ChatWidgetHeader::paintEvent(QPaintEvent *)
{
@ -139,6 +140,14 @@ ChatWidgetHeader::mouseMoveEvent(QMouseEvent *event)
}
}
void
ChatWidgetHeader::mouseDoubleClickEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton) {
chatWidget()->showChangeChannelPopup();
}
}
void
ChatWidgetHeader::leftButtonClicked()
{
@ -166,6 +175,7 @@ ChatWidgetHeader::menuMoveSplit()
void
ChatWidgetHeader::menuChangeChannel()
{
m_chatWidget->showChangeChannelPopup();
}
void
ChatWidgetHeader::menuClearChat()

2
chatwidgetheader.h
View file

@ -28,11 +28,13 @@ public:
}
void updateColors();
void updateChannelText();
protected:
void paintEvent(QPaintEvent *);
void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseDoubleClickEvent(QMouseEvent *event);
private:
ChatWidget *m_chatWidget;

17
chatwidgetview.cpp
View file

@ -1,5 +1,6 @@
#include "chatwidgetview.h"
#include "channels.h"
#include "chatwidget.h"
#include "message.h"
#include "word.h"
#include "wordpart.h"
@ -7,22 +8,20 @@
#include <QPainter>
#include <QScroller>
ChatWidgetView::ChatWidgetView()
ChatWidgetView::ChatWidgetView(ChatWidget *parent)
: QWidget()
, scrollbar(this)
, m_channel(NULL)
, m_chatWidget(parent)
, m_scrollbar(this)
{
auto scroll = QScroller::scroller(this);
scroll->scrollTo(QPointF(0, 100));
m_channel = Channels::getChannel("fourtf");
}
bool
ChatWidgetView::layoutMessages()
{
auto c = channel();
auto c = m_chatWidget->channel();
if (c == NULL)
return false;
@ -41,8 +40,8 @@ ChatWidgetView::layoutMessages()
void
ChatWidgetView::resizeEvent(QResizeEvent *)
{
scrollbar.resize(scrollbar.width(), height());
scrollbar.move(width() - scrollbar.width(), 0);
m_scrollbar.resize(m_scrollbar.width(), height());
m_scrollbar.move(width() - m_scrollbar.width(), 0);
layoutMessages();
}
@ -54,7 +53,7 @@ ChatWidgetView::paintEvent(QPaintEvent *)
painter.setRenderHint(QPainter::SmoothPixmapTransform);
auto c = channel();
auto c = m_chatWidget->channel();
if (c == NULL)
return;

15
chatwidgetview.h
View file

@ -6,18 +6,14 @@
#include "channel.h"
#include "scrollbar.h"
class ChatWidget;
class ChatWidgetView : public QWidget
{
Q_OBJECT
public:
ChatWidgetView();
Channel *
channel()
{
return m_channel;
}
ChatWidgetView(ChatWidget *parent);
bool layoutMessages();
@ -25,8 +21,9 @@ protected:
void resizeEvent(QResizeEvent *);
private:
ScrollBar scrollbar;
Channel *m_channel;
ChatWidget *m_chatWidget;
ScrollBar m_scrollbar;
void paintEvent(QPaintEvent *);
};

97
ircmanager.cpp
View file

@ -13,14 +13,14 @@
#include <future>
Account *IrcManager::account = nullptr;
IrcConnection *IrcManager::connection = NULL;
QMutex IrcManager::connectionMutex;
long IrcManager::connectionIteration = 0;
IrcConnection *IrcManager::m_connection = NULL;
QMutex IrcManager::m_connectionMutex;
long IrcManager::m_connectionIteration = 0;
const QString IrcManager::defaultClientId = "7ue61iz46fz11y3cugd0l3tawb4taal";
QNetworkAccessManager IrcManager::m_accessManager;
QMap<QString, bool> IrcManager::twitchBlockedUsers;
QMutex IrcManager::twitchBlockedUsersMutex;
QMap<QString, bool> IrcManager::m_twitchBlockedUsers;
QMutex IrcManager::m_twitchBlockedUsersMutex;
IrcManager::IrcManager()
{
@ -39,7 +39,7 @@ IrcManager::beginConnecting()
{
IrcManager::account = const_cast<Account *>(Account::anon());
int iteration = ++connectionIteration;
int iteration = ++m_connectionIteration;
auto c = new IrcConnection();
@ -62,9 +62,9 @@ IrcManager::beginConnecting()
QNetworkReply *reply = m_accessManager.get(req);
QObject::connect(reply, &QNetworkReply::finished, [=] {
twitchBlockedUsersMutex.lock();
twitchBlockedUsers.clear();
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.clear();
m_twitchBlockedUsersMutex.unlock();
QByteArray data = reply->readAll();
QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
@ -75,15 +75,15 @@ IrcManager::beginConnecting()
auto blocks = root.value("blocks").toArray();
twitchBlockedUsersMutex.lock();
m_twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user =
block.toObject().value("user").toObject();
// display_name
twitchBlockedUsers.insert(
m_twitchBlockedUsers.insert(
user.value("name").toString().toLower(), true);
}
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.unlock();
});
}
@ -104,15 +104,15 @@ IrcManager::beginConnecting()
auto blocks = root.value("blocks").toArray();
twitchBlockedUsersMutex.lock();
m_twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user =
block.toObject().value("user").toObject();
// display_name
twitchBlockedUsers.insert(
m_twitchBlockedUsers.insert(
user.value("name").toString().toLower(), true);
}
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.unlock();
});
}
}
@ -123,41 +123,60 @@ IrcManager::beginConnecting()
c->setUserName("justinfan123");
c->setNickName("justinfan123");
c->setRealName("justinfan123");
c->sendRaw("JOIN #fourtf");
c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/commands"));
c->sendCommand(IrcCommand::createCapability("REQ", "twitch.tv/tags"));
c->open();
connectionMutex.lock();
if (iteration == connectionIteration) {
delete connection;
m_connectionMutex.lock();
if (iteration == m_connectionIteration) {
delete m_connection;
c->moveToThread(QCoreApplication::instance()->thread());
connection = c;
m_connection = c;
} else {
delete c;
}
connectionMutex.unlock();
m_connectionMutex.unlock();
}
void
IrcManager::disconnect()
{
connectionMutex.lock();
m_connectionMutex.lock();
if (connection != NULL) {
delete connection;
connection = NULL;
if (m_connection != NULL) {
delete m_connection;
m_connection = NULL;
}
connectionMutex.unlock();
m_connectionMutex.unlock();
}
void
IrcManager::joinChannel(const QString &channel)
{
m_connectionMutex.lock();
if (m_connection != NULL) {
m_connection->sendRaw("JOIN #" + channel);
}
m_connectionMutex.unlock();
}
void
IrcManager::partChannel(const QString &channel)
{
m_connectionMutex.lock();
if (m_connection != NULL) {
m_connection->sendRaw("PART #" + channel);
}
m_connectionMutex.unlock();
}
void
IrcManager::messageReceived(IrcMessage *message)
{
// qInfo(message->command().toStdString().c_str());
qInfo(message->command().toStdString().c_str());
// if (message->command() == "")
}
@ -165,7 +184,7 @@ IrcManager::messageReceived(IrcMessage *message)
void
IrcManager::privateMessageReceived(IrcPrivateMessage *message)
{
// qInfo(message->content().toStdString().c_str());
// qInfo(message->content().toStdString().c_str());
auto c = Channels::getChannel(message->target().mid(1));
@ -177,16 +196,16 @@ IrcManager::privateMessageReceived(IrcPrivateMessage *message)
bool
IrcManager::isTwitchBlockedUser(QString const &username)
{
twitchBlockedUsersMutex.lock();
m_twitchBlockedUsersMutex.lock();
auto iterator = twitchBlockedUsers.find(username);
auto iterator = m_twitchBlockedUsers.find(username);
if (iterator == twitchBlockedUsers.end()) {
twitchBlockedUsersMutex.unlock();
if (iterator == m_twitchBlockedUsers.end()) {
m_twitchBlockedUsersMutex.unlock();
return false;
}
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.unlock();
return true;
}
@ -202,9 +221,9 @@ IrcManager::tryAddIgnoredUser(QString const &username, QString &errorMessage)
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
twitchBlockedUsersMutex.lock();
twitchBlockedUsers.insert(username, true);
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.insert(username, true);
m_twitchBlockedUsersMutex.unlock();
delete reply;
return true;
@ -236,9 +255,9 @@ IrcManager::tryRemoveIgnoredUser(QString const &username, QString &errorMessage)
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
twitchBlockedUsersMutex.lock();
twitchBlockedUsers.remove(username);
twitchBlockedUsersMutex.unlock();
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.remove(username);
m_twitchBlockedUsersMutex.unlock();
delete reply;
return true;

14
ircmanager.h
View file

@ -34,19 +34,23 @@ public:
return m_accessManager;
}
static void joinChannel(const QString &channel);
static void partChannel(const QString &channel);
private:
IrcManager();
static QMap<QString, bool> twitchBlockedUsers;
static QMutex twitchBlockedUsersMutex;
static QMap<QString, bool> m_twitchBlockedUsers;
static QMutex m_twitchBlockedUsersMutex;
static QNetworkAccessManager m_accessManager;
static void beginConnecting();
static IrcConnection *connection;
static QMutex connectionMutex;
static long connectionIteration;
static IrcConnection *m_connection;
static QMutex m_connectionMutex;
static long m_connectionIteration;
static void messageReceived(IrcMessage *message);
static void privateMessageReceived(IrcPrivateMessage *message);

3
main.cpp
View file

@ -22,9 +22,6 @@ main(int argc, char *argv[])
MainWindow &w = Windows::mainWindow();
w.show();
Channels::addChannel("ian678");
Channels::addChannel("fourtf");
IrcManager::connect();
return a.exec();

38
textinputdialog.cpp Normal file
View file

@ -0,0 +1,38 @@
#include "textinputdialog.h"
#include <QSizePolicy>
TextInputDialog::TextInputDialog(QWidget *parent)
: QDialog(parent)
, m_vbox(this)
, m_lineEdit()
, m_buttonBox()
, m_okButton("OK")
, m_cancelButton("Cancel")
{
m_vbox.addWidget(&m_lineEdit);
m_vbox.addLayout(&m_buttonBox);
m_buttonBox.addStretch(1);
m_buttonBox.addWidget(&m_okButton);
m_buttonBox.addWidget(&m_cancelButton);
QObject::connect(&m_okButton, &m_okButton.clicked, this, &okButtonClicked);
QObject::connect(&m_cancelButton, &m_cancelButton.clicked, this,
&cancelButtonClicked);
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
setWindowFlags((windowFlags() & ~(Qt::WindowContextHelpButtonHint)) |
Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint);
}
void
TextInputDialog::okButtonClicked()
{
accept();
}
void
TextInputDialog::cancelButtonClicked()
{
reject();
}

41
textinputdialog.h Normal file
View file

@ -0,0 +1,41 @@
#ifndef TEXTINPUTDIALOG_H
#define TEXTINPUTDIALOG_H
#include <QDialog>
#include <QHBoxLayout>
#include <QLineEdit>
#include <QPushButton>
#include <QString>
#include <QVBoxLayout>
class TextInputDialog : public QDialog
{
Q_OBJECT
public:
TextInputDialog(QWidget *parent = NULL);
QString
text() const
{
return m_lineEdit.text();
}
void
setText(const QString &text)
{
m_lineEdit.setText(text);
}
private:
QVBoxLayout m_vbox;
QLineEdit m_lineEdit;
QHBoxLayout m_buttonBox;
QPushButton m_okButton;
QPushButton m_cancelButton;
void okButtonClicked();
void cancelButtonClicked();
};
#endif // TEXTINPUTDIALOG_H

6
textinputform.cpp
View file

@ -1,6 +0,0 @@
#include "textinputform.h"
TextInputForm::TextInputForm()
{
}

12
textinputform.h
View file

@ -1,12 +0,0 @@
#ifndef TEXTINPUTFORM_H
#define TEXTINPUTFORM_H
#include <QDialog>
class TextInputForm : public QDialog
{
public:
TextInputForm();
};
#endif // TEXTINPUTFORM_H