From 88046506c3b77adf9b2455d57d0e2b0a7c687a28 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sun, 4 Sep 2022 21:33:44 +0200 Subject: [PATCH] Renamed Metaverse Server to Directory Server/Services --- BUILD.md | 2 +- README.md | 15 +++--- assignment-client/src/avatars/MixerAvatar.cpp | 2 +- debian/control | 10 ++-- .../resources/describe-settings.json | 18 +++---- domain-server/resources/web/js/shared.js | 6 +-- .../resources/web/settings/js/settings.js | 18 +++---- .../resources/web/wizard/index.shtml | 14 +++--- .../resources/web/wizard/js/wizard.js | 12 ++--- domain-server/src/DomainGatekeeper.cpp | 14 +++--- domain-server/src/DomainGatekeeper.h | 4 +- domain-server/src/DomainServer.cpp | 26 +++++----- .../src/DomainServerSettingsManager.cpp | 6 +-- .../src/DomainServerSettingsManager.h | 4 +- ice-server/src/IceServer.cpp | 6 +-- .../qml/LoginDialog/LinkAccountBody.qml | 16 +++---- interface/src/Application.cpp | 10 ++-- interface/src/DiscoverabilityManager.cpp | 2 +- interface/src/LocationBookmarks.h | 18 +++---- interface/src/main.cpp | 2 +- .../AccountServicesScriptingInterface.h | 6 +-- .../src/scripting/WindowScriptingInterface.h | 6 +-- interface/src/ui/LoginDialog.cpp | 4 +- .../entities/src/EntityItemProperties.cpp | 2 +- libraries/networking/src/AccountManager.cpp | 18 +++---- libraries/networking/src/AddressManager.h | 48 +++++++++---------- libraries/networking/src/DomainHandler.cpp | 6 +-- libraries/networking/src/DomainHandler.h | 4 +- libraries/networking/src/MetaverseAPI.cpp | 2 +- .../networking/src/NetworkingConstants.h | 4 +- libraries/networking/src/NodeList.cpp | 2 +- pkg-scripts/new-server | 2 +- script-archive/hotPlaces.js | 2 +- scripts/communityScripts/explore/explore.html | 6 +-- scripts/system/makeUserConnection.js | 4 +- scripts/system/places/places.html | 2 +- scripts/system/request-service.js | 4 +- scripts/system/tablet-users.js | 2 +- scripts/tutorials/getDomainMetadata.js | 4 +- tools/jsdoc/api-mainpage.md | 4 +- 40 files changed, 169 insertions(+), 168 deletions(-) diff --git a/BUILD.md b/BUILD.md index 2031d2226d..aa623d934c 100644 --- a/BUILD.md +++ b/BUILD.md @@ -128,7 +128,7 @@ PRODUCTION_BUILD=0|1 PR_BUILD=0|1 STABLE_BUILD=0|1 -// Determine if to utilize testing or stable Metaverse URLs +// Determine if to utilize testing or stable directory services URLs USE_STABLE_GLOBAL_SERVICES=1 BUILD_GLOBAL_SERVICES=STABLE ``` diff --git a/README.md b/README.md index d9dffc9f33..b86364a86b 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,11 @@ ### What is this? -Overte is a 3D social software project seeking to incrementally bring about a truly free and open metaverse. +Overte is a free and open source 3D social virtual worlds software. * Desktop and VR use * Hundreds of users simultaneously +* Collaborative in-game creation * Full-body avatars * FBX, glTF, and OBJ support * JavaScript scripting engine @@ -58,18 +59,18 @@ Overte is a 3D social software project seeking to incrementally bring about a tr - [For Linux - Server .deb - Overte Builder](INSTALLER.md#ubuntu-1804--deb) - [For Linux - Interface AppImage - Overte Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages) -### Boot to Metaverse: The Goal +### Mission statement -Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's metaverse. Finding a way to make infinite realities our reality is the dream. +Overte aims to provide social virtual worlds experience with entitely free and open source infrastructure. -### Boot to Metaverse: The Technicals +### Technical details -Overte consists of many projects and codebases with its unifying structure's goal being a decentralized metaverse. +Overte consists of many projects and codebases with its unifying structure's goal being free and open source self-hosted virtual worlds. - The Interface - You are here! - The Server - You are also here! -- [The Metaverse Server (Codename Iamus)](https://github.com/overte/Iamus/) -- [The Metaverse Server Dashboard (Codename Iamus)](https://github.com/overte/project-iamus-dashboard/) +- [The Directory Server (Codename Iamus)](https://github.com/overte/Iamus/) +- [The Directory Server Dashboard (Codename Iamus)](https://github.com/overte/project-iamus-dashboard/) - [The Launcher (Codename Pantheon)](https://github.com/overte/pantheon-launcher/) - Currently Windows only. #### Tools diff --git a/assignment-client/src/avatars/MixerAvatar.cpp b/assignment-client/src/avatars/MixerAvatar.cpp index 30509aaed8..a31a84a41d 100644 --- a/assignment-client/src/avatars/MixerAvatar.cpp +++ b/assignment-client/src/avatars/MixerAvatar.cpp @@ -230,7 +230,7 @@ void MixerAvatar::ownerRequestComplete() { } void MixerAvatar::requestCurrentOwnership() { - // Get registered owner's public key from metaverse. + // Get registered owner's public key from directory server. static const QString POP_MARKETPLACE_API { "/api/v1/commerce/proof_of_purchase_status/transfer" }; auto& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest networkRequest; diff --git a/debian/control b/debian/control index 15d354d0b3..7d2405272a 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: Seth Alves Build-Depends: debhelper (>= 11), cmake Standards-Version: 4.1.3 -Homepage: https://www.highfidelity.com/ -Vcs-Browser: https://github.com/highfidelity/hifi -Vcs-Git: https://github.com/highfidelity/hifi.git +Homepage: https://www.overte.org/ +Vcs-Browser: https://github.com/overte-org/overte +Vcs-Git: https://github.com/overte-org/overte.git Package: hifi-interface Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5quick5, libqt5quickcontrols2-5, libqt5quickwidgets5, qml-module-qtquick-controls, qml-module-qtquick-controls2, qml-module-qtquick-dialogs, libqt5webchannel5, qml-module-qtwebchannel, qml-module-qtwebengine, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings -Description: High Fidelity allows creation and sharing of VR experiences. - The High Fidelity metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment. +Description: Overte allows creation and sharing of virtual worlds experiences. + Overte provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment. diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index cad51a40dc..cf74b0a836 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -3,25 +3,25 @@ "settings": [ { "name": "metaverse", - "label": "Networking / Metaverse", + "label": "Networking / Directory Services", "settings": [ { "name": "access_token", "label": "Access Token", - "help": "This is your OAuth access token to connect this domain-server with your Metaverse account.
It can be generated by clicking the 'Connect Account' button above.
You can also go to the Security page of your account on your Metaverse Server and generate a token with the 'domains' scope and paste it here.", + "help": "This is your OAuth access token to connect this domain-server with your Directory Services account.
It can be generated by clicking the 'Connect Account' button above.
You can also go to the Security page of your account on your Directory Server and generate a token with the 'domains' scope and paste it here.", "advanced": true, "backup": false }, { "name": "id", "label": "Domain ID", - "help": "This is your Metaverse domain ID. If you do not want your domain to be registered in the Metaverse you can leave this blank.", + "help": "This is your Directory Services domain ID. If you do not want your domain to be registered in the Directory Services you can leave this blank.", "advanced": true }, { "name": "automatic_networking", "label": "Automatic Networking", - "help": "This defines how other nodes in the Metaverse will be able to reach your domain-server.
If you don't want to deal with any network settings, use full automatic networking.", + "help": "This defines how other users will be able to reach your domain-server.
If you don't want to deal with any network settings, use full automatic networking.", "default": "full", "type": "select", "options": [ @@ -35,7 +35,7 @@ }, { "value": "disabled", - "label": "None: use the network information I have entered for this domain at in the Metaverse Server." + "label": "None: use the network information I have entered for this domain at the Directory Server." } ] }, @@ -50,7 +50,7 @@ { "name": "enable_packet_verification", "label": "Enable Packet Verification", - "help": "Enable secure checksums on communication that uses the Metaverse protocol. Increases security with possibly a small performance penalty.", + "help": "Enable secure checksums on communication that uses the Directory Services protocol. Increases security with possibly a small performance penalty.", "default": true, "type": "checkbox", "advanced": true @@ -66,7 +66,7 @@ { "name": "metadata_exporter_port", "label": "Metadata Exporter HTTP Port", - "help": "This is the port where the Metaverse exporter accepts connections. It listens both on IPv4 and IPv6 and can be accessed remotely, so you should make sure to restrict access with a firewall as needed.", + "help": "This is the port where the Metadata exporter accepts connections. It listens both on IPv4 and IPv6 and can be accessed remotely, so you should make sure to restrict access with a firewall as needed.", "default": "9704", "type": "int", "advanced": true @@ -182,7 +182,7 @@ "name": "descriptors", "label": "Description", "restart": false, - "help": "This data will be queryable from your server. It may be collected by the Metaverse and used to share your domain with others.", + "help": "This data will be queryable from your server. It may be collected by the Directory Services and used to share your domain with others.", "settings": [ { "name": "world_name", @@ -1947,7 +1947,7 @@ "label": "Admin Roles", "type": "table", "can_add_new_rows": true, - "help": "Any user with any of these metaverse roles can administer the domain.", + "help": "Any user with any of these roles can administer the domain.", "numbered": false, "backup": false, "advanced": true, diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js index 85a0c6ac4c..961cc9ed8b 100644 --- a/domain-server/resources/web/js/shared.js +++ b/domain-server/resources/web/js/shared.js @@ -61,7 +61,7 @@ var Strings = { CHOOSE_DOMAIN_BUTTON: "Choose from my domains", CREATE_DOMAIN_BUTTON: "Create new domain ID", - CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connnected your Metaverse account and created a new domain ID for this machine.", + CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connected your Directory Services account and created a new domain ID for this machine.", CREATE_DOMAIN_SUCCESS: "We created a new domain ID for this machine.", // When a place modification fails, they will be brought back to the previous @@ -92,7 +92,7 @@ var Strings = { ADD_PLACE_LOADING_DIALOG: "Loading your places...", ADD_PLACE_NOT_CONNECTED_TITLE: "Access token required", - ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your Metaverse places.

