Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit d2ea1dd

Browse files
chr233chr233
committed
misc
1 parent 38b5e1b commit d2ea1dd

File tree

7 files changed

+204
-26
lines changed

7 files changed

+204
-26
lines changed

‎ASFOAuth/ASFOAuth.cs‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.ComponentModel;
88
using System.Composition;
99
using System.Reflection;
10+
using System.Text;
1011

1112
namespace ASFOAuth;
1213

@@ -18,10 +19,9 @@ internal sealed class ASFOAuth : IASF, IBotCommand2
1819

1920
private bool ASFEBridge;
2021

21-
[JsonProperty]
2222
public static PluginConfig Config => Utils.Config;
2323

24-
private Timer? StatisticTimer;
24+
private Timer? StatisticTimer { get; set; }
2525

2626
/// <summary>
2727
/// ASF启动事件
@@ -56,8 +56,24 @@ public Task OnASFInit(IReadOnlyDictionary<string, JToken>? additionalConfigPrope
5656

5757
Utils.Config = config ?? new();
5858

59+
var warnings = new StringBuilder("\n");
60+
61+
//使用协议
62+
if (!Config.EULA)
63+
{
64+
warnings.AppendLine(Langs.Line);
65+
warnings.AppendLineFormat(Langs.EulaWarning, Name);
66+
warnings.AppendLine(Langs.Line);
67+
}
68+
69+
warnings.AppendLine(Langs.Line);
70+
warnings.AppendLine(Langs.RiskWarning);
71+
warnings.AppendLine(Langs.Line);
72+
73+
ASFLogger.LogGenericWarning(warnings.ToString());
74+
5975
//统计
60-
if (Config.Statistic)
76+
if (Config.Statistic && !ASFEBridge)
6177
{
6278
Uri request = new("https://asfe.chrxw.com/");
6379
StatisticTimer = new Timer(
@@ -71,10 +87,6 @@ public Task OnASFInit(IReadOnlyDictionary<string, JToken>? additionalConfigPrope
7187
);
7288
}
7389

74-
ASFLogger.LogGenericWarning(Langs.Line);
75-
ASFLogger.LogGenericWarning(Langs.RiskWarning);
76-
ASFLogger.LogGenericWarning(Langs.Line);
77-
7890
return Task.CompletedTask;
7991
}
8092

‎ASFOAuth/Localization/Langs.Designer.cs‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ASFOAuth/Localization/Langs.en-US.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,10 @@
168168
<data name="ASFEnhanceRegisterSuccess" xml:space="preserve">
169169
<value>ASFEBridge 注册成功</value>
170170
</data>
171+
<data name="EulaWarning" xml:space="preserve">
172+
<value>{0}: ASFEnhance.EULA not agreed, some features is disabled</value>
173+
</data>
174+
<data name="EulaCmdUnavilable" xml:space="preserve">
175+
<value>ASFEnhance.EULA not agreed, this feature is unavilable</value>
176+
</data>
171177
</root>

‎ASFOAuth/Localization/Langs.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,10 @@
168168
<data name="PluginStandalongMode" xml:space="preserve">
169169
<value>推荐安装 ASFEnhance, 支持自动更新插件</value>
170170
</data>
171+
<data name="EulaWarning" xml:space="preserve">
172+
<value>{0}: 尚未同意 ASFEnhance.EULA , 部分命令已禁用</value>
173+
</data>
174+
<data name="EulaCmdUnavilable" xml:space="preserve">
175+
<value>尚未同意 ASFEnhance.EULA , 该命令不可用</value>
176+
</data>
171177
</root>

‎ASFOAuth/Localization/Langs.ru-RU.resx‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="EulaWarning" xml:space="preserve">
121+
<value>{0}: ASFEnhance.EULA не принят, некоторые функции отключены</value>
122+
</data>
123+
<data name="EulaCmdUnavilable" xml:space="preserve">
124+
<value>"ASFEnhance.EULA" не принят, эта функция недоступна</value>
125+
</data>
126+
</root>

‎ASFOAuth/Localization/Langs.zh-Hans.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,10 @@
168168
<data name="ASFEnhanceRegisterSuccess" xml:space="preserve">
169169
<value>ASFEBridge 注册成功</value>
170170
</data>
171+
<data name="EulaWarning" xml:space="preserve">
172+
<value>{0}: 尚未同意 ASFEnhance.EULA, 部分命令已禁用</value>
173+
</data>
174+
<data name="EulaCmdUnavilable" xml:space="preserve">
175+
<value>尚未同意 ASFEnhance.EULA , 该命令不可用</value>
176+
</data>
171177
</root>

‎ASFOAuth/Utils.cs‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using ArchiSteamFarm.Steam.Integration;
55
using ASFOAuth.Data;
66
using System.Reflection;
7+
using System.Text;
78

89
namespace ASFOAuth;
910

@@ -15,49 +16,52 @@ internal static class Utils
1516
internal static PluginConfig Config { get; set; } = new();
1617

1718
/// <summary>
18-
/// 更新已就绪
19+
/// 格式化返回文本
1920
/// </summary>
20-
internal static bool UpdatePadding { get; set; }
21+
/// <param name="message"></param>
22+
/// <returns></returns>
23+
internal static string FormatStaticResponse(string message)
24+
{
25+
return $"<ASF> {message}";
26+
}
2127

2228
/// <summary>
23-
/// 更新标记
29+
/// 格式化返回文本
2430
/// </summary>
31+
/// <param name="message"></param>
32+
/// <param name="args"></param>
2533
/// <returns></returns>
26-
private static string UpdateFlag()
34+
internal static string FormatStaticResponse(string message, params object?[] args)
2735
{
28-
if (UpdatePadding)
29-
{
30-
return "*";
31-
}
32-
else
33-
{
34-
return "";
35-
}
36+
return FormatStaticResponse(string.Format(message, args));
3637
}
3738

3839
/// <summary>
3940
/// 格式化返回文本
4041
/// </summary>
42+
/// <param name="bot"></param>
4143
/// <param name="message"></param>
4244
/// <returns></returns>
43-
internal static string FormatStaticResponse(string message)
45+
internal static string FormatBotResponse(this Bot bot, string message)
4446
{
45-
string flag = UpdateFlag();
46-
47-
return $"<ABB{flag}> {message}";
47+
return $"<{bot.BotName}> {message}";
4848
}
4949

5050
/// <summary>
5151
/// 格式化返回文本
5252
/// </summary>
5353
/// <param name="bot"></param>
5454
/// <param name="message"></param>
55+
/// <param name="args"></param>
5556
/// <returns></returns>
56-
internal static string FormatBotResponse(this Bot bot, string message)
57+
internal static string FormatBotResponse(this Bot bot, string message, params object?[] args)
5758
{
58-
string flag = UpdateFlag();
59+
return bot.FormatBotResponse(string.Format(message, args));
60+
}
5961

60-
return $"<{bot.BotName}{flag}> {message}";
62+
internal static StringBuilder AppendLineFormat(this StringBuilder sb, string format, params object?[] args)
63+
{
64+
return sb.AppendLine(string.Format(format, args));
6165
}
6266

6367
/// <summary>

0 commit comments

Comments
 (0)