Skip to content

Commit

Permalink
0.8e update
Browse files Browse the repository at this point in the history 
Fixed user-agent issue with http requests, since Cloudflare seems to be blocking requests that don't contain one.
  • Loading branch information
@testpushpleaseignore
testpushpleaseignore committed May 6, 2022
1 parent c08a170 commit 8f863a5
Show file tree
Hide file tree
Showing 16 changed files with 1,717 additions and 1,673 deletions.
198 changes: 99 additions & 99 deletions acquisition.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ TEMPLATE = app
QT += core gui network testlib

win32 {
QT += winextras
QT.testlib.CONFIG -= console
QT += winextras
QT.testlib.CONFIG -= console
}

unix {
LIBS += -ldl
QMAKE_CXXFLAGS += -Wno-inconsistent-missing-override
LIBS += -ldl
QMAKE_CXXFLAGS += -Wno-inconsistent-missing-override
}

nowebengine {
Expand All @@ -23,112 +23,112 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

include(deps/QsLog/QsLog.pri)

INCLUDEPATH += src deps deps/boost-header-only "C:\Qt\Tools\OpenSSL\Win_x64\include"
INCLUDEPATH += src deps deps/boost-header-only "C:\Program Files\OpenSSL-Win64\include"

SOURCES += \
deps/sqlite/sqlite3.c \
src/application.cpp \
src/autoonline.cpp \
src/bucket.cpp \
src/buyoutmanager.cpp \
src/column.cpp \
src/currencymanager.cpp \
src/influence.cpp \
src/sqlitedatastore.cpp \
src/filesystem.cpp \
src/filters.cpp \
src/flowlayout.cpp \
src/imagecache.cpp \
src/influence.cpp \
src/item.cpp \
src/itemlocation.cpp \
src/items_model.cpp \
src/itemsmanager.cpp \
src/itemsmanagerworker.cpp \
src/itemtooltip.cpp \
src/logindialog.cpp \
src/logpanel.cpp \
src/main.cpp \
src/mainwindow.cpp \
src/memorydatastore.cpp \
src/modlist.cpp \
src/modsfilter.cpp \
src/porting.cpp \
src/replytimeout.cpp \
src/search.cpp \
src/shop.cpp \
src/steamlogindialog.cpp \
src/tabcache.cpp \
src/updatechecker.cpp \
src/util.cpp \
src/version.cpp \
src/verticalscrollarea.cpp \
test/testdata.cpp \
test/testitem.cpp \
test/testitemsmanager.cpp \
test/testmain.cpp \
test/testshop.cpp \
test/testutil.cpp
deps/sqlite/sqlite3.c \
src/application.cpp \
src/autoonline.cpp \
src/bucket.cpp \
src/buyoutmanager.cpp \
src/column.cpp \
src/currencymanager.cpp \
src/influence.cpp \
src/sqlitedatastore.cpp \
src/filesystem.cpp \
src/filters.cpp \
src/flowlayout.cpp \
src/imagecache.cpp \
src/influence.cpp \
src/item.cpp \
src/itemlocation.cpp \
src/items_model.cpp \
src/itemsmanager.cpp \
src/itemsmanagerworker.cpp \
src/itemtooltip.cpp \
src/logindialog.cpp \
src/logpanel.cpp \
src/main.cpp \
src/mainwindow.cpp \
src/memorydatastore.cpp \
src/modlist.cpp \
src/modsfilter.cpp \
src/porting.cpp \
src/replytimeout.cpp \
src/search.cpp \
src/shop.cpp \
src/steamlogindialog.cpp \
src/tabcache.cpp \
src/updatechecker.cpp \
src/util.cpp \
src/version.cpp \
src/verticalscrollarea.cpp \
test/testdata.cpp \
test/testitem.cpp \
test/testitemsmanager.cpp \
test/testmain.cpp \
test/testshop.cpp \
test/testutil.cpp

HEADERS += \
deps/sqlite/sqlite3.h \
src/application.h \
src/autoonline.h \
src/bucket.h \
src/buyoutmanager.h \
src/column.h \
src/currencymanager.h \
src/datastore.h \
src/influence.h \
src/sqlitedatastore.h \
src/filesystem.h \
src/filters.h \
src/flowlayout.h \
src/imagecache.h \
src/influence.h \
src/item.h \
src/itemconstants.h \
src/itemlocation.h \
src/items_model.h \
src/itemsmanager.h \
src/itemsmanagerworker.h \
src/itemtooltip.h \
src/logindialog.h \
src/logpanel.h \
src/mainwindow.h \
src/memorydatastore.h \
src/modlist.h \
src/modsfilter.h \
src/porting.h \
src/rapidjson_util.h \
src/replytimeout.h \
src/search.h \
src/selfdestructingreply.h \
src/shop.h \
src/steamlogindialog.h \
src/tabcache.h \
src/updatechecker.h \
src/util.h \
src/version.h \
src/version_defines.h \
src/verticalscrollarea.h \
test/testdata.h \
test/testitem.h \
test/testitemsmanager.h \
test/testmain.h \
test/testshop.h \
test/testutil.h
deps/sqlite/sqlite3.h \
src/application.h \
src/autoonline.h \
src/bucket.h \
src/buyoutmanager.h \
src/column.h \
src/currencymanager.h \
src/datastore.h \
src/influence.h \
src/sqlitedatastore.h \
src/filesystem.h \
src/filters.h \
src/flowlayout.h \
src/imagecache.h \
src/influence.h \
src/item.h \
src/itemconstants.h \
src/itemlocation.h \
src/items_model.h \
src/itemsmanager.h \
src/itemsmanagerworker.h \
src/itemtooltip.h \
src/logindialog.h \
src/logpanel.h \
src/mainwindow.h \
src/memorydatastore.h \
src/modlist.h \
src/modsfilter.h \
src/porting.h \
src/rapidjson_util.h \
src/replytimeout.h \
src/search.h \
src/selfdestructingreply.h \
src/shop.h \
src/steamlogindialog.h \
src/tabcache.h \
src/updatechecker.h \
src/util.h \
src/version.h \
src/version_defines.h \
src/verticalscrollarea.h \
test/testdata.h \
test/testitem.h \
test/testitemsmanager.h \
test/testmain.h \
test/testshop.h \
test/testutil.h

FORMS += \
forms/mainwindow.ui \
forms/logindialog.ui \
forms/steamlogindialog.ui
forms/mainwindow.ui \
forms/logindialog.ui \
forms/steamlogindialog.ui

#CONFIG += c++11

DEPENDPATH *= $${INCLUDEPATH}

RESOURCES += resources.qrc \
deps/qdarkstyle/style.qrc
deps/qdarkstyle/style.qrc

RC_FILE = resources.rc
80 changes: 40 additions & 40 deletions src/application.h
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*
Copyright 2014 Ilya Zhuravlev
Copyright 2014 Ilya Zhuravlev
This file is part of Acquisition.
This file is part of Acquisition.
Acquisition is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Acquisition is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Acquisition is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Acquisition is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Acquisition. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with Acquisition. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once
Expand All @@ -33,35 +33,35 @@ class Shop;
class CurrencyManager;

class Application : public QObject {
Q_OBJECT
Q_OBJECT
public:
Application();
~Application();
Application(const Application&) = delete;
Application& operator=(const Application&) = delete;
// Should be called by login dialog after login
void InitLogin(std::unique_ptr<QNetworkAccessManager> login_manager, const std::string &league, const std::string &email, bool mock_data = false);
const std::string &league() const { return league_; }
const std::string &email() const { return email_; }
ItemsManager &items_manager() { return *items_manager_; }
DataStore &data() const { return *data_; }
DataStore &sensitive_data() const { return *sensitive_data_; }
BuyoutManager &buyout_manager() const { return *buyout_manager_; }
QNetworkAccessManager &logged_in_nm() const { return *logged_in_nm_; }
Shop &shop() const { return *shop_; }
CurrencyManager &currency_manager() const { return *currency_manager_; }
Application();
~Application();
Application(const Application&) = delete;
Application& operator=(const Application&) = delete;
// Should be called by login dialog after login
void InitLogin(std::unique_ptr<QNetworkAccessManager> login_manager, const std::string &league, const std::string &email, bool mock_data = false);
const std::string &league() const { return league_; }
const std::string &email() const { return email_; }
ItemsManager &items_manager() { return *items_manager_; }
DataStore &data() const { return *data_; }
DataStore &sensitive_data() const { return *sensitive_data_; }
BuyoutManager &buyout_manager() const { return *buyout_manager_; }
QNetworkAccessManager &logged_in_nm() const { return *logged_in_nm_; }
Shop &shop() const { return *shop_; }
CurrencyManager &currency_manager() const { return *currency_manager_; }
public slots:
void OnItemsRefreshed(bool initial_refresh);
void OnItemsRefreshed(bool initial_refresh);
private:
std::string league_;
std::string email_;
std::unique_ptr<DataStore> data_;
// stores sensitive data that you'd rather not share, like control.poe.trade secret URL
std::unique_ptr<DataStore> sensitive_data_;
std::unique_ptr<BuyoutManager> buyout_manager_;
std::unique_ptr<Shop> shop_;
std::unique_ptr<QNetworkAccessManager> logged_in_nm_;
std::unique_ptr<ItemsManager> items_manager_;
std::unique_ptr<CurrencyManager> currency_manager_;
void SaveDbOnNewVersion();
std::string league_;
std::string email_;
std::unique_ptr<DataStore> data_;
// stores sensitive data that you'd rather not share, like control.poe.trade secret URL
std::unique_ptr<DataStore> sensitive_data_;
std::unique_ptr<BuyoutManager> buyout_manager_;
std::unique_ptr<Shop> shop_;
std::unique_ptr<QNetworkAccessManager> logged_in_nm_;
std::unique_ptr<ItemsManager> items_manager_;
std::unique_ptr<CurrencyManager> currency_manager_;
void SaveDbOnNewVersion();
};
Loading

0 comments on commit 8f863a5

Please sign in to comment.