Please follow the instructions on the settings page to add an access token.", + ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your Directory Services places.

Please follow the instructions on the settings page to add an access token.", }; var DOMAIN_ID_TYPE_NONE = 0; @@ -428,7 +428,7 @@ function chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded loadPlaces(); } else { loadingDialog.modal('hide'); - bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) { + bootbox.confirm("We were not able to load your domain information from the Directory Services. Would you like to retry?", function(response) { if (response) { chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded); } diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index ea38a30f49..36e731f463 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -279,7 +279,7 @@ $(document).ready(function(){ swal({ title: '', type: 'error', - text: "There was a problem retrieving domain information from the Metaverse API.", + text: "There was a problem retrieving domain information from the Directory Services API.", confirmButtonText: 'Try again', showCancelButton: true, closeOnConfirm: false @@ -308,7 +308,7 @@ $(document).ready(function(){ if (hasAccessToken) { el = "

"; - el += ""; + el += ""; el += ""; el += "

"; el = $(el); @@ -321,7 +321,7 @@ $(document).ready(function(){ } buttonSetting.help = ""; buttonSetting.classes = "btn-primary"; - buttonSetting.button_label = "Connect Metaverse Account"; + buttonSetting.button_label = "Connect Directory Services Account"; buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID; buttonSetting.href = METAVERSE_URL + "/user/tokens/new?for_domain_server=true"; @@ -334,7 +334,7 @@ $(document).ready(function(){ el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values); } - // add the button group to the top of the metaverse panel + // add the button group to the top of the Directory Services panel $('#metaverse .panel-body').prepend(el); } @@ -730,7 +730,7 @@ $(document).ready(function(){ html_id: Settings.PLACES_TABLE_ID, help: "To point places to this domain, " + " go to the Places " - + "page in your Metaverse account.", + + "page in your Directory Services account.", read_only: true, can_add_new_rows: false, columns: [ @@ -1015,7 +1015,7 @@ $(document).ready(function(){ if (data.data.domains.length) { // setup a select box for the returned domains - modal_body = "

Choose the Metaverse domain you want this domain-server to represent.
This will set your domain ID on the settings page.

"; + modal_body = "

Choose the Directory Services domain you want this domain-server to represent.
This will set your domain ID on the settings page.

"; domain_select = $(""); _.each(data.data.domains, function(domain){ var domainString = ""; @@ -1044,7 +1044,7 @@ $(document).ready(function(){ window.open(METAVERSE_URL + "/user/domains", '_blank'); } } - modal_body = "

You do not have any domains in your Metaverse account." + + modal_body = "

You do not have any domains in your Directory Services account." + "

Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.

" } @@ -1056,7 +1056,7 @@ $(document).ready(function(){ }) }, error: function() { - bootbox.alert("Failed to retrieve your domains from the Metaverse"); + bootbox.alert("Failed to retrieve your domains from the Directory Server"); }, complete: function() { // remove the spinner from the choose button @@ -1067,7 +1067,7 @@ $(document).ready(function(){ } else { bootbox.alert({ - message: "You must have an access token to query your Metaverse domains.

" + + message: "You must have an access token to query your Directory Services domains.

" + "Please follow the instructions on the settings page to add an access token.", title: "Access token required" }) diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index 4fda50e1ed..a6163efff8 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -3,12 +3,12 @@

- Connect your Metaverse account to be able to make your domain discoverable and add account based authentication. You can always do this later. + Connect your Directory Services to be able to make your domain discoverable and add account based authentication. You can always do this later.
- Connect your Metaverse account + Connect your Directory Services account
@@ -60,7 +60,7 @@

- Add your Metaverse username and any other usernames to grant administrator privileges + Add your Directory Services username and any other usernames to grant administrator privileges

@@ -95,7 +95,7 @@

@@ -126,7 +126,7 @@

@@ -164,14 +164,14 @@

