1
0

3 Коммиты 2b4de48a03 ... a39e3c68eb

Автор SHA1 Сообщение Дата
  Lekuru a39e3c68eb Refactor unsupported protocol notification 4 месяцев назад
  Lekuru 390263aed5 Fix user profile urls 4 месяцев назад
  Lekuru e885816728 Fix osu-token header 4 месяцев назад
3 измененных файлов с 7 добавлено и 2 удалено
  1. 1 1
      src/App/Osu/Bancho.cpp
  2. 5 0
      src/App/Osu/BanchoNetworking.cpp
  3. 1 1
      src/App/Osu/UIUserContextMenu.cpp

+ 1 - 1
src/App/Osu/Bancho.cpp

@@ -318,7 +318,7 @@ void handle_packet(Packet *packet) {
         debugLog("Spectator left: user id %d\n", spectator_id);
     } else if(packet->id == VERSION_UPDATE) {
         disconnect();
-        bancho.osu->getNotificationOverlay()->addNotification("Server uses an unsupported protocol version.");
+        bancho.osu->getNotificationOverlay()->addNotification("This server may use an unsupported protocol version.");
     } else if(packet->id == SPECTATOR_CANT_SPECTATE) {
         i32 spectator_id = read<u32>(packet);
         debugLog("Spectator can't spectate: user id %d\n", spectator_id);

+ 5 - 0
src/App/Osu/BanchoNetworking.cpp

@@ -236,6 +236,10 @@ static void send_bancho_packet(CURL *curl, Packet outgoing) {
     }
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
 
+    auto token_header = UString::format("osu-token: %s", cho_token.toUtf8());
+    chunk = curl_slist_append(chunk, token_header.toUtf8());
+    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
+
     auto query_url = UString::format("https://c.%s/", bancho.endpoint.toUtf8());
     curl_easy_setopt(curl, CURLOPT_URL, query_url.toUtf8());
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, outgoing.memory);
@@ -268,6 +272,7 @@ static void send_bancho_packet(CURL *curl, Packet outgoing) {
         auth_header = "osu-token: " + std::string(header->value);
         cho_token = UString(header->value);
     }
+
     hres = curl_easy_header(curl, "x-mcosu-features", 0, CURLH_HEADER, -1, &header);
     if(hres == CURLHE_OK) {
         if(strstr(header->value, "submit=0") != NULL) {

+ 1 - 1
src/App/Osu/UIUserContextMenu.cpp

@@ -107,7 +107,7 @@ void UIUserContextMenuScreen::on_action(UString text, int user_action) {
     } else if(user_action == START_CHAT) {
         m_osu->m_chat->addChannel(user_info->name, true);
     } else if(user_action == VIEW_PROFILE) {
-        auto url = UString::format("https://%s/u/%d", bancho.endpoint.toUtf8(), m_user_id);
+        auto url = UString::format("https://osu.%s/u/%d", bancho.endpoint.toUtf8(), m_user_id);
         m_osu->getNotificationOverlay()->addNotification("Opening browser, please wait ...", 0xffffffff, false, 0.75f);
         env->openURLInDefaultBrowser(url.toUtf8());
     } else if(user_action == UA_ADD_FRIEND) {