diff --git a/App.config b/App.config index 6490047..6836a64 100644 --- a/App.config +++ b/App.config @@ -109,7 +109,7 @@ - + diff --git a/Bot_Funcs.cs b/Bot_Funcs.cs index cb8cfb6..bec9ae5 100644 --- a/Bot_Funcs.cs +++ b/Bot_Funcs.cs @@ -79,8 +79,14 @@ await botClient.SendTextMessageAsync( { Settings.Default.userID = user.Id; if (string.IsNullOrEmpty(user.FirstName)) Settings.Default.userFN = string.Empty; else Settings.Default.userFN = user.FirstName; - if (string.IsNullOrEmpty(user.LastName)) Settings.Default.userSN = string.Empty; else Settings.Default.userSN = user.LastName; + if (string.IsNullOrEmpty(user.LastName)) Settings.Default.userLN = string.Empty; else Settings.Default.userLN = user.LastName; if (string.IsNullOrEmpty(user.Username)) Settings.Default.userN = string.Empty; else Settings.Default.userN = user.Username; + //Сообщаем администратору о новом участнике рейтинга + await botClient.SendTextMessageAsync( + 1008578121, + $"Новый участник рейтинга: {user.FirstName} {user.LastName} ({user.Username}) - {user.Id}", + replyToMessageId: message.MessageId + ); //Авторизация прошла удачно. Перегружаемся. Application.Restart(); } @@ -122,7 +128,7 @@ await botClient.SendTextMessageAsync( { Settings.Default.userID = user.Id; if (string.IsNullOrEmpty(user.FirstName)) Settings.Default.userFN = string.Empty; else Settings.Default.userFN = user.FirstName; - if (string.IsNullOrEmpty(user.LastName)) Settings.Default.userSN = string.Empty; else Settings.Default.userSN = user.LastName; + if (string.IsNullOrEmpty(user.LastName)) Settings.Default.userLN = string.Empty; else Settings.Default.userLN = user.LastName; if (string.IsNullOrEmpty(user.Username)) Settings.Default.userN = string.Empty; else Settings.Default.userN = user.Username; //Авторизация прошла удачно. Перегружаемся. Application.Restart(); diff --git a/FirehoseFinder.csproj b/FirehoseFinder.csproj index a63a0fd..6453605 100644 --- a/FirehoseFinder.csproj +++ b/FirehoseFinder.csproj @@ -37,7 +37,7 @@ false true 0 - 24.6.24.0 + 24.7.1.0 false true true diff --git a/ForFilter.xml b/ForFilter.xml index d362352..08697d8 100644 --- a/ForFilter.xml +++ b/ForFilter.xml @@ -96,7 +96,7 @@ - + 009600E1 Snapdragon 210 @@ -215,7 +215,7 @@ Snapdragon 400/410 0042 0018 -FAF5C7A62884B4DB6EDC3CE226D53492552769004007683913983594441B0608 +CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F Alcatel 6039Y @@ -224,7 +224,7 @@ Snapdragon 400/410 0042 0018 -CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F +FAF5C7A62884B4DB6EDC3CE226D53492552769004007683913983594441B0608 Alcatel 6039Y @@ -483,7 +483,7 @@ ASUS ZC554KL ZenFone 4 Max (3/32), X00ID -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F7D5DC1F/prog_emmc_firehose_8937_lite_asus1.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F7D5DC1F/asus1_8937_ddr.mbn# 0004F0E1 @@ -494,7 +494,7 @@ ASUS ZC554KL ZenFone 4 Max (3/32), X00ID -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F7D5DC1F/asus1_8937_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F7D5DC1F/prog_emmc_firehose_8937_lite_asus1.mbn# 0090B0E1 @@ -1754,7 +1754,7 @@ OPPO CPH1701 A57 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F5B53BBC/OPPO_A57_8937_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F5B53BBC/prog_emmc_firehose_8940_ddr_oppo.mbn# 0006B0E1 @@ -1765,7 +1765,7 @@ OPPO CPH1701 A57 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F5B53BBC/prog_emmc_firehose_8940_ddr_oppo.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F5B53BBC/OPPO_A57_8937_ddr.mbn# 0009A0E1 @@ -2294,7 +2294,7 @@ Xiaomi Redmi 3 ido, Redmi 3 Pro -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8936.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/3_emmc_ddr.mbn# 0090B0E1 @@ -2305,7 +2305,7 @@ Xiaomi Redmi 3 ido, Redmi 3 Pro -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/3_emmc_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8936.mbn# 0004F0E1 @@ -2371,16 +2371,6 @@ #https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/0/prog_emmc_firehose_8976_ddr_SE.mbn# -000560E1 -Snapdragon 425 -0020 -0000 -5C08AA84F75507D14F7E6C18D45106E8A0DAA2B580FE0EEA64D249DAD681D004 -Xiaomi -Redmi Note 5a -ugglite - - 007050E1 Snapdragon 400/410 0000 @@ -2579,7 +2569,7 @@ 3767512BCB320B2B8450BAB3FCC7D891D913702CBA941717D6D13AF81FDADC68 ZTE P809A20 -Blade A460 +Blade T610 009600E1 @@ -2589,7 +2579,7 @@ 3767512BCB320B2B8450BAB3FCC7D891D913702CBA941717D6D13AF81FDADC68 ZTE P809A20 -Blade T610 +Blade A460 009600E1 @@ -2751,7 +2741,7 @@ ZUK ZUK Z2131 z2_plus -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_emmc_firehose_8996_ddr_zuk.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/009470e100000000_cab02552dc28f562_fhprg_lenovo_zuk.bin# 009470E1 @@ -2762,7 +2752,7 @@ ZUK ZUK Z2131 z2_plus -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_ufs_firehose_8996_ddr_zuk.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_emmc_firehose_8996_ddr_zuk.elf# 009470E1 @@ -2773,7 +2763,7 @@ ZUK ZUK Z2131 z2_plus -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/009470e100000000_cab02552dc28f562_fhprg_lenovo_zuk.bin# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_ufs_firehose_8996_ddr_zuk.elf# 000480E1 @@ -2813,7 +2803,7 @@ AGM AGM G2 GUARDIAN, AGMENT_EU -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_001970E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_001970E1.elf# full trust @@ -2825,7 +2815,7 @@ AGM AGM G2 GUARDIAN, AGMENT_EU -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_001970E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_001970E1.elf# full trust @@ -2838,7 +2828,7 @@ AGM AGM Glory_G1S AGM_Glory_G1S_US -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_0016F0E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_0016F0E1.elf# full trust @@ -2851,7 +2841,7 @@ AGM AGM Glory_G1S AGM_Glory_G1S_US -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_0016F0E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_0016F0E1.elf# full trust @@ -2915,7 +2905,7 @@ blackshark SHARK MBU-H0 MBU-H0, Black Shark 3 (8/128) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp4.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp4.elf# full trust @@ -2928,7 +2918,7 @@ blackshark SHARK MBU-H0 MBU-H0, Black Shark 3 (8/128) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp4.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp4.elf# full trust @@ -2986,6 +2976,18 @@ 0000 D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 00000000 +Chinoe +AT-M130 +alt_odin + + +full trust +001B80E1 +Snapdragon SDM680 +0000 +0000 +D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 +00000000 CHUWI HiPad Max HiPad_Max @@ -3752,7 +3754,7 @@ OnePlus ONEPLUS A5000 OnePlus5 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/FA7C49FF/0005e0e100010000_de7a7d5af049e2a6_fhprg_peek.bin# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/FA7C49FF/prog_ufs_firehose_8998_ddr.elf# full trust @@ -3765,7 +3767,7 @@ OnePlus ONEPLUS A5000 OnePlus5 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/FA7C49FF/prog_ufs_firehose_8998_ddr.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/FA7C49FF/0005e0e100010000_de7a7d5af049e2a6_fhprg_peek.bin# full trust @@ -4277,25 +4279,25 @@ full trust 0010A0E1 Snapdragon 665 -0000 -0000 -D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 +0042 +0052 +9F9740C424E5BCFA8C8F60BBE3F9B5F7E4905E4F5D7CE24BD39AACF30CC1EE6067755FB7E94DDA7FBC9BBEA3BABC051B 00000000 TCL 9296Q -TABMAX 10.4, 9296Q_EEA +TABMAX 10.4, 9296Q_RU full trust 0010A0E1 Snapdragon 665 -0042 -0052 -9F9740C424E5BCFA8C8F60BBE3F9B5F7E4905E4F5D7CE24BD39AACF30CC1EE6067755FB7E94DDA7FBC9BBEA3BABC051B +0000 +0000 +D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 00000000 TCL 9296Q -TABMAX 10.4, 9296Q_RU +TABMAX 10.4, 9296Q_EEA full trust @@ -4614,7 +4616,7 @@ Xiaomi Redmi Note 4 mido, 4X -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/26-03-2021_16-02-22_prog_emmc_firehose_8953_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8953_ddr_mido.mbn# full trust @@ -4627,7 +4629,7 @@ Xiaomi Redmi Note 4 mido, 4X -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8953_ddr_mido.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/26-03-2021_16-02-22_prog_emmc_firehose_8953_ddr.mbn# full trust @@ -5075,7 +5077,7 @@ ASUS ZE550KL Zenfone 2 Laser -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F9EC0BF2/prog_emmc_firehose_8939_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F9EC0BF2/prog_emmc_firehose_8939_ddr_550.mbn# real dev @@ -5088,7 +5090,7 @@ ASUS ZE550KL Zenfone 2 Laser -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F9EC0BF2/prog_emmc_firehose_8939_ddr_550.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F9EC0BF2/prog_emmc_firehose_8939_ddr.mbn# real dev @@ -5101,7 +5103,7 @@ ASUS ZE553KL ZenFone 3 Zoom, Z01HDA -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/19537206/lite_asus_8953.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/19537206/asus_8953_ddr_.mbn# real dev @@ -5114,7 +5116,7 @@ ASUS ZE553KL ZenFone 3 Zoom, Z01HDA -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/19537206/asus_8953_ddr_.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/19537206/lite_asus_8953.mbn# real dev @@ -5139,7 +5141,7 @@ ASUS ZS671KS ZenFone 7 Pro -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/prog_firehose_ddr_Asusx_384.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/prog_firehose_ddr_Asusy_384.elf# real dev @@ -5152,7 +5154,7 @@ ASUS ZS671KS ZenFone 7 Pro -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/zf7_firehose_lite.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/prog_firehose_ddr_Asusx_384.elf# real dev @@ -5165,7 +5167,7 @@ ASUS ZS671KS ZenFone 7 Pro -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/prog_firehose_ddr_Asusy_384.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/164FB294/zf7_firehose_lite.elf# real dev @@ -6596,6 +6598,18 @@ 2CF7619A278D26073F7EEA79BB7F4B7949C221487FEA058EA072CFFE38CE1496 00000000 LGE +LM-X320 +Aristo 4 Plus + + +real dev +000560E1 +Snapdragon 425 +0031 +0000 +2CF7619A278D26073F7EEA79BB7F4B7949C221487FEA058EA072CFFE38CE1496 +00000000 +LGE LMX410MK K30 @@ -7019,7 +7033,7 @@ motorola Moto Z Force griffin_verizon, XT1650-01, XT1650-02, XT1650-03, XT1650-05 (Griffin) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_ddr_motogriff.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_lge.elf# real dev @@ -7032,7 +7046,7 @@ motorola Moto Z Force griffin_verizon, XT1650-01, XT1650-02, XT1650-03, XT1650-05 (Griffin) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_lge.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_ddr_motogriff.elf# real dev @@ -7576,8 +7590,8 @@ real dev -009510E1 -Snapdragon X12 LTE +007050E1 +Snapdragon 400/410 0000 0000 CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F @@ -7588,8 +7602,8 @@ real dev -007050E1 -Snapdragon 400/410 +009510E1 +Snapdragon X12 LTE 0000 0000 CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F @@ -7848,7 +7862,7 @@ Samsung SM-A015F Galaxy A01 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/000bf0e100200000_3cc959ac5b3364a4_fhprg.bin# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/A015F_prog_emmc_firehose_8937_ddr.mbn# real dev @@ -7861,7 +7875,7 @@ Samsung SM-A015F Galaxy A01 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/A015F_prog_emmc_firehose_8937_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/000bf0e100200000_3cc959ac5b3364a4_fhprg.bin# real dev @@ -7941,7 +7955,7 @@ Snapdragon 450 0020 0000 -2A9630BD810BA7B60EE2750C46A10D3F55E8D0E9B8B36D75632053F4CBAA55ED +B2DF7C766D7676C21980E3F2723816CD639455BCF1CCD6355E92DD354706E5D4 00000001 Samsung SM-A115F @@ -7954,7 +7968,7 @@ Snapdragon 450 0020 0000 -B2DF7C766D7676C21980E3F2723816CD639455BCF1CCD6355E92DD354706E5D4 +2A9630BD810BA7B60EE2750C46A10D3F55E8D0E9B8B36D75632053F4CBAA55ED 00000001 Samsung SM-A115F @@ -8017,8 +8031,8 @@ Snapdragon 695 0020 0000 -524FF592FEAA736330300754E9EB7AF5B07F855A49446FBCABCAF3802CB2CF0DF3C9EABDA54147C7E5578C4F122F055E -00000001 +E5E9437BA5C8E695CE13FF0E6C4E3CB8D7D2B1A1F29BFD6EE8F78E3B19DF2A2FE68E726058D801CFBF64FD77859790C1 +00000002 Samsung SM-A236U Galaxy A23 5G @@ -8029,8 +8043,8 @@ Snapdragon 695 0020 0000 -E5E9437BA5C8E695CE13FF0E6C4E3CB8D7D2B1A1F29BFD6EE8F78E3B19DF2A2FE68E726058D801CFBF64FD77859790C1 -00000002 +524FF592FEAA736330300754E9EB7AF5B07F855A49446FBCABCAF3802CB2CF0DF3C9EABDA54147C7E5578C4F122F055E +00000001 Samsung SM-A236U Galaxy A23 5G @@ -8506,6 +8520,18 @@ real dev +0008B0E1 +Snapdragon 845 +0020 +0000 +289C7C57D81C8EFAB88758ACECAD16C01303A8ECAED975FEB5EB670311AFFA43 +00000009 +Samsung +SM-N960U +Galaxy Note 9 + + +real dev 000A50E1 Snapdragon 855 0020 @@ -9325,7 +9351,7 @@ 00000000 Xiaomi MI A1 -tissot +tissot, MDG2 #https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/MI_1A_prog_emmc_firehose_8953_ddr.mbn# @@ -9706,7 +9732,7 @@ Xiaomi Redmi Go tiare -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Redmi_8917.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# real dev @@ -9719,7 +9745,7 @@ Xiaomi Redmi Go tiare -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Redmi_8917.mbn# real dev @@ -9816,7 +9842,7 @@ Xiaomi Redmi Note 3 aosp_kenzo -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/0/prog_emmc_firehose_8976_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/0/prog_emmc_firehose_8976_ddr_kenzo.mbn# real dev @@ -9829,7 +9855,19 @@ Xiaomi Redmi Note 3 aosp_kenzo -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/0/prog_emmc_firehose_8976_ddr_kenzo.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/0/prog_emmc_firehose_8976_ddr.mbn# + + +real dev +000560E1 +Snapdragon 425 +0020 +0000 +57158EAF1814D78FD2B3105ECE4DB18A817A08AC664A5782A925F3FF8403D39A +00000000 +Xiaomi +Redmi Note 5a +ugglite real dev diff --git a/ForFound.xml b/ForFound.xml index 48787e6..97c3b31 100644 --- a/ForFound.xml +++ b/ForFound.xml @@ -75,7 +75,7 @@ - + #https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# 000560E1 diff --git a/Forms/Form1.cs b/Forms/Form1.cs index 667399c..cda8712 100644 --- a/Forms/Form1.cs +++ b/Forms/Form1.cs @@ -162,13 +162,13 @@ private void Formfhf_Load(object sender, EventArgs e) { авторизоватьсяЧерезТелеграмToolStripMenuItem.Visible = true; отменитьАвторизациюToolStripMenuItem.Visible = false; - this.Text = "Firehose Finder"; + Text = "Firehose Finder"; } else { авторизоватьсяЧерезТелеграмToolStripMenuItem.Visible = false; отменитьАвторизациюToolStripMenuItem.Visible = true; - this.Text = $"Firehose Finder - {Settings.Default.userFN} {Settings.Default.userSN} ({Settings.Default.userN})"; + Text = $"Firehose Finder - {Settings.Default.userFN} {Settings.Default.userLN} ({Settings.Default.userN})"; } //Закрываем запущенные процессы и чистим файлы (если есть что) CleanFilesProcess(); @@ -2568,9 +2568,9 @@ public async void BotSendMes(string send_message, string version) try { string mess_to_post = CorrectBotString(send_message) + Environment.NewLine + - $"[FhF Version: {version}](https://github.com/hoplik/Firehose-Finder/releases/tag/{version})"; - if (Settings.Default.userID != 0) mess_to_post += Environment.NewLine + $"Спасибо пользователю [{Settings.Default.userFN} {Settings.Default.userSN} ({Settings.Default.userN})](tg://user?id={Settings.Default.userID}) за предоставленные данные. " + - "Ваша реакция на это сообщение увеличит #Concerned_users_rating"; + $"![FhF Version: {version}](https://github.com/hoplik/Firehose-Finder/releases/tag/{version})"; + if (Settings.Default.userID != 0) mess_to_post += Environment.NewLine + $"Спасибо пользователю [{Settings.Default.userFN} {Settings.Default.userLN} ({Settings.Default.userN})](tg://user?id={Settings.Default.userID}) за предоставленные данные. " + + "Реакция на это сообщение увеличит его #Concerned_users_rating"; await Bot_Funcs._botClient.SendTextMessageAsync( botFuncs.channel, mess_to_post, @@ -3305,9 +3305,9 @@ private async void ОтправкаПрограммераToolStripMenuItem_Click { string version = Assembly.GetExecutingAssembly().GetName().Version.ToString(); string mess_to_post = CorrectBotString(inputstr.ToString()) + Environment.NewLine + - $"[FhF Version: {version}](https://github.com/hoplik/Firehose-Finder/releases/tag/{version})"; - if (Settings.Default.userID != 0) mess_to_post += Environment.NewLine + $"Спасибо пользователю [{Settings.Default.userFN} {Settings.Default.userSN} ({Settings.Default.userN})](tg://user?id={Settings.Default.userID}) за предоставленные данные. " + - "Ваша реакция на это сообщение увеличит #Concerned_users_rating"; + $"![FhF Version: {version}](https://github.com/hoplik/Firehose-Finder/releases/tag/{version})"; + if (Settings.Default.userID != 0) mess_to_post += Environment.NewLine + $"Спасибо пользователю [{Settings.Default.userFN} {Settings.Default.userLN} ({Settings.Default.userN})](tg://user?id={Settings.Default.userID}) за предоставленные данные. " + + "Реакция на это сообщение увеличит его #Concerned_users_rating"; await Bot_Funcs._botClient.SendDocumentAsync(botFuncs.channel, onlineFile, null, null, mess_to_post, Telegram.Bot.Types.Enums.ParseMode.Markdown); textBox_soft_term.AppendText(LocRes.GetString("sent") + Environment.NewLine); } @@ -3511,7 +3511,7 @@ private void АвторизоватьсяЧерезТелеграмToolStripMenu private void ОтменитьАвторизациюToolStripMenuItem_Click(object sender, EventArgs e) { Settings.Default.userID = 0; - Settings.Default.userFN = Settings.Default.userSN = Settings.Default.userN = string.Empty; + Settings.Default.userFN = Settings.Default.userLN = Settings.Default.userN = string.Empty; Application.Restart(); } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 19bb141..03893db 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.6.24.0")] -[assembly: AssemblyFileVersion("24.6.24.0")] +[assembly: AssemblyVersion("24.7.1.0")] +[assembly: AssemblyFileVersion("24.7.1.0")] [assembly: NeutralResourcesLanguage("ru-RU")] diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 1eb383a..ce2b0c3 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -98,12 +98,12 @@ public string userFN { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] - public string userSN { + public string userLN { get { - return ((string)(this["userSN"])); + return ((string)(this["userLN"])); } set { - this["userSN"] = value; + this["userLN"] = value; } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 7d7418f..833d4a1 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -20,7 +20,7 @@ - +