Username
- This does not have to be your Metaverse username + This does not have to be your Directory Services username
Enter password
- This should not be the same as your Metaverse password + This should not be the same as your Directory Services password
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index d02dce456e..3025c0e142 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -20,9 +20,9 @@ $(document).ready(function(){ $('.perms-link').on('click', function() { var modal_body = '
'; modal_body += 'None - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.

'; - modal_body += 'Friends - Users who are your Friends in the Metaverse.

'; - modal_body += 'Users logged into the Metaverse - Users who are currently logged into the Metaverse.

'; - modal_body += 'Everyone - Anyone who uses the Metaverse.'; + modal_body += 'Friends - Users who are your Friends in the Directory Services.

'; + modal_body += 'Users logged into the Directory Services - Users who are currently logged into the Directory Services.

'; + modal_body += 'Everyone - Any user, both logged in and not logged in.'; modal_body += '
'; dialog = bootbox.dialog({ @@ -153,7 +153,7 @@ function setupWizardSteps() { }); $('#permissions-description').html('You have been assigned administrator privileges to this domain.'); - $('#admin-description').html('Add more Metaverse usernames'); + $('#admin-description').html('Add more Directory Services usernames'); } else { $('.cloud-only').remove(); $('#save-threading-settings').text("Finish"); @@ -207,7 +207,7 @@ function promptToCreateDomainID() { if (data && data.status === "failure") { swal.showInputError("Error: " + data.error); } else { - swal.showInputError("Error: Failed to post to metaverse."); + swal.showInputError("Error: Failed to post to directory server."); } console.log("Failed to create domain ID..."); }); @@ -250,7 +250,7 @@ function updatePlaceNameDisplay() { console.warn('Request Failed'); }); } else { - console.warn('No metaverse domain ID!'); + console.warn('No Directory Services domain ID!'); } } diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index 1d34d7db84..b9d0b0fe79 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -178,7 +178,7 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin } // If this user is a known member of a domain group, give them the implied permissions. - // Do before processing verifiedUsername in case user is logged into the metaverse and is a member of a blacklist group. + // Do before processing verifiedUsername in case user is logged into the Directory Services and is a member of a blacklist group. if (!verifiedDomainUserName.isEmpty()) { auto userGroups = _domainGroupMemberships[verifiedDomainUserName]; foreach (QString userGroup, userGroups) { @@ -249,10 +249,10 @@ NodePermissions DomainGatekeeper::setPermissionsForUser(bool isLocalUser, QStrin qDebug() << "| user-permissions: specific IP matches, so:" << userPerms; #endif } else { - // they are logged into metaverse, but we don't have specific permissions for them. + // they are logged into Directory Services, but we don't have specific permissions for them. userPerms |= _server->_settingsManager.getStandardPermissionsForName(NodePermissions::standardNameLoggedIn); #ifdef WANT_DEBUG - qDebug() << "| user-permissions: user is logged-into metaverse, so:" << userPerms; + qDebug() << "| user-permissions: user is logged-into Directory Services, so:" << userPerms; #endif // if this user is a friend of the domain-owner, give them friend's permissions @@ -568,7 +568,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain, domainAuthURL + "|" + domainAuthClientID); } else { - sendConnectionDeniedPacket("You lack the required metaverse permissions to connect to this domain.", + sendConnectionDeniedPacket("You lack the required Directory Services permissions to connect to this domain.", nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedMetaverse); } #ifdef WANT_DEBUG @@ -737,11 +737,11 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username, // (a key that we hoped would work but is probably stale) if (!senderSockAddr.isNull() && !isOptimisticKey) { - qDebug() << "Error decrypting metaverse username signature for" << username << "- denying connection."; + qDebug() << "Error decrypting directory services username signature for" << username << "- denying connection."; sendConnectionDeniedPacket("Error decrypting username signature.", senderSockAddr, DomainHandler::ConnectionRefusedReason::LoginErrorMetaverse); } else if (!senderSockAddr.isNull()) { - qDebug() << "Error decrypting metaverse username signature for" << username << "with optimistic key -" + qDebug() << "Error decrypting directory services username signature for" << username << "with optimistic key -" << "re-requesting public key and delaying connection"; } @@ -1291,7 +1291,7 @@ void DomainGatekeeper::requestDomainUserFinished() { QStringList domainUserGroups; auto userRoles = rootObject.value("roles").toArray(); foreach (auto role, userRoles) { - // Distinguish domain groups from metaverse groups by adding a leading special character. + // Distinguish domain groups from directory services groups by adding a leading special character. domainUserGroups.append(DOMAIN_GROUP_CHAR + role.toString().toLower()); } _domainGroupMemberships[username] = domainUserGroups; diff --git a/domain-server/src/DomainGatekeeper.h b/domain-server/src/DomainGatekeeper.h index b24f550483..511fb9a1c9 100644 --- a/domain-server/src/DomainGatekeeper.h +++ b/domain-server/src/DomainGatekeeper.h @@ -76,7 +76,7 @@ public slots: private slots: void handlePeerPingTimeout(); - // Login and groups for domain, separate from metaverse. + // Login and groups for domain, separate from directory services. void requestDomainUserFinished(); private: @@ -153,7 +153,7 @@ private: Node::LocalID _currentLocalID; Node::LocalID _idIncrement; - // Login and groups for domain, separate from metaverse. + // Login and groups for domain, separate from directory services. bool domainHasLogin(); void requestDomainUser(const QString& username, const QString& accessToken, const QString& refreshToken); diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index b0edcd51b6..11602c6c89 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -86,10 +86,10 @@ bool DomainServer::_getTempName { false }; QString DomainServer::_userConfigFilename; int DomainServer::_parentPID { -1 }; -/// @brief The Domain server can proxy requests to the Metaverse server, this function handles those forwarding requests. +/// @brief The Domain server can proxy requests to the Directory Server, this function handles those forwarding requests. /// @param connection The HTTP connection object. /// @param requestUrl The full URL of the request. e.g. https://google.com/api/v1/test -/// @param metaversePath The path on the Metaverse server to route to. +/// @param metaversePath The path on the Directory Server to route to. /// @param requestSubobjectKey (Optional) The parent object key that any data will be inserted into for the forwarded request. /// @param requiredData (Optional) This data is required to be present for the request. /// @param optionalData (Optional) If provided, this optional data will be forwarded with the request. @@ -180,7 +180,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection, connect(reply, &QNetworkReply::finished, this, [reply, connection]() { if (reply->error() != QNetworkReply::NoError) { auto data = reply->readAll(); - qDebug() << "Got error response from metaverse server (" << reply->url() << "): " << data << reply->errorString(); + qDebug() << "Got error response from directory server (" << reply->url() << "): " << data << reply->errorString(); connection->respond(HTTPConnection::StatusCode400, data); return; } @@ -298,14 +298,14 @@ DomainServer::DomainServer(int argc, char* argv[]) : #endif if (_type != NonMetaverse) { - // if we have a metaverse domain, we'll use an access token for API calls + // if we have a directory services domain, we'll use an access token for API calls resetAccountManagerAccessToken(); setupAutomaticNetworking(); } if (!getID().isNull() && _type != NonMetaverse) { - // setup periodic heartbeats to metaverse API + // setup periodic heartbeats to directory services API setupHeartbeatToMetaverse(); // send the first heartbeat immediately @@ -988,7 +988,7 @@ bool DomainServer::resetAccountManagerAccessToken() { if (accessTokenVariant.canConvert(QMetaType::QString)) { accessToken = accessTokenVariant.toString(); } else { - qWarning() << "No access token is present. Some operations that use the metaverse API will fail."; + qWarning() << "No access token is present. Some operations that use the directory services API will fail."; qDebug() << "Set an access token via the web interface, in your user config" << "at keypath metaverse.access_token or in your ENV at key DOMAIN_SERVER_ACCESS_TOKEN"; @@ -1799,7 +1799,7 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() { callbackParameters.errorCallbackMethod = "handleFailedICEServerAddressUpdate"; callbackParameters.jsonCallbackMethod = "handleSuccessfulICEServerAddressUpdate"; - qCDebug(domain_server_ice) << "Updating ice-server address in Metaverse API to" + qCDebug(domain_server_ice) << "Updating ice-server address in Directory Services API to" << (_iceServerSocket.isNull() ? "" : _iceServerSocket.getAddress().toString()); static const QString DOMAIN_ICE_ADDRESS_UPDATE = "/api/v1/domains/%1/ice_server_address"; @@ -1814,11 +1814,11 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() { void DomainServer::handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply) { _sendICEServerAddressToMetaverseAPIInProgress = false; if (_sendICEServerAddressToMetaverseAPIRedo) { - qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with metaverse, but has since changed. redoing update..."; + qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with directory server, but has since changed. redoing update..."; _sendICEServerAddressToMetaverseAPIRedo = false; sendICEServerAddressToMetaverseAPI(); } else { - qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with metaverse."; + qCDebug(domain_server_ice) << "ice-server address (" << _iceServerSocket << ") updated with directory server."; } } @@ -1832,7 +1832,7 @@ void DomainServer::handleFailedICEServerAddressUpdate(QNetworkReply* requestRepl const int ICE_SERVER_UPDATE_RETRY_MS = 2 * 1000; qCWarning(domain_server_ice) << "PAGE: Failed to update ice-server address (" << _iceServerSocket << - ") with Metaverse (" << requestReply->url() << ") (critical error for auto-networking) error:" << + ") with Directory Server (" << requestReply->url() << ") (critical error for auto-networking) error:" << requestReply->errorString(); qCWarning(domain_server_ice) << "\tRe-attempting in" << ICE_SERVER_UPDATE_RETRY_MS / 1000 << "seconds"; @@ -2655,9 +2655,9 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url connect(reply, &QNetworkReply::finished, this, [reply, connection]() { if (reply->error() != QNetworkReply::NoError) { - qDebug() << "Got error response from metaverse server: " << reply->readAll(); + qDebug() << "Got error response from Directory Server: " << reply->readAll(); connection->respond(HTTPConnection::StatusCode500, - "Error communicating with Metaverse"); + "Error communicating with Directory Server"); return; } @@ -3761,7 +3761,7 @@ void DomainServer::randomizeICEServerAddress(bool shouldTriggerHostLookup) { // immediately fire an ICE heartbeat once we've picked a candidate ice-server sendHeartbeatToIceServer(); - // immediately send an update to the metaverse API when our ice-server changes + // immediately send an update to the directory services API when our ice-server changes sendICEServerAddressToMetaverseAPI(); } diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 726f9f9ce2..a66c2dd17d 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -2016,7 +2016,7 @@ void DomainServerSettingsManager::apiRefreshGroupInformation() { foreach (QString groupName, groupNames) { QString lowerGroupName = groupName.toLower(); if (lowerGroupName.startsWith(DOMAIN_GROUP_CHAR)) { - // Ignore domain groups. (Assumption: metaverse group names can't start with a "@".) + // Ignore domain groups. (Assumption: Directory Services group names can't start with a "@".) return; } if (_groupIDs.contains(lowerGroupName)) { @@ -2239,7 +2239,7 @@ QList DomainServerSettingsManager::getBlacklistGroupIDs() { } QStringList DomainServerSettingsManager::getDomainServerGroupNames() { - // All names as listed in the domain server settings; both metaverse groups and domain groups + // All names as listed in the domain server settings; both Directory Services groups and domain groups QSet result; foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) { result += _groupPermissions[groupKey]->getID(); @@ -2248,7 +2248,7 @@ QStringList DomainServerSettingsManager::getDomainServerGroupNames() { } QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() { - // All names as listed in the domain server settings; not necessarily mnetaverse groups. + // All names as listed in the domain server settings; not necessarily Directory Services groups. QSet result; foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) { result += _groupForbiddens[groupKey]->getID(); diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h index 24c8eb0f05..4c74f2301b 100644 --- a/domain-server/src/DomainServerSettingsManager.h +++ b/domain-server/src/DomainServerSettingsManager.h @@ -110,7 +110,7 @@ public: QStringList getDomainServerGroupNames(); QStringList getDomainServerBlacklistGroupNames(); - // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on metaverse's api + // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on Directory Services api void clearGroupMemberships(const QString& name) { _groupMembership[name.toLower()].clear(); } void recordGroupMembership(const QString& name, const QUuid groupID, QUuid rankID); QUuid isGroupMember(const QString& name, const QUuid& groupID); // returns rank or -1 if not a member @@ -177,7 +177,7 @@ private: // is done with the returned QVariant* HifiConfigVariantMap _configMap; - // these cause calls to metaverse's group api + // these cause calls to directory services group api void apiGetGroupID(const QString& groupName); void apiGetGroupRanks(const QUuid& groupID); diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 4a864b8398..ee610edce4 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -206,7 +206,7 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla } // we could not verify this heartbeat (missing public key, could not load public key, bad actor) - // ask the metaverse API for the right public key and return false to indicate that this is not verified + // ask the directory services API for the right public key and return false to indicate that this is not verified requestDomainPublicKey(domainID); } @@ -214,7 +214,7 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla } void IceServer::requestDomainPublicKey(const QUuid& domainID) { - // send a request to the metaverse API for the public key for this domain + // send a request to the directory services API for the public key for this domain auto& networkAccessManager = NetworkAccessManager::getInstance(); QUrl publicKeyURL{ MetaverseAPI::getCurrentMetaverseServerURL() }; @@ -281,7 +281,7 @@ void IceServer::publicKeyReplyFinished(QNetworkReply* reply) { qWarning() << "There was no public key present in response for domain with ID" << domainID; } } else { - qWarning() << "The metaverse API did not return success for public key request for domain with ID" << domainID; + qWarning() << "The directory services API did not return success for public key request for domain with ID" << domainID; } } else { diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index c095ecf492..b975e3c443 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -45,7 +45,7 @@ Item { property bool lostFocus: false readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp() - // If not logging into domain, then we must be logging into the metaverse... + // If not logging into domain, then we must be logging into the directory services... readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested() readonly property string domainLoginDomain: loginDialog.getDomainLoginDomain() @@ -74,7 +74,7 @@ Item { } function login() { - // make sure the metaverse server is set so we don't send your password to the wrong place! + // make sure the directory server is set so we don't send your password to the wrong place! if (!isLoggingInToDomain) { Settings.setValue("private/selectedMetaverseURL", metaverseServerField.text); } @@ -120,9 +120,9 @@ Item { errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height; } var domainLoginText = "Log In to Domain\n" + domainLoginDomain; - loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : domainLoginText; + loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Directory Service" : domainLoginText; loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account"; - loginButton.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain"; + loginButton.text = (!isLoggingInToDomain) ? "Log In to Directory Service" : "Log In to Domain"; loginButton.color = hifi.buttons.blue; displayNameField.placeholderText = "Display Name (optional)"; var savedDisplayName = Settings.getValue("Avatar/displayName", ""); @@ -133,7 +133,7 @@ Item { emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : ""; var metaverseServer = Settings.getValue("private/selectedMetaverseURL", ""); - console.log("Saved metaverse server:", metaverseServer); + console.log("Saved directory server:", metaverseServer); metaverseServerField.text = metaverseServer; } else { // ####### TODO @@ -388,7 +388,7 @@ Item { top: passwordField.bottom topMargin: 1.5 * hifi.dimensions.contentSpacing.y } - placeholderText: "Metaverse Server (optional)" + placeholderText: "Directory Server (optional)" activeFocusOnPress: true Keys.onPressed: { switch (event.key) { @@ -405,7 +405,7 @@ Item { event.accepted = true; if (!isLoggingInToDomain) { var url = metaverseServerField.text; - console.log("Setting metaverse server to", url); + console.log("Setting directory server to", url); Settings.setValue("private/selectedMetaverseURL", url); if(AccountServices.isLoggedIn()){ AccountServices.logOut(); @@ -424,7 +424,7 @@ Item { var url = metaverseServerField.text; if(!(url == Settings.getValue("private/selectedMetaverseURL")) && !(url == "")){ if (!isLoggingInToDomain) { - console.log("Setting metaverse server to", url); + console.log("Setting directory server to", url); Settings.setValue("private/selectedMetaverseURL", url); if(AccountServices.isLoggedIn()){ AccountServices.logOut(); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 41403e0e02..b0e3812e7e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1273,7 +1273,7 @@ Application::Application( // to has gone down and switched to a new content set, so when you reconnect the cached ATP assets will no longer be valid. connect(&domainHandler, &DomainHandler::disconnectedFromDomain, DependencyManager::get().data(), &ScriptCache::clearATPScriptsFromCache); - // update our location every 5 seconds in the metaverse server, assuming that we are authenticated with one + // update our location every 5 seconds in the directory server, assuming that we are authenticated with one const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SECOND; auto discoverabilityManager = DependencyManager::get(); @@ -1282,7 +1282,7 @@ Application::Application( DependencyManager::get().data(), &AddressManager::storeCurrentAddress); locationUpdateTimer.start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS); - // if we get a domain change, immediately attempt update location in metaverse server + // if we get a domain change, immediately attempt update location in directory server connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain, discoverabilityManager.data(), &DiscoverabilityManager::updateLocation); @@ -2571,7 +2571,7 @@ Application::Application( _pendingIdleEvent = false; _graphicsEngine.startup(); - qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); + qCDebug(interfaceapp) << "Directory Service session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); #if defined(Q_OS_ANDROID) connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground); @@ -7210,9 +7210,9 @@ void Application::updateWindowTitle() const { QString metaverseDetails; if (isMetaverseLoggedIn) { - metaverseDetails = " (Metaverse: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")"; + metaverseDetails = " (Directory Services: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")"; } else { - metaverseDetails = " (Metaverse: Not Logged In)"; + metaverseDetails = " (Directory Services: Not Logged In)"; } QString domainDetails; diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp index e3a99475ef..bef429736f 100644 --- a/interface/src/DiscoverabilityManager.cpp +++ b/interface/src/DiscoverabilityManager.cpp @@ -118,7 +118,7 @@ void DiscoverabilityManager::updateLocation() { callbackParameters, QJsonDocument(rootObject).toJson()); } else if (UserActivityLogger::getInstance().isEnabled()) { - // we still send a heartbeat to the metaverse server for stats collection + // we still send a heartbeat to the directory server for stats collection JSONCallbackParameters callbackParameters; callbackParameters.callbackReceiver = this; diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h index 2bea44f78c..88b7cdf999 100644 --- a/interface/src/LocationBookmarks.h +++ b/interface/src/LocationBookmarks.h @@ -18,7 +18,7 @@ /*@jsdoc * The LocationBookmarks API provides facilities for working with location bookmarks. A location bookmark - * associates a name with a metaverse address. + * associates a name with a directory services address. * * @namespace LocationBookmarks * @@ -38,11 +38,11 @@ public: static const QString HOME_BOOKMARK; /*@jsdoc - * Gets the metaverse address associated with a bookmark. + * Gets the directory services address associated with a bookmark. * @function LocationBookmarks.getAddress - * @param {string} bookmarkName - Name of the bookmark to get the metaverse address for (case sensitive). - * @returns {string} The metaverse address for the bookmark. If the bookmark does not exist, "" is returned. - * @example Report the "Home" bookmark's metaverse address. + * @param {string} bookmarkName - Name of the bookmark to get the directory services address for (case sensitive). + * @returns {string} The directory services address for the bookmark. If the bookmark does not exist, "" is returned. + * @example Report the "Home" bookmark's directory services address. * print("Home bookmark's address: " + LocationBookmarks.getAddress("Home")); */ Q_INVOKABLE QString getAddress(const QString& bookmarkName); @@ -57,16 +57,16 @@ public slots: void addBookmark(); /*@jsdoc - * Sets the metaverse address associated with the "Home" bookmark. + * Sets the directory services address associated with the "Home" bookmark. * @function LocationBookmarks.setHomeLocationToAddress - * @param {string} address - The metaverse address to set the "Home" bookmark to. + * @param {string} address - The directory services address to set the "Home" bookmark to. */ void setHomeLocationToAddress(const QVariant& address); /*@jsdoc - * Gets the metaverse address associated with the "Home" bookmark. + * Gets the directory services address associated with the "Home" bookmark. * @function LocationBookmarks.getHomeLocationAddress - * @returns {string} The metaverse address for the "Home" bookmark. + * @returns {string} The directory services address for the "Home" bookmark. */ QString getHomeLocationAddress(); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index a90eda57a7..de08708e41 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -69,7 +69,7 @@ int main(int argc, const char* argv[]) { LogHandler::getInstance().setShouldUseJournald(false); QCommandLineParser parser; - parser.setApplicationDescription("Overte -- A free/libre and open-source metaverse client"); + parser.setApplicationDescription("Overte -- A free/libre and open-source virtual worlds client"); QCommandLineOption helpOption = parser.addHelpOption(); QCommandLineOption versionOption = parser.addVersionOption(); diff --git a/interface/src/scripting/AccountServicesScriptingInterface.h b/interface/src/scripting/AccountServicesScriptingInterface.h index 723622523c..5c7d85fdf0 100644 --- a/interface/src/scripting/AccountServicesScriptingInterface.h +++ b/interface/src/scripting/AccountServicesScriptingInterface.h @@ -85,7 +85,7 @@ class AccountServicesScriptingInterface : public QObject { *
  • "connections" — user is visible to friends and connections.
    • *
  • "all" — user is visible to everyone.
    • * - * @property {string} metaverseServerURL - The metaverse server that the user is authenticated against when logged in + * @property {string} metaverseServerURL - The directory server that the user is authenticated against when logged in * — typically "https://metaverse.highfidelity.com". Read-only. * * @borrows AccountServices.getDownloadInfo as getDownloadInfo @@ -125,7 +125,7 @@ class AccountServicesScriptingInterface : public QObject { *
  • "connections" — user is visible to friends and connections.
    • *
  • "all" — user is visible to everyone.
    • * - * @property {string} metaverseServerURL - The metaverse server that the user is authenticated against when logged in + * @property {string} metaverseServerURL - The directory server that the user is authenticated against when logged in * — typically "https://metaverse.highfidelity.com". Read-only. * * @borrows AccountServices.getDownloadInfo as getDownloadInfo @@ -194,7 +194,7 @@ public slots: void logOut(); /*@jsdoc - * Updates Metaverse Server URL in AccountManager. It's called by Login window after Metaverse Server URL is changed. + * Updates Directory Server URL in AccountManager. It's called by Login window after Directory Server URL is changed. * @function AccountServices.updateAuthURLFromMetaverseServerURL */ void updateAuthURLFromMetaverseServerURL(); diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 9e8c2d5835..3b54112f6c 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -43,7 +43,7 @@ * Read-only. * @property {boolean} interstitialModeEnabled=false - true if the interstitial graphics are displayed when a * domain is loading, otherwise false. - * @property {location} location - Provides facilities for working with your current metaverse location. + * @property {location} location - Provides facilities for working with your current directory services location. */ class WindowScriptingInterface : public QObject, public Dependency { @@ -305,7 +305,7 @@ public slots: /*@jsdoc * Gets the signature for Interface's protocol version. * @function Window.protocolSignature - * @returns {string} A string uniquely identifying the version of the metaverse protocol that Interface is using. + * @returns {string} A string uniquely identifying the version of the directory services protocol that Interface is using. */ QString protocolSignature(); @@ -429,7 +429,7 @@ public slots: * has been prepared. * @function Window.shareSnapshot * @param {string} path - The path and name of the image file to share. - * @param {string} [href=""] - The metaverse location where the snapshot was taken. + * @param {string} [href=""] - The directory services location where the snapshot was taken. */ void shareSnapshot(const QString& path, const QUrl& href = QUrl("")); diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 58764d958b..7dd5ac303d 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -99,11 +99,11 @@ void LoginDialog::toggleAction() { if (accountManager->isLoggedIn()) { // change the menu item to logout - loginAction->setText("Metaverse: Logout " + accountManager->getAccountInfo().getUsername()); + loginAction->setText("Directory Service: Logout " + accountManager->getAccountInfo().getUsername()); connection = connect(loginAction, &QAction::triggered, accountManager.data(), &AccountManager::logout); } else { // change the menu item to login - loginAction->setText("Metaverse: Log In / Sign Up"); + loginAction->setText("Directory Service: Log In / Sign Up"); connection = connect(loginAction, &QAction::triggered, [] { // if not in login state, show. if (!qApp->getLoginDialogPoppedUp()) { diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index d605b5d8c0..72543a99d2 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -768,7 +768,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * if it isn't. * @property {boolean} collisionsWillMove - A synonym for dynamic. * - * @property {string} href="" - A "hifi://" metaverse address that a user is teleported to when they click on the entity. + * @property {string} href="" - A "hifi://" directory services address that a user is teleported to when they click on the entity. * @property {string} description="" - A description of the href property value. * * @property {string} userData="" - Used to store extra data about the entity in JSON format. diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index ce449a66c3..7542bb620b 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -181,7 +181,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) { // pull out the stored account info and store it in memory _accountInfo = accountsMap[_authURL.toString()].value(); - qCDebug(networking) << "Found metaverse API account information for" << qPrintable(_authURL.toString()); + qCDebug(networking) << "Found directory services API account information for" << qPrintable(_authURL.toString()); } else { qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded."; } @@ -211,7 +211,7 @@ void AccountManager::updateAuthURLFromMetaverseServerURL() { void AccountManager::setSessionID(const QUuid& sessionID) { if (_sessionID != sessionID) { - qCDebug(networking) << "Metaverse session ID changed to" << uuidStringWithoutCurlyBraces(sessionID); + qCDebug(networking) << "Directory Services session ID changed to" << uuidStringWithoutCurlyBraces(sessionID); _sessionID = sessionID; } } @@ -381,7 +381,7 @@ void AccountManager::sendRequest(const QString& path, } } else { if (VERBOSE_HTTP_REQUEST_DEBUGGING) { - qCDebug(networking) << "Received JSON response from metaverse API that has no matching callback."; + qCDebug(networking) << "Received JSON response from directory services API that has no matching callback."; qCDebug(networking) << QJsonDocument::fromJson(networkReply->readAll()); } } @@ -409,7 +409,7 @@ void AccountManager::sendRequest(const QString& path, } else { if (VERBOSE_HTTP_REQUEST_DEBUGGING) { - qCDebug(networking) << "Received error response from metaverse API that has no matching callback."; + qCDebug(networking) << "Received error response from directory services API that has no matching callback."; qCDebug(networking) << "Error" << networkReply->error() << "-" << networkReply->errorString(); qCDebug(networking) << networkReply->readAll(); } @@ -840,7 +840,7 @@ void AccountManager::requestAccountSettings() { return; } - qCDebug(networking) << "Requesting the Account Settings from the Metaverse API"; + qCDebug(networking) << "Requesting the Account Settings from the Directory Services API"; QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); @@ -870,7 +870,7 @@ void AccountManager::requestAccountSettingsFinished() { _settings.unpack(rootObject["data"].toObject()); _lastSuccessfulSyncTimestamp = _settings.lastChangeTimestamp(); - qCDebug(networking) << "Received the Account Settings from the Metaverse API"; + qCDebug(networking) << "Received the Account Settings from the Directory Services API"; emit accountSettingsLoaded(); } else { @@ -911,7 +911,7 @@ void AccountManager::postAccountSettings() { return; } - qCDebug(networking) << "Account Settings have changed, pushing them to the Metaverse API"; + qCDebug(networking) << "Account Settings have changed, pushing them to the Directory Services API"; QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); @@ -1000,7 +1000,7 @@ void AccountManager::processGeneratedKeypair(QByteArray publicKey, QByteArray pr qCDebug(networking) << "Generated 2048-bit RSA keypair."; - // hold the private key to later set our metaverse API account info if upload succeeds + // hold the private key to later set our directory services API account info if upload succeeds _pendingPublicKey = publicKey; _pendingPrivateKey = privateKey; uploadPublicKey(); @@ -1058,7 +1058,7 @@ void AccountManager::uploadPublicKey() { } void AccountManager::publicKeyUploadSucceeded(QNetworkReply* reply) { - qCDebug(networking) << "Uploaded public key to Metaverse API. RSA keypair generation is completed."; + qCDebug(networking) << "Uploaded public key to Directory Services API. RSA keypair generation is completed."; // public key upload complete - store the matching private key and persist the account to settings _accountInfo.setPrivateKey(_pendingPrivateKey); diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 02f8f1503d..a8dbc782c8 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -33,10 +33,10 @@ const QString INDEX_PATH = "/"; const QString GET_PLACE = "/api/v1/places/%1"; /*@jsdoc - * The location API provides facilities related to your current location in the metaverse. + * The location API provides facilities related to your current location in the directory services. * *

    Getter/Setter

    - *

    You can get and set your current metaverse address by directly reading a string value from and writing a string value to + *

    You can get and set your current directory services address by directly reading a string value from and writing a string value to * the location object. This is an alternative to using the location.href property or other object * functions.

    * @@ -50,27 +50,27 @@ const QString GET_PLACE = "/api/v1/places/%1"; * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not * connected to the domain or are in a serverless domain. * Read-only. - * @property {string} hostname - The name of the domain for your current metaverse address (e.g., "DomainName", + * @property {string} hostname - The name of the domain for your current directory services address (e.g., "DomainName", * localhost, or an IP address). Is blank if you're in a serverless domain. * Read-only. - * @property {string} href - Your current metaverse address (e.g., "hifi://domainname/15,-10,26/0,0,0,1") + * @property {string} href - Your current directory services address (e.g., "hifi://domainname/15,-10,26/0,0,0,1") * regardless of whether or not you're connected to the domain. Starts with "file:///" if you're in a * serverless domain. * Read-only. * @property {boolean} isConnected - true if you're connected to the domain in your current href - * metaverse address, otherwise false. - * @property {string} pathname - The location and orientation in your current href metaverse address + * directory services address, otherwise false. + * @property {string} pathname - The location and orientation in your current href directory services address * (e.g., "/15,-10,26/0,0,0,1"). * Read-only. - * @property {string} placename - The place name in your current href metaverse address + * @property {string} placename - The place name in your current href directory services address * (e.g., "DomainName"). Is blank if your hostname is an IP address. * Read-only. - * @property {string} protocol - The protocol of your current href metaverse address (e.g., "hifi"). + * @property {string} protocol - The protocol of your current href directory services address (e.g., "hifi"). * Read-only. */ /*@jsdoc - * The AddressManager API provides facilities related to your current location in the metaverse. + * The AddressManager API provides facilities related to your current location in the directory services. * * @namespace AddressManager * @@ -84,22 +84,22 @@ const QString GET_PLACE = "/api/v1/places/%1"; * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not * connected to the domain or are in a serverless domain. * Read-only. - * @property {string} hostname - The name of the domain for your current metaverse address (e.g., "DomainName", + * @property {string} hostname - The name of the domain for your current directory services address (e.g., "DomainName", * localhost, or an IP address). Is blank if you're in a serverless domain. * Read-only. - * @property {string} href - Your current metaverse address (e.g., "hifi://domainname/15,-10,26/0,0,0,1") + * @property {string} href - Your current directory services address (e.g., "hifi://domainname/15,-10,26/0,0,0,1") * regardless of whether or not you're connected to the domain. Starts with "file:///" if you're in a * serverless domain. * Read-only. * @property {boolean} isConnected - true if you're connected to the domain in your current href - * metaverse address, otherwise false. - * @property {string} pathname - The location and orientation in your current href metaverse address + * directory services address, otherwise false. + * @property {string} pathname - The location and orientation in your current href directory services address * (e.g., "/15,-10,26/0,0,0,1"). * Read-only. - * @property {string} placename - The place name in your current href metaverse address + * @property {string} placename - The place name in your current href directory services address * (e.g., "DomainName"). Is blank if your hostname is an IP address. * Read-only. - * @property {string} protocol - The protocol of your current href metaverse address (e.g., "hifi"). + * @property {string} protocol - The protocol of your current href directory services address (e.g., "hifi"). * Read-only. * * @borrows location.handleLookupString as handleLookupString @@ -144,7 +144,7 @@ public: using OrientationGetter = std::function; /*@jsdoc - *

    The reasons for an address lookup via the metaverse API are defined by numeric values:

    + *

    The reasons for an address lookup via the Directory Services API are defined by numeric values:

    * * * @@ -247,7 +247,7 @@ public: public slots: /*@jsdoc - * Takes you to a specified metaverse address. + * Takes you to a specified directory services address. * @function location.handleLookupString * @param {string} address - The address to go to: a "hifi://" address, an IP address (e.g., * "127.0.0.1" or "localhost"), a file:/// address, a domain name, a named path @@ -297,7 +297,7 @@ public slots: } /*@jsdoc - * Takes you to the default "welcome" metaverse address. + * Takes you to the default "welcome" directory services address. * @function location.goToEntry * @param {location.LookupTrigger} trigger=StartupFromSettings - The reason for the function call. Helps ensure that user's * location history is correctly maintained. @@ -336,20 +336,20 @@ public slots: void refreshPreviousLookup(); /*@jsdoc - * Updates your current metaverse location in Interface's {@link Settings} file as your last-known address. This can be used + * Updates your current directory services location in Interface's {@link Settings} file as your last-known address. This can be used * to ensure that you start up at that address if you exit Interface without a later address automatically being saved. * @function location.storeCurrentAddress */ void storeCurrentAddress(); /*@jsdoc - * Copies your current metaverse address (i.e., location.href property value) to the OS clipboard. + * Copies your current directory services address (i.e., location.href property value) to the OS clipboard. * @function location.copyAddress */ void copyAddress(); /*@jsdoc - * Copies your current metaverse location and orientation (i.e., location.pathname property value) to the OS + * Copies your current directory services location and orientation (i.e., location.pathname property value) to the OS * clipboard. * @function location.copyPath */ @@ -367,7 +367,7 @@ public slots: signals: /*@jsdoc - * Triggered when looking up the details of a metaverse user or location to go to has completed (successfully or + * Triggered when looking up the details of a directory services user or location to go to has completed (successfully or * unsuccessfully). * @function location.lookupResultsFinished * @returns {Signal} @@ -375,7 +375,7 @@ signals: void lookupResultsFinished(); /*@jsdoc - * Triggered when looking up the details of a metaverse user or location to go to has completed and the domain or user is + * Triggered when looking up the details of a directory services user or location to go to has completed and the domain or user is * offline. * @function location.lookupResultIsOffline * @returns {Signal} @@ -383,7 +383,7 @@ signals: void lookupResultIsOffline(); /*@jsdoc - * Triggered when looking up the details of a metaverse user or location to go to has completed and the domain or user could + * Triggered when looking up the details of a directory services user or location to go to has completed and the domain or user could * not be found. * @function location.lookupResultIsNotFound * @returns {Signal} diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index e13696c6b4..af043192e8 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -600,7 +600,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer(); @@ -617,7 +617,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer(); domainAccountManager->setAuthURL(QUrl()); domainAccountManager->setClientID(QString()); @@ -641,7 +641,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer * * - * + * * * * * - * + * * * * diff --git a/libraries/networking/src/MetaverseAPI.cpp b/libraries/networking/src/MetaverseAPI.cpp index 290267d96d..cca7a6125d 100644 --- a/libraries/networking/src/MetaverseAPI.cpp +++ b/libraries/networking/src/MetaverseAPI.cpp @@ -18,7 +18,7 @@ namespace MetaverseAPI { - // You can change the return of this function if you want to use a custom metaverse URL at compile time + // You can change the return of this function if you want to use a custom directory services URL at compile time // or you can pass a custom URL via the env variable QUrl getCurrentMetaverseServerURL() { QUrl selectedMetaverseURL; diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 9bf0a4ead1..4287da92d4 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -19,7 +19,7 @@ namespace NetworkingConstants { // If you want to use STAGING instead of STABLE, // links from the Domain Server web interface (like the connect account token generation) - // will still point at stable unless you ALSO change the Domain Server Metaverse Server URL inside of: + // will still point at stable unless you ALSO change the Domain Server Directory Services URL inside of: // \domain-server\resources\web\js\shared.js // You can avoid changing that and still effectively use a connected domain on staging @@ -28,7 +28,7 @@ namespace NetworkingConstants { const QString WEB_ENGINE_VERSION = "Chrome/83.0.4103.122"; - // For now we only have one Metaverse server. + // For now we only have one directory server. const QUrl METAVERSE_SERVER_URL_STABLE { "https://mv.overte.org/server" }; const QUrl METAVERSE_SERVER_URL_STAGING { "https://mv.overte.org/server" }; diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 40e5798155..a230970909 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -507,7 +507,7 @@ void NodeList::sendDomainServerCheckIn() { if (!domainIsConnected) { - // Metaverse account. + // Directory services account. DataServerAccountInfo& accountInfo = accountManager->getAccountInfo(); packetStream << accountInfo.getUsername(); // if this is a connect request, and we can present a username signature, send it along diff --git a/pkg-scripts/new-server b/pkg-scripts/new-server index 3bd22e9c7c..f646a251f7 100755 --- a/pkg-scripts/new-server +++ b/pkg-scripts/new-server @@ -4,7 +4,7 @@ if [ -z "$1" ] || [ -z "$2" ]; then echo echo "Sets up a new Overte server with the specified name and base port number" echo " {name} - a simple name used to identify the server to scripts (not used in the server configuration)" - echo " {base-port} - the base port number (default server is 40100). The metaverse port will be {base-port}+2" + echo " {base-port} - the base port number (default server is 40100). The domain server port will be {base-port}+2" echo " Four contiguous port numbers are allocated, these must not overlap with other running services on this machine" echo echo "Launching a server created by this script is done with:" diff --git a/script-archive/hotPlaces.js b/script-archive/hotPlaces.js index 42423f84fe..36acbffe15 100644 --- a/script-archive/hotPlaces.js +++ b/script-archive/hotPlaces.js @@ -1,7 +1,7 @@ // // hotPlaces.js // -// Press the number keys to jump to different places in the metaverse! +// Press the number keys to jump to different places! // // Created by Philip Rosedale on November 20, 2014 // Copyright 2014 High Fidelity, Inc. diff --git a/scripts/communityScripts/explore/explore.html b/scripts/communityScripts/explore/explore.html index 945985e431..b89f2456e1 100644 --- a/scripts/communityScripts/explore/explore.html +++ b/scripts/communityScripts/explore/explore.html @@ -321,7 +321,7 @@ var activeThresholdTime = new Date(); activeThresholdTime.setMinutes(activeThresholdTime.getMinutes() - 15); - // while blending metaverse data ensure it is cleaned for active domains + // while blending directory server data ensure it is cleaned for active domains for (var i = 0; i < placesData.length; i++) { if (placesData[i].domain.active && placesData[i].visibility == "open" && new Date(placesData[i].last_activity_update) > activeThresholdTime) { joinedData.push({ @@ -351,9 +351,9 @@ EventBridge.emitWebEvent(JSON.stringify(readyEvent)); } - // if metaverse data not loaded fire a request for it + // if directory server data not loaded fire a request for it if (placesData == null) { - // fire off data get against the metaverse + // fire off data get against the directory server axios.get("https://mv.overte.org/server/api/v1/places") .then((response) => { placesData = response.data.data.places; diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js index befb0e36b2..f66810914d 100644 --- a/scripts/system/makeUserConnection.js +++ b/scripts/system/makeUserConnection.js @@ -696,8 +696,8 @@ requestBody = {'node_id': cleanId(MyAvatar.sessionUUID), 'proposed_node_id': cleanId(id)}; // for use when repeating // It would be "simpler" to skip this and just look at the response, but: - // 1. We don't want to bother the metaverse with request that we know will fail. - // 2. We don't want our code here to be dependent on precisely how the metaverse responds (400, 401, etc.) + // 1. We don't want to bother the directory server with request that we know will fail. + // 2. We don't want our code here to be dependent on precisely how the directory server responds (400, 401, etc.) // 3. We also don't want to connect to someone who is anonymous _now_, but was not earlier and still has // the same node id. Since the messaging doesn't say _who_ isn't logged in, fail the same as if we are // not logged in. diff --git a/scripts/system/places/places.html b/scripts/system/places/places.html index 040eaa422e..1fa208ecde 100644 --- a/scripts/system/places/places.html +++ b/scripts/system/places/places.html @@ -194,7 +194,7 @@ function generateContent() { if (currentListFormat === "REGIONS") { - //Display metaverse page here + //Display directory services page here var formattedMetaverseList = ""; var metaverseCounter = 0; diff --git a/scripts/system/request-service.js b/scripts/system/request-service.js index b57f2d4cd7..ee6efc618c 100644 --- a/scripts/system/request-service.js +++ b/scripts/system/request-service.js @@ -13,7 +13,7 @@ // QML has its own XMLHttpRequest, but: // - npm request is easier to use. - // - It is not easy to hack QML's XMLHttpRequest to use our MetaverseServer, and to supply the user's auth when contacting it. + // - It is not easy to hack QML's XMLHttpRequest to use our Directory Services, and to supply the user's auth when contacting it. // a. Our custom XMLHttpRequestClass object only works with QScriptEngine, not QML's javascript. // b. We have hacked profiles that intercept requests to our MetavserseServer (providing the correct auth), but those // only work in QML WebEngineView. Setting up communication between ordinary QML and a hiddent WebEngineView is @@ -24,7 +24,7 @@ // We will then asynchonously call fromScript({id: theSameString, method: 'http.response', error: errorOrFalsey, response: body}) // on that root object. // RootHttpRequest.qml does this. - // 2. If the uri used (computed from byNameOptions, see request.js) is to our metaverse, we will use the appropriate auth. + // 2. If the uri used (computed from byNameOptions, see request.js) is to our Directory Services, we will use the appropriate auth. var request = Script.require('request').request; var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); diff --git a/scripts/system/tablet-users.js b/scripts/system/tablet-users.js index bac77f1f03..d8df4db479 100644 --- a/scripts/system/tablet-users.js +++ b/scripts/system/tablet-users.js @@ -85,7 +85,7 @@ tablet.emitScriptEvent(JSON.stringify(object)); } if (event.type === "manage-friends") { - // open a web overlay to metaverse friends page + // open a web overlay to directory services friends page var friendsWindow = new OverlayWebWindow({ title: FRIENDS_WINDOW_TITLE, width: FRIENDS_WINDOW_WIDTH, diff --git a/scripts/tutorials/getDomainMetadata.js b/scripts/tutorials/getDomainMetadata.js index 1af801f2d6..112aaa6a06 100644 --- a/scripts/tutorials/getDomainMetadata.js +++ b/scripts/tutorials/getDomainMetadata.js @@ -14,7 +14,7 @@ var OVERLAY = null; location.hostChanged.connect(function(host) { print('Detected host change:', host); - // Fetch the domain ID from the metaverse + // Fetch the domain ID from the directory server var placeData = request(SERVER + '/places/' + host); if (!placeData) { print('Cannot find place name - abandoning metadata request for', host); @@ -24,7 +24,7 @@ location.hostChanged.connect(function(host) { var domainID = placeData.data.place.domain.id; print('Domain ID:', domainID); - // Fetch the domain metadata from the metaverse + // Fetch the domain metadata from the directory server var domainData = request(SERVER + '/domains/' + domainID); print(SERVER + '/domains/' + domainID); if (!domainData) { diff --git a/tools/jsdoc/api-mainpage.md b/tools/jsdoc/api-mainpage.md index 2f5bbf4a62..adc6e585f6 100644 --- a/tools/jsdoc/api-mainpage.md +++ b/tools/jsdoc/api-mainpage.md @@ -1,4 +1,4 @@ -The Overte JavaScript API lets content creators and developers create new experiences and transform virtual worlds within the Overte metaverse. +The Overte JavaScript API lets content creators and developers create new experiences and transform virtual worlds within the Overte. With it, you can build great content, customize avatars, play audio and so much more. You are most likely to interact with these APIs: @@ -7,4 +7,4 @@ You are most likely to interact with these APIs: * The **[AvatarList](AvatarList.html)**, **[MyAvatar](MyAvatar.html)**, and **[Avatar](Avatar.html)** namespaces affect your personal avatars, and lets you get information on other people's avatars. * The **[Script](Script.html)** namespace lets you to connect callbacks from your client to script, such as functionality that is dependent on time (`Script.update`, `Script.setTimeout`, `Script.setInterval`, etc), connect paths relatively to assets (`Script.resolvePath`), refer to other scripts (`Script.require`, `Script.include`), or connect functions to events which occur when the script is turned off (`Script.scriptEnding`). -To learn more about using Overte and exploring the metaverse, visit the [Overte User Documentation](https://docs.overte.org). +To learn more about using Overte and exploring virtual worlds, visit the [Overte User Documentation](https://docs.overte.org).
    LoginErrorMetaverse2You could not be logged into the domain per your metaverse login.You could not be logged into the domain per your Directory Services login.
    NotAuthorizedMetaverse3You are not authorized to connect to the domain per your metaverse login.You are not authorized to connect to the domain per your Directory Services login.
    TooManyUsers