using OpenTween.Api;
using OpenTween.Api.DataModel;
using OpenTween.Connection;
+using OpenTween.Models;
+using System.Drawing.Imaging;
+using OpenTween.Setting;
namespace OpenTween
{
public static readonly Regex StatusUrlRegex = new Regex(@"https?://([^.]+\.)?twitter\.com/(#!/)?(?<ScreenName>[a-zA-Z0-9_]+)/status(es)?/(?<StatusId>[0-9]+)(/photo)?", RegexOptions.IgnoreCase);
/// <summary>
+ /// attachment_url に指定可能な URL を判定する正規表現
+ /// </summary>
+ public static readonly Regex AttachmentUrlRegex = new Regex(@"https?://(
+ twitter\.com/[0-9A-Za-z_]+/status/[0-9]+
+ | mobile\.twitter\.com/[0-9A-Za-z_]+/status/[0-9]+
+ | twitter\.com/messages/compose\?recipient_id=[0-9]+(&.+)?
+)$", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+ /// <summary>
/// FavstarやaclogなどTwitter関連サービスのパーマリンクURLからステータスIDを抽出する正規表現
/// </summary>
public static readonly Regex ThirdPartyStatusUrlRegex = new Regex(@"https?://(?:[^.]+\.)?(?:
public TwitterApi Api { get; }
public TwitterConfiguration Configuration { get; private set; }
+ public TwitterTextConfiguration TextConfiguration { get; private set; }
+
+ public bool GetFollowersSuccess { get; private set; } = false;
+ public bool GetNoRetweetSuccess { get; private set; } = false;
delegate void GetIconImageDelegate(PostClass post);
private readonly object LockObj = new object();
private ISet<long> followerId = new HashSet<long>();
- private bool _GetFollowerResult = false;
private long[] noRTId = new long[0];
- private bool _GetNoRetweetResult = false;
//プロパティからアクセスされる共通情報
private string _uname;
-
- private bool _readOwnPost;
private List<string> _hashList = new List<string>();
//max_idで古い発言を取得するために保持(lists分は個別タブで管理)
- private long minHomeTimeline = long.MaxValue;
- private long minMentions = long.MaxValue;
private long minDirectmessage = long.MaxValue;
private long minDirectmessageSent = long.MaxValue;
- //private FavoriteQueue favQueue;
+ private long previousStatusId = -1L;
- private HttpTwitter twCon = new HttpTwitter();
+ //private FavoriteQueue favQueue;
//private List<PostClass> _deletemessages = new List<PostClass>();
{
this.Api = api;
this.Configuration = TwitterConfiguration.DefaultConfiguration();
+ this.TextConfiguration = TwitterTextConfiguration.DefaultConfiguration();
}
public TwitterApiAccessLevel AccessLevel
- {
- get
- {
- return MyCommon.TwitterApiInfo.AccessLevel;
- }
- }
+ => MyCommon.TwitterApiInfo.AccessLevel;
protected void ResetApiStatus()
- {
- MyCommon.TwitterApiInfo.Reset();
- }
+ => MyCommon.TwitterApiInfo.Reset();
public void ClearAuthInfo()
{
Twitter.AccountState = MyCommon.ACCOUNT_STATE.Invalid;
this.ResetApiStatus();
- twCon.ClearAuthInfo();
}
+ [Obsolete]
public void VerifyCredentials()
{
- HttpStatusCode res;
- var content = "";
try
{
- res = twCon.VerifyCredentials(ref content);
+ this.VerifyCredentialsAsync().Wait();
}
- catch (Exception ex)
+ catch (AggregateException ex) when (ex.InnerException is WebApiException)
{
- throw new WebApiException("Err:" + ex.Message, ex);
+ throw new WebApiException(ex.InnerException.Message, ex);
}
+ }
- this.CheckStatusCode(res, content);
-
- try
- {
- var user = TwitterUser.ParseJson(content);
+ public async Task VerifyCredentialsAsync()
+ {
+ var user = await this.Api.AccountVerifyCredentials()
+ .ConfigureAwait(false);
- this.twCon.AuthenticatedUserId = user.Id;
- this.UpdateUserStats(user);
- }
- catch (SerializationException ex)
- {
- MyCommon.TraceOut(ex.Message + Environment.NewLine + content);
- throw new WebApiException("Err:Json Parse Error(DataContractJsonSerializer)", content, ex);
- }
+ this.UpdateUserStats(user);
}
public void Initialize(string token, string tokenSecret, string username, long userId)
}
this.ResetApiStatus();
this.Api.Initialize(token, tokenSecret, userId, username);
- twCon.Initialize(token, tokenSecret, username, userId);
- _uname = username.ToLowerInvariant();
- if (SettingCommon.Instance.UserstreamStartup) this.ReconnectUserStream();
+ _uname = username;
+ if (SettingManager.Common.UserstreamStartup) this.ReconnectUserStream();
}
- public string PreProcessUrl(string orgData)
+ internal static string PreProcessUrl(string orgData)
{
int posl1;
var posl2 = 0;
return orgData;
}
- private string GetPlainText(string orgData)
- {
- return WebUtility.HtmlDecode(Regex.Replace(orgData, "(?<tagStart><a [^>]+>)(?<text>[^<]+)(?<tagEnd></a>)", "${text}"));
- }
-
- // htmlの簡易サニタイズ(詳細表示に不要なタグの除去)
-
- private string SanitizeHtml(string orgdata)
- {
- var retdata = orgdata;
-
- retdata = Regex.Replace(retdata, "<(script|object|applet|image|frameset|fieldset|legend|style).*" +
- "</(script|object|applet|image|frameset|fieldset|legend|style)>", "", RegexOptions.IgnoreCase);
-
- retdata = Regex.Replace(retdata, "<(frame|link|iframe|img)>", "", RegexOptions.IgnoreCase);
-
- return retdata;
- }
-
- private string AdjustHtml(string orgData)
- {
- var retStr = orgData;
- //var m = Regex.Match(retStr, "<a [^>]+>[#|#](?<1>[a-zA-Z0-9_]+)</a>");
- //while (m.Success)
- //{
- // lock (LockObj)
- // {
- // _hashList.Add("#" + m.Groups(1).Value);
- // }
- // m = m.NextMatch;
- //}
- retStr = Regex.Replace(retStr, "<a [^>]*href=\"/", "<a href=\"https://twitter.com/");
- retStr = retStr.Replace("<a href=", "<a target=\"_self\" href=");
- retStr = Regex.Replace(retStr, @"(\r\n?|\n)", "<br>"); // CRLF, CR, LF は全て <br> に置換する
-
- //半角スペースを置換(Thanks @anis774)
- var ret = false;
- do
- {
- ret = EscapeSpace(ref retStr);
- } while (!ret);
-
- return SanitizeHtml(retStr);
- }
-
- private bool EscapeSpace(ref string html)
- {
- //半角スペースを置換(Thanks @anis774)
- var isTag = false;
- for (int i = 0; i < html.Length; i++)
- {
- if (html[i] == '<')
- {
- isTag = true;
- }
- if (html[i] == '>')
- {
- isTag = false;
- }
-
- if ((!isTag) && (html[i] == ' '))
- {
- html = html.Remove(i, 1);
- html = html.Insert(i, " ");
- return false;
- }
- }
- return true;
- }
-
- private struct PostInfo
- {
- public string CreatedAt;
- public string Id;
- public string Text;
- public string UserId;
- public PostInfo(string Created, string IdStr, string txt, string uid)
- {
- CreatedAt = Created;
- Id = IdStr;
- Text = txt;
- UserId = uid;
- }
- public bool Equals(PostInfo dst)
- {
- if (this.CreatedAt == dst.CreatedAt && this.Id == dst.Id && this.Text == dst.Text && this.UserId == dst.UserId)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
- }
-
- static private PostInfo _prev = new PostInfo("", "", "", "");
- private bool IsPostRestricted(TwitterStatus status)
- {
- var _current = new PostInfo("", "", "", "");
-
- _current.CreatedAt = status.CreatedAt;
- _current.Id = status.IdStr;
- if (status.Text == null)
- {
- _current.Text = "";
- }
- else
- {
- _current.Text = status.Text;
- }
- _current.UserId = status.User.IdStr;
-
- if (_current.Equals(_prev))
- {
- return true;
- }
- _prev.CreatedAt = _current.CreatedAt;
- _prev.Id = _current.Id;
- _prev.Text = _current.Text;
- _prev.UserId = _current.UserId;
-
- return false;
- }
-
- public async Task PostStatus(string postStr, long? reply_to, IReadOnlyList<long> mediaIds = null)
+ public async Task PostStatus(PostStatusParams param)
{
this.CheckAccountState();
- if (mediaIds == null &&
- Twitter.DMSendTextRegex.IsMatch(postStr))
+ if (Twitter.DMSendTextRegex.IsMatch(param.Text))
{
- await this.SendDirectMessage(postStr)
+ await this.SendDirectMessage(param.Text)
.ConfigureAwait(false);
return;
}
- var response = await this.Api.StatusesUpdate(postStr, reply_to, mediaIds)
+ var response = await this.Api.StatusesUpdate(param.Text, param.InReplyToStatusId, param.MediaIds,
+ param.AutoPopulateReplyMetadata, param.ExcludeReplyUserIds, param.AttachmentUrl)
.ConfigureAwait(false);
var status = await response.LoadJsonAsync()
this.UpdateUserStats(status.User);
- if (IsPostRestricted(status))
- {
+ if (status.Id == this.previousStatusId)
throw new WebApiException("OK:Delaying?");
- }
+
+ this.previousStatusId = status.Id;
}
- public async Task PostStatusWithMultipleMedia(string postStr, long? reply_to, IMediaItem[] mediaItems)
+ public Task<long> UploadMedia(IMediaItem item)
+ => this.UploadMedia(item, SettingManager.Common.AlphaPNGWorkaround);
+
+ public async Task<long> UploadMedia(IMediaItem item, bool alphaPNGWorkaround)
{
this.CheckAccountState();
- if (Twitter.DMSendTextRegex.IsMatch(postStr))
+ LazyJson<TwitterUploadMediaResult> response;
+
+ using (var origImage = item.CreateImage())
{
- await this.SendDirectMessage(postStr)
- .ConfigureAwait(false);
- return;
+ if (alphaPNGWorkaround && this.AddAlphaChannelIfNeeded(origImage.Image, out var newImage))
+ {
+ using (var newMediaItem = new MemoryImageMediaItem(newImage))
+ {
+ response = await this.Api.MediaUpload(newMediaItem)
+ .ConfigureAwait(false);
+ }
+ }
+ else
+ {
+ response = await this.Api.MediaUpload(item)
+ .ConfigureAwait(false);
+ }
}
- if (mediaItems.Length == 0)
- throw new WebApiException("Err:Invalid Files!");
-
- var uploadTasks = from m in mediaItems
- select this.UploadMedia(m);
-
- var mediaIds = await Task.WhenAll(uploadTasks)
+ var media = await response.LoadJsonAsync()
.ConfigureAwait(false);
- await this.PostStatus(postStr, reply_to, mediaIds)
- .ConfigureAwait(false);
+ return media.MediaId;
}
- public async Task<long> UploadMedia(IMediaItem item)
- {
- this.CheckAccountState();
+ /// <summary>
+ /// pic.twitter.com アップロード時に JPEG への変換を回避するための加工を行う
+ /// </summary>
+ /// <remarks>
+ /// pic.twitter.com へのアップロード時に、アルファチャンネルを持たない PNG 画像が
+ /// JPEG 形式に変換され画質が低下する問題を回避します。
+ /// PNG 以外の画像や、すでにアルファチャンネルを持つ PNG 画像に対しては何もしません。
+ /// </remarks>
+ /// <returns>加工が行われた場合は true、そうでない場合は false</returns>
+ private bool AddAlphaChannelIfNeeded(Image origImage, out MemoryImage newImage)
+ {
+ newImage = null;
+
+ // PNG 画像以外に対しては何もしない
+ if (origImage.RawFormat.Guid != ImageFormat.Png.Guid)
+ return false;
- var response = await this.Api.MediaUpload(item)
- .ConfigureAwait(false);
+ using (var bitmap = new Bitmap(origImage))
+ {
+ // アルファ値が 255 以外のピクセルが含まれていた場合は何もしない
+ foreach (var x in Enumerable.Range(0, bitmap.Width))
+ {
+ foreach (var y in Enumerable.Range(0, bitmap.Height))
+ {
+ if (bitmap.GetPixel(x, y).A != 255)
+ return false;
+ }
+ }
- var media = await response.LoadJsonAsync()
- .ConfigureAwait(false);
+ // 左上の 1px だけアルファ値を 254 にする
+ var pixel = bitmap.GetPixel(0, 0);
+ var newPixel = Color.FromArgb(pixel.A - 1, pixel.R, pixel.G, pixel.B);
+ bitmap.SetPixel(0, 0, newPixel);
- return media.MediaId;
+ // MemoryImage 作成時に画像はコピーされるため、この後 bitmap は破棄しても問題ない
+ newImage = MemoryImage.CopyFromImage(bitmap);
+
+ return true;
+ }
}
public async Task SendDirectMessage(string postStr)
this.CheckAccountState();
//データ部分の生成
- var target = id;
var post = TabInformations.GetInstance()[id];
if (post == null)
- {
throw new WebApiException("Err:Target isn't found.");
- }
- if (TabInformations.GetInstance()[id].RetweetedId != null)
- {
- target = TabInformations.GetInstance()[id].RetweetedId.Value; //再RTの場合は元発言をRT
- }
+
+ var target = post.RetweetedId ?? id; //再RTの場合は元発言をRT
var response = await this.Api.StatusesRetweet(target)
.ConfigureAwait(false);
var status = await response.LoadJsonAsync()
.ConfigureAwait(false);
- //ReTweetしたものをTLに追加
- post = CreatePostsFromStatusData(status);
- if (post == null)
- throw new WebApiException("Invalid Json!");
-
//二重取得回避
lock (LockObj)
{
- if (TabInformations.GetInstance().ContainsKey(post.StatusId))
+ if (TabInformations.GetInstance().ContainsKey(status.Id))
return;
}
+
//Retweet判定
- if (post.RetweetedId == null)
+ if (status.RetweetedStatus == null)
throw new WebApiException("Invalid Json!");
+
+ //ReTweetしたものをTLに追加
+ post = CreatePostsFromStatusData(status);
+
//ユーザー情報
post.IsMe = true;
post.IsRead = read;
post.IsOwl = false;
- if (_readOwnPost) post.IsRead = true;
+ if (this.ReadOwnPost) post.IsRead = true;
post.IsDm = false;
TabInformations.GetInstance().AddPost(post);
}
public string Username
- {
- get
- {
- return twCon.AuthenticatedUsername;
- }
- }
+ => this.Api.CurrentScreenName;
public long UserId
- {
- get
- {
- return twCon.AuthenticatedUserId;
- }
- }
-
- public string Password
- {
- get
- {
- return twCon.Password;
- }
- }
-
- private static MyCommon.ACCOUNT_STATE _accountState = MyCommon.ACCOUNT_STATE.Valid;
- public static MyCommon.ACCOUNT_STATE AccountState
- {
- get
- {
- return _accountState;
- }
- set
- {
- _accountState = value;
- }
- }
+ => this.Api.CurrentUserId;
+ public static MyCommon.ACCOUNT_STATE AccountState { get; set; } = MyCommon.ACCOUNT_STATE.Valid;
public bool RestrictFavCheck { get; set; }
-
-#region "バージョンアップ"
- public void GetTweenBinary(string strVer)
- {
- try
- {
- //本体
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/Tween" + strVer + ".gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(MyCommon.settingPath, "TweenNew.exe")))
- {
- throw new WebApiException("Err:Download failed");
- }
- //英語リソース
- if (!Directory.Exists(Path.Combine(MyCommon.settingPath, "en")))
- {
- Directory.CreateDirectory(Path.Combine(MyCommon.settingPath, "en"));
- }
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/TweenResEn" + strVer + ".gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(Path.Combine(MyCommon.settingPath, "en"), "Tween.resourcesNew.dll")))
- {
- throw new WebApiException("Err:Download failed");
- }
- //その他言語圏のリソース。取得失敗しても継続
- //UIの言語圏のリソース
- var curCul = "";
- if (!Thread.CurrentThread.CurrentUICulture.IsNeutralCulture)
- {
- var idx = Thread.CurrentThread.CurrentUICulture.Name.LastIndexOf('-');
- if (idx > -1)
- {
- curCul = Thread.CurrentThread.CurrentUICulture.Name.Substring(0, idx);
- }
- else
- {
- curCul = Thread.CurrentThread.CurrentUICulture.Name;
- }
- }
- else
- {
- curCul = Thread.CurrentThread.CurrentUICulture.Name;
- }
- if (!string.IsNullOrEmpty(curCul) && curCul != "en" && curCul != "ja")
- {
- if (!Directory.Exists(Path.Combine(MyCommon.settingPath, curCul)))
- {
- Directory.CreateDirectory(Path.Combine(MyCommon.settingPath, curCul));
- }
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/TweenRes" + curCul + strVer + ".gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(Path.Combine(MyCommon.settingPath, curCul), "Tween.resourcesNew.dll")))
- {
- //return "Err:Download failed";
- }
- }
- //スレッドの言語圏のリソース
- string curCul2;
- if (!Thread.CurrentThread.CurrentCulture.IsNeutralCulture)
- {
- var idx = Thread.CurrentThread.CurrentCulture.Name.LastIndexOf('-');
- if (idx > -1)
- {
- curCul2 = Thread.CurrentThread.CurrentCulture.Name.Substring(0, idx);
- }
- else
- {
- curCul2 = Thread.CurrentThread.CurrentCulture.Name;
- }
- }
- else
- {
- curCul2 = Thread.CurrentThread.CurrentCulture.Name;
- }
- if (!string.IsNullOrEmpty(curCul2) && curCul2 != "en" && curCul2 != curCul)
- {
- if (!Directory.Exists(Path.Combine(MyCommon.settingPath, curCul2)))
- {
- Directory.CreateDirectory(Path.Combine(MyCommon.settingPath, curCul2));
- }
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/TweenRes" + curCul2 + strVer + ".gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(Path.Combine(MyCommon.settingPath, curCul2), "Tween.resourcesNew.dll")))
- {
- //return "Err:Download failed";
- }
- }
-
- //アップデータ
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/TweenUp3.gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(MyCommon.settingPath, "TweenUp3.exe")))
- {
- throw new WebApiException("Err:Download failed");
- }
- //シリアライザDLL
- if (!(new HttpVarious()).GetDataToFile("http://tween.sourceforge.jp/TweenDll" + strVer + ".gz?" + DateTime.Now.ToString("yyMMddHHmmss") + Environment.TickCount.ToString(),
- Path.Combine(MyCommon.settingPath, "TweenNew.XmlSerializers.dll")))
- {
- throw new WebApiException("Err:Download failed");
- }
- }
- catch (Exception ex)
- {
- throw new WebApiException("Err:Download failed", ex);
- }
- }
-#endregion
-
- public bool ReadOwnPost
- {
- get
- {
- return _readOwnPost;
- }
- set
- {
- _readOwnPost = value;
- }
- }
+ public bool ReadOwnPost { get; set; }
public int FollowersCount { get; private set; }
public int FriendsCount { get; private set; }
/// 渡された取得件数がWORKERTYPEに応じた取得可能範囲に収まっているか検証する
/// </summary>
public static bool VerifyApiResultCount(MyCommon.WORKERTYPE type, int count)
- {
- return count >= 20 && count <= GetMaxApiResultCount(type);
- }
+ => count >= 20 && count <= GetMaxApiResultCount(type);
/// <summary>
/// 渡された取得件数が更新時の取得可能範囲に収まっているか検証する
/// </summary>
public static bool VerifyMoreApiResultCount(int count)
- {
- return count >= 20 && count <= 200;
- }
+ => count >= 20 && count <= 200;
/// <summary>
/// 渡された取得件数が起動時の取得可能範囲に収まっているか検証する
/// </summary>
public static bool VerifyFirstApiResultCount(int count)
- {
- return count >= 20 && count <= 200;
- }
+ => count >= 20 && count <= 200;
/// <summary>
/// WORKERTYPEに応じた取得可能な最大件数を取得する
return 20;
}
- if (SettingCommon.Instance.UseAdditionalCount)
+ if (SettingManager.Common.UseAdditionalCount)
{
switch (type)
{
case MyCommon.WORKERTYPE.Favorites:
- if (SettingCommon.Instance.FavoritesCountApi != 0)
- return SettingCommon.Instance.FavoritesCountApi;
+ if (SettingManager.Common.FavoritesCountApi != 0)
+ return SettingManager.Common.FavoritesCountApi;
break;
case MyCommon.WORKERTYPE.List:
- if (SettingCommon.Instance.ListCountApi != 0)
- return SettingCommon.Instance.ListCountApi;
+ if (SettingManager.Common.ListCountApi != 0)
+ return SettingManager.Common.ListCountApi;
break;
case MyCommon.WORKERTYPE.PublicSearch:
- if (SettingCommon.Instance.SearchCountApi != 0)
- return SettingCommon.Instance.SearchCountApi;
+ if (SettingManager.Common.SearchCountApi != 0)
+ return SettingManager.Common.SearchCountApi;
break;
case MyCommon.WORKERTYPE.UserTimeline:
- if (SettingCommon.Instance.UserTimelineCountApi != 0)
- return SettingCommon.Instance.UserTimelineCountApi;
+ if (SettingManager.Common.UserTimelineCountApi != 0)
+ return SettingManager.Common.UserTimelineCountApi;
break;
}
- if (more && SettingCommon.Instance.MoreCountApi != 0)
+ if (more && SettingManager.Common.MoreCountApi != 0)
{
- return Math.Min(SettingCommon.Instance.MoreCountApi, GetMaxApiResultCount(type));
+ return Math.Min(SettingManager.Common.MoreCountApi, GetMaxApiResultCount(type));
}
- if (startup && SettingCommon.Instance.FirstCountApi != 0 && type != MyCommon.WORKERTYPE.Reply)
+ if (startup && SettingManager.Common.FirstCountApi != 0 && type != MyCommon.WORKERTYPE.Reply)
{
- return Math.Min(SettingCommon.Instance.FirstCountApi, GetMaxApiResultCount(type));
+ return Math.Min(SettingManager.Common.FirstCountApi, GetMaxApiResultCount(type));
}
}
// 上記に当てはまらない場合の共通処理
- var count = SettingCommon.Instance.CountApi;
+ var count = SettingManager.Common.CountApi;
if (type == MyCommon.WORKERTYPE.Reply)
- count = SettingCommon.Instance.CountApiReply;
+ count = SettingManager.Common.CountApiReply;
return Math.Min(count, GetMaxApiResultCount(type));
}
- public async Task GetTimelineApi(bool read, MyCommon.WORKERTYPE gType, bool more, bool startup)
+ public async Task GetHomeTimelineApi(bool read, HomeTabModel tab, bool more, bool startup)
{
this.CheckAccountState();
- var count = GetApiResultCount(gType, more, startup);
+ var count = GetApiResultCount(MyCommon.WORKERTYPE.Timeline, more, startup);
TwitterStatus[] statuses;
- if (gType == MyCommon.WORKERTYPE.Timeline)
+ if (more)
{
- if (more)
- {
- statuses = await this.Api.StatusesHomeTimeline(count, maxId: this.minHomeTimeline)
- .ConfigureAwait(false);
- }
- else
- {
- statuses = await this.Api.StatusesHomeTimeline(count)
- .ConfigureAwait(false);
- }
+ statuses = await this.Api.StatusesHomeTimeline(count, maxId: tab.OldestId)
+ .ConfigureAwait(false);
}
else
{
- if (more)
- {
- statuses = await this.Api.StatusesMentionsTimeline(count, maxId: this.minMentions)
- .ConfigureAwait(false);
- }
- else
- {
- statuses = await this.Api.StatusesMentionsTimeline(count)
- .ConfigureAwait(false);
- }
+ statuses = await this.Api.StatusesHomeTimeline(count)
+ .ConfigureAwait(false);
}
- var minimumId = CreatePostsFromJson(statuses, gType, null, read);
-
+ var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.Timeline, tab, read);
if (minimumId != null)
+ tab.OldestId = minimumId.Value;
+ }
+
+ public async Task GetMentionsTimelineApi(bool read, MentionsTabModel tab, bool more, bool startup)
+ {
+ this.CheckAccountState();
+
+ var count = GetApiResultCount(MyCommon.WORKERTYPE.Reply, more, startup);
+
+ TwitterStatus[] statuses;
+ if (more)
{
- if (gType == MyCommon.WORKERTYPE.Timeline)
- this.minHomeTimeline = minimumId.Value;
- else
- this.minMentions = minimumId.Value;
+ statuses = await this.Api.StatusesMentionsTimeline(count, maxId: tab.OldestId)
+ .ConfigureAwait(false);
}
+ else
+ {
+ statuses = await this.Api.StatusesMentionsTimeline(count)
+ .ConfigureAwait(false);
+ }
+
+ var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.Reply, tab, read);
+ if (minimumId != null)
+ tab.OldestId = minimumId.Value;
}
- public async Task GetUserTimelineApi(bool read, string userName, TabClass tab, bool more)
+ public async Task GetUserTimelineApi(bool read, string userName, UserTimelineTabModel tab, bool more)
{
this.CheckAccountState();
TwitterStatus[] statuses;
if (string.IsNullOrEmpty(userName))
{
- var target = tab.User;
+ var target = tab.ScreenName;
if (string.IsNullOrEmpty(target)) return;
userName = target;
statuses = await this.Api.StatusesUserTimeline(userName, count)
.ConfigureAwait(false);
var item = CreatePostsFromStatusData(status);
- if (item == null)
- throw new WebApiException("Err:Can't create post");
item.IsRead = read;
- if (item.IsMe && !read && _readOwnPost) item.IsRead = true;
+ if (item.IsMe && !read && this.ReadOwnPost) item.IsRead = true;
return item;
}
- public async Task GetStatusApi(bool read, long id, TabClass tab)
+ public async Task GetStatusApi(bool read, long id, TabModel tab)
{
var post = await this.GetStatusApi(read, id)
.ConfigureAwait(false);
//非同期アイコン取得&StatusDictionaryに追加
if (tab != null && tab.IsInnerStorageTabType)
- tab.AddPostToInnerStorage(post);
+ tab.AddPostQueue(post);
else
TabInformations.GetInstance().AddPost(post);
}
private PostClass CreatePostsFromStatusData(TwitterStatus status)
- {
- return CreatePostsFromStatusData(status, false);
- }
+ => this.CreatePostsFromStatusData(status, false);
private PostClass CreatePostsFromStatusData(TwitterStatus status, bool favTweet)
{
//Id
post.RetweetedId = retweeted.Id;
//本文
- post.TextFromApi = retweeted.Text;
+ post.TextFromApi = retweeted.FullText;
entities = retweeted.MergedEntities;
sourceHtml = retweeted.Source;
//Reply先
//以下、ユーザー情報
var user = retweeted.User;
-
- if (user == null || user.ScreenName == null || status.User.ScreenName == null) return null;
-
- post.UserId = user.Id;
- post.ScreenName = user.ScreenName;
- post.Nickname = user.Name.Trim();
- post.ImageUrl = user.ProfileImageUrlHttps;
- post.IsProtect = user.Protected;
+ if (user != null)
+ {
+ post.UserId = user.Id;
+ post.ScreenName = user.ScreenName;
+ post.Nickname = user.Name.Trim();
+ post.ImageUrl = user.ProfileImageUrlHttps;
+ post.IsProtect = user.Protected;
+ }
+ else
+ {
+ post.UserId = 0L;
+ post.ScreenName = "?????";
+ post.Nickname = "Unknown User";
+ }
//Retweetした人
- post.RetweetedBy = status.User.ScreenName;
- post.RetweetedByUserId = status.User.Id;
- post.IsMe = post.RetweetedBy.ToLowerInvariant().Equals(_uname);
+ if (status.User != null)
+ {
+ post.RetweetedBy = status.User.ScreenName;
+ post.RetweetedByUserId = status.User.Id;
+ post.IsMe = post.RetweetedBy.Equals(_uname, StringComparison.InvariantCultureIgnoreCase);
+ }
+ else
+ {
+ post.RetweetedBy = "?????";
+ post.RetweetedByUserId = 0L;
+ }
}
else
{
post.CreatedAt = MyCommon.DateTimeParse(status.CreatedAt);
//本文
- post.TextFromApi = status.Text;
+ post.TextFromApi = status.FullText;
entities = status.MergedEntities;
sourceHtml = status.Source;
post.InReplyToStatusId = status.InReplyToStatusId;
//以下、ユーザー情報
var user = status.User;
-
- if (user == null || user.ScreenName == null) return null;
-
- post.UserId = user.Id;
- post.ScreenName = user.ScreenName;
- post.Nickname = user.Name.Trim();
- post.ImageUrl = user.ProfileImageUrlHttps;
- post.IsProtect = user.Protected;
- post.IsMe = post.ScreenName.ToLowerInvariant().Equals(_uname);
+ if (user != null)
+ {
+ post.UserId = user.Id;
+ post.ScreenName = user.ScreenName;
+ post.Nickname = user.Name.Trim();
+ post.ImageUrl = user.ProfileImageUrlHttps;
+ post.IsProtect = user.Protected;
+ post.IsMe = post.ScreenName.Equals(_uname, StringComparison.InvariantCultureIgnoreCase);
+ }
+ else
+ {
+ post.UserId = 0L;
+ post.ScreenName = "?????";
+ post.Nickname = "Unknown User";
+ }
}
//HTMLに整形
string textFromApi = post.TextFromApi;
- post.Text = CreateHtmlAnchor(textFromApi, post.ReplyToList, entities, post.Media);
+
+ var quotedStatusLink = (status.RetweetedStatus ?? status).QuotedStatusPermalink;
+
+ if (quotedStatusLink != null && entities.Urls.Any(x => x.ExpandedUrl == quotedStatusLink.Expanded))
+ quotedStatusLink = null; // 移行期は entities.urls と quoted_status_permalink の両方に含まれる場合がある
+
+ post.Text = CreateHtmlAnchor(textFromApi, entities, quotedStatusLink);
post.TextFromApi = textFromApi;
- post.TextFromApi = this.ReplaceTextFromApi(post.TextFromApi, entities);
+ post.TextFromApi = this.ReplaceTextFromApi(post.TextFromApi, entities, quotedStatusLink);
post.TextFromApi = WebUtility.HtmlDecode(post.TextFromApi);
post.TextFromApi = post.TextFromApi.Replace("<3", "\u2661");
+ post.AccessibleText = CreateAccessibleText(textFromApi, entities, (status.RetweetedStatus ?? status).QuotedStatus, quotedStatusLink);
+ post.AccessibleText = WebUtility.HtmlDecode(post.AccessibleText);
+ post.AccessibleText = post.AccessibleText.Replace("<3", "\u2661");
- post.QuoteStatusIds = GetQuoteTweetStatusIds(entities)
+ this.ExtractEntities(entities, post.ReplyToList, post.Media);
+
+ post.QuoteStatusIds = GetQuoteTweetStatusIds(entities, quotedStatusLink)
.Where(x => x != post.StatusId && x != post.RetweetedId)
.Distinct().ToArray();
.Select(x => new PostClass.ExpandedUrlInfo(x.Url, x.ExpandedUrl))
.ToArray();
+ // メモリ使用量削減 (同一のテキストであれば同一の string インスタンスを参照させる)
+ if (post.Text == post.TextFromApi)
+ post.Text = post.TextFromApi;
+ if (post.AccessibleText == post.TextFromApi)
+ post.AccessibleText = post.TextFromApi;
+
+ // 他の発言と重複しやすい (共通化できる) 文字列は string.Intern を通す
+ post.ScreenName = string.Intern(post.ScreenName);
+ post.Nickname = string.Intern(post.Nickname);
+ post.ImageUrl = string.Intern(post.ImageUrl);
+ post.RetweetedBy = post.RetweetedBy != null ? string.Intern(post.RetweetedBy) : null;
+
//Source整形
- var source = ParseSource(sourceHtml);
- post.Source = source.Item1;
- post.SourceUri = source.Item2;
+ var (sourceText, sourceUri) = ParseSource(sourceHtml);
+ post.Source = string.Intern(sourceText);
+ post.SourceUri = sourceUri;
- post.IsReply = post.ReplyToList.Contains(_uname);
+ post.IsReply = post.RetweetedId == null && post.ReplyToList.Any(x => x.Item1 == this.UserId);
post.IsExcludeReply = false;
if (post.IsMe)
/// <summary>
/// ツイートに含まれる引用ツイートのURLからステータスIDを抽出
/// </summary>
- public static IEnumerable<long> GetQuoteTweetStatusIds(IEnumerable<TwitterEntity> entities)
+ public static IEnumerable<long> GetQuoteTweetStatusIds(IEnumerable<TwitterEntity> entities, TwitterQuotedStatusPermalink quotedStatusLink)
{
var urls = entities.OfType<TwitterEntityUrl>().Select(x => x.ExpandedUrl);
+ if (quotedStatusLink != null)
+ urls = urls.Concat(new[] { quotedStatusLink.Expanded });
+
return GetQuoteTweetStatusIds(urls);
}
var match = Twitter.StatusUrlRegex.Match(url);
if (match.Success)
{
- long statusId;
- if (long.TryParse(match.Groups["StatusId"].Value, out statusId))
+ if (long.TryParse(match.Groups["StatusId"].Value, out var statusId))
yield return statusId;
}
}
}
- private long? CreatePostsFromJson(TwitterStatus[] items, MyCommon.WORKERTYPE gType, TabClass tab, bool read)
+ private long? CreatePostsFromJson(TwitterStatus[] items, MyCommon.WORKERTYPE gType, TabModel tab, bool read)
{
long? minimumId = null;
foreach (var status in items)
{
- PostClass post = null;
- post = CreatePostsFromStatusData(status);
- if (post == null) continue;
-
- if (minimumId == null || minimumId.Value > post.StatusId)
- minimumId = post.StatusId;
+ if (minimumId == null || minimumId.Value > status.Id)
+ minimumId = status.Id;
//二重取得回避
lock (LockObj)
{
if (tab == null)
{
- if (TabInformations.GetInstance().ContainsKey(post.StatusId)) continue;
+ if (TabInformations.GetInstance().ContainsKey(status.Id)) continue;
}
else
{
- if (tab.Contains(post.StatusId)) continue;
+ if (tab.Contains(status.Id)) continue;
}
}
//RT禁止ユーザーによるもの
if (gType != MyCommon.WORKERTYPE.UserTimeline &&
- post.RetweetedByUserId != null && this.noRTId.Contains(post.RetweetedByUserId.Value)) continue;
+ status.RetweetedStatus != null && this.noRTId.Contains(status.User.Id)) continue;
+
+ var post = CreatePostsFromStatusData(status);
post.IsRead = read;
- if (post.IsMe && !read && _readOwnPost) post.IsRead = true;
+ if (post.IsMe && !read && this.ReadOwnPost) post.IsRead = true;
- //非同期アイコン取得&StatusDictionaryに追加
if (tab != null && tab.IsInnerStorageTabType)
- tab.AddPostToInnerStorage(post);
+ tab.AddPostQueue(post);
else
TabInformations.GetInstance().AddPost(post);
}
return minimumId;
}
- private long? CreatePostsFromSearchJson(string content, TabClass tab, bool read, int count, bool more)
+ private long? CreatePostsFromSearchJson(TwitterSearchResult items, PublicSearchTabModel tab, bool read, bool more)
{
- TwitterSearchResult items;
- try
- {
- items = TwitterSearchResult.ParseJson(content);
- }
- catch (SerializationException ex)
- {
- MyCommon.TraceOut(ex.Message + Environment.NewLine + content);
- throw new WebApiException("Json Parse Error(DataContractJsonSerializer)", content, ex);
- }
- catch (Exception ex)
- {
- MyCommon.TraceOut(ex, MethodBase.GetCurrentMethod().Name + " " + content);
- throw new WebApiException("Invalid Json!", content, ex);
- }
-
long? minimumId = null;
- foreach (var result in items.Statuses)
+ foreach (var status in items.Statuses)
{
- var post = CreatePostsFromStatusData(result);
- if (post == null)
- continue;
-
- if (minimumId == null || minimumId.Value > post.StatusId)
- minimumId = post.StatusId;
+ if (minimumId == null || minimumId.Value > status.Id)
+ minimumId = status.Id;
- if (!more && post.StatusId > tab.SinceId) tab.SinceId = post.StatusId;
+ if (!more && status.Id > tab.SinceId) tab.SinceId = status.Id;
//二重取得回避
lock (LockObj)
{
- if (tab == null)
- {
- if (TabInformations.GetInstance().ContainsKey(post.StatusId)) continue;
- }
- else
- {
- if (tab.Contains(post.StatusId)) continue;
- }
+ if (tab.Contains(status.Id)) continue;
}
+ var post = CreatePostsFromStatusData(status);
+
post.IsRead = read;
- if ((post.IsMe && !read) && this._readOwnPost) post.IsRead = true;
+ if ((post.IsMe && !read) && this.ReadOwnPost) post.IsRead = true;
- //非同期アイコン取得&StatusDictionaryに追加
- if (tab != null && tab.IsInnerStorageTabType)
- tab.AddPostToInnerStorage(post);
- else
- TabInformations.GetInstance().AddPost(post);
+ tab.AddPostQueue(post);
}
return minimumId;
}
- private void CreateFavoritePostsFromJson(string content, bool read)
+ private long? CreateFavoritePostsFromJson(TwitterStatus[] items, bool read)
{
- TwitterStatus[] item;
- try
- {
- item = TwitterStatus.ParseJsonArray(content);
- }
- catch (SerializationException ex)
- {
- MyCommon.TraceOut(ex.Message + Environment.NewLine + content);
- throw new WebApiException("Json Parse Error(DataContractJsonSerializer)", content, ex);
- }
- catch (Exception ex)
- {
- MyCommon.TraceOut(ex, MethodBase.GetCurrentMethod().Name + " " + content);
- throw new WebApiException("Invalid Json!", content, ex);
- }
-
var favTab = TabInformations.GetInstance().GetTabByType(MyCommon.TabUsageType.Favorites);
+ long? minimumId = null;
- foreach (var status in item)
+ foreach (var status in items)
{
+ if (minimumId == null || minimumId.Value > status.Id)
+ minimumId = status.Id;
+
//二重取得回避
lock (LockObj)
{
}
var post = CreatePostsFromStatusData(status, true);
- if (post == null) continue;
post.IsRead = read;
TabInformations.GetInstance().AddPost(post);
}
+
+ return minimumId;
}
- public async Task GetListStatus(bool read, TabClass tab, bool more, bool startup)
+ public async Task GetListStatus(bool read, ListTimelineTabModel tab, bool more, bool startup)
{
var count = GetApiResultCount(MyCommon.WORKERTYPE.List, more, startup);
TwitterStatus[] statuses;
if (more)
{
- statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, maxId: tab.OldestId, includeRTs: SettingCommon.Instance.IsListsIncludeRts)
+ statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, maxId: tab.OldestId, includeRTs: SettingManager.Common.IsListsIncludeRts)
.ConfigureAwait(false);
}
else
{
- statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, includeRTs: SettingCommon.Instance.IsListsIncludeRts)
+ statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, includeRTs: SettingManager.Common.IsListsIncludeRts)
.ConfigureAwait(false);
}
return nextPost;
}
- public async Task GetRelatedResult(bool read, TabClass tab)
+ public async Task GetRelatedResult(bool read, RelatedPostsTabModel tab)
{
+ var targetPost = tab.TargetPost;
var relPosts = new Dictionary<Int64, PostClass>();
- if (tab.RelationTargetPost.TextFromApi.Contains("@") && tab.RelationTargetPost.InReplyToStatusId == null)
+ if (targetPost.TextFromApi.Contains("@") && targetPost.InReplyToStatusId == null)
{
//検索結果対応
- var p = TabInformations.GetInstance()[tab.RelationTargetPost.StatusId];
+ var p = TabInformations.GetInstance()[targetPost.StatusId];
if (p != null && p.InReplyToStatusId != null)
{
- tab.RelationTargetPost = p;
+ targetPost = p;
}
else
{
- p = await this.GetStatusApi(read, tab.RelationTargetPost.StatusId)
+ p = await this.GetStatusApi(read, targetPost.StatusId)
.ConfigureAwait(false);
- tab.RelationTargetPost = p;
+ targetPost = p;
}
}
- relPosts.Add(tab.RelationTargetPost.StatusId, tab.RelationTargetPost);
+ relPosts.Add(targetPost.StatusId, targetPost);
Exception lastException = null;
// in_reply_to_status_id を使用してリプライチェインを辿る
- var nextPost = FindTopOfReplyChain(relPosts, tab.RelationTargetPost.StatusId);
+ var nextPost = FindTopOfReplyChain(relPosts, targetPost.StatusId);
var loopCount = 1;
while (nextPost.InReplyToStatusId != null && loopCount++ <= 20)
{
}
//MRTとかに対応のためツイート内にあるツイートを指すURLを取り込む
- var text = tab.RelationTargetPost.Text;
+ var text = targetPost.Text;
var ma = Twitter.StatusUrlRegex.Matches(text).Cast<Match>()
.Concat(Twitter.ThirdPartyStatusUrlRegex.Matches(text).Cast<Match>());
foreach (var _match in ma)
{
- Int64 _statusId;
- if (Int64.TryParse(_match.Groups["StatusId"].Value, out _statusId))
+ if (Int64.TryParse(_match.Groups["StatusId"].Value, out var _statusId))
{
if (relPosts.ContainsKey(_statusId))
continue;
relPosts.Values.ToList().ForEach(p =>
{
- if (p.IsMe && !read && this._readOwnPost)
+ if (p.IsMe && !read && this.ReadOwnPost)
p.IsRead = true;
else
p.IsRead = read;
- tab.AddPostToInnerStorage(p);
+ tab.AddPostQueue(p);
});
if (lastException != null)
throw new WebApiException(lastException.Message, lastException);
}
- public void GetSearch(bool read,
- TabClass tab,
- bool more)
+ public async Task GetSearch(bool read, PublicSearchTabModel tab, bool more)
{
- HttpStatusCode res;
- var content = "";
var count = GetApiResultCount(MyCommon.WORKERTYPE.PublicSearch, more, false);
+
long? maxId = null;
long? sinceId = null;
if (more)
sinceId = tab.SinceId;
}
- try
- {
- // TODO:一時的に40>100件に 件数変更UI作成の必要あり
- res = twCon.Search(tab.SearchWords, tab.SearchLang, count, maxId, sinceId, ref content);
- }
- catch(Exception ex)
- {
- throw new WebApiException("Err:" + ex.Message, ex);
- }
- switch (res)
- {
- case HttpStatusCode.BadRequest:
- throw new WebApiException("Invalid query", content);
- case HttpStatusCode.NotFound:
- throw new WebApiException("Invalid query", content);
- case HttpStatusCode.PaymentRequired: //API Documentには420と書いてあるが、該当コードがないので402にしてある
- throw new WebApiException("Search API Limit?", content);
- case HttpStatusCode.OK:
- break;
- default:
- throw new WebApiException("Err:" + res.ToString() + "(" + MethodBase.GetCurrentMethod().Name + ")", content);
- }
+ var searchResult = await this.Api.SearchTweets(tab.SearchWords, tab.SearchLang, count, maxId, sinceId)
+ .ConfigureAwait(false);
if (!TabInformations.GetInstance().ContainsTab(tab))
return;
- var minimumId = this.CreatePostsFromSearchJson(content, tab, read, count, more);
+ var minimumId = this.CreatePostsFromSearchJson(searchResult, tab, read, more);
if (minimumId != null)
tab.OldestId = minimumId.Value;
//本文
var textFromApi = message.Text;
//HTMLに整形
- post.Text = CreateHtmlAnchor(textFromApi, post.ReplyToList, message.Entities, post.Media);
- post.TextFromApi = this.ReplaceTextFromApi(textFromApi, message.Entities);
+ post.Text = CreateHtmlAnchor(textFromApi, message.Entities, quotedStatusLink: null);
+ post.TextFromApi = this.ReplaceTextFromApi(textFromApi, message.Entities, quotedStatusLink: null);
post.TextFromApi = WebUtility.HtmlDecode(post.TextFromApi);
post.TextFromApi = post.TextFromApi.Replace("<3", "\u2661");
+ post.AccessibleText = CreateAccessibleText(textFromApi, message.Entities, quotedStatus: null, quotedStatusLink: null);
+ post.AccessibleText = WebUtility.HtmlDecode(post.AccessibleText);
+ post.AccessibleText = post.AccessibleText.Replace("<3", "\u2661");
post.IsFav = false;
- post.QuoteStatusIds = GetQuoteTweetStatusIds(message.Entities).Distinct().ToArray();
+ this.ExtractEntities(message.Entities, post.ReplyToList, post.Media);
+
+ post.QuoteStatusIds = GetQuoteTweetStatusIds(message.Entities, quotedStatusLink: null)
+ .Distinct().ToArray();
post.ExpandedUrls = message.Entities.OfType<TwitterEntityUrl>()
.Select(x => new PostClass.ExpandedUrlInfo(x.Url, x.ExpandedUrl))
TwitterUser user;
if (gType == MyCommon.WORKERTYPE.UserStream)
{
- if (twCon.AuthenticatedUsername.Equals(message.Recipient.ScreenName, StringComparison.CurrentCultureIgnoreCase))
+ if (this.Api.CurrentUserId == message.Recipient.Id)
{
user = message.Sender;
post.IsMe = false;
post.Nickname = user.Name.Trim();
post.ImageUrl = user.ProfileImageUrlHttps;
post.IsProtect = user.Protected;
+
+ // メモリ使用量削減 (同一のテキストであれば同一の string インスタンスを参照させる)
+ if (post.Text == post.TextFromApi)
+ post.Text = post.TextFromApi;
+ if (post.AccessibleText == post.TextFromApi)
+ post.AccessibleText = post.TextFromApi;
+
+ // 他の発言と重複しやすい (共通化できる) 文字列は string.Intern を通す
+ post.ScreenName = string.Intern(post.ScreenName);
+ post.Nickname = string.Intern(post.Nickname);
+ post.ImageUrl = string.Intern(post.ImageUrl);
}
catch(Exception ex)
{
}
post.IsRead = read;
- if (post.IsMe && !read && _readOwnPost) post.IsRead = true;
+ if (post.IsMe && !read && this.ReadOwnPost) post.IsRead = true;
post.IsReply = false;
post.IsExcludeReply = false;
post.IsDm = true;
var dmTab = TabInformations.GetInstance().GetTabByType(MyCommon.TabUsageType.DirectMessage);
- dmTab.AddPostToInnerStorage(post);
+ dmTab.AddPostQueue(post);
}
}
CreateDirectMessagesFromJson(messages, gType, read);
}
- public void GetFavoritesApi(bool read,
- bool more)
+ public async Task GetFavoritesApi(bool read, FavoritesTabModel tab, bool backward)
{
this.CheckAccountState();
- HttpStatusCode res;
- var content = "";
- var count = GetApiResultCount(MyCommon.WORKERTYPE.Favorites, more, false);
+ var count = GetApiResultCount(MyCommon.WORKERTYPE.Favorites, backward, false);
- try
+ TwitterStatus[] statuses;
+ if (backward)
{
- res = twCon.Favorites(count, ref content);
+ statuses = await this.Api.FavoritesList(count, maxId: tab.OldestId)
+ .ConfigureAwait(false);
}
- catch(Exception ex)
+ else
{
- throw new WebApiException("Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod().Name + ")", ex);
+ statuses = await this.Api.FavoritesList(count)
+ .ConfigureAwait(false);
}
- this.CheckStatusCode(res, content);
+ var minimumId = this.CreateFavoritePostsFromJson(statuses, read);
- CreateFavoritePostsFromJson(content, read);
+ if (minimumId != null)
+ tab.OldestId = minimumId.Value;
}
- private string ReplaceTextFromApi(string text, TwitterEntities entities)
+ private string ReplaceTextFromApi(string text, TwitterEntities entities, TwitterQuotedStatusPermalink quotedStatusLink)
{
if (entities != null)
{
{
foreach (var m in entities.Media)
{
- if (m.AltText != null)
- {
- text = text.Replace(m.Url, string.Format(Properties.Resources.ImageAltText, m.AltText));
- }
- else
+ if (!string.IsNullOrEmpty(m.DisplayUrl)) text = text.Replace(m.Url, m.DisplayUrl);
+ }
+ }
+ }
+
+ if (quotedStatusLink != null)
+ text += " " + quotedStatusLink.Display;
+
+ return text;
+ }
+
+ internal static string CreateAccessibleText(string text, TwitterEntities entities, TwitterStatus quotedStatus, TwitterQuotedStatusPermalink quotedStatusLink)
+ {
+ if (entities == null)
+ return text;
+
+ if (entities.Urls != null)
+ {
+ foreach (var entity in entities.Urls)
+ {
+ if (quotedStatus != null)
+ {
+ var matchStatusUrl = Twitter.StatusUrlRegex.Match(entity.ExpandedUrl);
+ if (matchStatusUrl.Success && matchStatusUrl.Groups["StatusId"].Value == quotedStatus.IdStr)
{
- if (!string.IsNullOrEmpty(m.DisplayUrl)) text = text.Replace(m.Url, m.DisplayUrl);
+ var quotedText = CreateAccessibleText(quotedStatus.FullText, quotedStatus.MergedEntities, quotedStatus: null, quotedStatusLink: null);
+ text = text.Replace(entity.Url, string.Format(Properties.Resources.QuoteStatus_AccessibleText, quotedStatus.User.ScreenName, quotedText));
+ continue;
}
}
+
+ if (!string.IsNullOrEmpty(entity.DisplayUrl))
+ text = text.Replace(entity.Url, entity.DisplayUrl);
+ }
+ }
+
+ if (entities.Media != null)
+ {
+ foreach (var entity in entities.Media)
+ {
+ if (!string.IsNullOrEmpty(entity.AltText))
+ {
+ text = text.Replace(entity.Url, string.Format(Properties.Resources.ImageAltText, entity.AltText));
+ }
+ else if (!string.IsNullOrEmpty(entity.DisplayUrl))
+ {
+ text = text.Replace(entity.Url, entity.DisplayUrl);
+ }
}
}
+
+ if (quotedStatusLink != null)
+ {
+ var quoteText = CreateAccessibleText(quotedStatus.FullText, quotedStatus.MergedEntities, quotedStatus: null, quotedStatusLink: null);
+ text += " " + string.Format(Properties.Resources.QuoteStatus_AccessibleText, quotedStatus.User.ScreenName, quoteText);
+ }
+
return text;
}
this.followerId = newFollowerIds;
TabInformations.GetInstance().RefreshOwl(this.followerId);
- this._GetFollowerResult = true;
- }
-
- public bool GetFollowersSuccess
- {
- get
- {
- return _GetFollowerResult;
- }
+ this.GetFollowersSuccess = true;
}
/// <summary>
this.noRTId = await this.Api.NoRetweetIds()
.ConfigureAwait(false);
- this._GetNoRetweetResult = true;
- }
-
- public bool GetNoRetweetSuccess
- {
- get
- {
- return _GetNoRetweetResult;
- }
+ this.GetNoRetweetSuccess = true;
}
/// <summary>
{
this.Configuration = await this.Api.Configuration()
.ConfigureAwait(false);
+
+ // TextConfiguration 相当の JSON を得る API が存在しないため、TransformedURLLength のみ help/configuration.json に合わせて更新する
+ this.TextConfiguration.TransformedURLLength = this.Configuration.ShortUrlLengthHttps;
}
public async Task GetListsApi()
{
this.CheckAccountState();
- var ownedLists = await TwitterLists.GetAllItemsAsync(x => this.Api.ListsOwnerships(this.Username, cursor: x))
- .ConfigureAwait(false);
+ var ownedLists = await TwitterLists.GetAllItemsAsync(x =>
+ this.Api.ListsOwnerships(this.Username, cursor: x, count: 1000))
+ .ConfigureAwait(false);
- var subscribedLists = await TwitterLists.GetAllItemsAsync(x => this.Api.ListsSubscriptions(this.Username, cursor: x))
- .ConfigureAwait(false);
+ var subscribedLists = await TwitterLists.GetAllItemsAsync(x =>
+ this.Api.ListsSubscriptions(this.Username, cursor: x, count: 1000))
+ .ConfigureAwait(false);
TabInformations.GetInstance().SubscribableLists = Enumerable.Concat(ownedLists, subscribedLists)
.Select(x => new ListElement(x, this))
return new ListElement(list, this);
}
- public long GetListMembers(string list_id, List<UserInfo> lists, long cursor)
+ public async Task<long> GetListMembers(long listId, List<UserInfo> lists, long cursor)
{
this.CheckAccountState();
- HttpStatusCode res;
- var content = "";
- try
- {
- res = twCon.GetListMembers(this.Username, list_id, cursor, ref content);
- }
- catch(Exception ex)
- {
- throw new WebApiException("Err:" + ex.Message);
- }
-
- this.CheckStatusCode(res, content);
+ var users = await this.Api.ListsMembers(listId, cursor)
+ .ConfigureAwait(false);
- try
- {
- var users = TwitterUsers.ParseJson(content);
- Array.ForEach<TwitterUser>(
- users.Users,
- u => lists.Add(new UserInfo(u)));
+ Array.ForEach(users.Users, u => lists.Add(new UserInfo(u)));
- return users.NextCursor;
- }
- catch(SerializationException ex)
- {
- MyCommon.TraceOut(ex.Message + Environment.NewLine + content);
- throw new WebApiException("Err:Json Parse Error(DataContractJsonSerializer)", content, ex);
- }
- catch(Exception ex)
- {
- MyCommon.TraceOut(ex, MethodBase.GetCurrentMethod().Name + " " + content);
- throw new WebApiException("Err:Invalid Json!", content, ex);
- }
+ return users.NextCursor;
}
public async Task CreateListApi(string listName, bool isPrivate, string description)
TabInformations.GetInstance().SubscribableLists.Add(new ListElement(list, this));
}
- public bool ContainsUserAtList(string listId, string user)
+ public async Task<bool> ContainsUserAtList(long listId, string user)
{
this.CheckAccountState();
- HttpStatusCode res;
- var content = "";
-
try
{
- res = this.twCon.ShowListMember(listId, user, ref content);
- }
- catch(Exception ex)
- {
- throw new WebApiException("Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod().Name + ")", ex);
- }
-
- if (res == HttpStatusCode.NotFound)
- {
- return false;
- }
-
- this.CheckStatusCode(res, content);
+ await this.Api.ListsMembersShow(listId, user)
+ .ConfigureAwait(false);
- try
- {
- TwitterUser.ParseJson(content);
return true;
}
- catch(Exception)
+ catch (TwitterApiException ex)
+ when (ex.ErrorResponse.Errors.Any(x => x.Code == TwitterErrorCode.NotFound))
{
return false;
}
}
- public void AddUserToList(string listId, string user)
- {
- HttpStatusCode res;
- var content = "";
-
- try
- {
- res = twCon.CreateListMembers(listId, user, ref content);
- }
- catch(Exception ex)
- {
- throw new WebApiException("Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod().Name + ")", ex);
- }
-
- this.CheckStatusCode(res, content);
- }
-
- public void RemoveUserToList(string listId, string user)
- {
- HttpStatusCode res;
- var content = "";
-
- try
- {
- res = twCon.DeleteListMembers(listId, user, ref content);
- }
- catch(Exception ex)
- {
- throw new WebApiException("Err:" + ex.Message + "(" + MethodBase.GetCurrentMethod().Name + ")", ex);
- }
-
- this.CheckStatusCode(res, content);
- }
-
- public string CreateHtmlAnchor(string text, List<string> AtList, TwitterEntities entities, List<MediaInfo> media)
+ private void ExtractEntities(TwitterEntities entities, List<Tuple<long, string>> AtList, List<MediaInfo> media)
{
if (entities != null)
{
{
foreach (var ent in entities.UserMentions)
{
- var screenName = ent.ScreenName.ToLowerInvariant();
- if (!AtList.Contains(screenName))
- AtList.Add(screenName);
+ AtList.Add(Tuple.Create(ent.Id, ent.ScreenName));
}
}
if (entities.Media != null)
{
foreach (var ent in entities.Media)
{
- if (!media.Any(x => x.Url == ent.MediaUrl))
+ if (!media.Any(x => x.Url == ent.MediaUrlHttps))
{
if (ent.VideoInfo != null &&
ent.Type == "animated_gif" || ent.Type == "video")
// .Where(v => v.ContentType == "video/mp4")
// .OrderByDescending(v => v.Bitrate)
// .Select(v => v.Url).FirstOrDefault();
- media.Add(new MediaInfo(ent.MediaUrl, ent.AltText, ent.ExpandedUrl));
+ media.Add(new MediaInfo(ent.MediaUrlHttps, ent.AltText, ent.ExpandedUrl));
}
else
- media.Add(new MediaInfo(ent.MediaUrl, ent.AltText, videoUrl: null));
+ media.Add(new MediaInfo(ent.MediaUrlHttps, ent.AltText, videoUrl: null));
}
}
}
}
}
+ }
+ internal static string CreateHtmlAnchor(string text, TwitterEntities entities, TwitterQuotedStatusPermalink quotedStatusLink)
+ {
// PostClass.ExpandedUrlInfo を使用して非同期に URL 展開を行うためここでは expanded_url を使用しない
text = TweetFormatter.AutoLinkHtml(text, entities, keepTco: true);
text = Regex.Replace(text, "(^|[^a-zA-Z0-9_/&##@@>=.~])(sm|nm)([0-9]{1,10})", "$1<a href=\"http://www.nicovideo.jp/watch/$2$3\">$2$3</a>");
text = PreProcessUrl(text); //IDN置換
+ if (quotedStatusLink != null)
+ {
+ text += string.Format(" <a href=\"{0}\" title=\"{0}\">{1}</a>",
+ WebUtility.HtmlEncode(quotedStatusLink.Url),
+ WebUtility.HtmlEncode(quotedStatusLink.Display));
+ }
+
return text;
}
/// <summary>
/// Twitter APIから得たHTML形式のsource文字列を分析し、source名とURLに分離します
/// </summary>
- public static Tuple<string, Uri> ParseSource(string sourceHtml)
+ internal static (string SourceText, Uri SourceUri) ParseSource(string sourceHtml)
{
if (string.IsNullOrEmpty(sourceHtml))
- return Tuple.Create<string, Uri>("", null);
+ return ("", null);
string sourceText;
Uri sourceUri;
sourceUri = null;
}
- return Tuple.Create(sourceText, sourceUri);
+ return (sourceText, sourceUri);
}
public async Task<TwitterApiStatus> GetInfoApi()
}
public string AccessToken
- {
- get
- {
- return twCon.AccessToken;
- }
- }
+ => ((TwitterApiConnection)this.Api.Connection).AccessToken;
public string AccessTokenSecret
- {
- get
- {
- return twCon.AccessTokenSecret;
- }
- }
+ => ((TwitterApiConnection)this.Api.Connection).AccessSecret;
private void CheckAccountState()
{
throw new WebApiException("Auth Err:try to re-authorization.");
}
- private void CheckStatusCode(HttpStatusCode httpStatus, string responseText,
- [CallerMemberName] string callerMethodName = "")
- {
- if (httpStatus == HttpStatusCode.OK)
- {
- Twitter.AccountState = MyCommon.ACCOUNT_STATE.Valid;
- return;
- }
-
- if (string.IsNullOrWhiteSpace(responseText))
- {
- if (httpStatus == HttpStatusCode.Unauthorized)
- Twitter.AccountState = MyCommon.ACCOUNT_STATE.Invalid;
-
- throw new WebApiException("Err:" + httpStatus + "(" + callerMethodName + ")");
- }
-
- try
- {
- var errors = TwitterError.ParseJson(responseText).Errors;
- if (errors == null || !errors.Any())
- {
- throw new WebApiException("Err:" + httpStatus + "(" + callerMethodName + ")", responseText);
- }
-
- foreach (var error in errors)
- {
- if (error.Code == TwitterErrorCode.InvalidToken ||
- error.Code == TwitterErrorCode.SuspendedAccount)
- {
- Twitter.AccountState = MyCommon.ACCOUNT_STATE.Invalid;
- }
- }
-
- throw new WebApiException("Err:" + string.Join(",", errors.Select(x => x.ToString())) + "(" + callerMethodName + ")", responseText);
- }
- catch (SerializationException) { }
-
- throw new WebApiException("Err:" + httpStatus + "(" + callerMethodName + ")", responseText);
- }
-
public int GetTextLengthRemain(string postText)
{
var matchDm = Twitter.DMSendTextRegex.Match(postText);
if (matchDm.Success)
- return this.GetTextLengthRemainInternal(matchDm.Groups["body"].Value, isDm: true);
+ return this.GetTextLengthRemainDM(matchDm.Groups["body"].Value);
- return this.GetTextLengthRemainInternal(postText, isDm: false);
+ return this.GetTextLengthRemainWeighted(postText);
}
- private int GetTextLengthRemainInternal(string postText, bool isDm)
+ private int GetTextLengthRemainDM(string postText)
{
var textLength = 0;
textLength += shortUrlLength - url.Length;
}
- if (isDm)
- return this.Configuration.DmTextCharacterLimit - textLength;
- else
- return 140 - textLength;
+ return this.Configuration.DmTextCharacterLimit - textLength;
}
-
-#region "UserStream"
- private string trackWord_ = "";
- public string TrackWord
- {
- get
- {
- return trackWord_;
- }
- set
- {
- trackWord_ = value;
- }
- }
- private bool allAtReply_ = false;
- public bool AllAtReply
+ private int GetTextLengthRemainWeighted(string postText)
{
- get
- {
- return allAtReply_;
- }
- set
+ var config = this.TextConfiguration;
+ var totalWeight = 0;
+
+ var urls = TweetExtractor.ExtractUrlEntities(postText).ToArray();
+
+ var pos = 0;
+ while (pos < postText.Length)
{
- allAtReply_ = value;
+ var urlEntity = urls.FirstOrDefault(x => x.Indices[0] == pos);
+ if (urlEntity != null)
+ {
+ totalWeight += config.TransformedURLLength * config.Scale;
+
+ var urlLength = urlEntity.Indices[1] - urlEntity.Indices[0];
+ pos += urlLength;
+
+ continue;
+ }
+
+ var codepoint = postText.GetCodepointAtSafe(pos);
+ var weight = config.DefaultWeight;
+
+ foreach (var weightRange in config.Ranges)
+ {
+ if (codepoint >= weightRange.Start && codepoint <= weightRange.End)
+ {
+ weight = weightRange.Weight;
+ break;
+ }
+ }
+
+ totalWeight += weight;
+
+ var isSurrogatePair = codepoint > 0xffff;
+ if (isSurrogatePair)
+ pos += 2; // サロゲートペアの場合は2文字分進める
+ else
+ pos++;
}
+
+ var remainWeight = config.MaxWeightedTweetLength * config.Scale - totalWeight;
+
+ return remainWeight / config.Scale;
}
+
+#region "UserStream"
+ public string TrackWord { get; set; } = "";
+ public bool AllAtReply { get; set; } = false;
+
public event EventHandler NewPostFromStream;
public event EventHandler UserStreamStarted;
public event EventHandler UserStreamStopped;
public event EventHandler<PostDeletedEventArgs> PostDeleted;
public event EventHandler<UserStreamEventReceivedEventArgs> UserStreamEventReceived;
- private DateTime _lastUserstreamDataReceived;
+ private DateTimeUtc _lastUserstreamDataReceived;
private TwitterUserstream userStream;
public class FormattedEvent
{
public MyCommon.EVENTTYPE Eventtype { get; set; }
- public DateTime CreatedAt { get; set; }
+ public DateTimeUtc CreatedAt { get; set; }
public string Event { get; set; }
public string Username { get; set; }
public string Target { get; set; }
public bool IsMe { get; set; }
}
- public List<FormattedEvent> storedEvent_ = new List<FormattedEvent>();
- public List<FormattedEvent> StoredEvent
- {
- get
- {
- return storedEvent_;
- }
- set
- {
- storedEvent_ = value;
- }
- }
+ public List<FormattedEvent> StoredEvent { get; } = new List<FormattedEvent>();
private readonly IReadOnlyDictionary<string, MyCommon.EVENTTYPE> eventTable = new Dictionary<string, MyCommon.EVENTTYPE>
{
};
public bool IsUserstreamDataReceived
- {
- get
- {
- return DateTime.Now.Subtract(this._lastUserstreamDataReceived).TotalSeconds < 31;
- }
- }
+ => (DateTimeUtc.Now - this._lastUserstreamDataReceived).TotalSeconds < 31;
private void userStream_StatusArrived(string line)
{
- this._lastUserstreamDataReceived = DateTime.Now;
+ this._lastUserstreamDataReceived = DateTimeUtc.Now;
if (string.IsNullOrEmpty(line)) return;
if (line.First() != '{' || line.Last() != '}')
{
try
{
- var status = TwitterStatus.ParseJson(line);
- this.CreatePostsFromJson(new[] { status }, MyCommon.WORKERTYPE.UserStream, null, false);
+ var status = TwitterStatusCompat.ParseJson(line);
+ this.CreatePostsFromJson(new[] { status.Normalize() }, MyCommon.WORKERTYPE.UserStream, null, false);
}
catch (SerializationException ex)
{
MyCommon.TraceOut(ex);
return;
}
+ catch (XmlException)
+ {
+ MyCommon.TraceOut("XmlException (StatusArrived): " + line);
+ }
catch(NullReferenceException)
{
MyCommon.TraceOut("NullRef StatusArrived: " + line);
MyCommon.TraceOut(ex, "Event Exception!" + Environment.NewLine + content);
}
- var evt = new FormattedEvent();
- evt.CreatedAt = MyCommon.DateTimeParse(eventData.CreatedAt);
- evt.Event = eventData.Event;
- evt.Username = eventData.Source.ScreenName;
- evt.IsMe = evt.Username.ToLowerInvariant().Equals(this.Username.ToLowerInvariant());
-
- MyCommon.EVENTTYPE eventType;
- eventTable.TryGetValue(eventData.Event, out eventType);
- evt.Eventtype = eventType;
+ var evt = new FormattedEvent
+ {
+ CreatedAt = MyCommon.DateTimeParse(eventData.CreatedAt),
+ Event = eventData.Event,
+ Username = eventData.Source.ScreenName,
+ IsMe = eventData.Source.ScreenName.Equals(this.Username, StringComparison.InvariantCultureIgnoreCase),
+ Eventtype = eventTable.TryGetValue(eventData.Event, out var eventType) ? eventType : MyCommon.EVENTTYPE.None,
+ };
- TwitterStreamEvent<TwitterStatus> tweetEvent;
+ TwitterStreamEvent<TwitterStatusCompat> tweetEvent;
+ TwitterStatus tweet;
switch (eventData.Event)
{
case "user_suspend":
return;
case "follow":
- if (eventData.Target.ScreenName.ToLowerInvariant().Equals(_uname))
+ if (eventData.Target.ScreenName.Equals(_uname, StringComparison.InvariantCultureIgnoreCase))
{
if (!this.followerId.Contains(eventData.Source.Id)) this.followerId.Add(eventData.Source.Id);
}
return;
case "favorite":
case "unfavorite":
- tweetEvent = TwitterStreamEvent<TwitterStatus>.ParseJson(content);
- evt.Target = "@" + tweetEvent.TargetObject.User.ScreenName + ":" + WebUtility.HtmlDecode(tweetEvent.TargetObject.Text);
- evt.Id = tweetEvent.TargetObject.Id;
+ tweetEvent = TwitterStreamEvent<TwitterStatusCompat>.ParseJson(content);
+ tweet = tweetEvent.TargetObject.Normalize();
+ evt.Target = "@" + tweet.User.ScreenName + ":" + WebUtility.HtmlDecode(tweet.FullText);
+ evt.Id = tweet.Id;
- if (SettingCommon.Instance.IsRemoveSameEvent)
+ if (SettingManager.Common.IsRemoveSameEvent)
{
if (this.StoredEvent.Any(ev => ev.Username == evt.Username && ev.Eventtype == evt.Eventtype && ev.Target == evt.Target))
return;
var tabinfo = TabInformations.GetInstance();
- PostClass post;
- var statusId = tweetEvent.TargetObject.Id;
- if (!tabinfo.Posts.TryGetValue(statusId, out post))
+ var statusId = tweet.Id;
+ if (!tabinfo.Posts.TryGetValue(statusId, out var post))
break;
if (eventData.Event == "favorite")
{
var favTab = tabinfo.GetTabByType(MyCommon.TabUsageType.Favorites);
- if (!favTab.Contains(post.StatusId))
- favTab.AddPostImmediately(post.StatusId, post.IsRead);
+ favTab.AddPostQueue(post);
if (tweetEvent.Source.Id == this.UserId)
{
{
post.FavoritedCount++;
- if (SettingCommon.Instance.FavEventUnread)
+ if (SettingManager.Common.FavEventUnread)
tabinfo.SetReadAllTab(post.StatusId, read: false);
}
}
case "quoted_tweet":
if (evt.IsMe) return;
- tweetEvent = TwitterStreamEvent<TwitterStatus>.ParseJson(content);
- evt.Target = "@" + tweetEvent.TargetObject.User.ScreenName + ":" + WebUtility.HtmlDecode(tweetEvent.TargetObject.Text);
- evt.Id = tweetEvent.TargetObject.Id;
+ tweetEvent = TwitterStreamEvent<TwitterStatusCompat>.ParseJson(content);
+ tweet = tweetEvent.TargetObject.Normalize();
+ evt.Target = "@" + tweet.User.ScreenName + ":" + WebUtility.HtmlDecode(tweet.FullText);
+ evt.Id = tweet.Id;
- if (SettingCommon.Instance.IsRemoveSameEvent)
+ if (SettingManager.Common.IsRemoveSameEvent)
{
if (this.StoredEvent.Any(ev => ev.Username == evt.Username && ev.Eventtype == evt.Eventtype && ev.Target == evt.Target))
return;
}
private void userStream_Started()
- {
- this.UserStreamStarted?.Invoke(this, EventArgs.Empty);
- }
+ => this.UserStreamStarted?.Invoke(this, EventArgs.Empty);
private void userStream_Stopped()
- {
- this.UserStreamStopped?.Invoke(this, EventArgs.Empty);
- }
+ => this.UserStreamStopped?.Invoke(this, EventArgs.Empty);
public bool UserStreamActive
- => this.userStream == null ? false : this.userStream.IsStreamActive;
+ => this.userStream != null && this.userStream.IsStreamActive;
public void StartUserStream()
{
public void ReconnectUserStream()
{
- this.StartUserStream();
+ if (this.userStream != null)
+ {
+ this.StartUserStream();
+ }
}
private class TwitterUserstream : IDisposable
private CancellationTokenSource streamCts;
public TwitterUserstream(TwitterApi twitterApi)
- {
- this.twitterApi = twitterApi;
- }
+ => this.twitterApi = twitterApi;
public void Start(bool allAtReplies, string trackwords)
{
private async Task UserStreamLoop(CancellationToken cancellationToken)
{
- TimeSpan? sleep = null;
+ TimeSpan sleep = TimeSpan.Zero;
for (;;)
{
- if (sleep != null)
+ if (sleep != TimeSpan.Zero)
{
- await Task.Delay(sleep.Value, cancellationToken)
+ await Task.Delay(sleep, cancellationToken)
.ConfigureAwait(false);
- sleep = null;
+ sleep = TimeSpan.Zero;
}
if (!MyCommon.IsNetworkAvailable())
// キャンセルされていないのにストリームが終了した場合
sleep = TimeSpan.FromSeconds(30);
}
- catch (HttpRequestException) { sleep = TimeSpan.FromSeconds(30); }
+ catch (TwitterApiException) { sleep = TimeSpan.FromSeconds(30); }
catch (IOException) { sleep = TimeSpan.FromSeconds(30); }
catch (OperationCanceledException)
{
public long StatusId { get; }
public PostDeletedEventArgs(long statusId)
- {
- this.StatusId = statusId;
- }
+ => this.StatusId = statusId;
}
public class UserStreamEventReceivedEventArgs : EventArgs
public Twitter.FormattedEvent EventData { get; }
public UserStreamEventReceivedEventArgs(Twitter.FormattedEvent eventData)
- {
- this.EventData = eventData;
- }
+ => this.EventData = eventData;
}
}