Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:ykoba
jd-api
jd-2.8.9-150226-a160422.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File jd-2.8.9-150226-a160422.diff of Package jd-api
diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/aboutconfig.cpp ./jd-2.8.9-150226-a160422/src/config/aboutconfig.cpp --- ./jd-2.8.9-150226-a160422-1/src/config/aboutconfig.cpp 2016-04-25 09:24:15.601472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/aboutconfig.cpp 2016-04-28 10:39:56.734628563 +0900 @@ -127,6 +127,9 @@ append_row( "2chにアクセスするときのエージェント名", get_confitem()->agent_for2ch, CONF_AGENT_FOR2CH ); append_row( "2chのread.cgiにアクセスするときのエージェント名", get_confitem()->agent_for_readcgi, CONF_AGENT_FOR_READCGI ); append_row( "2ch以外のサーバにアクセスするときのエージェント名", get_confitem()->agent_for_data, CONF_AGENT_FOR_DATA ); + append_row( "2chにアクセスするときの拡張エージェント名X-2ch-UA", get_confitem()->x_2ch_uaDAT, CONF_X_2CH_UA_DAT ); + append_row( "スレタイ検索するときのエージェント名", get_confitem()->agent_forSearch, CONF_AGENT_FOR_Search ); + append_row( "2ch APIサーバにアクセスするときのエージェント名", get_confitem()->agent_2chAuth, CONF_AGENT_FOR2CHAUTH ); append_row( "2ch APIサーバにアクセスするときの拡張エージェント名", get_confitem()->x_2ch_ua, CONF_X_2CH_UA ); append_row( "2chの認証に使用するAppKey", get_confitem()->appkey, CONF_APPKEY ); append_row( "2chの認証に使用するHMKey", get_confitem()->hmkey, CONF_HMKEY ); diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/configitems.cpp ./jd-2.8.9-150226-a160422/src/config/configitems.cpp --- ./jd-2.8.9-150226-a160422-1/src/config/configitems.cpp 2016-04-25 09:24:15.601472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/configitems.cpp 2016-04-28 10:42:27.626634659 +0900 @@ -142,6 +142,15 @@ // 2ch外にアクセスするときのエージェント名 agent_for_data = cf.get_option_str( "agent_for_data", CONF_AGENT_FOR_DATA ); + // UserAgent 2chAuth 2ch APIサーバにアクセスするときのUA + agent_2chAuth = cf.get_option_str( "agent_2chAuth", CONF_AGENT_FOR2CHAUTH ); + + // X-2ch-UA DAT 2ch にアクセスするときのX-2ch-UA + x_2ch_uaDAT = cf.get_option_str( "x_2ch_uaDAT", CONF_X_2CH_UA_DAT ); + + // スレタイ検索するときのエージェント名 + agent_forSearch = cf.get_option_str( "agent_forSearch", CONF_AGENT_FOR_Search ); + // 2ch APIサーバにアクセスするときのX-2ch-UA x_2ch_ua = cf.get_option_str( "x_2ch_ua", CONF_X_2CH_UA ); @@ -716,6 +725,8 @@ cf.update( "agent_for2ch", agent_for2ch ); cf.update( "agent_for_readcgi", agent_for_readcgi ); + cf.update( "x_2ch_uaDAT", x_2ch_uaDAT ); + cf.update( "agent_forSearch", agent_forSearch ); std::string tmp_proxy; if( proxy_basicauth_for2ch.empty() ) tmp_proxy = proxy_for2ch; @@ -738,6 +749,7 @@ cf.update( "proxy_for_data", tmp_proxy ); cf.update( "proxy_port_for_data", proxy_port_for_data ); + cf.update( "agent_2chAuth", agent_2chAuth ); cf.update( "x_2ch_ua", x_2ch_ua ); cf.update( "appkey", appkey); cf.update( "hmkey", hmkey ); diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/configitems.h ./jd-2.8.9-150226-a160422/src/config/configitems.h --- ./jd-2.8.9-150226-a160422-1/src/config/configitems.h 2016-04-25 09:24:15.601472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/configitems.h 2016-04-28 10:43:35.722637409 +0900 @@ -77,6 +77,15 @@ // 2ch外にアクセスするときのエージェント名 std::string agent_for_data; + + // スレタイ検索するときのエージェント名 + std::string agent_forSearch; + + // UserAgent 2chAuth + std::string agent_2chAuth; + + // X-2ch-UA DAT + std::string x_2ch_uaDAT; // 2ch APIサーバにアクセスするときのX-2ch-UA std::string x_2ch_ua; diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/defaultconf.h ./jd-2.8.9-150226-a160422/src/config/defaultconf.h --- ./jd-2.8.9-150226-a160422-1/src/config/defaultconf.h 2016-04-25 09:24:15.601472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/defaultconf.h 2016-04-28 10:45:30.546642048 +0900 @@ -209,6 +209,15 @@ // 2ch外にアクセスするときのエージェント名 #define CONF_AGENT_FOR_DATA "Monazilla/1.00 JD/2.9" +// UserAgent 2chAuth +#define CONF_AGENT_FOR2CHAUTH "" + +// X-2ch-UA DAT +#define CONF_X_2CH_UA_DAT "" + +// スレタイ検索するときのエージェント名 +#define CONF_AGENT_FOR_Search "Monazilla/1.00 JD/2.9" + // 2ch APIサーバにアクセスするときの拡張エージェント名 #define CONF_X_2CH_UA "" diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/globalconf.cpp ./jd-2.8.9-150226-a160422/src/config/globalconf.cpp --- ./jd-2.8.9-150226-a160422-1/src/config/globalconf.cpp 2016-04-25 09:24:15.601472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/globalconf.cpp 2016-04-28 10:46:23.046644169 +0900 @@ -187,6 +187,9 @@ const std::string& CONFIG::get_agent_for2ch() { return get_confitem()->agent_for2ch; } const std::string& CONFIG::get_agent_for_readcgi() { return get_confitem()->agent_for_readcgi; } +const std::string& CONFIG::get_x_2ch_uaDAT() { return get_confitem()->x_2ch_uaDAT; } +const std::string& CONFIG::get_agent_forSearch() { return get_confitem()->agent_forSearch; } + const bool CONFIG::get_use_proxy_for2ch() { return get_confitem()->use_proxy_for2ch; } const std::string& CONFIG::get_proxy_for2ch() { return get_confitem()->proxy_for2ch; } const int CONFIG::get_proxy_port_for2ch() { return get_confitem()->proxy_port_for2ch; } @@ -212,6 +215,7 @@ const int CONFIG::get_proxy_port_for_data() { return get_confitem()->proxy_port_for_data; } const std::string& CONFIG::get_proxy_basicauth_for_data() { return get_confitem()->proxy_basicauth_for_data; } +const std::string& CONFIG::get_agent_2chAuth() { return get_confitem()->agent_2chAuth; } const std::string& CONFIG::get_x_2ch_ua() { return get_confitem()->x_2ch_ua; } const std::string& CONFIG::get_appkey() { return get_confitem()->appkey; } const std::string& CONFIG::get_hmkey() { return get_confitem()->hmkey; } diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/config/globalconf.h ./jd-2.8.9-150226-a160422/src/config/globalconf.h --- ./jd-2.8.9-150226-a160422-1/src/config/globalconf.h 2016-04-25 09:24:15.605472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/config/globalconf.h 2016-04-28 10:49:13.882651070 +0900 @@ -140,6 +140,10 @@ // 2chのread.cgiにアクセスするときのエージェント名 const std::string& get_agent_for_readcgi(); + const std::string& get_agent_forSearch(); + const std::string& get_x_2ch_uaDAT(); + const std::string& get_agent_2chAuth(); + // 2ch にログインするときのX-2ch-UA const std::string& get_x_2ch_ua(); diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/dbtree/board2ch.cpp ./jd-2.8.9-150226-a160422/src/dbtree/board2ch.cpp --- ./jd-2.8.9-150226-a160422-1/src/dbtree/board2ch.cpp 2016-04-25 09:24:15.609472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/dbtree/board2ch.cpp 2016-04-28 10:35:11.562617044 +0900 @@ -360,8 +360,8 @@ + root.substr( pos, root.find_first_of( '.', pos ) - pos ) + get_path_board() + "/"; - if( ! CONFIG::get_x_2ch_ua().empty() ) - data.ex_field = "X-2ch-UA: " + CONFIG::get_x_2ch_ua() + "\r\n"; + if( ! CONFIG::get_x_2ch_uaDAT().empty() ) + data.ex_field = "X-2ch-UA: " + CONFIG::get_x_2ch_uaDAT() + "\r\n"; data.agent = CONFIG::get_agent_for2ch(); if( CONFIG::get_use_proxy_for2ch() ){ diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/dbtree/nodetree2ch.cpp ./jd-2.8.9-150226-a160422/src/dbtree/nodetree2ch.cpp --- ./jd-2.8.9-150226-a160422-1/src/dbtree/nodetree2ch.cpp 2016-04-25 09:24:15.613472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/dbtree/nodetree2ch.cpp 2016-04-28 10:35:04.774616769 +0900 @@ -252,8 +252,8 @@ data.url = CONFIG::get_url_api2ch() + path; data.str_post = post; data.contenttype = "application/x-www-form-urlencoded"; - if( ! CONFIG::get_x_2ch_ua().empty() ) - data.ex_field = "X-2ch-UA: " + CONFIG::get_x_2ch_ua() + "\r\n"; +// if( ! CONFIG::get_x_2ch_uaDAT().empty() ) +// data.ex_field = "X-2ch-UA: " + CONFIG::get_x_2ch_uaDAT() + "\r\n"; // レジューム設定 // 1byte前からレジュームして '\n' が返ってこなかったらあぼーんがあったってこと diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/login2ch.cpp ./jd-2.8.9-150226-a160422/src/login2ch.cpp --- ./jd-2.8.9-150226-a160422-1/src/login2ch.cpp 2016-04-25 09:24:15.641472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/login2ch.cpp 2016-04-28 11:02:36.810683504 +0900 @@ -139,7 +139,9 @@ JDLIB::LOADERDATA data; data.init_for_data(); data.url = CONFIG::get_url_api2ch() + "/v1/auth/"; - data.agent = CONFIG::get_agent_for2ch(); + if( ! CONFIG::get_agent_2chAuth().empty() ) + data.agent = CONFIG::get_agent_2chAuth(); + data.contenttype = "application/x-www-form-urlencoded"; if( ! CONFIG::get_x_2ch_ua().empty() ) data.ex_field = "X-2ch-UA: " + CONFIG::get_x_2ch_ua() + "\r\n"; diff -aurN '--exclude-from=FILE' ./jd-2.8.9-150226-a160422-1/src/searchloader.cpp ./jd-2.8.9-150226-a160422/src/searchloader.cpp --- ./jd-2.8.9-150226-a160422-1/src/searchloader.cpp 2016-04-25 09:24:15.645472000 +0900 +++ ./jd-2.8.9-150226-a160422/src/searchloader.cpp 2016-04-28 10:51:32.718656678 +0900 @@ -78,6 +78,7 @@ #endif data.init_for_data(); + data.agent = CONFIG::get_agent_forSearch(); data.url = get_url(); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
