mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
032f290767
This change enforces strict include grouping using IncludeCategories
In addition to adding this to the .clang-format file and applying it in the tests/src and src directories, I also did the following small changes:
In ChatterSet.hpp, I changed lrucache to a <>include
In Irc2.hpp, I change common/SignalVector.hpp to a "project-include"
In AttachedWindow.cpp, NativeMessaging.cpp, WindowsHelper.hpp, BaseWindow.cpp, and StreamerMode.cpp, I disabled clang-format for the windows-includes
In WindowDescriptors.hpp, I added the missing vector include. It was previously not needed because the include was handled by another file that was previously included first.
clang-format minimum version has been bumped, so Ubuntu version used in the check-formatting job has been bumped to 22.04 (which is the latest LTS)
81 lines
1.6 KiB
C++
81 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include "providers/twitch/api/Helix.hpp"
|
|
#include "util/RapidjsonHelpers.hpp"
|
|
|
|
#include <pajlada/serialize.hpp>
|
|
#include <QString>
|
|
#include <rapidjson/document.h>
|
|
|
|
#include <cassert>
|
|
|
|
namespace chatterino {
|
|
|
|
struct TwitchUser {
|
|
QString id;
|
|
mutable QString name;
|
|
mutable QString displayName;
|
|
|
|
void update(const TwitchUser &other) const
|
|
{
|
|
assert(this->id == other.id);
|
|
|
|
this->name = other.name;
|
|
this->displayName = other.displayName;
|
|
}
|
|
|
|
void fromHelixBlock(const HelixBlock &ignore)
|
|
{
|
|
this->id = ignore.userId;
|
|
this->name = ignore.userName;
|
|
this->displayName = ignore.displayName;
|
|
}
|
|
|
|
bool operator<(const TwitchUser &rhs) const
|
|
{
|
|
return this->id < rhs.id;
|
|
}
|
|
};
|
|
|
|
} // namespace chatterino
|
|
|
|
namespace pajlada {
|
|
|
|
template <>
|
|
struct Deserialize<chatterino::TwitchUser> {
|
|
static chatterino::TwitchUser get(const rapidjson::Value &value,
|
|
bool *error = nullptr)
|
|
{
|
|
using namespace chatterino;
|
|
|
|
TwitchUser user;
|
|
|
|
if (!value.IsObject())
|
|
{
|
|
PAJLADA_REPORT_ERROR(error)
|
|
return user;
|
|
}
|
|
|
|
if (!rj::getSafe(value, "_id", user.id))
|
|
{
|
|
PAJLADA_REPORT_ERROR(error)
|
|
return user;
|
|
}
|
|
|
|
if (!rj::getSafe(value, "name", user.name))
|
|
{
|
|
PAJLADA_REPORT_ERROR(error)
|
|
return user;
|
|
}
|
|
|
|
if (!rj::getSafe(value, "display_name", user.displayName))
|
|
{
|
|
PAJLADA_REPORT_ERROR(error)
|
|
return user;
|
|
}
|
|
|
|
return user;
|
|
}
|
|
};
|
|
|
|
} // namespace pajlada
|