diff --git a/.changeset/calm-months-shave.md b/.changeset/calm-months-shave.md deleted file mode 100644 index f3505a6f..00000000 --- a/.changeset/calm-months-shave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@wpsocio/vite-wp-react": patch ---- - -Fixed peer depencencies to support vite 6.0 diff --git a/.changeset/little-onions-hide.md b/.changeset/little-onions-hide.md deleted file mode 100644 index 4ae62537..00000000 --- a/.changeset/little-onions-hide.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wptelegram-login": patch ---- - -Improved login handler to add more actions and filters diff --git a/.changeset/sixty-seahorses-design.md b/.changeset/sixty-seahorses-design.md deleted file mode 100644 index 13decf1a..00000000 --- a/.changeset/sixty-seahorses-design.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wptelegram-login": patch ---- - -Updated user ID column to make it clickable with ID and username diff --git a/.changeset/three-games-wink.md b/.changeset/three-games-wink.md deleted file mode 100644 index f590ce53..00000000 --- a/.changeset/three-games-wink.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wptelegram-login": patch ---- - -Fixed a race condition to prevent duplicate Mini App users diff --git a/plugins/wptelegram-login/CHANGELOG.md b/plugins/wptelegram-login/CHANGELOG.md index 153e28df..4a77bdad 100644 --- a/plugins/wptelegram-login/CHANGELOG.md +++ b/plugins/wptelegram-login/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 1.11.7 + +### Patch Changes + +- [#224](https://github.com/wpsocio/wp-projects/pull/224) [`d179cce`](https://github.com/wpsocio/wp-projects/commit/d179ccea6d9d24fdac9f863351ad6dd826a741c4) Thanks [@irshadahmad21](https://github.com/irshadahmad21)! - Improved login handler to add more actions and filters + +- [#219](https://github.com/wpsocio/wp-projects/pull/219) [`93f3cbd`](https://github.com/wpsocio/wp-projects/commit/93f3cbd9ea8123a42cec3bee2731503a78f7aca4) Thanks [@irshadahmad21](https://github.com/irshadahmad21)! - Updated user ID column to make it clickable with ID and username + +- [#218](https://github.com/wpsocio/wp-projects/pull/218) [`06fbeea`](https://github.com/wpsocio/wp-projects/commit/06fbeea2962b53c760f05824e0437a5fe0dda72c) Thanks [@irshadahmad21](https://github.com/irshadahmad21)! - Fixed a race condition to prevent duplicate Mini App users + ## 1.11.6 ### Patch Changes diff --git a/plugins/wptelegram-login/README.md b/plugins/wptelegram-login/README.md index e2241ab9..557f0b37 100644 --- a/plugins/wptelegram-login/README.md +++ b/plugins/wptelegram-login/README.md @@ -4,8 +4,8 @@ **Tags:** telegram, login, register, social, signup **Requires at least:** 6.4 **Requires PHP:** 7.4 -**Tested up to:** 6.7 -**Stable tag:** 1.11.6 +**Tested up to:** 6.7.1 +**Stable tag:** 1.11.7 **License:** GPL-3.0-or-later **License URI:** [https://www.gnu.org/licenses/gpl-3.0.html](https://www.gnu.org/licenses/gpl-3.0.html) **Donate link:** [wpsocio.com/donate](https://wpsocio.com/donate) diff --git a/plugins/wptelegram-login/composer.json b/plugins/wptelegram-login/composer.json index f66db452..f759d4f9 100644 --- a/plugins/wptelegram-login/composer.json +++ b/plugins/wptelegram-login/composer.json @@ -1,6 +1,6 @@ { "name": "wpsocio/wptelegram-login", - "version": "1.11.6", + "version": "1.11.7", "description": "Let the users login to your website with their Telegram and make it simple for them to get connected and let them receive their email notifications on Telegram.", "scripts": { "gen:docs": "\"vendor/bin/wp-documentor\" parse src --format=markdown --output=docs/README.md --relative=docs", diff --git a/plugins/wptelegram-login/docs/README.md b/plugins/wptelegram-login/docs/README.md index 032b1f56..4ced0ab7 100644 --- a/plugins/wptelegram-login/docs/README.md +++ b/plugins/wptelegram-login/docs/README.md @@ -22,7 +22,7 @@ Argument | Type | Description -------- | ---- | ----------- `$auth_data` | `array` | The authenticated user data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 56](../src/shared/LoginHandler.php#L56-L61) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 68](../src/shared/LoginHandler.php#L68-L73) ### `wptelegram_login_after_save_user_data` @@ -35,7 +35,7 @@ Argument | Type | Description `$wp_user_id` | `int` | The WordPress user ID. `$auth_data` | `array` | The authenticated user data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 65](../src/shared/LoginHandler.php#L65-L71) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 77](../src/shared/LoginHandler.php#L77-L83) ### `wptelegram_login_before_user_login` @@ -47,7 +47,7 @@ Argument | Type | Description -------- | ---- | ----------- `$wp_user_id` | `int` | The WordPress user ID. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 82](../src/shared/LoginHandler.php#L82-L87) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 96](../src/shared/LoginHandler.php#L96-L101) ### `wptelegram_login_after_user_login` @@ -61,7 +61,7 @@ Argument | Type | Description -------- | ---- | ----------- `$wp_user_id` | `int` | The WordPress user ID. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 94](../src/shared/LoginHandler.php#L94-L101) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 108](../src/shared/LoginHandler.php#L108-L115) ### `wptelegram_login` @@ -80,7 +80,7 @@ Version | Description ------- | ----------- `1.3.4` | -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 116](../src/shared/LoginHandler.php#L116-L124) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 130](../src/shared/LoginHandler.php#L130-L138) ### `wptelegram_login_before_redirect` @@ -94,7 +94,20 @@ Argument | Type | Description -------- | ---- | ----------- `$user` | `\WP_User` | The logged in user. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 133](../src/shared/LoginHandler.php#L133-L140) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 147](../src/shared/LoginHandler.php#L147-L154) + +### `wptelegram_login_pre_insert_user` + +*Fires before the user is inserted into the database.* + +**Arguments** + +Argument | Type | Description +-------- | ---- | ----------- +`$userdata` | `array` | The user data inserted into the database. +`$auth_data` | `array` | The user data from Telegram. + +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 586](../src/shared/LoginHandler.php#L586-L592) ### `wptelegram_login_after_insert_user` @@ -105,9 +118,10 @@ Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 133 Argument | Type | Description -------- | ---- | ----------- `$wp_user_id` | `int` | The WordPress user ID. -`$userdata` | `array` | The user data. +`$userdata` | `array` | The user data inserted into the database. +`$auth_data` | `array` | The user data from Telegram. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 579](../src/shared/LoginHandler.php#L579-L585) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 600](../src/shared/LoginHandler.php#L600-L607) ### `wptelegram_login_after_update_user` @@ -120,7 +134,7 @@ Argument | Type | Description `$wp_user_id` | `int` | The WordPress user ID. `$userdata` | `array` | The user data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 615](../src/shared/LoginHandler.php#L615-L621) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 638](../src/shared/LoginHandler.php#L638-L644) ### `wptelegram_login_after_update_user_meta` @@ -132,7 +146,7 @@ Argument | Type | Description -------- | ---- | ----------- `$wp_user_id` | `int` | The WordPress user ID. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 635](../src/shared/LoginHandler.php#L635-L640) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 663](../src/shared/LoginHandler.php#L663-L668) ## Filters @@ -281,7 +295,7 @@ Argument | Type | Description `$validation_query_params` | `array` | The validation query parameters. `$input` | `array` | The input data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 204](../src/shared/LoginHandler.php#L204-L210) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 218](../src/shared/LoginHandler.php#L218-L224) ### `wptelegram_login_clean_input` @@ -294,7 +308,7 @@ Argument | Type | Description `$clean_input` | `array` | The cleaned input. `$input` | `array` | The input data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 214](../src/shared/LoginHandler.php#L214-L220) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 228](../src/shared/LoginHandler.php#L228-L234) ### `wptelegram_login_valid_auth_data` @@ -307,7 +321,7 @@ Argument | Type | Description `$auth_data` | `array` | The valid auth data. `$input_data` | `array` | The input data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 264](../src/shared/LoginHandler.php#L264-L270) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 282](../src/shared/LoginHandler.php#L282-L288) ### `wptelegram_login_hash_auth_data` @@ -321,7 +335,7 @@ Argument | Type | Description `$auth_data` | `array` | The auth data received. `$secret_key` | `string` | The secret key. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 298](../src/shared/LoginHandler.php#L298-L305) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 316](../src/shared/LoginHandler.php#L316-L323) ### `wptelegram_login_get_secret_key` @@ -335,7 +349,7 @@ Argument | Type | Description `$data_source` | `string` | The data source. `$bot_token` | `string` | The bot token. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 344](../src/shared/LoginHandler.php#L344-L351) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 362](../src/shared/LoginHandler.php#L362-L369) ### `wptelegram_login_random_email_host` @@ -348,7 +362,7 @@ Argument | Type | Description `$host` | `string` | The host for the random email. `$user` | `\WP_User` | The current user. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 365](../src/shared/LoginHandler.php#L365-L371) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 383](../src/shared/LoginHandler.php#L383-L389) ### `wptelegram_login_random_email_user` @@ -361,7 +375,7 @@ Argument | Type | Description `$random_user` | `string` | The username for the random email. `$user` | `\WP_User` | The current user. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 374](../src/shared/LoginHandler.php#L374-L380) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 392](../src/shared/LoginHandler.php#L392-L398) ### `wptelegram_login_random_email` @@ -376,7 +390,7 @@ Argument | Type | Description `$random_user` | `string` | The username for the random email. `$host` | `string` | The host for the random email. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 384](../src/shared/LoginHandler.php#L384-L392) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 402](../src/shared/LoginHandler.php#L402-L410) ### `wptelegram_login_disable_signup` @@ -389,9 +403,9 @@ It means that the user must first create an account and connect it to Telegram t Argument | Type | Description -------- | ---- | ----------- `$disable_signup` | `bool` | Whether to disable sign up via Telegram. -`$data` | `array` | The user details. +`$auth_data` | `array` | The user data from Telegram. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 475](../src/shared/LoginHandler.php#L475-L483) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 487](../src/shared/LoginHandler.php#L487-L495) ### `wptelegram_login_always_update_user_data` @@ -406,10 +420,10 @@ Pass `false` if you do not want to update user profile for existing users. Argument | Type | Description -------- | ---- | ----------- `$always_update` | `bool` | Whether to always update the user data. -`$data` | `array` | The user details. +`$auth_data` | `array` | The user data from Telegram. `$existing_user_id` | `int\|null` | Existing WP User ID. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 493](../src/shared/LoginHandler.php#L493-L504) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 505](../src/shared/LoginHandler.php#L505-L516) ### `wptelegram_login_save_user_data` @@ -419,10 +433,10 @@ Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 493 Argument | Type | Description -------- | ---- | ----------- -`$data` | `array` | The user details. +`$auth_data` | `array` | The user data from Telegram. `$wp_user_id` | `int\|null` | Existing WP User ID. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 527](../src/shared/LoginHandler.php#L527-L533) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 539](../src/shared/LoginHandler.php#L539-L545) ### `wptelegram_login_unique_username` @@ -434,7 +448,7 @@ Argument | Type | Description -------- | ---- | ----------- `$unique_username` | `string` | The unique username. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 552](../src/shared/LoginHandler.php#L552-L557) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 564](../src/shared/LoginHandler.php#L564-L569) ### `wptelegram_login_insert_user_data` @@ -444,9 +458,10 @@ Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 552 Argument | Type | Description -------- | ---- | ----------- -`$userdata` | `array` | The user data. +`$userdata` | `array` | The user data to insert into the database. +`$auth_data` | `array` | The user data from Telegram. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 566](../src/shared/LoginHandler.php#L566-L571) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 578](../src/shared/LoginHandler.php#L578-L584) ### `wptelegram_login_update_user_data` @@ -460,7 +475,7 @@ Argument | Type | Description -------- | ---- | ----------- `$userdata` | `array` | The user data. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 595](../src/shared/LoginHandler.php#L595-L602) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 618](../src/shared/LoginHandler.php#L618-L625) ### `wptelegram_login_user_redirect_to` @@ -473,7 +488,7 @@ Argument | Type | Description `$redirect_to` | `string` | The redirect URL. `$user` | `\WP_User` | The logged in user. -Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 683](../src/shared/LoginHandler.php#L683-L689) +Source: [src/shared/LoginHandler.php](../src/shared/LoginHandler.php), [line 711](../src/shared/LoginHandler.php#L711-L717) ### `wptelegram_login_web_app_login_data` @@ -502,6 +517,19 @@ Argument | Type | Description Source: [src/includes/AssetManager.php](../src/includes/AssetManager.php), [line 410](../src/includes/AssetManager.php#L410-L416) +### `wptelegram_login_get_user_by_telegram_id` + +*Filter the user found by its Telegram ID.* + +**Arguments** + +Argument | Type | Description +-------- | ---- | ----------- +`$user` | `\WPTelegram\Login\includes\WP_User\|false` | The user object or false. +`$tg_user_id` | `int\|string` | Telegram User ID. + +Source: [src/includes/Utils.php](../src/includes/Utils.php), [line 111](../src/includes/Utils.php#L111-L117) + ### `wptelegram_login_intercept_request_on` *Filter the hook and priority to use for intercepting the login request.* diff --git a/plugins/wptelegram-login/package.json b/plugins/wptelegram-login/package.json index 42f823e6..ba5f563d 100644 --- a/plugins/wptelegram-login/package.json +++ b/plugins/wptelegram-login/package.json @@ -1,7 +1,7 @@ { "name": "wptelegram-login", "title": "WP Telegram Login", - "version": "1.11.6", + "version": "1.11.7", "description": "Let the users login to your website with their Telegram and make it simple for them to get connected and let them receive their email notifications on Telegram.", "private": true, "license": "GPL-3.0-or-later", diff --git a/plugins/wptelegram-login/src/languages/wptelegram-login-de_DE.po b/plugins/wptelegram-login/src/languages/wptelegram-login-de_DE.po index 3b9fd8db..05dbe779 100644 --- a/plugins/wptelegram-login/src/languages/wptelegram-login-de_DE.po +++ b/plugins/wptelegram-login/src/languages/wptelegram-login-de_DE.po @@ -17,62 +17,59 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: admin/settings\n" -#: admin/Admin.php:171 +#: admin/Admin.php:172 msgid "Telegram Login" msgstr "Telegram Login" -#: admin/Admin.php:225 -#: admin/Admin.php:252 +#: admin/Admin.php:226 +#: admin/Admin.php:253 msgid "Telegram Info" msgstr "" -#: admin/Admin.php:226 -#: admin/Admin.php:253 +#: admin/Admin.php:227 +#: admin/Admin.php:254 msgid "Here you can connect this account to Telegram." msgstr "" -#: admin/Admin.php:228 -#: admin/Admin.php:257 +#: admin/Admin.php:229 +#: admin/Admin.php:258 msgid "Telegram Chat ID" msgstr "" #: ../../packages/js/shared-ui/components/instructions.tsx:17 -#: admin/Admin.php:278 +#: admin/Admin.php:279 #: languages/wptelegram-login-js-translations.php:32 msgid "INSTRUCTIONS!" msgstr "KONFIGURATIONSANLEITUNG" -#: admin/Admin.php:285 +#: admin/Admin.php:287 msgid "Get your Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:287 +#: admin/Admin.php:289 msgid "Ask the user to get the Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:297 +#: admin/Admin.php:300 msgid "Start a conversation with %s to receive notifications." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:299 +#: admin/Admin.php:302 msgid "Ask the user to start a conversation with %s to receive notifications." msgstr "" #: ../../packages/js/services/api-fetch/index.ts:41 -#: admin/Admin.php:323 +#: admin/Admin.php:327 #: languages/wptelegram-login-js-translations.php:11 -#: shared/LoginHandler.php:75 +#: shared/LoginHandler.php:89 msgid "Error:" msgstr "Fehler:" -#: admin/Admin.php:323 +#: admin/Admin.php:327 msgid "Please Enter a valid Chat ID" msgstr "" -#: admin/Admin.php:367 +#: admin/Admin.php:371 msgid "Telegram User ID" msgstr "Telegram User ID" @@ -565,28 +562,28 @@ msgstr "%s wird benötigt." msgid "Changes could not be saved." msgstr "Die Änderungen konnten nicht gespeichert werden." -#: shared/LoginHandler.php:251 +#: shared/LoginHandler.php:265 msgid "Unauthorized! Data is NOT from Telegram" msgstr "Unautorisiert! Diese Daten stammen NICHT von Telegram" -#: shared/LoginHandler.php:255 +#: shared/LoginHandler.php:269 msgid "Invalid! The data is outdated" msgstr "Ungültig! Die Daten sind abgelaufen/veraltet" -#: shared/LoginHandler.php:444 +#: shared/LoginHandler.php:279 msgid "Invalid! The data is incomplete" msgstr "Ungültig! Die Daten sind unvollständig" -#: shared/LoginHandler.php:461 +#: shared/LoginHandler.php:473 msgid "The Telegram User ID is already associated with another existing user. Please contact the admin" msgstr "Diese Telegram User ID ist bereits mit einem anderen existierenden Benutzer verbunden. Bitte den Administrator kontaktieren" -#: shared/LoginHandler.php:487 +#: shared/LoginHandler.php:499 msgid "Sign up via Telegram is disabled. You must first create an account and connect it to Telegram to be able to use Telegram Login" msgstr "Anmelden über Telegram ist deaktiviert. Du musst zuerst einen Account anlegen und mit Telegram verbinden, um Telegram Login verwenden zu können." -#: shared/LoginHandler.php:576 -#: shared/LoginHandler.php:612 +#: shared/LoginHandler.php:597 +#: shared/LoginHandler.php:635 msgid "Telegram sign in could not be completed." msgstr "Die Telegram-Anmeldung konnte nicht erfolgreich durchgeführt werden." @@ -642,11 +639,11 @@ msgstr "" msgid "https://wpsocio.com" msgstr "" -#: admin/Admin.php:191 +#: admin/Admin.php:192 msgid "Plugin data has been upgraded." msgstr "" -#: admin/Admin.php:192 +#: admin/Admin.php:193 msgid "Please reload the page." msgstr "" diff --git a/plugins/wptelegram-login/src/languages/wptelegram-login-ru_RU.po b/plugins/wptelegram-login/src/languages/wptelegram-login-ru_RU.po index ee966a46..412eb685 100644 --- a/plugins/wptelegram-login/src/languages/wptelegram-login-ru_RU.po +++ b/plugins/wptelegram-login/src/languages/wptelegram-login-ru_RU.po @@ -17,62 +17,59 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: admin/settings\n" -#: admin/Admin.php:171 +#: admin/Admin.php:172 msgid "Telegram Login" msgstr "Telegram Login" -#: admin/Admin.php:225 -#: admin/Admin.php:252 +#: admin/Admin.php:226 +#: admin/Admin.php:253 msgid "Telegram Info" msgstr "" -#: admin/Admin.php:226 -#: admin/Admin.php:253 +#: admin/Admin.php:227 +#: admin/Admin.php:254 msgid "Here you can connect this account to Telegram." msgstr "" -#: admin/Admin.php:228 -#: admin/Admin.php:257 +#: admin/Admin.php:229 +#: admin/Admin.php:258 msgid "Telegram Chat ID" msgstr "ID Польз. Telegram" #: ../../packages/js/shared-ui/components/instructions.tsx:17 -#: admin/Admin.php:278 +#: admin/Admin.php:279 #: languages/wptelegram-login-js-translations.php:32 msgid "INSTRUCTIONS!" msgstr "ИНСТРУКЦИЯ!" -#: admin/Admin.php:285 +#: admin/Admin.php:287 msgid "Get your Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:287 +#: admin/Admin.php:289 msgid "Ask the user to get the Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:297 +#: admin/Admin.php:300 msgid "Start a conversation with %s to receive notifications." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:299 +#: admin/Admin.php:302 msgid "Ask the user to start a conversation with %s to receive notifications." msgstr "" #: ../../packages/js/services/api-fetch/index.ts:41 -#: admin/Admin.php:323 +#: admin/Admin.php:327 #: languages/wptelegram-login-js-translations.php:11 -#: shared/LoginHandler.php:75 +#: shared/LoginHandler.php:89 msgid "Error:" msgstr "Ошибка:" -#: admin/Admin.php:323 +#: admin/Admin.php:327 msgid "Please Enter a valid Chat ID" msgstr "" -#: admin/Admin.php:367 +#: admin/Admin.php:371 msgid "Telegram User ID" msgstr "ID Польз. Telegram" @@ -566,28 +563,28 @@ msgstr "" msgid "Changes could not be saved." msgstr "" -#: shared/LoginHandler.php:251 +#: shared/LoginHandler.php:265 msgid "Unauthorized! Data is NOT from Telegram" msgstr "Несанкционированный! Данные НЕ из Telegram" -#: shared/LoginHandler.php:255 +#: shared/LoginHandler.php:269 msgid "Invalid! The data is outdated" msgstr "Ошибка! Данные устарели" -#: shared/LoginHandler.php:444 +#: shared/LoginHandler.php:279 msgid "Invalid! The data is incomplete" msgstr "Ошибка! Данные неполные" -#: shared/LoginHandler.php:461 +#: shared/LoginHandler.php:473 msgid "The Telegram User ID is already associated with another existing user. Please contact the admin" msgstr "Идентификатор пользователя Telegram уже связан с другой существующей учетной записью. Пожалуйста, свяжитесь с администратором" -#: shared/LoginHandler.php:487 +#: shared/LoginHandler.php:499 msgid "Sign up via Telegram is disabled. You must first create an account and connect it to Telegram to be able to use Telegram Login" msgstr "Регистрация через Telegram отключена. Вы должны сначала создать учетную запись и подключить к ней Telegram, чтобы иметь возможность входа через Telegram" -#: shared/LoginHandler.php:576 -#: shared/LoginHandler.php:612 +#: shared/LoginHandler.php:597 +#: shared/LoginHandler.php:635 msgid "Telegram sign in could not be completed." msgstr "Не удалось выполнить вход через Telegram." @@ -643,11 +640,11 @@ msgstr "" msgid "https://wpsocio.com" msgstr "" -#: admin/Admin.php:191 +#: admin/Admin.php:192 msgid "Plugin data has been upgraded." msgstr "" -#: admin/Admin.php:192 +#: admin/Admin.php:193 msgid "Please reload the page." msgstr "" diff --git a/plugins/wptelegram-login/src/languages/wptelegram-login-uk.po b/plugins/wptelegram-login/src/languages/wptelegram-login-uk.po index db1bdfcb..60bf99a6 100644 --- a/plugins/wptelegram-login/src/languages/wptelegram-login-uk.po +++ b/plugins/wptelegram-login/src/languages/wptelegram-login-uk.po @@ -17,62 +17,59 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: admin/settings\n" -#: admin/Admin.php:171 +#: admin/Admin.php:172 msgid "Telegram Login" msgstr "Telegram Вхід" -#: admin/Admin.php:225 -#: admin/Admin.php:252 +#: admin/Admin.php:226 +#: admin/Admin.php:253 msgid "Telegram Info" msgstr "" -#: admin/Admin.php:226 -#: admin/Admin.php:253 +#: admin/Admin.php:227 +#: admin/Admin.php:254 msgid "Here you can connect this account to Telegram." msgstr "" -#: admin/Admin.php:228 -#: admin/Admin.php:257 +#: admin/Admin.php:229 +#: admin/Admin.php:258 msgid "Telegram Chat ID" msgstr "" #: ../../packages/js/shared-ui/components/instructions.tsx:17 -#: admin/Admin.php:278 +#: admin/Admin.php:279 #: languages/wptelegram-login-js-translations.php:32 msgid "INSTRUCTIONS!" msgstr "ІНСТРУКЦІЇ!" -#: admin/Admin.php:285 +#: admin/Admin.php:287 msgid "Get your Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:287 +#: admin/Admin.php:289 msgid "Ask the user to get the Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:297 +#: admin/Admin.php:300 msgid "Start a conversation with %s to receive notifications." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:299 +#: admin/Admin.php:302 msgid "Ask the user to start a conversation with %s to receive notifications." msgstr "" #: ../../packages/js/services/api-fetch/index.ts:41 -#: admin/Admin.php:323 +#: admin/Admin.php:327 #: languages/wptelegram-login-js-translations.php:11 -#: shared/LoginHandler.php:75 +#: shared/LoginHandler.php:89 msgid "Error:" msgstr "Помилка:" -#: admin/Admin.php:323 +#: admin/Admin.php:327 msgid "Please Enter a valid Chat ID" msgstr "" -#: admin/Admin.php:367 +#: admin/Admin.php:371 msgid "Telegram User ID" msgstr "Ідентифікатор користувача Telegram" @@ -566,28 +563,28 @@ msgstr "%s є обов'язковим." msgid "Changes could not be saved." msgstr "Не вдається зберегти зміни." -#: shared/LoginHandler.php:251 +#: shared/LoginHandler.php:265 msgid "Unauthorized! Data is NOT from Telegram" msgstr "Несанкціоновано! Дані НЕ від Telegram" -#: shared/LoginHandler.php:255 +#: shared/LoginHandler.php:269 msgid "Invalid! The data is outdated" msgstr "Недійсний! Дані застарілі" -#: shared/LoginHandler.php:444 +#: shared/LoginHandler.php:279 msgid "Invalid! The data is incomplete" msgstr "Недійсний! Дані неповні" -#: shared/LoginHandler.php:461 +#: shared/LoginHandler.php:473 msgid "The Telegram User ID is already associated with another existing user. Please contact the admin" msgstr "Ідентифікатор користувача Telegram вже пов'язаний з іншим наявним користувачем. Будь ласка, зверніться до адміністратора" -#: shared/LoginHandler.php:487 +#: shared/LoginHandler.php:499 msgid "Sign up via Telegram is disabled. You must first create an account and connect it to Telegram to be able to use Telegram Login" msgstr "Реєстрація через Telegram вимкнена. Спочатку потрібно створити обліковий запис і підключити його до Telegram, щоб мати можливість користуватися Telegram Вхід" -#: shared/LoginHandler.php:576 -#: shared/LoginHandler.php:612 +#: shared/LoginHandler.php:597 +#: shared/LoginHandler.php:635 msgid "Telegram sign in could not be completed." msgstr "Не вдалося увійти в Telegram." @@ -643,11 +640,11 @@ msgstr "" msgid "https://wpsocio.com" msgstr "" -#: admin/Admin.php:191 +#: admin/Admin.php:192 msgid "Plugin data has been upgraded." msgstr "" -#: admin/Admin.php:192 +#: admin/Admin.php:193 msgid "Please reload the page." msgstr "" diff --git a/plugins/wptelegram-login/src/languages/wptelegram-login.pot b/plugins/wptelegram-login/src/languages/wptelegram-login.pot index 42878f99..92cc7a4b 100644 --- a/plugins/wptelegram-login/src/languages/wptelegram-login.pot +++ b/plugins/wptelegram-login/src/languages/wptelegram-login.pot @@ -2,14 +2,14 @@ # This file is distributed under the GPL-2.0+. msgid "" msgstr "" -"Project-Id-Version: WP Telegram Login 1.11.6\n" +"Project-Id-Version: WP Telegram Login 1.11.7\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wptelegram-login\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-11-18T05:49:02+00:00\n" +"POT-Creation-Date: 2024-12-07T09:52:54+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.11.0\n" "language: en_US\n" @@ -31,9 +31,9 @@ msgid "Could not connect" msgstr "" #: ../../packages/js/services/api-fetch/index.ts:41 -#: admin/Admin.php:323 +#: admin/Admin.php:327 #: languages/wptelegram-login-js-translations.php:11 -#: shared/LoginHandler.php:75 +#: shared/LoginHandler.php:89 msgid "Error:" msgstr "" @@ -68,7 +68,7 @@ msgid "Changes saved successfully." msgstr "" #: ../../packages/js/shared-ui/components/instructions.tsx:17 -#: admin/Admin.php:278 +#: admin/Admin.php:279 #: languages/wptelegram-login-js-translations.php:32 msgid "INSTRUCTIONS!" msgstr "" @@ -520,57 +520,54 @@ msgstr "" msgid "WP Telegram" msgstr "" -#: admin/Admin.php:171 +#: admin/Admin.php:172 msgid "Telegram Login" msgstr "" -#: admin/Admin.php:191 +#: admin/Admin.php:192 msgid "Plugin data has been upgraded." msgstr "" -#: admin/Admin.php:192 +#: admin/Admin.php:193 msgid "Please reload the page." msgstr "" -#: admin/Admin.php:225 -#: admin/Admin.php:252 +#: admin/Admin.php:226 +#: admin/Admin.php:253 msgid "Telegram Info" msgstr "" -#: admin/Admin.php:226 -#: admin/Admin.php:253 +#: admin/Admin.php:227 +#: admin/Admin.php:254 msgid "Here you can connect this account to Telegram." msgstr "" -#: admin/Admin.php:228 -#: admin/Admin.php:257 +#: admin/Admin.php:229 +#: admin/Admin.php:258 msgid "Telegram Chat ID" msgstr "" -#: admin/Admin.php:285 +#: admin/Admin.php:287 msgid "Get your Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:287 +#: admin/Admin.php:289 msgid "Ask the user to get the Chat ID from %s and enter it above." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:297 +#: admin/Admin.php:300 msgid "Start a conversation with %s to receive notifications." msgstr "" -#. translators: %s is bot username -#: admin/Admin.php:299 +#: admin/Admin.php:302 msgid "Ask the user to start a conversation with %s to receive notifications." msgstr "" -#: admin/Admin.php:323 +#: admin/Admin.php:327 msgid "Please Enter a valid Chat ID" msgstr "" -#: admin/Admin.php:367 +#: admin/Admin.php:371 msgid "Telegram User ID" msgstr "" @@ -628,28 +625,28 @@ msgstr "" msgid "Please contact your hosting provider to ensure the above requirements are met." msgstr "" -#: shared/LoginHandler.php:251 +#: shared/LoginHandler.php:265 msgid "Unauthorized! Data is NOT from Telegram" msgstr "" -#: shared/LoginHandler.php:255 +#: shared/LoginHandler.php:269 msgid "Invalid! The data is outdated" msgstr "" -#: shared/LoginHandler.php:444 +#: shared/LoginHandler.php:279 msgid "Invalid! The data is incomplete" msgstr "" -#: shared/LoginHandler.php:461 +#: shared/LoginHandler.php:473 msgid "The Telegram User ID is already associated with another existing user. Please contact the admin" msgstr "" -#: shared/LoginHandler.php:487 +#: shared/LoginHandler.php:499 msgid "Sign up via Telegram is disabled. You must first create an account and connect it to Telegram to be able to use Telegram Login" msgstr "" -#: shared/LoginHandler.php:576 -#: shared/LoginHandler.php:612 +#: shared/LoginHandler.php:597 +#: shared/LoginHandler.php:635 msgid "Telegram sign in could not be completed." msgstr "" diff --git a/plugins/wptelegram-login/src/readme.txt b/plugins/wptelegram-login/src/readme.txt index 86f5b5fe..150f503a 100644 --- a/plugins/wptelegram-login/src/readme.txt +++ b/plugins/wptelegram-login/src/readme.txt @@ -4,8 +4,8 @@ Donate link: https://wpsocio.com/donate Tags: telegram, login, register, social, signup Requires at least: 6.4 Requires PHP: 7.4 -Tested up to: 6.7 -Stable tag: 1.11.6 +Tested up to: 6.7.1 +Stable tag: 1.11.7 License: GPL-3.0-or-later License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -154,7 +154,9 @@ Automatic updates should work smoothly, but we still recommend you back up your == Changelog == -= 1.11.6 = -- Fixed login for Web Apps after recent Telegram update to Bot API. += 1.11.7 = +- Improved login handler to add more actions and filters +- Updated user ID column to make it clickable with ID and username +- Fixed a race condition to prevent duplicate Mini App users [See full changelog](https://github.com/wpsocio/wptelegram-login/blob/main/CHANGELOG.md) diff --git a/plugins/wptelegram-login/src/wptelegram-login.php b/plugins/wptelegram-login/src/wptelegram-login.php index aa33e05b..8b62f509 100644 --- a/plugins/wptelegram-login/src/wptelegram-login.php +++ b/plugins/wptelegram-login/src/wptelegram-login.php @@ -10,7 +10,7 @@ * Plugin Name: WP Telegram Login * Plugin URI: https://t.me/WPTelegram * Description: Let the users login to your WordPress website with their Telegram and make it simple for them to get connected and let them receive their email notifications on Telegram. - * Version: 1.11.6 + * Version: 1.11.7 * Requires at least: 6.4 * Requires PHP: 7.4 * Author: WP Socio @@ -29,7 +29,7 @@ /** * Currently plugin version. */ -define( 'WPTELEGRAM_LOGIN_VER', '1.11.6' ); +define( 'WPTELEGRAM_LOGIN_VER', '1.11.7' ); defined( 'WPTELEGRAM_LOGIN_MAIN_FILE' ) || define( 'WPTELEGRAM_LOGIN_MAIN_FILE', __FILE__ ); diff --git a/tools/vite-wp-react/CHANGELOG.md b/tools/vite-wp-react/CHANGELOG.md index 01bdb3c6..ec8faa9f 100644 --- a/tools/vite-wp-react/CHANGELOG.md +++ b/tools/vite-wp-react/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.0.7 + +### Patch Changes + +- [#216](https://github.com/wpsocio/wp-projects/pull/216) [`85fac93`](https://github.com/wpsocio/wp-projects/commit/85fac93c47341b7e5fcd1de3abed4d3eae1b12f0) Thanks [@irshadahmad21](https://github.com/irshadahmad21)! - Fixed peer depencencies to support vite 6.0 + ## 1.0.6 ### Patch Changes diff --git a/tools/vite-wp-react/package.json b/tools/vite-wp-react/package.json index 97562f34..15c47c17 100644 --- a/tools/vite-wp-react/package.json +++ b/tools/vite-wp-react/package.json @@ -1,6 +1,6 @@ { "name": "@wpsocio/vite-wp-react", - "version": "1.0.6", + "version": "1.0.7", "description": "Set of tools to develop WordPress plugins and themes using React and Vite.", "license": "MIT", "repository": {